Bump to v3.3.3

* Made nodes data concatenate as RLP sequences instead of bytes

* Add test for getNodeData dispatch

* Update getNodeData to return data for non-aura networks

.cargo/config

@@ -1,30 +1,3 @@
-# NOTE: if you make changes here, remember to also update:
-#	scripts/test-linux.sh
-#	scripts/build-linux.sh
-#	scripts/build-windows.sh
-
-# Using 'cfg` is broken, see https://github.com/rust-lang/cargo/issues/6858
-#[target.'cfg(target_arch = "x86_64")']
-#rustflags = ["-Ctarget-feature=+aes,+sse2,+ssse3"]
-
-# …so instead we list all target triples (Tier 1 64-bit platforms)
-[target.x86_64-unknown-linux-gnu]
-# Enables the aes-ni instructions for RustCrypto dependency.
-rustflags = ["-Ctarget-feature=+aes,+sse2,+ssse3"]
-
-[target.x86_64-pc-windows-gnu]
-# Enables the aes-ni instructions for RustCrypto dependency.
-rustflags = ["-Ctarget-feature=+aes,+sse2,+ssse3"]
-
 [target.x86_64-pc-windows-msvc]
-# Enables the aes-ni instructions for RustCrypto dependency.
-# Link the C runtime statically ; https://github.com/openethereum/openethereum/issues/6643
-rustflags = ["-Ctarget-feature=+aes,+sse2,+ssse3", "-Ctarget-feature=+crt-static"]
-
-[target.x86_64-apple-darwin]
-# Enables the aes-ni instructions for RustCrypto dependency.
-rustflags = ["-Ctarget-feature=+aes,+sse2,+ssse3"]
-
-[target.x86_64-unknown-linux-musl]
-# Enables the aes-ni instructions for RustCrypto dependency.
-rustflags = ["-Ctarget-feature=+aes,+sse2,+ssse3"]
+# Link the C runtime statically ; https://github.com/openethereum/parity-ethereum/issues/6643
+rustflags = ["-Ctarget-feature=+crt-static"]

.dockerignore

@@ -16,7 +16,7 @@ target
 # idea ide
 .idea
 
-# git folder is not ignored so vergen library can get the commit hash and date for the build
-#.git
+# git stuff
+.git
 
 ethcore/res/ethereum/tests

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Reformat the source code
+610d9baba4af83b5767c659ca2ccfed337af1056

.github/CODE_OF_CONDUCT.md

@@ -2,7 +2,7 @@
 
 ## 1. Purpose
 
-A primary goal of OpenEthereum project is to be inclusive to the largest number of contributors, with the most varied and diverse backgrounds possible. As such, we are committed to providing a friendly, safe and welcoming environment for all, regardless of gender, sexual orientation, ability, ethnicity, socioeconomic status, and religion (or lack thereof).
+A primary goal of OpenEthereum is to be inclusive to the largest number of contributors, with the most varied and diverse backgrounds possible. As such, we are committed to providing a friendly, safe and welcoming environment for all, regardless of gender, sexual orientation, ability, ethnicity, socioeconomic status, and religion (or lack thereof).
 
 This code of conduct outlines our expectations for all those who participate in our community, as well as the consequences for unacceptable behavior.
 
@@ -63,7 +63,7 @@ Additionally, community organizers are available to help community members engag
 
 ## 7. Addressing Grievances
 
-If you feel you have been falsely or unfairly accused of violating this Code of Conduct, you should notify Parity Technologies with a concise description of your grievance. Your grievance will be handled in accordance with our existing governing policies.
+If you feel you have been falsely or unfairly accused of violating this Code of Conduct, you should notify OpenEthereum Technologies with a concise description of your grievance. Your grievance will be handled in accordance with our existing governing policies.
 
 ## 8. Scope
 
@@ -73,7 +73,7 @@ This code of conduct and its related procedures also applies to unacceptable beh
 
 ## 9. Contact info
 
-You can contact Parity via Email: community@parity.io
+You can contact OpenEthereum via Email: community@parity.io
 
 ## 10. License and attribution
 

.github/CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 ## Do you have a question?
 
-Check out our [Basic Usage](https://wiki.parity.io/Basic-Usage), [Configuration](https://wiki.parity.io/Configuring-Parity-Ethereum), and [FAQ](https://wiki.parity.io/FAQ) articles on our [wiki](https://wiki.parity.io/)!
+Check out our [Beginner Introduction](https://openethereum.github.io/Beginner-Introduction), [Configuration](https://openethereum.github.io//Configuring-OpenEthereum), and [FAQ](https://openethereum.github.io/FAQ) articles on our [wiki](https://openethereum.github.io/)!
 
 See also frequently asked questions [tagged with `parity`](https://ethereum.stackexchange.com/questions/tagged/parity?sort=votes&pageSize=50) on Stack Exchange.
 
@@ -35,11 +35,11 @@ There are a few basic ground-rules for contributors (including the maintainer(s)
 * **No pushing directly to the master branch**.
 * **All modifications** must be made in a **pull-request** to solicit feedback from other contributors.
 * Pull-requests cannot be merged before CI runs green and two reviewers have given their approval.
-* Contributors should adhere to the [Parity Ethereum Style Guide](https://wiki.parity.io/Parity-Ethereum-Style-Guide).
+* All code changed should be formated by running `cargo fmt -- --config=merge_imports=true`
 
 ### Recommendations
 
-* **Non-master branch names** *should* be prefixed with a short name moniker, followed by the associated Github Issue ID (if any), and a brief description of the task using the format `<GITHUB_USERNAME>-<ISSUE_ID>-<BRIEF_DESCRIPTION>` (e.g. `gavin-123-readme`). The name moniker helps people to inquiry about their unfinished work, and the GitHub Issue ID helps your future self and other developers (particularly those who are onboarding) find out about and understand the original scope of the task, and where it fits into OpenEthereum [Projects](https://github.com/openethereum/openethereum/projects).
+* **Non-master branch names** *should* be prefixed with a short name moniker, followed by the associated Github Issue ID (if any), and a brief description of the task using the format `<GITHUB_USERNAME>-<ISSUE_ID>-<BRIEF_DESCRIPTION>` (e.g. `gavin-123-readme`). The name moniker helps people to inquiry about their unfinished work, and the GitHub Issue ID helps your future self and other developers (particularly those who are onboarding) find out about and understand the original scope of the task, and where it fits into Parity Ethereum [Projects](https://github.com/openethereum/openethereum/projects).
 * **Remove stale branches periodically**
 
 ### Preparing Pull Requests
@@ -63,4 +63,6 @@ When doing a review, make sure to look for any:
 
 ## License.
 
-By contributing to OpenEthereum, you agree that your contributions will be licensed under the [GPLv3 License](../LICENSE).
+By contributing to Parity Ethereum, you agree that your contributions will be licensed under the [GPLv3 License](../LICENSE).
+
+Each contributor has to sign our Contributor License Agreement. The purpose of the CLA is to ensure that the guardian of a project's outputs has the necessary ownership or grants of rights over all contributions to allow them to distribute under the chosen license. You can read and sign our full Contributor License Agreement at [cla.parity.io](https://cla.parity.io) before submitting a pull request.

.github/ISSUE_TEMPLATE.md

@@ -1,14 +1,13 @@
+For questions please use https://discord.io/openethereum, issues are for bugs and feature requests.
+
 _Before filing a new issue, please **provide the following information**._
 
-_If you think that your issue is an exploitable security vulnerability, please mail your bugreport to security@parity.io instead; your submission might be eligible for our Bug Bounty._
-_You can find mode info on the reporting process in [SECURITY.md](https://github.com/openethereum/openethereum/blob/master/SECURITY.md)_
-
-
-- **OpenEthereum version**: 0.0.0
+- **OpenEthereum version (>=3.1.0)**: 0.0.0
 - **Operating system**: Windows / MacOS / Linux
 - **Installation**: homebrew / one-line installer / built from source
 - **Fully synchronized**: no / yes
-- **Network**: ethereum / ropsten / goerli / ...
+- **Network**: ethereum / ropsten / kovan / ...
 - **Restarted**: no / yes
 
 _Your issue description goes here below. Try to include **actual** vs. **expected behavior** and **steps to reproduce** the issue._
+

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,21 +0,0 @@
-Thank you for your Pull Request!
-
-Before you submitting, please check that:
-
-- [ ] You added a brief description of the PR, e.g.:
-  - What does it do?
-  - What important points reviewers should know?
-  - Is there something left for follow-up PRs?
-- [ ] You labeled the PR with appropriate labels if you have permissions to do so.
-- [ ] You mentioned a related issue if this PR related to it, e.g. `Fixes #228` or `Related #1337`.
-- [ ] You asked any particular reviewers to review. If you aren't sure, start with GH suggestions.
-- [ ] Your PR adheres [the style guide](https://wiki.parity.io/Coding-guide)
-  - In particular, mind the maximal line length.
-  - There is no commented code checked in unless necessary.
-  - Any panickers have a proof or removed.
-- [ ] You updated any rustdocs which may have changed
-
-After you've read this notice feel free to remove it.
-Thank you!
-
-✄ -----------------------------------------------------------------------------

.github/workflows/audit.yml

@@ -1,18 +0,0 @@
-name: Security audit
-on:
-  pull_request:
-    paths: Cargo.lock
-  schedule:
-    - cron: '0 0 * * *'
-jobs:
-  security_audit:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v1
-        with:
-          fetch-depth: 50
-      - name: Run cargo audit
-        uses: actions-rs/audit-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build-test-windows.yml

@@ -0,0 +1,33 @@
+name:                           Build and Test Suite on Windows
+
+on:
+  push:
+    branches:
+      - main
+      - dev
+jobs:
+  build-tests:
+    name:                       Test and Build
+    strategy:
+      matrix:
+        platform:
+          - windows2019 # custom runner
+        toolchain:
+          - 1.52.1
+    runs-on:                    ${{ matrix.platform }}
+    steps:
+      - name:                   Checkout sources
+        uses:                   actions/checkout@main
+        with:
+          submodules:           true
+      - name:                   Install toolchain
+        uses:                   actions-rs/toolchain@v1
+        with:
+          toolchain:            ${{ matrix.toolchain }}
+          profile:              minimal
+          override:             true
+      - name:                   Build tests
+        uses:                   actions-rs/cargo@v1
+        with:
+          command:              test
+          args:                 --locked --all --release --features "json-tests" --verbose --no-run

.github/workflows/build-test.yml

@@ -4,100 +4,37 @@ on:
   pull_request:
   push:
     branches:
-      - master
-      - stable
+      - main
+      - dev
 jobs:
   build-tests:
     name:                       Test and Build
-    env:
-      SCCACHE_CACHE_SIZE:       "1G"
-      SCCACHE_IDLE_TIMEOUT:     0
     strategy:
       matrix:
         platform:
           - ubuntu-16.04
           - macos-latest
-          - windows-latest
         toolchain:
-          - stable
+          - 1.52.1
     runs-on:                    ${{ matrix.platform }}
     steps:
       - name:                   Checkout sources
-        uses:                   actions/checkout@master
+        uses:                   actions/checkout@main
         with:
           submodules:           true
-      # https://github.com/actions/cache/issues/133 
-      - name:                   Fixup the owner of ~/.cargo/
-        if:                     matrix.platform == 'ubuntu-16.04'
-        run:                    sudo chown -R $(whoami):$(id -ng) ~/.cargo/
       - name:                   Install toolchain
         uses:                   actions-rs/toolchain@v1
         with:
           toolchain:            ${{ matrix.toolchain }}
           profile:              minimal
           override:             true
-      - name:                   Cache cargo registry
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 ~/.cargo/registry
-          key:                  ${{ runner.os }}-cargo-registry-build-tests-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache cargo index
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 ~/.cargo/git
-          key:                  ${{ runner.os }}-cargo-git-build-tests-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache cargo build
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 target
-          key:                  ${{ runner.os }}-cargo-build-target-build-tests-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache sccache linux
-        if:                     matrix.platform == 'ubuntu-16.04'
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 "/home/runner/.cache/sccache"
-          key:                  ${{ runner.os }}-sccache-build-tests-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache sccache MacOS
-        if:                     matrix.platform == 'macos-latest'
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 "/Users/runner/Library/Caches/Mozilla.sccache"
-          key:                  ${{ runner.os }}-sccache-build-tests-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache sccache Windows
-        if:                     matrix.platform == 'windows-latest'
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 "C:\\Users\\runneradmin\\AppData\\Local\\Mozilla\\sccache\\cache"
-          key:                  ${{ runner.os }}-sccache-build-tests-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Install sccache for ${{ matrix.platform }}
-        shell:                  pwsh
-        run:                    pwsh scripts/actions/install-sccache.ps1 ${{ runner.os}}
-      - name:                   Install LLVM for Windows
-        if:                     matrix.platform == 'windows-latest'
-        run:                    choco install llvm
-      - name:                   Sccache statistics
-        run:                    sccache --show-stats
       - name:                   Build tests
         uses:                   actions-rs/cargo@v1
         with:
           command:              test
           args:                 --locked --all --release --features "json-tests" --verbose --no-run
-      - name:                   Run tests for ${{ matrix.platform }}
-        if:                     matrix.platform == 'windows-latest'
-        continue-on-error: true #Skip step if Windows tests failure
-        uses:                   actions-rs/cargo@v1
-        with:
-          command:              test
+      - name:                   Run tests for ${{ matrix.platform }}	
+        uses:                   actions-rs/cargo@v1	
+        with:	
+          command:              test	
           args:                 --locked --all --release --features "json-tests" --verbose
-      - name:                   Run tests for ${{ matrix.platform }}
-        if:                     matrix.platform != 'windows-latest'
-        uses:                   actions-rs/cargo@v1
-        with:
-          command:              test
-          args:                 --locked --all --release --features "json-tests" --verbose
-      - name:                   Stop sccache
-        if:                     always()
-        run:                    sccache --stop-server
-      - name:                   Prepare build directory for cache
-        shell: bash
-        run:                    bash scripts/actions/clean-target.sh

.github/workflows/build.yml

@@ -2,94 +2,284 @@ name:                           Build Release Suite
 
 on:
   push:
-    branches:
-      - stable
     tags:
       - v*
 
+# Global vars
+env:
+  AWS_REGION:                   "us-east-1"
+  AWS_S3_ARTIFACTS_BUCKET:      "openethereum-releases"
+  ACTIONS_ALLOW_UNSECURE_COMMANDS: true
+
 jobs:
   build:
     name:                       Build Release
-    env:
-      SCCACHE_CACHE_SIZE:       "1G"
-      SCCACHE_IDLE_TIMEOUT:     0
     strategy:
       matrix:
         platform:
           - ubuntu-16.04
           - macos-latest
-          - windows-latest
         toolchain:
-          - stable
+          - 1.52.1
     runs-on:                    ${{ matrix.platform }}
     steps:
       - name:                   Checkout sources
-        uses:                   actions/checkout@master
-      # https://github.com/actions/cache/issues/133
-      - name:                   Fixup the owner of ~/.cargo/
-        if:                     matrix.platform == 'ubuntu-16.04'
-        run:                    sudo chown -R $(whoami):$(id -ng) ~/.cargo/
+        uses:                   actions/checkout@main
       - name:                   Install toolchain
         uses:                   actions-rs/toolchain@v1
         with:
           toolchain:            ${{ matrix.toolchain }}
           profile:              minimal
           override:             true
-      - name:                   Cache cargo registry
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 ~/.cargo/registry
-          key:                  ${{ runner.os }}-cargo-registry-build-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache cargo index
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 ~/.cargo/git
-          key:                  ${{ runner.os }}-cargo-git-build-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache cargo build
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 target
-          key:                  ${{ runner.os }}-cargo-build-target-build-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache sccache linux
-        if:                     matrix.platform == 'ubuntu-16.04'
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 "/home/runner/.cache/sccache"
-          key:                  ${{ runner.os }}-sccache-build-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache sccache MacOS
-        if:                     matrix.platform == 'macos-latest'
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 "/Users/runner/Library/Caches/Mozilla.sccache"
-          key:                  ${{ runner.os }}-sccache-build-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache sccache Windows
-        if:                     matrix.platform == 'windows-latest'
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 "C:\\Users\\runneradmin\\AppData\\Local\\Mozilla\\sccache\\cache"
-          key:                  ${{ runner.os }}-sccache-build-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Install sccache for ${{ matrix.platform }}
-        shell:                  pwsh
-        run:                    pwsh scripts/actions/install-sccache.ps1 ${{ runner.os}}
-      - name:                   Install LLVM for Windows
-        if:                     matrix.platform == 'windows-latest'
-        run:                    choco install llvm
-      - name:                   Sccache statistics
-        run:                    sccache --show-stats
-      - name:                   Build OpenEthereum for windows
-        if:                     matrix.platform == 'windows-latest'
-        run:                    sh scripts/actions/build-windows.sh ${{matrix.platform}}
+
+      # ==============================
+      #       Windows Build
+      # ==============================
+
+      # - name:                   Install LLVM for Windows
+      #   if:                     matrix.platform == 'windows2019'
+      #   run:                    choco install llvm
+
+      # - name:                   Build OpenEthereum for Windows
+      #   if:                     matrix.platform == 'windows2019'
+      #   run:                    sh scripts/actions/build-windows.sh ${{matrix.platform}}
+
+      # - name:                   Upload Windows build
+      #   uses:                   actions/upload-artifact@v2
+      #   if:                     matrix.platform == 'windows2019'
+      #   with:
+      #     name:                 windows-artifacts
+      #     path:                 artifacts
+
+      # ==============================
+      #       Linux/Macos Build
+      # ==============================
+    
       - name:                   Build OpenEthereum for ${{matrix.platform}}
-        if:                     matrix.platform != 'windows-latest'
+        if:                     matrix.platform != 'windows2019'
         run:                    sh scripts/actions/build-linux.sh ${{matrix.platform}}
-      - name:                   Stop sccache
-        if:                     always()
-        run:                    sccache --stop-server
-      - name:                   Download artifact
-        uses:                   actions/upload-artifact@v1
+
+      - name:                   Upload Linux build
+        uses:                   actions/upload-artifact@v2
+        if:                     matrix.platform == 'ubuntu-16.04'
         with:
-          name:                 ${{matrix.platform}}.artifacts.zip
-          path:                 artifacts/
-      - name:                   Prepare build directory for cache
-        shell: bash
-        run:                    bash scripts/actions/clean-target.sh
+          name:                 linux-artifacts
+          path:                 artifacts
+
+      - name:                   Upload MacOS build
+        uses:                   actions/upload-artifact@v2
+        if:                     matrix.platform == 'macos-latest'
+        with:
+          name:                 macos-artifacts
+          path:                 artifacts
+
+  zip-artifacts-creator:
+    name:                       Create zip artifacts
+    needs:                      build
+    runs-on:                    ubuntu-16.04
+    steps:
+      - name:                   Set env
+        run:                    echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+
+      # ==============================
+      #       Create ZIP files
+      # ==============================
+
+      # - name:                   Download Windows artifacts
+      #   uses:                   actions/download-artifact@v2
+      #   with:
+      #     name:                 windows-artifacts
+      #     path:                 windows-artifacts
+
+      - name:                   Download Linux artifacts
+        uses:                   actions/download-artifact@v2
+        with:
+          name:                 linux-artifacts
+          path:                 linux-artifacts
+
+      - name:                   Download MacOS artifacts
+        uses:                   actions/download-artifact@v2
+        with:
+          name:                 macos-artifacts
+          path:                 macos-artifacts
+
+      - name:                   Display structure of downloaded files
+        run:                    ls
+
+      - name:                   Create zip Linux
+        id:                     create_zip_linux
+        run: |
+          cd linux-artifacts/
+          zip -rT openethereum-linux-${{ env.RELEASE_VERSION }}.zip *
+          ls openethereum-linux-${{ env.RELEASE_VERSION }}.zip
+          cd ..
+          mv linux-artifacts/openethereum-linux-${{ env.RELEASE_VERSION }}.zip .
+
+          echo "Setting outputs..."
+          echo ::set-output name=LINUX_ARTIFACT::openethereum-linux-${{ env.RELEASE_VERSION }}.zip
+          echo ::set-output name=LINUX_SHASUM::$(shasum -a 256 openethereum-linux-${{ env.RELEASE_VERSION }}.zip | awk '{print $1}')
+
+      - name:                   Create zip MacOS
+        id:                     create_zip_macos
+        run: |
+          cd macos-artifacts/
+          zip -rT openethereum-macos-${{ env.RELEASE_VERSION }}.zip *
+          ls openethereum-macos-${{ env.RELEASE_VERSION }}.zip
+          cd ..
+          mv macos-artifacts/openethereum-macos-${{ env.RELEASE_VERSION }}.zip .
+
+          echo "Setting outputs..."
+          echo ::set-output name=MACOS_ARTIFACT::openethereum-macos-${{ env.RELEASE_VERSION }}.zip
+          echo ::set-output name=MACOS_SHASUM::$(shasum -a 256 openethereum-macos-${{ env.RELEASE_VERSION }}.zip | awk '{print $1}')
+
+      # - name:                   Create zip Windows
+      #   id:                     create_zip_windows
+      #   run: |
+      #     cd windows-artifacts/
+      #     zip -rT openethereum-windows-${{ env.RELEASE_VERSION }}.zip *
+      #     ls openethereum-windows-${{ env.RELEASE_VERSION }}.zip
+      #     cd ..
+      #     mv windows-artifacts/openethereum-windows-${{ env.RELEASE_VERSION }}.zip .
+
+      #     echo "Setting outputs..."
+      #     echo ::set-output name=WINDOWS_ARTIFACT::openethereum-windows-${{ env.RELEASE_VERSION }}.zip
+      #     echo ::set-output name=WINDOWS_SHASUM::$(shasum -a 256 openethereum-windows-${{ env.RELEASE_VERSION }}.zip | awk '{print $1}')
+
+      # =======================================================================
+      # Upload artifacts
+      # This is required to share artifacts between different jobs
+      # =======================================================================
+
+      - name:                   Upload artifacts
+        uses:                   actions/upload-artifact@v2
+        with:
+          name:                 openethereum-linux-${{ env.RELEASE_VERSION }}.zip
+          path:                 openethereum-linux-${{ env.RELEASE_VERSION }}.zip
+
+      - name:                   Upload artifacts
+        uses:                   actions/upload-artifact@v2
+        with:
+          name:                 openethereum-macos-${{ env.RELEASE_VERSION }}.zip
+          path:                 openethereum-macos-${{ env.RELEASE_VERSION }}.zip
+
+      # - name:                   Upload artifacts
+      #   uses:                   actions/upload-artifact@v2
+      #   with:
+      #     name:                 openethereum-windows-${{ env.RELEASE_VERSION }}.zip
+      #     path:                 openethereum-windows-${{ env.RELEASE_VERSION }}.zip
+
+      # =======================================================================
+      # Upload artifacts to S3
+      # This is required by some software distribution systems which require
+      # artifacts to be downloadable, like Brew on MacOS.
+      # =======================================================================
+      - name:                   Configure AWS credentials
+        uses:                   aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id:     ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region:            ${{ env.AWS_REGION }}
+
+      - name:                   Copy files to S3 with the AWS CLI
+        run: |
+          # Deploy zip artifacts to S3 bucket to a directory whose name is the tagged release version.
+          # Deploy macos binary artifact (if required, add more `aws s3 cp` commands to deploy specific OS versions)
+          aws s3 cp macos-artifacts/openethereum s3://${{ env.AWS_S3_ARTIFACTS_BUCKET }}/${{ env.RELEASE_VERSION }}/macos/ --region ${{ env.AWS_REGION }}
+
+    outputs:
+      linux-artifact:           ${{ steps.create_zip_linux.outputs.LINUX_ARTIFACT }}
+      linux-shasum:             ${{ steps.create_zip_linux.outputs.LINUX_SHASUM }}
+      macos-artifact:           ${{ steps.create_zip_macos.outputs.MACOS_ARTIFACT }}
+      macos-shasum:             ${{ steps.create_zip_macos.outputs.MACOS_SHASUM }}
+      # windows-artifact:         ${{ steps.create_zip_windows.outputs.WINDOWS_ARTIFACT }}
+      # windows-shasum:           ${{ steps.create_zip_windows.outputs.WINDOWS_SHASUM }}
+
+  draft-release:
+    name:                       Draft Release
+    needs:                      zip-artifacts-creator
+    runs-on:                    ubuntu-16.04
+    steps:
+      - name:                   Set env
+        run:                    echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+
+      # ==============================
+      #       Download artifacts
+      # ==============================
+
+      - name:                   Download artifacts
+        uses:                   actions/download-artifact@v2
+        with:
+          name:                 openethereum-linux-${{ env.RELEASE_VERSION }}.zip
+
+      - name:                   Download artifacts
+        uses:                   actions/download-artifact@v2
+        with:
+          name:                 openethereum-macos-${{ env.RELEASE_VERSION }}.zip
+
+      # - name:                   Download artifacts
+      #   uses:                   actions/download-artifact@v2
+      #   with:
+      #     name:                 openethereum-windows-${{ env.RELEASE_VERSION }}.zip
+
+      - name:                   Display structure of downloaded files
+        run:                    ls
+
+      # ==============================
+      #       Create release draft
+      # ==============================
+
+      - name:                   Create Release Draft
+        id:                     create_release_draft
+        uses:                   actions/create-release@v1
+        env:
+          GITHUB_TOKEN:         ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+        with:
+          tag_name:             ${{ github.ref }}
+          release_name:         OpenEthereum ${{ github.ref }}
+          body: |
+            This release contains <ADD_TEXT>
+
+            | System | Architecture | Binary | Sha256 Checksum |
+            |:---:|:---:|:---:|:---|
+            | <img src="https://gist.github.com/5chdn/1fce888fde1d773761f809b607757f76/raw/44c4f0fc63f1ea8e61a9513af5131ef65eaa6c75/apple.png" alt="Apple Icon by Pixel Perfect from https://www.flaticon.com/authors/pixel-perfect" style="width: 32px;"/> | x64 | [${{ needs.zip-artifacts-creator.outputs.macos-artifact }}](https://github.com/openethereum/openethereum/releases/download/${{ env.RELEASE_VERSION }}/${{ needs.zip-artifacts-creator.outputs.macos-artifact }}) | `${{ needs.zip-artifacts-creator.outputs.macos-shasum }}` |
+            | <img src="https://gist.github.com/5chdn/1fce888fde1d773761f809b607757f76/raw/44c4f0fc63f1ea8e61a9513af5131ef65eaa6c75/linux.png" alt="Linux Icon by Pixel Perfect from https://www.flaticon.com/authors/pixel-perfect" style="width: 32px;"/> | x64 | [${{ needs.zip-artifacts-creator.outputs.linux-artifact }}](https://github.com/openethereum/openethereum/releases/download/${{ env.RELEASE_VERSION }}/${{ needs.zip-artifacts-creator.outputs.linux-artifact }}) | `${{ needs.zip-artifacts-creator.outputs.linux-shasum }}` |
+            | <img src="https://gist.github.com/5chdn/1fce888fde1d773761f809b607757f76/raw/44c4f0fc63f1ea8e61a9513af5131ef65eaa6c75/windows.png" alt="Windows Icon by Pixel Perfect from https://www.flaticon.com/authors/pixel-perfect" style="width: 32px;"/> | x64 | [${{ needs.zip-artifacts-creator.outputs.windows-artifact }}](https://github.com/openethereum/openethereum/releases/download/${{ env.RELEASE_VERSION }}/${{ needs.zip-artifacts-creator.outputs.windows-artifact }}) | `${{ needs.zip-artifacts-creator.outputs.windows-shasum }}` |
+            | | | | |
+            | **System** | **Option** | - | **Resource** |
+            | <img src="https://gist.github.com/5chdn/1fce888fde1d773761f809b607757f76/raw/44c4f0fc63f1ea8e61a9513af5131ef65eaa6c75/settings.png" alt="Settings Icon by Pixel Perfect from https://www.flaticon.com/authors/pixel-perfect" style="width: 32px;"/> | Docker | - | [hub.docker.com/r/openethereum/openethereum](https://hub.docker.com/r/openethereum/openethereum) |
+
+          draft:                true
+          prerelease:           true
+
+      - name:                   Upload Release Asset - Linux
+        id:                     upload_release_asset_linux
+        uses:                   actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN:         ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url:           ${{ steps.create_release_draft.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
+          asset_path:           ./openethereum-linux-${{ env.RELEASE_VERSION }}.zip
+          asset_name:           openethereum-linux-${{ env.RELEASE_VERSION }}.zip
+          asset_content_type:   application/zip
+
+      - name:                   Upload Release Asset - MacOS
+        id:                     upload_release_asset_macos
+        uses:                   actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN:         ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url:           ${{ steps.create_release_draft.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
+          asset_path:           ./openethereum-macos-${{ env.RELEASE_VERSION }}.zip
+          asset_name:           openethereum-macos-${{ env.RELEASE_VERSION }}.zip
+          asset_content_type:   application/zip
+
+      # - name:                   Upload Release Asset - Windows
+      #   id:                     upload_release_asset_windows
+      #   uses:                   actions/upload-release-asset@v1
+      #   env:
+      #     GITHUB_TOKEN:         ${{ secrets.GITHUB_TOKEN }}
+      #   with:
+      #     upload_url:           ${{ steps.create_release_draft.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
+      #     asset_path:           ./openethereum-windows-${{ env.RELEASE_VERSION }}.zip
+      #     asset_name:           openethereum-windows-${{ env.RELEASE_VERSION }}.zip
+      #     asset_content_type:   application/zip

.github/workflows/check.yml

@@ -4,55 +4,23 @@ on:
   pull_request:
   push:
     branches:
-      - master
-      - stable
+      - main
+      - dev
 jobs:
   check:
     name:                       Check
     runs-on:                    ubuntu-16.04
-    env:
-      SCCACHE_CACHE_SIZE:       "1G"
-      SCCACHE_IDLE_TIMEOUT:     0    
     steps:
       - name:                   Checkout sources
-        uses:                   actions/checkout@master
+        uses:                   actions/checkout@main
         with:
           submodules:           true
-      # https://github.com/actions/cache/issues/133
-      - name:                   Fixup the owner of ~/.cargo/
-        run:                    sudo chown -R $(whoami):$(id -ng) ~/.cargo/
-      - name:                   Install stable toolchain
+      - name:                   Install 1.52.1 toolchain
         uses:                   actions-rs/toolchain@v1
         with:
-          toolchain:            stable
+          toolchain:            1.52.1
           profile:              minimal
           override:             true
-      - name:                   Cache cargo registry
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 ~/.cargo/registry
-          key:                  ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache cargo index
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 ~/.cargo/git
-          key:                  ${{ runner.os }}-cargo-git-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache cargo build
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 target
-          key:                  ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
-      # Install sccache based on https://github.com/denoland/rusty_v8/blob/master/.github/workflows/ci.yml#L69
-      - name:                   Cache sccache
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 "/home/runner/.cache/sccache"
-          key:                  ${{ runner.os }}-sccache-check-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Install sccache for Linux
-        shell:                  pwsh
-        run:                    pwsh scripts/actions/install-sccache.ps1 ${{ runner.os}}
-      - name:                   Sccache statistics
-        run:                    sccache --show-stats
       - name:                   Run cargo check 1/3
         uses:                   actions-rs/cargo@v1
         with:
@@ -62,12 +30,12 @@ jobs:
         uses:                   actions-rs/cargo@v1
         with:
           command:              check
-          args:                 --locked --manifest-path util/io/Cargo.toml --no-default-features --verbose
+          args:                 --locked --manifest-path crates/runtime/io/Cargo.toml --no-default-features --verbose
       - name:                   Run cargo check 3/3
         uses:                   actions-rs/cargo@v1
         with:
           command:              check
-          args:                 --locked --manifest-path util/io/Cargo.toml --features "mio" --verbose
+          args:                 --locked --manifest-path crates/runtime/io/Cargo.toml --features "mio" --verbose
       - name:                   Run cargo check evmbin
         uses:                   actions-rs/cargo@v1
         with:
@@ -80,9 +48,3 @@ jobs:
           args:                 --locked --all --benches --verbose
       - name:                   Run validate chainspecs
         run:                    ./scripts/actions/validate-chainspecs.sh
-      - name:                   Stop sccache
-        if:                     always()
-        run:                    sccache --stop-server
-      - name:                   Prepare build directory for cache
-        shell: bash
-        run:                    bash scripts/actions/clean-target.sh

.github/workflows/deploy-docker-nightly.yml

@@ -0,0 +1,29 @@
+name:                           Docker Image Nightly Release
+
+# Run "nightly" build on each commit to "dev" branch.
+on:
+  push:
+    branches:
+      - dev
+
+jobs:
+  deploy-docker:
+    name:                       Build Release
+    runs-on:                    ubuntu-latest
+    steps:
+      - name:                   Checkout sources
+        uses:                   actions/checkout@master
+      - name:                   Install toolchain
+        uses:                   actions-rs/toolchain@v1
+        with:
+          toolchain:            1.52.1
+          profile:              minimal
+          override:             true
+      - name:                   Deploy to docker hub
+        uses: elgohr/Publish-Docker-Github-Action@master
+        with:
+          name: openethereum/openethereum
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          dockerfile: scripts/docker/alpine/Dockerfile
+          tags: "nightly"

.github/workflows/deploy-docker-tag.yml

@@ -0,0 +1,30 @@
+name:                           Docker Image Tag and Latest Release
+
+on:
+  push:
+    tags:
+      - v*
+
+jobs:
+  deploy-docker:
+    name:                       Build Release
+    runs-on:                    ubuntu-latest
+    steps:
+      - name:                   Checkout sources
+        uses:                   actions/checkout@master
+      - name:                   Set env
+        run:                    echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+      - name:                   Install toolchain
+        uses:                   actions-rs/toolchain@v1
+        with:
+          toolchain:            1.52.1
+          profile:              minimal
+          override:             true
+      - name:                   Deploy to docker hub
+        uses: elgohr/Publish-Docker-Github-Action@master
+        with:
+          name: openethereum/openethereum
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          dockerfile: scripts/docker/alpine/Dockerfile
+          tags: "latest,${{ env.RELEASE_VERSION }}"

.github/workflows/deploy-docker.yml

@@ -3,7 +3,7 @@ name:                           Docker Image Release
 on:
   push:
     branches:
-      - master
+      - main
     tags:
       - v*
 
@@ -17,7 +17,7 @@ jobs:
       - name:                   Install toolchain
         uses:                   actions-rs/toolchain@v1
         with:
-          toolchain:            stable
+          toolchain:            1.52.1
           profile:              minimal
           override:             true
       - name:                   Deploy to docker hub

.github/workflows/fmt.yml

@@ -0,0 +1,20 @@
+on: [push, pull_request]
+
+name: rustfmt
+
+jobs:
+  fmt:
+    name: Rustfmt
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: 1.52.1
+          override: true
+      - run: rustup component add rustfmt
+      - uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check --config merge_imports=true

.gitignore

@@ -38,8 +38,10 @@ node_modules
 
 # Build artifacts
 out/
-parity-clib-examples/cpp/build/
 
 .vscode
 rls/
-/openethereum.*
+/parity.*
+
+# cargo remote artifacts
+remote-target

.gitmodules

@@ -1,7 +1,3 @@
-[submodule "ethcore/res/ethereum/tests"]
-	path = ethcore/res/ethereum/tests
+[submodule "crates/ethcore/res/json_tests"]
+	path = crates/ethcore/res/json_tests
 	url = https://github.com/ethereum/tests.git
-	branch = develop
-[submodule "ethcore/res/wasm-tests"]
-	path = ethcore/res/wasm-tests
-	url = https://github.com/openethereum/wasm-tests

CHANGELOG.md

@@ -1,123 +1,208 @@
-## OpenEthereum [v3.0.1](https://github.com/openethereum/openethereum/releases/tag/v3.0.1)
+## OpenEthereum v3.3.3
 
-- Add missing forks to fork ID (#11747)
+Enhancements:
+* Implement eip-3607 (#593)
 
-## OpenEthereum [v3.0.0](https://github.com/openethereum/openethereum/releases/tag/v3.0.0)
+Bug fixes:
+* Add type field for legacy transactions in RPC calls (#580)
+* Makes eth_mining to return False if not is not allowed to seal (#581)
+* Made nodes data concatenate as RLP sequences instead of bytes (#598)
 
-OpenEthereum v3.0.0 is the first release of OpenEthereum client as part of OpenEthereum project, divested from Parity Technologies.
+## OpenEthereum v3.3.2
 
-This release marks the transition from Parity Technologies infrastructure and bootnodes to the one managed by OpenEthereum project.
+Enhancements:
+* London hardfork block: Sokol (24114400)
 
-Parity-Ethereum v2.7 users can continue using their existing data folders. Command-line interface has also stayed identical.
-Unless specified otherwise, OpenEthereum v3.0.0 will detect if the user's database in the old Parity-Ethereum default path,
-and only if it's not found will write to the new default location.
+Bug fixes:
+* Fix for maxPriorityFeePerGas overflow
 
-This release includes several major improvements to network and database stack:
-- Support for `eth/64` protocol and Node Discovery v4 `Ethereum Node Records` extension.
-- Accounts bloom is removed which should decrease the database size.
+## OpenEthereum v3.3.1
 
-**Due to database changes this is a one-way upgrade. Please back up your database if you plan to continue using Parity-Ethereum v2.7.2.**
+Enhancements:
+* Add eth_maxPriorityFeePerGas implementation (#570)
+* Add a bootnode for Kovan
 
-Note that this release drops support for IPFS and `eth/62` protocol. Additionally, it marks light client, private transactions and updater as deprecated features which may be removed in a future release.
+Bug fixes:
+* Fix for modexp overflow in debug mode (#578)
 
-The full list of included changes:
-- Add deprecation warnings (#11682)
-- Add Curl to Docker image (#11687)
-- v3 release version strings and track stable (#11680)
-- Fix sccache server errors (#11675)
-- Don't delete old db after migration (#11662)
-- rename inject to drain_transaction_overlay (#11657)
-- Drain the transaction overlay (#11654)
-- vergen library seems to depend not only on the .git folder content but also on the git binary (#11651)
-- New default paths (#11641)
-- Update EWF's chains with Istanbul transition block numbers (#11482)
-- add openethereum supplementary bootnodes, those are not active right now, but will be in case the network needs more power (#11650)
-- Remove Parity bootnodes (#11644)
-- Remove accounts bloom (#11589)
-- Deploy docker images on master (#11640)
-- Fix some compiler warnings (#11632)
-- Add support for non-fork side of Phoenix (#11627)
-- validate mainnet specs against all forks (#11625)
-- Fix ecrecover builtin (#11623)
-- Update .gitmodules (#11628)
-- ethcore/res: activate ecip-1088 phoenix on classic (#11598)
-- Upgrade parity-common deps to latest (#11620)
-- Fix Goerli syncing (#11604)
-- deps: switch to upstream ctrlc (#11617)
-- Deduplicating crate dependencies (part 3 of n) (#11614)
-- Deduplicating crate dependencies (part 2 of n, `slab`) (#11613)
-- Actually save ENR on creation and modification (#11602)
-- Activate POSDAO on xDai chain and update bootnodes (#11610)
-- Activate on-chain randomness in POA Core (#11609)
-- Deduplicating crate dependencies (part 1 of n) (#11606)
-- Update enodes for POA Sokol (#11611)
-- Remove .git folder from dogerignore file so vergen library can get build date and commit hash in the binary generatio vergen library can get build date and commit hash in the binary generation (#11608)
-- Reduced gas cost for static calls made to precompiles EIP2046/1352 (#11583)
-- `ethcore-bloom-journal` was renamed to `accounts-bloom` (#11605)
-- Use serde_json to export hardcoded sync (#11601)
-- Node Discovery v4 ENR Extension (EIP-868) (#11540)
-- Fix compile warnings (#11595)
-- Update version to 3.0.0-alpha.1 (#11592)
-- ethcore/res: bump canon fork hash for mordor and kotti testnets (#11584)
-- Update on push tags (#11590)
-- Replace deprecated tempdir dependency with tempfile (#11588)
-- Fix project name, links, rename the binaries (#11580)
-- Update Cargo.lock (#11573)
-- ci: workaround for the cache bug on Linux (#11568)
-- Increase the default pruning parameters (#11558)
-- Add Docker build and push to github actions (#11555)
-- Update README (#11578)
-- informant: display I/O stats (#11523)
-- [devp2p discovery]: remove `deprecated_echo_hash` (#11564)
-- [secretstore] create db_version file when database doesn't exist (#11570)
-- Remove Parity's Security Policy (#11565)
-- ethcore/res: enable ecip-1088 phoenix upgrade for kotti and mordor testnets (#11529)
-- Misc docs and renames …and one less clone (#11556)
-- [secretstore]: don't sign message with only zeroes (#11561)
-- [devp2p discovery]: cleanup (#11547)
-- Code cleanup in the sync module (#11552)
-- initial cleanup (#11542)
-- Warn if genesis constructor revert (#11550)
-- ethcore: cleanup after #11531 (#11546)
-- license update (#11543)
-- Less cloning when importing blocks (#11531)
-- Github Actions (#11528)
-- Fix Alpine Dockerfile (#11538)
-- Remove AuxiliaryData/AuxiliaryRequest (#11533)
-- [journaldb]: cleanup (#11534)
-- Remove references to parity-ethereum (#11525)
-- Drop IPFS support (#11532)
-- chain-supplier: fix warning reporting for GetNodeData request (#11530)
-- Faster kill_garbage (#11514)
-- [EngineSigner]: don't sign message with only zeroes (#11524)
-- fix compilation warnings (#11522)
-- [ethcore cleanup]: various unrelated fixes from `#11493` (#11507)
-- Add benchmark for transaction execution (#11509)
-- Add Smart Contract License v1.0
-- Misc fixes (#11510)
-- [dependencies]: unify `rustc-hex` (#11506)
-- Activate on-chain randomness in POA Sokol (#11505)
-- Grab bag of cleanup (#11504)
-- Implement eth/64 (EIP-2364) and drop support for eth/62 (#11472)
-- [dependencies]: remove `util/macros` (#11501)
-- OpenEthereum bootnodes are added (#11499)
-- [ci benches]: use `all-features` (#11496)
-- [verification]: make test-build compile standalone (#11495)
-- complete null-signatures removal (#11491)
-- Include the seal when populating the header for a new block (#11475)
-- fix compilation warnings (#11492)
-- cargo update -p cmake (#11490)
-- update to published rlp-derive (#11489)
-- Switch usage of Secret Store to the external lib (#11487)
-- Switch from the internal runtime lib to external one from crates.io (#11480)
-- Update params.rs (#11474)
-- weak_counts has been stabilized (#11476)
-- sync: remove broken eth_protocol_version method (#11473)
-- Use parity-crypto updated to use upstream rust-secp256k1 (#11406)
-- Cleanup some code in Aura (#11466)
-- upgrade some of the dependencies (#11467)
-- Some more release track changes to README.md (#11465)
-- Update simple one-line installer due to switching to a single stable release track (#11463)
-- update Dockerfile (#11461)
-- Implement EIP-2124 (#11456)
-- [eth classic chainspec]: remove `balance = 1` (#11459)
+## OpenEthereum v3.3.0
+
+Enhancements:
+* Add `validateServiceTransactionsTransition` spec option to be able to enable additional checking of zero gas price transactions by block verifier
+
+## OpenEthereum v3.3.0-rc.15
+
+* Revert eip1559BaseFeeMinValue activation on xDai at London hardfork block
+
+## OpenEthereum v3.3.0-rc.14
+
+Enhancements:
+* Add eip1559BaseFeeMinValue and eip1559BaseFeeMinValueTransition spec options
+* Activate eip1559BaseFeeMinValue on xDai at London hardfork block (19040000), set it to 20 GWei
+* Activate eip1559BaseFeeMinValue on POA Core at block 24199500 (November 8, 2021), set it to 10 GWei
+* Delay difficulty bomb to June 2022 for Ethereum Mainnet (EIP-4345)
+
+## OpenEthereum v3.3.0-rc.13
+
+Enhancements:
+* London hardfork block: POA Core (24090200)
+
+## OpenEthereum v3.3.0-rc.12
+
+Enhancements:
+* London hardfork block: xDai (19040000)
+
+## OpenEthereum v3.3.0-rc.11
+
+Bug fixes:
+* Ignore GetNodeData requests only for non-AuRa chains
+
+## OpenEthereum v3.3.0-rc.10
+
+Enhancements:
+* Add eip1559FeeCollector and eip1559FeeCollectorTransition spec options
+
+## OpenEthereum v3.3.0-rc.9
+
+Bug fixes:
+* Add service transactions support for EIP-1559
+* Fix MinGasPrice config option for POSDAO and EIP-1559
+
+Enhancements:
+* min_gas_price becomes min_effective_priority_fee
+* added version 4 for TxPermission contract
+
+## OpenEthereum v3.3.0-rc.8
+
+Bug fixes:
+* Ignore GetNodeData requests (#519)
+
+## OpenEthereum v3.3.0-rc.7
+
+Bug fixes:
+* GetPooledTransactions is sent in invalid form (wrong packet id)
+
+## OpenEthereum v3.3.0-rc.6
+
+Enhancements:
+* London hardfork block: kovan (26741100) (#502)
+
+## OpenEthereum v3.3.0-rc.4
+
+Enhancements:
+* London hardfork block: mainnet (12,965,000) (#475)
+* Support for eth/66 protocol version (#465)
+* Bump ethereum/tests to v9.0.3
+* Add eth_feeHistory
+
+Bug fixes:
+* GetNodeData from eth63 is missing (#466)
+* Effective gas price not omitting (#477)
+* London support in openethereum-evm (#479)
+* gasPrice is required field for Transaction object (#481)
+
+## OpenEthereum v3.3.0-rc.3
+
+Bug fixes:
+* Add effective_gas_price to eth_getTransactionReceipt #445 (#450)
+* Update eth_gasPrice to support EIP-1559 #449 (#458)
+* eth_estimateGas returns "Requires higher than upper limit of X" after London Ropsten Hard Fork #459 (#460)
+
+## OpenEthereum v3.3.0-rc.2
+
+Enhancements:
+* EIP-1559: Fee market change for ETH 1.0 chain
+* EIP-3198: BASEFEE opcode
+* EIP-3529: Reduction in gas refunds
+* EIP-3541: Reject new contracts starting with the 0xEF byte
+* Delay difficulty bomb to December 2021 (EIP-3554)
+* London hardfork blocks: goerli (5,062,605), rinkeby (8,897,988), ropsten (10,499,401)
+* Add chainspecs for aleut and baikal
+* Bump ethereum/tests to v9.0.2
+
+## OpenEthereum v3.2.6
+
+Enhancement:
+* Berlin hardfork blocks: poacore (21,364,900), poasokol (21,050,600)
+
+## OpenEthereum v3.2.5
+
+Bug fixes:
+* Backport: Block sync stopped without any errors. #277 (#286)
+* Strict memory order (#306)
+
+Enhancements:
+* Executable queue for ancient blocks inclusion (#208)
+* Backport AuRa commits for xdai (#330)
+* Add Nethermind to clients that accept service transactions (#324)
+* Implement the filter argument in parity_pendingTransactions (#295)
+* Ethereum-types and various libs upgraded (#315)
+* [evmbin] Omit storage output, now for std-json (#311)
+* Freeze pruning while creating snapshot (#205)
+* AuRa multi block reward (#290)
+* Improved metrics. DB read/write. prometheus prefix config (#240)
+* Send RLPx auth in EIP-8 format (#287)
+* rpc module reverted for RPC JSON api (#284)
+* Revert "Remove eth/63 protocol version (#252)"
+* Support for eth/65 protocol version (#366)
+* Berlin hardfork blocks: kovan (24,770,900), xdai (16,101,500)
+* Bump ethereum/tests to v8.0.3
+
+devops:
+* Upgrade docker alpine to `v1.13.2`. for rust `v1.47`.
+* Send SIGTERM instead of SIGHUP to OE daemon (#317)
+
+## OpenEthereum v3.2.4
+
+* Fix for Typed transaction broadcast.
+
+## OpenEthereum v3.2.3
+
+* Hotfix for berlin consensus error.
+
+## OpenEthereum v3.2.2-rc.1
+
+Bug fixes:
+* Backport: Block sync stopped without any errors. #277 (#286)
+* Strict memory order (#306)
+
+Enhancements:
+* Executable queue for ancient blocks inclusion (#208)
+* Backport AuRa commits for xdai (#330)
+* Add Nethermind to clients that accept service transactions (#324)
+* Implement the filter argument in parity_pendingTransactions (#295) 
+* Ethereum-types and various libs upgraded (#315)
+* Bump ethereum/tests to v8.0.2
+* [evmbin] Omit storage output, now for std-json (#311)
+* Freeze pruning while creating snapshot (#205)
+* AuRa multi block reward (#290)
+* Improved metrics. DB read/write. prometheus prefix config (#240)
+* Send RLPx auth in EIP-8 format (#287)
+* rpc module reverted for RPC JSON api (#284)
+* Revert "Remove eth/63 protocol version (#252)"
+
+devops:
+* Upgrade docker alpine to `v1.13.2`. for rust `v1.47`.
+* Send SIGTERM instead of SIGHUP to OE daemon (#317)
+
+## OpenEthereum v3.2.1
+
+Hot fix issue, related to initial sync:
+* Initial sync gets stuck. (#318)
+
+## OpenEthereum v3.2.0
+
+Bug fixes:
+* Update EWF's chains with Istanbul transition block numbers (#11482) (#254)
+* fix Supplied instant is later than self (#169)
+* ethcore/snapshot: fix double-lock in Service::feed_chunk (#289)
+
+Enhancements:
+* Berlin hardfork blocks: mainnet (12,244,000), goerli (4,460,644), rinkeby (8,290,928) and ropsten (9,812,189)
+* yolo3x spec (#241)
+* EIP-2930 RPC support
+* Remove eth/63 protocol version (#252)
+* Snapshot manifest block added to prometheus (#232)
+* EIP-1898: Allow default block parameter to be blockHash
+* Change ProtocolId to U64
+* Update ethereum/tests

Cargo.toml

@@ -2,7 +2,7 @@
 description = "OpenEthereum"
 name = "openethereum"
 # NOTE Make sure to update util/version/Cargo.toml as well
-version = "3.0.1"
+version = "3.3.3"
 license = "GPL-3.0"
 authors = [
 	"OpenEthereum developers",
@@ -10,75 +10,68 @@ authors = [
 ]
 
 [dependencies]
-ansi_term = "0.11"
-atty = "0.2.8"
-blooms-db = { path = "util/blooms-db" }
-clap = "2"
-cli-signer= { path = "cli-signer" }
-client-traits = { path = "ethcore/client-traits" }
-common-types = { path = "ethcore/types" }
-ctrlc = { version = "3.1.4", features = ["termination"] }
-dir = { path = "util/dir" }
-docopt = "1.0"
-engine = { path = "ethcore/engine" }
-ethabi = { version = "12.0", optional = true }
-ethcore = { path = "ethcore", features = ["parity"] }
-ethcore-accounts = { path = "accounts", optional = true }
-ethcore-blockchain = { path = "ethcore/blockchain" }
-ethcore-call-contract = { path = "ethcore/call-contract", optional = true }
-ethcore-db = { path = "ethcore/db" }
-ethcore-io = { path = "util/io" }
-ethcore-light = { path = "ethcore/light" }
-ethcore-logger = { path = "parity/logger" }
-ethcore-miner = { path = "miner" }
-ethcore-network = { path = "util/network" }
-ethcore-private-tx = { path = "ethcore/private-tx" }
-ethcore-service = { path = "ethcore/service" }
-ethcore-sync = { path = "ethcore/sync" }
-ethereum-types = "0.9.0"
-ethkey = { path = "accounts/ethkey" }
-ethstore = { path = "accounts/ethstore" }
-fdlimit = "0.1"
-futures = "0.1"
-journaldb = { path = "util/journaldb" }
-jsonrpc-core = "14.0.3"
-keccak-hash = "0.5.0"
-kvdb = "0.5.0"
-kvdb-rocksdb = "0.7.0"
+blooms-db = { path = "crates/db/blooms-db" }
 log = "0.4"
-migration-rocksdb = { path = "util/migration-rocksdb" }
-node-filter = { path = "ethcore/node-filter" }
+rustc-hex = "1.0"
+docopt = "1.0"
+clap = "2"
+term_size = "0.3"
+textwrap = "0.9"
 num_cpus = "1.2"
 number_prefix = "0.2"
-panic_hook = { path = "util/panic-hook" }
-parity-bytes = "0.1"
-parity-crypto = { version = "0.6.1", features = ["publickey"] }
-parity-daemonize = "0.3"
-parity-hash-fetch = { path = "updater/hash-fetch" }
-parity-local-store = { path = "miner/local-store" }
-parity-path = "0.1"
-parity-rpc = { path = "rpc" }
-parity-runtime = "0.1.1"
-parity-secretstore = { git = "https://github.com/paritytech/secret-store", branch = "v1.x", optional = true }
-parity-updater = { path = "updater" }
-parity-util-mem = { version = "0.6.0", features = ["jemalloc-global"] }
-parity-version = { path = "util/version" }
-parking_lot = "0.10.0"
-regex = "1.0"
-registrar = { path = "util/registrar" }
-rlp = "0.4.5"
 rpassword = "1.0"
-rustc-hex = "2.1.0"
 semver = "0.9"
+ansi_term = "0.10"
+parking_lot = "0.11.1"
+regex = "1.0"
+atty = "0.2.8"
+toml = "0.4"
 serde = "1.0"
-serde_derive = "1.0"
 serde_json = "1.0"
-snapshot = { path = "ethcore/snapshot" }
-spec = { path = "ethcore/spec" }
-term_size = "0.3"
-textwrap = "0.11.0"
-toml = "0.5.6"
-verification = { path = "ethcore/verification" }
+serde_derive = "1.0"
+futures = "0.1"
+hyper = { version = "0.12" }
+fdlimit = "0.1"
+ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" }
+jsonrpc-core = "15.0.0"
+parity-bytes = "0.1"
+common-types = { path = "crates/ethcore/types" }
+ethcore = { path = "crates/ethcore", features = ["parity"] }
+ethcore-accounts = { path = "crates/accounts", optional = true }
+ethcore-blockchain = { path = "crates/ethcore/blockchain" }
+ethcore-call-contract = { path = "crates/vm/call-contract"}
+ethcore-db = { path = "crates/db/db" }
+ethcore-io = { path = "crates/runtime/io" }
+ethcore-logger = { path = "bin/oe/logger" }
+ethcore-miner = { path = "crates/concensus/miner" }
+ethcore-network = { path = "crates/net/network" }
+ethcore-service = { path = "crates/ethcore/service" }
+ethcore-sync = { path = "crates/ethcore/sync" }
+ethereum-types = "0.9.2"
+ethkey = { path = "crates/accounts/ethkey" }
+ethstore = { path = "crates/accounts/ethstore" }
+fetch = { path = "crates/net/fetch" }
+node-filter = { path = "crates/net/node-filter" }
+parity-crypto = { version = "0.6.2", features = [ "publickey" ] }
+rlp = { version = "0.4.6" }
+cli-signer= { path = "crates/util/cli-signer" }
+parity-daemonize = "0.3"
+parity-local-store = { path = "crates/concensus/miner/local-store" }
+parity-runtime = { path = "crates/runtime/runtime" }
+parity-rpc = { path = "crates/rpc" }
+parity-version = { path = "crates/util/version" }
+parity-path = "0.1"
+dir = { path = "crates/util/dir" }
+panic_hook = { path = "crates/util/panic-hook" }
+keccak-hash = "0.5.0"
+migration-rocksdb = { path = "crates/db/migration-rocksdb" }
+kvdb = "0.1"
+kvdb-rocksdb = "0.1.3"
+journaldb = { path = "crates/db/journaldb" }
+stats = { path = "crates/util/stats" }
+prometheus = "0.9.0"
+
+# ethcore-secretstore = { path = "crates/util/secret-store", optional = true }
 
 [build-dependencies]
 rustc_version = "0.2"
@@ -86,36 +79,44 @@ rustc_version = "0.2"
 [dev-dependencies]
 pretty_assertions = "0.1"
 ipnetwork = "0.12.6"
-tempfile = "3.1"
-fake-fetch = { path = "util/fake-fetch" }
+tempdir = "0.3"
+fake-fetch = { path = "crates/net/fake-fetch" }
+lazy_static = "1.2.0"
 
 [target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3.8", features = ["winsock2", "winuser", "shellapi"] }
+winapi = { version = "0.3.4", features = ["winsock2", "winuser", "shellapi"] }
 
 [features]
 default = ["accounts"]
 accounts = ["ethcore-accounts", "parity-rpc/accounts"]
 miner-debug = ["ethcore/miner-debug"]
 json-tests = ["ethcore/json-tests"]
+ci-skip-tests = ["ethcore/ci-skip-tests"]
 test-heavy = ["ethcore/test-heavy"]
 evm-debug = ["ethcore/evm-debug"]
 evm-debug-tests = ["ethcore/evm-debug-tests"]
 slow-blocks = ["ethcore/slow-blocks"]
-secretstore = ["parity-secretstore", "accounts", "ethabi", "ethcore-call-contract"]
 final = ["parity-version/final"]
 deadlock_detection = ["parking_lot/deadlock_detection"]
-# hardcode version number 1.3.7 of parity to force an update
-# in order to manually test that parity fall-over to the local version
-# in case of invalid or deprecated command line arguments are entered
-test-updater = ["parity-updater/test-updater"]
+# to create a memory profile (requires nightly rust), use e.g.
+# `heaptrack /path/to/parity <parity params>`,
+# to visualize a memory profile, use `heaptrack_gui`
+# or
+# `valgrind --tool=massif /path/to/parity <parity params>`
+# and `massif-visualizer` for visualization
+memory_profiling = []
 
 [lib]
-path = "parity/lib.rs"
+path = "bin/oe/lib.rs"
 
 [[bin]]
-path = "parity/main.rs"
+path = "bin/oe/main.rs"
 name = "openethereum"
 
+[profile.test]
+lto = false
+opt-level = 3 # makes tests slower to compile, but faster to run
+
 [profile.release]
 debug = false
 lto = true
@@ -125,9 +126,8 @@ lto = true
 # in the dependency tree in any other way
 # (i.e. pretty much only standalone CLI tools)
 members = [
-	"accounts/ethkey/cli",
-	"accounts/ethstore/cli",
-	"chainspec",
-	"ethcore/wasm/run",
-	"evmbin",
+	"bin/ethkey",
+	"bin/ethstore",
+	"bin/evmbin",
+	"bin/chainspec"
 ]

README.md

@@ -46,7 +46,7 @@ OpenEthereum's goal is to be the fastest, lightest, and most secure Ethereum cli
 
 By default, OpenEthereum runs a JSON-RPC HTTP server on port `:8545` and a Web-Sockets server on port `:8546`. This is fully configurable and supports a number of APIs.
 
-If you run into problems while using OpenEthereum, check out the [old wiki for documentation](https://wiki.parity.io/), feel free to [file an issue in this repository](https://github.com/openethereum/openethereum/issues/new), or hop on our [Discord](https://discord.io/openethereum) chat room to ask a question. We are glad to help!
+If you run into problems while using OpenEthereum, check out the [old wiki for documentation](https://openethereum.github.io/), feel free to [file an issue in this repository](https://github.com/openethereum/openethereum/issues/new), or hop on our [Discord](https://discord.io/openethereum) chat room to ask a question. We are glad to help!
 
 You can download OpenEthereum's latest release at [the releases page](https://github.com/openethereum/openethereum/releases) or follow the instructions below to build from source. Read the [CHANGELOG.md](CHANGELOG.md) for a list of all changes between different versions.
 
@@ -135,7 +135,7 @@ To start OpenEthereum as a regular user using `systemd` init:
 1. Copy `./scripts/openethereum.service` to your
 `systemd` user directory (usually `~/.config/systemd/user`).
 2. Copy release to bin folder, write `sudo install ./target/release/openethereum /usr/bin/openethereum`
-3. To configure OpenEthereum, see [our old wiki](https://paritytech.github.io/wiki/Configuring-Parity) for details.
+3. To configure OpenEthereum, see [our wiki](https://openethereum.github.io/Configuring-OpenEthereum) for details.
 
 ## 4. Testing <a id="chapter-004"></a>
 
@@ -157,7 +157,7 @@ You can show your logs in the test output by passing `--nocapture` (i.e. `cargo
 
 ## 5. Documentation <a id="chapter-005"></a>
 
-Be sure to [check out our old wiki](https://wiki.parity.io) for more information.
+Be sure to [check out our wiki](https://openethereum.github.io/) for more information.
 
 ### Viewing documentation for OpenEthereum packages
 
@@ -230,10 +230,6 @@ Caching, Importing Blocks, and Block Information
     ```bash
     node-filter
     ```
-  * Private Transactions
-    ```bash
-    ethcore-private-tx
-    ```
   * OpenEthereum Client & Network Service Creation & Registration with the I/O Subsystem
     ```bash
     ethcore-service
@@ -301,9 +297,9 @@ Caching, Importing Blocks, and Block Information
 
 In addition to the OpenEthereum client, there are additional tools in this repository available:
 
-- [evmbin](./evmbin) - OpenEthereum EVM Implementation.
-- [ethstore](./accounts/ethstore) - OpenEthereum Key Management.
-- [ethkey](./accounts/ethkey) - OpenEthereum Keys Generator.
+- [evmbin](./bin/evmbin) - OpenEthereum EVM Implementation.
+- [ethstore](./crates/accounts/ethstore) - OpenEthereum Key Management.
+- [ethkey](./crates/accounts/ethkey) - OpenEthereum Keys Generator.
 
 The following tools are available in a separate repository:
 - [ethabi](https://github.com/openethereum/ethabi) - OpenEthereum Encoding of Function Calls. [Docs here](https://crates.io/crates/ethabi)

SMART_CONTRACT_LICENSE

@@ -1,49 +0,0 @@
-SMART CONTRACT LICENSE v1.0
-
-
-Anyone may run, modify, publicly perform, distribute and redistribute this
-software, and create derivative works based on it in each case in compliance
-with the permissions granted by the document (“Permissions Document”) whose
-**KECCAK256 HASH** equals the value found in the PUBLICLY READABLE VARIABLE
-named permissionsDocumentHash  on the **ETHEREUM MAINNET** **SMART CONTRACT
-ACCOUNT** with the following ADDRESS 0x5a88CA36Fd58Efde3b955758285E8e3347D1eAe3
-which is deemed incorporated into this license by reference. In case of any
-conflicts between this license and the Permissions Document, this license shall
-prevail.
-
-
-Where:
-- KECCAK256 HASH is the cryptographic hash algorithm that may take any document,
-expressed as a series of bytes, and convert it to a single value which may be
-expressed as a number from 0 to `2**256`;
-- ETHEREUM MAINNET is the peer-to-peer blockchain network and shared account
-ledger initiated and recognised by the Ethereum Foundation as "Ethereum";
-- SMART CONTRACT ACCOUNT is a single account to be found on the ETHEREUM MAINNET
-identified by an ADDRESS and which represents the combination of a computer
-programme and some associated values;
-- ADDRESS is a number between 0 and `2**160`, which is the primary means of
-identifying a single account on the ETHEREUM MAINNET;
-- PUBLICLY READABLE VARIABLE is an item in a smart contract storage, publicly
-accessible via the smart contract’s ABI using a getter function matching its
-name.
-
-This license supplements and does not replace any other license pertaining to
-this software.
-
-No permissions are granted if no **KECCAK256 HASH** appears in the *ETHEREUM
-MAINNET** **SMART CONTRACT ACCOUNT**.
-
-This license takes effect as a bare licence, and has the effect of granting
-rights to each licensee (which may be subject to conditions), BUT IMPOSES NO
-OBLIGATIONS OR LIABILITY ON ANY LICENSOR, ANY OWNER OF RIGHTS IN THE SOFTWARE,
-OR ANY PERSON INVOLVED IN THE DESIGN, DEVELOPMENT AND CODING OF THE SOFTWARE
-(“GRANTOR”).
-
-Each Grantor shall, to the maximum extent permitted by law, have no liability
-for direct, indirect, special, incidental, consequential, exemplary, punitive or
-other damages of any character including, without limitation, procurement of
-substitute software or services, loss of use, data or profits, or business
-interruption, however caused and on any theory of contract, warranty, tort
-(including negligence), product liability or otherwise, arising in any way in
-relation to the supply, licensing or operation of the software, even if advised
-of the possibility of such damages.

accounts/ethkey/Cargo.toml

@@ -1,13 +0,0 @@
-[package]
-description = "OpenEthereum Keys Generator"
-name = "ethkey"
-version = "0.4.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-
-[dependencies]
-edit-distance = "2.0"
-log = "0.4"
-serde = "1.0"
-serde_derive = "1.0"
-parity-crypto = { version = "0.6.1", features = ["publickey"] }
-parity-wordlist = "1.3.1"

accounts/ethkey/cli/Cargo.toml

@@ -1,22 +0,0 @@
-[package]
-description = "OpenEthereum Keys Generator CLI"
-name = "ethkey-cli"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-
-[dependencies]
-docopt = "1.0"
-env_logger = "0.5"
-ethkey = { path = "../" }
-panic_hook = { path = "../../../util/panic-hook" }
-parity-crypto = { version = "0.6.1", features = ["publickey"] }
-parity-wordlist= "1.3.1"
-rustc-hex = "2.1.0"
-serde = "1.0"
-serde_derive = "1.0"
-threadpool = "1.7"
-
-[[bin]]
-name = "ethkey"
-path = "src/main.rs"
-doc = false

accounts/ethkey/cli/src/main.rs

@@ -1,453 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate docopt;
-extern crate env_logger;
-extern crate ethkey;
-extern crate panic_hook;
-extern crate parity_wordlist;
-extern crate parity_crypto;
-extern crate rustc_hex;
-extern crate serde;
-extern crate threadpool;
-
-#[macro_use]
-extern crate serde_derive;
-
-use std::num::ParseIntError;
-use std::{env, fmt, process, io, sync};
-
-use docopt::Docopt;
-use ethkey::{Brain, BrainPrefix, Prefix, brain_recover};
-use parity_crypto::publickey::{KeyPair, Random, Error as EthkeyError, Generator, sign, verify_public, verify_address};
-use rustc_hex::{FromHex, FromHexError};
-
-const USAGE: &'static str = r#"
-OpenEthereum keys generator.
-  Copyright 2015-2020 Parity Technologies (UK) Ltd.
-
-Usage:
-    ethkey info <secret-or-phrase> [options]
-    ethkey generate random [options]
-    ethkey generate prefix <prefix> [options]
-    ethkey sign <secret> <message>
-    ethkey verify public <public> <signature> <message>
-    ethkey verify address <address> <signature> <message>
-    ethkey recover <address> <known-phrase>
-    ethkey [-h | --help]
-
-Options:
-    -h, --help         Display this message and exit.
-    -s, --secret       Display only the secret key.
-    -p, --public       Display only the public key.
-    -a, --address      Display only the address.
-    -b, --brain        Use parity brain wallet algorithm. Not recommended.
-
-Commands:
-    info               Display public key and address of the secret.
-    generate random    Generates new random Ethereum key.
-    generate prefix    Random generation, but address must start with a prefix ("vanity address").
-    sign               Sign message using a secret key.
-    verify             Verify signer of the signature by public key or address.
-    recover            Try to find brain phrase matching given address from partial phrase.
-"#;
-
-#[derive(Debug, Deserialize)]
-struct Args {
-	cmd_info: bool,
-	cmd_generate: bool,
-	cmd_random: bool,
-	cmd_prefix: bool,
-	cmd_sign: bool,
-	cmd_verify: bool,
-	cmd_public: bool,
-	cmd_address: bool,
-	cmd_recover: bool,
-	arg_prefix: String,
-	arg_secret: String,
-	arg_secret_or_phrase: String,
-	arg_known_phrase: String,
-	arg_message: String,
-	arg_public: String,
-	arg_address: String,
-	arg_signature: String,
-	flag_secret: bool,
-	flag_public: bool,
-	flag_address: bool,
-	flag_brain: bool,
-}
-
-#[derive(Debug)]
-enum Error {
-	Ethkey(EthkeyError),
-	FromHex(FromHexError),
-	ParseInt(ParseIntError),
-	Docopt(docopt::Error),
-	Io(io::Error),
-}
-
-impl From<EthkeyError> for Error {
-	fn from(err: EthkeyError) -> Self {
-		Error::Ethkey(err)
-	}
-}
-
-impl From<FromHexError> for Error {
-	fn from(err: FromHexError) -> Self {
-		Error::FromHex(err)
-	}
-}
-
-impl From<ParseIntError> for Error {
-	fn from(err: ParseIntError) -> Self {
-		Error::ParseInt(err)
-	}
-}
-
-impl From<docopt::Error> for Error {
-	fn from(err: docopt::Error) -> Self {
-		Error::Docopt(err)
-	}
-}
-
-impl From<io::Error> for Error {
-	fn from(err: io::Error) -> Self {
-		Error::Io(err)
-	}
-}
-
-impl fmt::Display for Error {
-	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-		match *self {
-			Error::Ethkey(ref e) => write!(f, "{}", e),
-			Error::FromHex(ref e) => write!(f, "{}", e),
-			Error::ParseInt(ref e) => write!(f, "{}", e),
-			Error::Docopt(ref e) => write!(f, "{}", e),
-			Error::Io(ref e) => write!(f, "{}", e),
-		}
-	}
-}
-
-enum DisplayMode {
-	KeyPair,
-	Secret,
-	Public,
-	Address,
-}
-
-impl DisplayMode {
-	fn new(args: &Args) -> Self {
-		if args.flag_secret {
-			DisplayMode::Secret
-		} else if args.flag_public {
-			DisplayMode::Public
-		} else if args.flag_address {
-			DisplayMode::Address
-		} else {
-			DisplayMode::KeyPair
-		}
-	}
-}
-
-fn main() {
-	panic_hook::set_abort();
-	env_logger::try_init().expect("Logger initialized only once.");
-
-	match execute(env::args()) {
-		Ok(ok) => println!("{}", ok),
-		Err(Error::Docopt(ref e)) => e.exit(),
-		Err(err) => {
-			eprintln!("{}", err);
-			process::exit(1);
-		}
-	}
-}
-
-fn display(result: (KeyPair, Option<String>), mode: DisplayMode) -> String {
-	let keypair = result.0;
-	match mode {
-		DisplayMode::KeyPair => match result.1 {
-			Some(extra_data) => format!("{}\n{}", extra_data, keypair),
-			None => format!("{}", keypair)
-		},
-		DisplayMode::Secret => format!("{:x}", keypair.secret()),
-		DisplayMode::Public => format!("{:x}", keypair.public()),
-		DisplayMode::Address => format!("{:x}", keypair.address()),
-	}
-}
-
-fn execute<S, I>(command: I) -> Result<String, Error> where I: IntoIterator<Item=S>, S: AsRef<str> {
-	let args: Args = Docopt::new(USAGE)
-		.and_then(|d| d.argv(command).deserialize())?;
-
-	return if args.cmd_info {
-		let display_mode = DisplayMode::new(&args);
-
-		let result = if args.flag_brain {
-			let phrase = args.arg_secret_or_phrase;
-			let phrase_info = validate_phrase(&phrase);
-			let keypair = Brain::new(phrase).generate();
-			(keypair, Some(phrase_info))
-		} else {
-			let secret = args.arg_secret_or_phrase.parse().map_err(|_| EthkeyError::InvalidSecretKey)?;
-			(KeyPair::from_secret(secret)?, None)
-		};
-		Ok(display(result, display_mode))
-	} else if args.cmd_generate {
-		let display_mode = DisplayMode::new(&args);
-		let result = if args.cmd_random {
-			if args.flag_brain {
-				let mut brain = BrainPrefix::new(vec![0], usize::max_value(), BRAIN_WORDS);
-				let keypair = brain.generate()?;
-				let phrase = format!("recovery phrase: {}", brain.phrase());
-				(keypair, Some(phrase))
-			} else {
-				(Random.generate(), None)
-			}
-		} else if args.cmd_prefix {
-			let prefix: Vec<_> = args.arg_prefix.from_hex()?;
-			let brain = args.flag_brain;
-			in_threads(move || {
-				let iterations = 1024;
-				let prefix = prefix.clone();
-				move || {
-					let prefix = prefix.clone();
-					let res = if brain {
-						let mut brain = BrainPrefix::new(prefix, iterations, BRAIN_WORDS);
-						let result = brain.generate();
-						let phrase = format!("recovery phrase: {}", brain.phrase());
-						result.map(|keypair| (keypair, Some(phrase)))
-					} else {
-						let result = Prefix::new(prefix, iterations).generate();
-						result.map(|res| (res, None))
-					};
-
-					Ok(res.map(Some).unwrap_or(None))
-				}
-			})?
-		} else {
-			return Ok(format!("{}", USAGE))
-		};
-		Ok(display(result, display_mode))
-	} else if args.cmd_sign {
-		let secret = args.arg_secret.parse().map_err(|_| EthkeyError::InvalidSecretKey)?;
-		let message = args.arg_message.parse().map_err(|_| EthkeyError::InvalidMessage)?;
-		let signature = sign(&secret, &message)?;
-		Ok(format!("{}", signature))
-	} else if args.cmd_verify {
-		let signature = args.arg_signature.parse().map_err(|_| EthkeyError::InvalidSignature)?;
-		let message = args.arg_message.parse().map_err(|_| EthkeyError::InvalidMessage)?;
-		let ok = if args.cmd_public {
-			let public = args.arg_public.parse().map_err(|_| EthkeyError::InvalidPublicKey)?;
-			verify_public(&public, &signature, &message)?
-		} else if args.cmd_address {
-			let address = args.arg_address.parse().map_err(|_| EthkeyError::InvalidAddress)?;
-			verify_address(&address, &signature, &message)?
-		} else {
-			return Ok(format!("{}", USAGE))
-		};
-		Ok(format!("{}", ok))
-	} else if args.cmd_recover {
-		let display_mode = DisplayMode::new(&args);
-		let known_phrase = args.arg_known_phrase;
-		let address = args.arg_address.parse().map_err(|_| EthkeyError::InvalidAddress)?;
-		let (phrase, keypair) = in_threads(move || {
-			let mut it = brain_recover::PhrasesIterator::from_known_phrase(&known_phrase, BRAIN_WORDS);
-			move || {
-				let mut i = 0;
-				while let Some(phrase) = it.next() {
-					i += 1;
-
-					let keypair = Brain::new(phrase.clone()).generate();
-					if keypair.address() == address {
-						return Ok(Some((phrase, keypair)))
-					}
-
-					if i >= 1024 {
-						return Ok(None)
-					}
-				}
-
-				Err(EthkeyError::Custom("Couldn't find any results.".into()))
-			}
-		})?;
-		Ok(display((keypair, Some(phrase)), display_mode))
-	} else {
-		Ok(format!("{}", USAGE))
-	}
-}
-
-const BRAIN_WORDS: usize = 12;
-
-fn validate_phrase(phrase: &str) -> String {
-	match Brain::validate_phrase(phrase, BRAIN_WORDS) {
-		Ok(()) => format!("The recovery phrase looks correct.\n"),
-		Err(err) => format!("The recover phrase was not generated by Parity: {}", err)
-	}
-}
-
-fn in_threads<F, X, O>(prepare: F) -> Result<O, EthkeyError> where
-	O: Send + 'static,
-	X: Send + 'static,
-	F: Fn() -> X,
-	X: FnMut() -> Result<Option<O>, EthkeyError>,
-{
-	let pool = threadpool::Builder::new().build();
-
-	let (tx, rx) = sync::mpsc::sync_channel(1);
-	let is_done = sync::Arc::new(sync::atomic::AtomicBool::default());
-
-	for _ in 0..pool.max_count() {
-		let is_done = is_done.clone();
-		let tx = tx.clone();
-		let mut task = prepare();
-		pool.execute(move || {
-			loop {
-				if is_done.load(sync::atomic::Ordering::SeqCst) {
-					return;
-				}
-
-				let res = match task() {
-					Ok(None) => continue,
-					Ok(Some(v)) => Ok(v),
-					Err(err) => Err(err),
-				};
-
-				// We are interested only in the first response.
-				let _ = tx.send(res);
-			}
-		});
-	}
-
-	if let Ok(solution) = rx.recv() {
-		is_done.store(true, sync::atomic::Ordering::SeqCst);
-		return solution;
-	}
-
-	Err(EthkeyError::Custom("No results found.".into()))
-}
-
-#[cfg(test)]
-mod tests {
-	use super::execute;
-
-	#[test]
-	fn info() {
-		let command = vec!["ethkey", "info", "17d08f5fe8c77af811caa0c9a187e668ce3b74a99acc3f6d976f075fa8e0be55"]
-			.into_iter()
-			.map(Into::into)
-			.collect::<Vec<String>>();
-
-		let expected =
-"secret:  17d08f5fe8c77af811caa0c9a187e668ce3b74a99acc3f6d976f075fa8e0be55
-public:  689268c0ff57a20cd299fa60d3fb374862aff565b20b5f1767906a99e6e09f3ff04ca2b2a5cd22f62941db103c0356df1a8ed20ce322cab2483db67685afd124
-address: 26d1ec50b4e62c1d1a40d16e7cacc6a6580757d5".to_owned();
-		assert_eq!(execute(command).unwrap(), expected);
-	}
-
-	#[test]
-	fn brain() {
-		let command = vec!["ethkey", "info", "--brain", "this is sparta"]
-			.into_iter()
-			.map(Into::into)
-			.collect::<Vec<String>>();
-
-		let expected =
-"The recover phrase was not generated by Parity: The word 'this' does not come from the dictionary.
-
-secret:  aa22b54c0cb43ee30a014afe5ef3664b1cde299feabca46cd3167a85a57c39f2
-public:  c4c5398da6843632c123f543d714d2d2277716c11ff612b2a2f23c6bda4d6f0327c31cd58c55a9572c3cc141dade0c32747a13b7ef34c241b26c84adbb28fcf4
-address: 006e27b6a72e1f34c626762f3c4761547aff1421".to_owned();
-		assert_eq!(execute(command).unwrap(), expected);
-	}
-
-	#[test]
-	fn secret() {
-		let command = vec!["ethkey", "info", "--brain", "this is sparta", "--secret"]
-			.into_iter()
-			.map(Into::into)
-			.collect::<Vec<String>>();
-
-		let expected = "aa22b54c0cb43ee30a014afe5ef3664b1cde299feabca46cd3167a85a57c39f2".to_owned();
-		assert_eq!(execute(command).unwrap(), expected);
-	}
-
-	#[test]
-	fn public() {
-		let command = vec!["ethkey", "info", "--brain", "this is sparta", "--public"]
-			.into_iter()
-			.map(Into::into)
-			.collect::<Vec<String>>();
-
-		let expected = "c4c5398da6843632c123f543d714d2d2277716c11ff612b2a2f23c6bda4d6f0327c31cd58c55a9572c3cc141dade0c32747a13b7ef34c241b26c84adbb28fcf4".to_owned();
-		assert_eq!(execute(command).unwrap(), expected);
-	}
-
-	#[test]
-	fn address() {
-		let command = vec!["ethkey", "info", "-b", "this is sparta", "--address"]
-			.into_iter()
-			.map(Into::into)
-			.collect::<Vec<String>>();
-
-		let expected = "006e27b6a72e1f34c626762f3c4761547aff1421".to_owned();
-		assert_eq!(execute(command).unwrap(), expected);
-	}
-
-	#[test]
-	fn sign() {
-		let command = vec!["ethkey", "sign", "17d08f5fe8c77af811caa0c9a187e668ce3b74a99acc3f6d976f075fa8e0be55", "bd50b7370c3f96733b31744c6c45079e7ae6c8d299613246d28ebcef507ec987"]
-			.into_iter()
-			.map(Into::into)
-			.collect::<Vec<String>>();
-
-		let expected = "c1878cf60417151c766a712653d26ef350c8c75393458b7a9be715f053215af63dfd3b02c2ae65a8677917a8efa3172acb71cb90196e42106953ea0363c5aaf200".to_owned();
-		assert_eq!(execute(command).unwrap(), expected);
-	}
-
-	#[test]
-	fn verify_valid_public() {
-		let command = vec!["ethkey", "verify", "public", "689268c0ff57a20cd299fa60d3fb374862aff565b20b5f1767906a99e6e09f3ff04ca2b2a5cd22f62941db103c0356df1a8ed20ce322cab2483db67685afd124", "c1878cf60417151c766a712653d26ef350c8c75393458b7a9be715f053215af63dfd3b02c2ae65a8677917a8efa3172acb71cb90196e42106953ea0363c5aaf200", "bd50b7370c3f96733b31744c6c45079e7ae6c8d299613246d28ebcef507ec987"]
-			.into_iter()
-			.map(Into::into)
-			.collect::<Vec<String>>();
-
-		let expected = "true".to_owned();
-		assert_eq!(execute(command).unwrap(), expected);
-	}
-
-	#[test]
-	fn verify_valid_address() {
-		let command = vec!["ethkey", "verify", "address", "26d1ec50b4e62c1d1a40d16e7cacc6a6580757d5", "c1878cf60417151c766a712653d26ef350c8c75393458b7a9be715f053215af63dfd3b02c2ae65a8677917a8efa3172acb71cb90196e42106953ea0363c5aaf200", "bd50b7370c3f96733b31744c6c45079e7ae6c8d299613246d28ebcef507ec987"]
-			.into_iter()
-			.map(Into::into)
-			.collect::<Vec<String>>();
-
-		let expected = "true".to_owned();
-		assert_eq!(execute(command).unwrap(), expected);
-	}
-
-	#[test]
-	fn verify_invalid() {
-		let command = vec!["ethkey", "verify", "public", "689268c0ff57a20cd299fa60d3fb374862aff565b20b5f1767906a99e6e09f3ff04ca2b2a5cd22f62941db103c0356df1a8ed20ce322cab2483db67685afd124", "c1878cf60417151c766a712653d26ef350c8c75393458b7a9be715f053215af63dfd3b02c2ae65a8677917a8efa3172acb71cb90196e42106953ea0363c5aaf200", "bd50b7370c3f96733b31744c6c45079e7ae6c8d299613246d28ebcef507ec986"]
-			.into_iter()
-			.map(Into::into)
-			.collect::<Vec<String>>();
-
-		let expected = "false".to_owned();
-		assert_eq!(execute(command).unwrap(), expected);
-	}
-}

accounts/ethkey/src/brain.rs

@@ -1,72 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use parity_crypto::publickey::{KeyPair, Generator, Secret};
-use parity_crypto::Keccak256;
-use parity_wordlist;
-
-/// Simple brainwallet.
-pub struct Brain(String);
-
-impl Brain {
-	pub fn new(s: String) -> Self {
-		Brain(s)
-	}
-
-	pub fn validate_phrase(phrase: &str, expected_words: usize) -> Result<(), ::WordlistError> {
-		parity_wordlist::validate_phrase(phrase, expected_words)
-	}
-}
-
-impl Generator for Brain {
-	fn generate(&mut self) -> KeyPair {
-		let seed = self.0.clone();
-		let mut secret = seed.into_bytes().keccak256();
-
-		let mut i = 0;
-		loop {
-			secret = secret.keccak256();
-
-			match i > 16384 {
-				false => i += 1,
-				true => {
-					if let Ok(pair) = Secret::import_key(&secret)
-						.and_then(KeyPair::from_secret)
-					{
-						if pair.address()[0] == 0 {
-							trace!("Testing: {}, got: {:?}", self.0, pair.address());
-							return pair
-						}
-					}
-				},
-			}
-		}
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use Brain;
-	use parity_crypto::publickey::Generator;
-
-	#[test]
-	fn test_brain() {
-		let words = "this is sparta!".to_owned();
-		let first_keypair = Brain::new(words.clone()).generate();
-		let second_keypair = Brain::new(words.clone()).generate();
-		assert_eq!(first_keypair.secret(), second_keypair.secret());
-	}
-}

accounts/ethkey/src/brain_prefix.rs

@@ -1,67 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use super::Brain;
-use parity_crypto::publickey::{Generator, KeyPair, Error};
-use parity_wordlist as wordlist;
-
-/// Tries to find brain-seed keypair with address starting with given prefix.
-pub struct BrainPrefix {
-	prefix: Vec<u8>,
-	iterations: usize,
-	no_of_words: usize,
-	last_phrase: String,
-}
-
-impl BrainPrefix {
-	pub fn new(prefix: Vec<u8>, iterations: usize, no_of_words: usize) -> Self {
-		BrainPrefix {
-			prefix,
-			iterations,
-			no_of_words,
-			last_phrase: String::new(),
-		}
-	}
-
-	pub fn phrase(&self) -> &str {
-		&self.last_phrase
-	}
-
-	pub fn generate(&mut self) -> Result<KeyPair, Error> {
-		for _ in 0..self.iterations {
-			let phrase = wordlist::random_phrase(self.no_of_words);
-			let keypair = Brain::new(phrase.clone()).generate();
-			if keypair.address().as_ref().starts_with(&self.prefix) {
-				self.last_phrase = phrase;
-				return Ok(keypair)
-			}
-		}
-
-		Err(Error::Custom("Could not find keypair".into()))
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use BrainPrefix;
-
-	#[test]
-	fn prefix_generator() {
-		let prefix = vec![0x00u8];
-		let keypair = BrainPrefix::new(prefix.clone(), usize::max_value(), 12).generate().unwrap();
-		assert!(keypair.address().as_bytes().starts_with(&prefix));
-	}
-}

accounts/ethkey/src/brain_recover.rs

@@ -1,174 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::collections::HashSet;
-
-use edit_distance::edit_distance;
-use parity_wordlist;
-
-use super::Brain;
-use parity_crypto::publickey::{Address, Generator};
-
-/// Tries to find a phrase for address, given the number
-/// of expected words and a partial phrase.
-///
-/// Returns `None` if phrase couldn't be found.
-pub fn brain_recover(
-	address: &Address,
-	known_phrase: &str,
-	expected_words: usize,
-) -> Option<String> {
-	let it = PhrasesIterator::from_known_phrase(known_phrase, expected_words);
-	for phrase in it {
-		let keypair = Brain::new(phrase.clone()).generate();
-		trace!("Testing: {}, got: {:?}", phrase, keypair.address());
-		if &keypair.address() == address {
-			return Some(phrase);
-		}
-	}
-
-	None
-}
-
-fn generate_substitutions(word: &str) -> Vec<&'static str> {
-	let mut words = parity_wordlist::WORDS.iter().cloned()
-		.map(|w| (edit_distance(w, word), w))
-		.collect::<Vec<_>>();
-	words.sort_by(|a, b| a.0.cmp(&b.0));
-
-	words.into_iter()
-		.map(|pair| pair.1)
-		.collect()
-}
-
-/// Iterator over possible
-pub struct PhrasesIterator {
-	words: Vec<Vec<&'static str>>,
-	combinations: u64,
-	indexes: Vec<usize>,
-	has_next: bool,
-}
-
-impl PhrasesIterator {
-	pub fn from_known_phrase(known_phrase: &str, expected_words: usize) -> Self {
-		let known_words = parity_wordlist::WORDS.iter().cloned().collect::<HashSet<_>>();
-		let mut words = known_phrase.split(' ')
-			.map(|word| match known_words.get(word) {
-				None => {
-					info!("Invalid word '{}', looking for potential substitutions.", word);
-					let substitutions = generate_substitutions(word);
-					info!("Closest words: {:?}", &substitutions[..10]);
-					substitutions
-				},
-				Some(word) => vec![*word],
-			})
-		.collect::<Vec<_>>();
-
-		// add missing words
-		if words.len() < expected_words {
-			let to_add = expected_words - words.len();
-			info!("Number of words is insuficcient adding {} more.", to_add);
-			for _ in 0..to_add {
-				words.push(parity_wordlist::WORDS.iter().cloned().collect());
-			}
-		}
-
-		// start searching
-		PhrasesIterator::new(words)
-	}
-
-	pub fn new(words: Vec<Vec<&'static str>>) -> Self {
-		let combinations = words.iter().fold(1u64, |acc, x| acc * x.len() as u64);
-		let indexes = words.iter().map(|_| 0).collect();
-		info!("Starting to test {} possible combinations.", combinations);
-
-		PhrasesIterator {
-			words,
-			combinations,
-			indexes,
-			has_next: combinations > 0,
-		}
-	}
-
-	pub fn combinations(&self) -> u64 {
-		self.combinations
-	}
-
-	fn current(&self) -> String {
-		let mut s = self.words[0][self.indexes[0]].to_owned();
-		for i in 1..self.indexes.len() {
-			s.push(' ');
-			s.push_str(self.words[i][self.indexes[i]]);
-		}
-		s
-	}
-
-	fn next_index(&mut self) -> bool {
-		let mut pos = self.indexes.len();
-		while pos > 0 {
-			pos -= 1;
-			self.indexes[pos] += 1;
-			if self.indexes[pos] >= self.words[pos].len() {
-				self.indexes[pos] = 0;
-			} else {
-				return true;
-			}
-		}
-
-		false
-	}
-}
-
-impl Iterator for PhrasesIterator {
-	type Item = String;
-
-	fn next(&mut self) -> Option<String> {
-		if !self.has_next {
-			return None;
-		}
-
-		let phrase = self.current();
-		self.has_next = self.next_index();
-		Some(phrase)
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use super::PhrasesIterator;
-
-	#[test]
-	fn should_generate_possible_combinations() {
-		let mut it = PhrasesIterator::new(vec![
-			vec!["1", "2", "3"],
-			vec!["test"],
-			vec!["a", "b", "c"],
-		]);
-
-		assert_eq!(it.combinations(), 9);
-		assert_eq!(it.next(), Some("1 test a".to_owned()));
-		assert_eq!(it.next(), Some("1 test b".to_owned()));
-		assert_eq!(it.next(), Some("1 test c".to_owned()));
-		assert_eq!(it.next(), Some("2 test a".to_owned()));
-		assert_eq!(it.next(), Some("2 test b".to_owned()));
-		assert_eq!(it.next(), Some("2 test c".to_owned()));
-		assert_eq!(it.next(), Some("3 test a".to_owned()));
-		assert_eq!(it.next(), Some("3 test b".to_owned()));
-		assert_eq!(it.next(), Some("3 test c".to_owned()));
-		assert_eq!(it.next(), None);
-	}
-
-}

accounts/ethkey/src/prefix.rs

@@ -1,52 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use parity_crypto::publickey::{Random, Generator, KeyPair, Error};
-
-/// Tries to find keypair with address starting with given prefix.
-pub struct Prefix {
-	prefix: Vec<u8>,
-	iterations: usize,
-}
-
-impl Prefix {
-	pub fn new(prefix: Vec<u8>, iterations: usize) -> Self {
-		Prefix { prefix, iterations }
-	}
-
-	pub fn generate(&mut self) -> Result<KeyPair, Error> {
-		for _ in 0..self.iterations {
-			let keypair = Random.generate();
-			if keypair.address().as_ref().starts_with(&self.prefix) {
-				return Ok(keypair)
-			}
-		}
-
-		Err(Error::Custom("Could not find keypair".into()))
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use Prefix;
-
-	#[test]
-	fn prefix_generator() {
-		let prefix = vec![0xffu8];
-		let keypair = Prefix::new(prefix.clone(), usize::max_value()).generate().unwrap();
-		assert!(keypair.address().as_bytes().starts_with(&prefix));
-	}
-}

accounts/ethstore/Cargo.toml

@@ -1,30 +0,0 @@
-[package]
-description = "OpenEthereum Key Management"
-name = "ethstore"
-version = "0.2.1"
-authors = ["Parity Technologies <admin@parity.io>"]
-repository = "https://github.com/openethereum/openethereum"
-
-[dependencies]
-log = "0.4"
-libc = "0.2"
-rand = "0.7.3"
-ethkey = { path = "../ethkey" }
-serde = "1.0"
-serde_json = "1.0"
-serde_derive = "1.0"
-rustc-hex = "2.1.0"
-tiny-keccak = "2.0.2"
-time = "0.1.34"
-parking_lot = "0.10.0"
-parity-crypto = { version = "0.6.1", features = ["publickey"] }
-ethereum-types = "0.9.0"
-dir = { path = "../../util/dir" }
-smallvec = "1.2.0"
-parity-wordlist = "1.3.1"
-tempfile = "3.1"
-
-[dev-dependencies]
-matches = "0.1"
-
-[lib]

accounts/ethstore/cli/Cargo.toml

@@ -1,27 +0,0 @@
-[package]
-description = "OpenEthereum Key Management CLI"
-name = "ethstore-cli"
-version = "0.1.1"
-authors = ["Parity Technologies <admin@parity.io>"]
-
-[dependencies]
-docopt = "1.0"
-env_logger = "0.5"
-num_cpus = "1.6"
-rustc-hex = "2.1.0"
-serde = "1.0"
-serde_derive = "1.0"
-parking_lot = "0.10.0"
-ethstore = { path = "../" }
-ethkey = { path = "../../ethkey" }
-parity-crypto = { version = "0.6.1", features = ["publickey"] }
-dir = { path = '../../../util/dir' }
-panic_hook = { path = "../../../util/panic-hook" }
-
-[[bin]]
-name = "ethstore"
-path = "src/main.rs"
-doc = false
-
-[dev-dependencies]
-tempfile = "3.1"

accounts/ethstore/cli/src/crack.rs

@@ -1,67 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::{cmp, thread};
-use std::sync::Arc;
-use std::collections::VecDeque;
-use parking_lot::Mutex;
-
-use ethstore::{PresaleWallet, Error};
-use ethkey::Password;
-use num_cpus;
-
-pub fn run(passwords: VecDeque<Password>, wallet_path: &str) -> Result<(), Error> {
-	let passwords = Arc::new(Mutex::new(passwords));
-
-	let mut handles = Vec::new();
-
-	for _ in 0..num_cpus::get() {
-		let passwords = passwords.clone();
-		let wallet = PresaleWallet::open(&wallet_path)?;
-		handles.push(thread::spawn(move || {
-			look_for_password(passwords, wallet);
-		}));
-	}
-
-	for handle in handles {
-		handle.join().map_err(|err| Error::Custom(format!("Error finishing thread: {:?}", err)))?;
-	}
-
-	Ok(())
-}
-
-fn look_for_password(passwords: Arc<Mutex<VecDeque<Password>>>, wallet: PresaleWallet) {
-	let mut counter = 0;
-	while !passwords.lock().is_empty() {
-		let package = {
-			let mut passwords = passwords.lock();
-			let len = passwords.len();
-			passwords.split_off(cmp::min(len, 32))
-		};
-		for pass in package {
-			counter += 1;
-			match wallet.decrypt(&pass) {
-				Ok(_) => {
-					println!("Found password: {}", pass.as_str());
-					passwords.lock().clear();
-					return;
-				},
-				_ if counter % 100 == 0 => print!("."),
-				_ => {},
-			}
-		}
-	}
-}

accounts/ethstore/cli/src/main.rs

@@ -1,322 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate dir;
-extern crate docopt;
-extern crate ethstore;
-extern crate ethkey;
-extern crate num_cpus;
-extern crate panic_hook;
-extern crate parking_lot;
-extern crate parity_crypto;
-extern crate rustc_hex;
-extern crate serde;
-
-extern crate env_logger;
-
-#[macro_use]
-extern crate serde_derive;
-
-use std::collections::VecDeque;
-use std::io::Read;
-use std::{env, process, fs, fmt};
-
-use docopt::Docopt;
-use ethstore::accounts_dir::{KeyDirectory, RootDiskDirectory};
-use ethkey::Password;
-use parity_crypto::publickey::Address;
-use ethstore::{EthStore, SimpleSecretStore, SecretStore, import_accounts, PresaleWallet, SecretVaultRef, StoreAccountRef};
-
-mod crack;
-
-pub const USAGE: &'static str = r#"
-OpenEthereum key management tool.
-  Copyright 2015-2020 Parity Technologies (UK) Ltd.
-
-Usage:
-    ethstore insert <secret> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
-    ethstore change-pwd <address> <old-pwd> <new-pwd> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
-    ethstore list [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
-    ethstore import [<password>] [--src DIR] [--dir DIR]
-    ethstore import-wallet <path> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
-    ethstore find-wallet-pass <path> <password>
-    ethstore remove <address> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
-    ethstore sign <address> <password> <message> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
-    ethstore public <address> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
-    ethstore list-vaults [--dir DIR]
-    ethstore create-vault <vault> <password> [--dir DIR]
-    ethstore change-vault-pwd <vault> <old-pwd> <new-pwd> [--dir DIR]
-    ethstore move-to-vault <address> <vault> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
-    ethstore move-from-vault <address> <vault> <password> [--dir DIR]
-    ethstore [-h | --help]
-
-Options:
-    -h, --help               Display this message and exit.
-    --dir DIR                Specify the secret store directory. It may be either
-                             parity, parity-(chain), geth, geth-test
-                             or a path [default: parity].
-    --vault VAULT            Specify vault to use in this operation.
-    --vault-pwd VAULTPWD     Specify vault password to use in this operation. Please note
-                             that this option is required when vault option is set.
-                             Otherwise it is ignored.
-    --src DIR                Specify import source. It may be either
-                             parity, parity-(chain), geth, geth-test
-                             or a path [default: geth].
-
-Commands:
-    insert             Save account with password.
-    change-pwd         Change password.
-    list               List accounts.
-    import             Import accounts from src.
-    import-wallet      Import presale wallet.
-    find-wallet-pass   Tries to open a wallet with list of passwords given.
-    remove             Remove account.
-    sign               Sign message.
-    public             Displays public key for an address.
-    list-vaults        List vaults.
-    create-vault       Create new vault.
-    change-vault-pwd   Change vault password.
-    move-to-vault      Move account to vault from another vault/root directory.
-    move-from-vault    Move account to root directory from given vault.
-"#;
-
-#[derive(Debug, Deserialize)]
-struct Args {
-	cmd_insert: bool,
-	cmd_change_pwd: bool,
-	cmd_list: bool,
-	cmd_import: bool,
-	cmd_import_wallet: bool,
-	cmd_find_wallet_pass: bool,
-	cmd_remove: bool,
-	cmd_sign: bool,
-	cmd_public: bool,
-	cmd_list_vaults: bool,
-	cmd_create_vault: bool,
-	cmd_change_vault_pwd: bool,
-	cmd_move_to_vault: bool,
-	cmd_move_from_vault: bool,
-	arg_secret: String,
-	arg_password: String,
-	arg_old_pwd: String,
-	arg_new_pwd: String,
-	arg_address: String,
-	arg_message: String,
-	arg_path: String,
-	arg_vault: String,
-	flag_src: String,
-	flag_dir: String,
-	flag_vault: String,
-	flag_vault_pwd: String,
-}
-
-enum Error {
-	Ethstore(ethstore::Error),
-	Docopt(docopt::Error),
-}
-
-impl From<ethstore::Error> for Error {
-	fn from(err: ethstore::Error) -> Self {
-		Error::Ethstore(err)
-	}
-}
-
-impl From<docopt::Error> for Error {
-	fn from(err: docopt::Error) -> Self {
-		Error::Docopt(err)
-	}
-}
-
-impl fmt::Display for Error {
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		match *self {
-			Error::Ethstore(ref err) => fmt::Display::fmt(err, f),
-			Error::Docopt(ref err) => fmt::Display::fmt(err, f),
-		}
-	}
-}
-
-fn main() {
-	panic_hook::set_abort();
-	if env::var("RUST_LOG").is_err() {
-		env::set_var("RUST_LOG", "warn")
-	}
-	env_logger::try_init().expect("Logger initialized only once.");
-
-	match execute(env::args()) {
-		Ok(result) => println!("{}", result),
-		Err(Error::Docopt(ref e)) => e.exit(),
-		Err(err) => {
-			eprintln!("{}", err);
-			process::exit(1);
-		}
-	}
-}
-
-fn key_dir(location: &str, password: Option<Password>) -> Result<Box<dyn KeyDirectory>, Error> {
-	let dir: RootDiskDirectory = match location {
-		"geth" => RootDiskDirectory::create(dir::geth(false))?,
-		"geth-test" => RootDiskDirectory::create(dir::geth(true))?,
-		path if path.starts_with("parity") => {
-			let chain = path.split('-').nth(1).unwrap_or("ethereum");
-			let mut path = dir::default_data_pathbuf();
-			path.push("keys");
-			path.push(chain);
-			RootDiskDirectory::create(path)?
-		},
-		path => RootDiskDirectory::create(path)?,
-	};
-
-	Ok(Box::new(dir.with_password(password)))
-}
-
-fn open_args_vault(store: &EthStore, args: &Args) -> Result<SecretVaultRef, Error> {
-	if args.flag_vault.is_empty() {
-		return Ok(SecretVaultRef::Root);
-	}
-
-	let vault_pwd = load_password(&args.flag_vault_pwd)?;
-	store.open_vault(&args.flag_vault, &vault_pwd)?;
-	Ok(SecretVaultRef::Vault(args.flag_vault.clone()))
-}
-
-fn open_args_vault_account(store: &EthStore, address: Address, args: &Args) -> Result<StoreAccountRef, Error> {
-	match open_args_vault(store, args)? {
-		SecretVaultRef::Root => Ok(StoreAccountRef::root(address)),
-		SecretVaultRef::Vault(name) => Ok(StoreAccountRef::vault(&name, address)),
-	}
-}
-
-fn format_accounts(accounts: &[Address]) -> String {
-	accounts.iter()
-		.enumerate()
-		.map(|(i, a)| format!("{:2}: 0x{:x}", i, a))
-		.collect::<Vec<String>>()
-		.join("\n")
-}
-
-fn format_vaults(vaults: &[String]) -> String {
-	vaults.join("\n")
-}
-
-fn load_password(path: &str) -> Result<Password, Error> {
-	let mut file = fs::File::open(path).map_err(|e| ethstore::Error::Custom(format!("Error opening password file '{}': {}", path, e)))?;
-	let mut password = String::new();
-	file.read_to_string(&mut password).map_err(|e| ethstore::Error::Custom(format!("Error reading password file '{}': {}", path, e)))?;
-	// drop EOF
-	let _ = password.pop();
-	Ok(password.into())
-}
-
-fn execute<S, I>(command: I) -> Result<String, Error> where I: IntoIterator<Item=S>, S: AsRef<str> {
-	let args: Args = Docopt::new(USAGE)
-		.and_then(|d| d.argv(command).deserialize())?;
-
-	let store = EthStore::open(key_dir(&args.flag_dir, None)?)?;
-
-	return if args.cmd_insert {
-		let secret = args.arg_secret.parse().map_err(|_| ethstore::Error::InvalidSecret)?;
-		let password = load_password(&args.arg_password)?;
-		let vault_ref = open_args_vault(&store, &args)?;
-		let account_ref = store.insert_account(vault_ref, secret, &password)?;
-		Ok(format!("0x{:x}", account_ref.address))
-	} else if args.cmd_change_pwd {
-		let address = args.arg_address.parse().map_err(|_| ethstore::Error::InvalidAccount)?;
-		let old_pwd = load_password(&args.arg_old_pwd)?;
-		let new_pwd = load_password(&args.arg_new_pwd)?;
-		let account_ref = open_args_vault_account(&store, address, &args)?;
-		let ok = store.change_password(&account_ref, &old_pwd, &new_pwd).is_ok();
-		Ok(format!("{}", ok))
-	} else if args.cmd_list {
-		let vault_ref = open_args_vault(&store, &args)?;
-		let accounts = store.accounts()?;
-		let accounts: Vec<_> = accounts
-			.into_iter()
-			.filter(|a| &a.vault == &vault_ref)
-			.map(|a| a.address)
-			.collect();
-		Ok(format_accounts(&accounts))
-	} else if args.cmd_import {
-		let password = match args.arg_password.as_ref() {
-			"" => None,
-			_ => Some(load_password(&args.arg_password)?)
-		};
-		let src = key_dir(&args.flag_src, password)?;
-		let dst = key_dir(&args.flag_dir, None)?;
-
-		let accounts = import_accounts(&*src, &*dst)?;
-		Ok(format_accounts(&accounts))
-	} else if args.cmd_import_wallet {
-		let wallet = PresaleWallet::open(&args.arg_path)?;
-		let password = load_password(&args.arg_password)?;
-		let kp = wallet.decrypt(&password)?;
-		let vault_ref = open_args_vault(&store, &args)?;
-		let account_ref = store.insert_account(vault_ref, kp.secret().clone(), &password)?;
-		Ok(format!("0x{:x}", account_ref.address))
-	} else if args.cmd_find_wallet_pass {
-		let passwords = load_password(&args.arg_password)?;
-		let passwords = passwords.as_str().lines().map(|line| str::to_owned(line).into()).collect::<VecDeque<_>>();
-		crack::run(passwords, &args.arg_path)?;
-		Ok(format!("Password not found."))
-	} else if args.cmd_remove {
-		let address = args.arg_address.parse().map_err(|_| ethstore::Error::InvalidAccount)?;
-		let password = load_password(&args.arg_password)?;
-		let account_ref = open_args_vault_account(&store, address, &args)?;
-		let ok = store.remove_account(&account_ref, &password).is_ok();
-		Ok(format!("{}", ok))
-	} else if args.cmd_sign {
-		let address = args.arg_address.parse().map_err(|_| ethstore::Error::InvalidAccount)?;
-		let message = args.arg_message.parse().map_err(|_| ethstore::Error::InvalidMessage)?;
-		let password = load_password(&args.arg_password)?;
-		let account_ref = open_args_vault_account(&store, address, &args)?;
-		let signature = store.sign(&account_ref, &password, &message)?;
-		Ok(format!("0x{}", signature))
-	} else if args.cmd_public {
-		let address = args.arg_address.parse().map_err(|_| ethstore::Error::InvalidAccount)?;
-		let password = load_password(&args.arg_password)?;
-		let account_ref = open_args_vault_account(&store, address, &args)?;
-		let public = store.public(&account_ref, &password)?;
-		Ok(format!("0x{:x}", public))
-	} else if args.cmd_list_vaults {
-		let vaults = store.list_vaults()?;
-		Ok(format_vaults(&vaults))
-	} else if args.cmd_create_vault {
-		let password = load_password(&args.arg_password)?;
-		store.create_vault(&args.arg_vault, &password)?;
-		Ok("OK".to_owned())
-	} else if args.cmd_change_vault_pwd {
-		let old_pwd = load_password(&args.arg_old_pwd)?;
-		let new_pwd = load_password(&args.arg_new_pwd)?;
-		store.open_vault(&args.arg_vault, &old_pwd)?;
-		store.change_vault_password(&args.arg_vault, &new_pwd)?;
-		Ok("OK".to_owned())
-	} else if args.cmd_move_to_vault {
-		let address = args.arg_address.parse().map_err(|_| ethstore::Error::InvalidAccount)?;
-		let password = load_password(&args.arg_password)?;
-		let account_ref = open_args_vault_account(&store, address, &args)?;
-		store.open_vault(&args.arg_vault, &password)?;
-		store.change_account_vault(SecretVaultRef::Vault(args.arg_vault), account_ref)?;
-		Ok("OK".to_owned())
-	} else if args.cmd_move_from_vault {
-		let address = args.arg_address.parse().map_err(|_| ethstore::Error::InvalidAccount)?;
-		let password = load_password(&args.arg_password)?;
-		store.open_vault(&args.arg_vault, &password)?;
-		store.change_account_vault(SecretVaultRef::Root, StoreAccountRef::vault(&args.arg_vault, address))?;
-		Ok("OK".to_owned())
-	} else {
-		Ok(format!("{}", USAGE))
-	}
-}

accounts/ethstore/cli/tests/cli.rs

@@ -1,82 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate tempfile;
-use std::process::Command;
-use tempfile::Builder;
-use std::fs::File;
-use std::io::Write;
-
-fn run(args: &[&str]) -> String {
-	let output = Command::new("cargo")
-		.args(&["run", "--"])
-		.args(args)
-		.output()
-		.unwrap();
-	assert!(output.status.success());
-	String::from_utf8(output.stdout).unwrap()
-}
-
-#[test]
-fn cli_cmd() {
-	Command::new("cargo")
-		.arg("build")
-		.output()
-		.unwrap();
-
-	let dir = Builder::new().prefix("test-vault").tempdir().unwrap();
-
-	let mut passwd = File::create(dir.path().join("test-password")).unwrap();
-	writeln!(passwd, "password").unwrap();
-
-	let mut passwd2 = File::create(dir.path().join("test-vault-addr")).unwrap();
-	writeln!(passwd2, "password2").unwrap();
-
-	let test_password_buf = dir.path().join("test-password");
-	let test_password: &str = test_password_buf.to_str().unwrap();
-	let dir_str: &str = dir.path().to_str().unwrap();
-	let test_vault_addr_buf = dir.path().join("test-vault-addr");
-	let test_vault_addr = test_vault_addr_buf.to_str().unwrap();
-
-	run(&["create-vault", "test-vault", test_password, "--dir", dir_str]);
-
-	let output = run(&["insert", "7d29fab185a33e2cd955812397354c472d2b84615b645aa135ff539f6b0d70d5",
-			    test_vault_addr,
-			    "--dir", dir_str,
-			    "--vault", "test-vault",
-			   "--vault-pwd", test_password]);
-	let address = output.trim();
-
-	let output = run(&["list",
-			   "--dir", dir_str,
-			   "--vault", "test-vault",
-			   "--vault-pwd", test_password]);
-	assert_eq!(output, " 0: 0xa8fa5dd30a87bb9e3288d604eb74949c515ab66e\n");
-
-	let output = run(&["sign", &address[2..],
-			   test_vault_addr,
-			   "7d29fab185a33e2cd955812397354c472d2b84615b645aa135ff539f6b0d70d5",
-			   "--dir", dir_str,
-			   "--vault", "test-vault",
-			   "--vault-pwd", test_password]);
-	assert_eq!(output, "0x54ab6e5cf0c5cb40043fdca5d15d611a3a94285414a076dafecc8dc9c04183f413296a3defff61092c0bb478dc9887ec01070e1275234211208fb8f4be4a9b0101\n");
-
-	let output = run(&["public", &address[2..], test_vault_addr,
-			   "--dir", dir_str,
-			   "--vault", "test-vault",
-			   "--vault-pwd", test_password]);
-	assert_eq!(output, "0x35f222d88b80151857a2877826d940104887376a94c1cbd2c8c7c192eb701df88a18a4ecb8b05b1466c5b3706042027b5e079fe3a3683e66d822b0e047aa3418\n");
-}

accounts/ethstore/src/account/cipher.rs

@@ -1,59 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use json;
-
-#[derive(Debug, PartialEq, Clone)]
-pub struct Aes128Ctr {
-	pub iv: [u8; 16],
-}
-
-#[derive(Debug, PartialEq, Clone)]
-pub enum Cipher {
-	Aes128Ctr(Aes128Ctr),
-}
-
-impl From<json::Aes128Ctr> for Aes128Ctr {
-	fn from(json: json::Aes128Ctr) -> Self {
-		Aes128Ctr {
-			iv: json.iv.into()
-		}
-	}
-}
-
-impl Into<json::Aes128Ctr> for Aes128Ctr {
-	fn into(self) -> json::Aes128Ctr {
-		json::Aes128Ctr {
-			iv: From::from(self.iv)
-		}
-	}
-}
-
-impl From<json::Cipher> for Cipher {
-	fn from(json: json::Cipher) -> Self {
-		match json {
-			json::Cipher::Aes128Ctr(params) => Cipher::Aes128Ctr(From::from(params)),
-		}
-	}
-}
-
-impl Into<json::Cipher> for Cipher {
-	fn into(self) -> json::Cipher {
-		match self {
-			Cipher::Aes128Ctr(params) => json::Cipher::Aes128Ctr(params.into()),
-		}
-	}
-}

accounts/ethstore/src/account/crypto.rs

@@ -1,207 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::str;
-use crypto::publickey::Secret;
-use ethkey::Password;
-use {json, Error, crypto};
-use crypto::Keccak256;
-use random::Random;
-use smallvec::SmallVec;
-use account::{Cipher, Kdf, Aes128Ctr, Pbkdf2, Prf};
-
-/// Encrypted data
-#[derive(Debug, PartialEq, Clone)]
-pub struct Crypto {
-	/// Encryption parameters
-	pub cipher: Cipher,
-	/// Encrypted data buffer
-	pub ciphertext: Vec<u8>,
-	/// Key derivation function parameters
-	pub kdf: Kdf,
-	/// Message authentication code
-	pub mac: [u8; 32],
-}
-
-impl From<json::Crypto> for Crypto {
-	fn from(json: json::Crypto) -> Self {
-		Crypto {
-			cipher: json.cipher.into(),
-			ciphertext: json.ciphertext.into(),
-			kdf: json.kdf.into(),
-			mac: json.mac.into(),
-		}
-	}
-}
-
-impl From<Crypto> for json::Crypto {
-	fn from(c: Crypto) -> Self {
-		json::Crypto {
-			cipher: c.cipher.into(),
-			ciphertext: c.ciphertext.into(),
-			kdf: c.kdf.into(),
-			mac: c.mac.into(),
-		}
-	}
-}
-
-impl str::FromStr for Crypto {
-	type Err = <json::Crypto as str::FromStr>::Err;
-
-	fn from_str(s: &str) -> Result<Self, Self::Err> {
-		s.parse::<json::Crypto>().map(Into::into)
-	}
-}
-
-impl From<Crypto> for String {
-	fn from(c: Crypto) -> Self {
-		json::Crypto::from(c).into()
-	}
-}
-
-impl Crypto {
-	/// Encrypt account secret
-	pub fn with_secret(secret: &Secret, password: &Password, iterations: u32) -> Result<Self, crypto::Error> {
-		Crypto::with_plain(secret.as_ref(), password, iterations)
-	}
-
-	/// Encrypt custom plain data
-	pub fn with_plain(plain: &[u8], password: &Password, iterations: u32) -> Result<Self, crypto::Error> {
-		let salt: [u8; 32] = Random::random();
-		let iv: [u8; 16] = Random::random();
-
-		// two parts of derived key
-		// DK = [ DK[0..15] DK[16..31] ] = [derived_left_bits, derived_right_bits]
-		let (derived_left_bits, derived_right_bits) =
-			crypto::derive_key_iterations(password.as_bytes(), &salt, iterations);
-
-		// preallocated (on-stack in case of `Secret`) buffer to hold cipher
-		// length = length(plain) as we are using CTR-approach
-		let plain_len = plain.len();
-		let mut ciphertext: SmallVec<[u8; 32]> = SmallVec::from_vec(vec![0; plain_len]);
-
-		// aes-128-ctr with initial vector of iv
-		crypto::aes::encrypt_128_ctr(&derived_left_bits, &iv, plain, &mut *ciphertext)?;
-
-		// KECCAK(DK[16..31] ++ <ciphertext>), where DK[16..31] - derived_right_bits
-		let mac = crypto::derive_mac(&derived_right_bits, &*ciphertext).keccak256();
-
-		Ok(Crypto {
-			cipher: Cipher::Aes128Ctr(Aes128Ctr {
-				iv: iv,
-			}),
-			ciphertext: ciphertext.into_vec(),
-			kdf: Kdf::Pbkdf2(Pbkdf2 {
-				dklen: crypto::KEY_LENGTH as u32,
-				salt: salt.to_vec(),
-				c: iterations,
-				prf: Prf::HmacSha256,
-			}),
-			mac: mac,
-		})
-	}
-
-	/// Try to decrypt and convert result to account secret
-	pub fn secret(&self, password: &Password) -> Result<Secret, Error> {
-		if self.ciphertext.len() > 32 {
-			return Err(Error::InvalidSecret);
-		}
-
-		let secret = self.do_decrypt(password, 32)?;
-		Ok(Secret::import_key(&secret)?)
-	}
-
-	/// Try to decrypt and return result as is
-	pub fn decrypt(&self, password: &Password) -> Result<Vec<u8>, Error> {
-		let expected_len = self.ciphertext.len();
-		self.do_decrypt(password, expected_len)
-	}
-
-	fn do_decrypt(&self, password: &Password, expected_len: usize) -> Result<Vec<u8>, Error> {
-		let (derived_left_bits, derived_right_bits) = match self.kdf {
-			Kdf::Pbkdf2(ref params) => crypto::derive_key_iterations(password.as_bytes(), &params.salt, params.c),
-			Kdf::Scrypt(ref params) => crypto::scrypt::derive_key(password.as_bytes(), &params.salt, params.n, params.p, params.r)?,
-		};
-
-		let mac = crypto::derive_mac(&derived_right_bits, &self.ciphertext).keccak256();
-
-		if !crypto::is_equal(&mac, &self.mac) {
-			return Err(Error::InvalidPassword)
-		}
-
-		let mut plain: SmallVec<[u8; 32]> = SmallVec::from_vec(vec![0; expected_len]);
-
-		match self.cipher {
-			Cipher::Aes128Ctr(ref params) => {
-				// checker by callers
-				debug_assert!(expected_len >= self.ciphertext.len());
-
-				let from = expected_len - self.ciphertext.len();
-				crypto::aes::decrypt_128_ctr(&derived_left_bits, &params.iv, &self.ciphertext, &mut plain[from..])?;
-				Ok(plain.into_iter().collect())
-			},
-		}
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use crypto::publickey::{Generator, Random};
-	use super::{Crypto, Error};
-
-	#[test]
-	fn crypto_with_secret_create() {
-		let keypair = Random.generate();
-		let passwd = "this is sparta".into();
-		let crypto = Crypto::with_secret(keypair.secret(), &passwd, 10240).unwrap();
-		let secret = crypto.secret(&passwd).unwrap();
-		assert_eq!(keypair.secret(), &secret);
-	}
-
-	#[test]
-	fn crypto_with_secret_invalid_password() {
-		let keypair = Random.generate();
-		let crypto = Crypto::with_secret(keypair.secret(), &"this is sparta".into(), 10240).unwrap();
-		assert_matches!(crypto.secret(&"this is sparta!".into()), Err(Error::InvalidPassword))
-	}
-
-	#[test]
-	fn crypto_with_null_plain_data() {
-		let original_data = b"";
-		let passwd = "this is sparta".into();
-		let crypto = Crypto::with_plain(&original_data[..], &passwd, 10240).unwrap();
-		let decrypted_data = crypto.decrypt(&passwd).unwrap();
-		assert_eq!(original_data[..], *decrypted_data);
-	}
-
-	#[test]
-	fn crypto_with_tiny_plain_data() {
-		let original_data = b"{}";
-		let passwd = "this is sparta".into();
-		let crypto = Crypto::with_plain(&original_data[..], &passwd, 10240).unwrap();
-		let decrypted_data = crypto.decrypt(&passwd).unwrap();
-		assert_eq!(original_data[..], *decrypted_data);
-	}
-
-	#[test]
-	fn crypto_with_huge_plain_data() {
-		let original_data: Vec<_> = (1..65536).map(|i| (i % 256) as u8).collect();
-		let passwd = "this is sparta".into();
-		let crypto = Crypto::with_plain(&original_data, &passwd, 10240).unwrap();
-		let decrypted_data = crypto.decrypt(&passwd).unwrap();
-		assert_eq!(&original_data, &decrypted_data);
-	}
-}

accounts/ethstore/src/account/kdf.rs

@@ -1,125 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use json;
-
-#[derive(Debug, PartialEq, Clone)]
-pub enum Prf {
-	HmacSha256,
-}
-
-#[derive(Debug, PartialEq, Clone)]
-pub struct Pbkdf2 {
-	pub c: u32,
-	pub dklen: u32,
-	pub prf: Prf,
-	pub salt: Vec<u8>,
-}
-
-#[derive(Debug, PartialEq, Clone)]
-pub struct Scrypt {
-	pub dklen: u32,
-	pub p: u32,
-	pub n: u32,
-	pub r: u32,
-	pub salt: Vec<u8>,
-}
-
-#[derive(Debug, PartialEq, Clone)]
-pub enum Kdf {
-	Pbkdf2(Pbkdf2),
-	Scrypt(Scrypt),
-}
-
-impl From<json::Prf> for Prf {
-	fn from(json: json::Prf) -> Self {
-		match json {
-			json::Prf::HmacSha256 => Prf::HmacSha256,
-		}
-	}
-}
-
-impl Into<json::Prf> for Prf {
-	fn into(self) -> json::Prf {
-		match self {
-			Prf::HmacSha256 => json::Prf::HmacSha256,
-		}
-	}
-}
-
-impl From<json::Pbkdf2> for Pbkdf2 {
-	fn from(json: json::Pbkdf2) -> Self {
-		Pbkdf2 {
-			c: json.c,
-			dklen: json.dklen,
-			prf: From::from(json.prf),
-			salt: json.salt.into(),
-		}
-	}
-}
-
-impl Into<json::Pbkdf2> for Pbkdf2 {
-	fn into(self) -> json::Pbkdf2 {
-		json::Pbkdf2 {
-			c: self.c,
-			dklen: self.dklen,
-			prf: self.prf.into(),
-			salt: From::from(self.salt),
-		}
-	}
-}
-
-impl From<json::Scrypt> for Scrypt {
-	fn from(json: json::Scrypt) -> Self {
-		Scrypt {
-			dklen: json.dklen,
-			p: json.p,
-			n: json.n,
-			r: json.r,
-			salt: json.salt.into(),
-		}
-	}
-}
-
-impl Into<json::Scrypt> for Scrypt {
-	fn into(self) -> json::Scrypt {
-		json::Scrypt {
-			dklen: self.dklen,
-			p: self.p,
-			n: self.n,
-			r: self.r,
-			salt: From::from(self.salt),
-		}
-	}
-}
-
-impl From<json::Kdf> for Kdf {
-	fn from(json: json::Kdf) -> Self {
-		match json {
-			json::Kdf::Pbkdf2(params) => Kdf::Pbkdf2(From::from(params)),
-			json::Kdf::Scrypt(params) => Kdf::Scrypt(From::from(params)),
-		}
-	}
-}
-
-impl Into<json::Kdf> for Kdf {
-	fn into(self) -> json::Kdf {
-		match self {
-			Kdf::Pbkdf2(params) => json::Kdf::Pbkdf2(params.into()),
-			Kdf::Scrypt(params) => json::Kdf::Scrypt(params.into()),
-		}
-	}
-}

accounts/ethstore/src/account/safe_account.rs

@@ -1,230 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use crypto::publickey::{KeyPair, sign, Address, Signature, Message, Public, Secret};
-use ethkey::Password;
-use crypto::publickey::ecdh::agree;
-use {json, Error};
-use account::Version;
-use crypto;
-use super::crypto::Crypto;
-
-/// Account representation.
-#[derive(Debug, PartialEq, Clone)]
-pub struct SafeAccount {
-	/// Account ID
-	pub id: [u8; 16],
-	/// Account version
-	pub version: Version,
-	/// Account address
-	pub address: Address,
-	/// Account private key derivation definition.
-	pub crypto: Crypto,
-	/// Account filename
-	pub filename: Option<String>,
-	/// Account name
-	pub name: String,
-	/// Account metadata
-	pub meta: String,
-}
-
-impl Into<json::KeyFile> for SafeAccount {
-	fn into(self) -> json::KeyFile {
-		json::KeyFile {
-			id: From::from(self.id),
-			version: self.version.into(),
-			address: Some(self.address.into()),
-			crypto: self.crypto.into(),
-			name: Some(self.name.into()),
-			meta: Some(self.meta.into()),
-		}
-	}
-}
-
-impl SafeAccount {
-	/// Create a new account
-	pub fn create(
-		keypair: &KeyPair,
-		id: [u8; 16],
-		password: &Password,
-		iterations: u32,
-		name: String,
-		meta: String
-	) -> Result<Self, crypto::Error> {
-		Ok(SafeAccount {
-			id: id,
-			version: Version::V3,
-			crypto: Crypto::with_secret(keypair.secret(), password, iterations)?,
-			address: keypair.address(),
-			filename: None,
-			name: name,
-			meta: meta,
-		})
-	}
-
-	/// Create a new `SafeAccount` from the given `json`; if it was read from a
-	/// file, the `filename` should be `Some` name. If it is as yet anonymous, then it
-	/// can be left `None`.
-	/// In case `password` is provided, we will attempt to read the secret from the keyfile
-	/// and derive the address from it instead of reading it directly.
-	/// Providing password is required for `json::KeyFile`s with no address.
-	pub fn from_file(json: json::KeyFile, filename: Option<String>, password: &Option<Password>) -> Result<Self, Error> {
-		let crypto = Crypto::from(json.crypto);
-		let address = match (password, &json.address) {
-			(None, Some(json_address)) => json_address.into(),
-			(None, None) => Err(Error::Custom(
-				"This keystore does not contain address. You need to provide password to import it".into()))?,
-			(Some(password), json_address) => {
-				let derived_address = KeyPair::from_secret(
-					crypto.secret(&password).map_err(|_| Error::InvalidPassword)?
-				)?.address();
-
-				match json_address {
-					Some(json_address) => {
-						let json_address = json_address.into();
-						if derived_address != json_address {
-							warn!("Detected address mismatch when opening an account. Derived: {:?}, in json got: {:?}",
-								derived_address, json_address);
-						}
-					},
-					_ => {},
-				}
-				derived_address
-			}
-		};
-
-		Ok(SafeAccount {
-			id: json.id.into(),
-			version: json.version.into(),
-			address,
-			crypto,
-			filename,
-			name: json.name.unwrap_or(String::new()),
-			meta: json.meta.unwrap_or("{}".to_owned()),
-		})
-	}
-
-	/// Create a new `SafeAccount` from the given vault `json`; if it was read from a
-	/// file, the `filename` should be `Some` name. If it is as yet anonymous, then it
-	/// can be left `None`.
-	pub fn from_vault_file(password: &Password, json: json::VaultKeyFile, filename: Option<String>) -> Result<Self, Error> {
-		let meta_crypto: Crypto = json.metacrypto.into();
-		let meta_plain = meta_crypto.decrypt(password)?;
-		let meta_plain = json::VaultKeyMeta::load(&meta_plain).map_err(|e| Error::Custom(format!("{:?}", e)))?;
-
-		SafeAccount::from_file(json::KeyFile {
-			id: json.id,
-			version: json.version,
-			crypto: json.crypto,
-			address: Some(meta_plain.address),
-			name: meta_plain.name,
-			meta: meta_plain.meta,
-		}, filename, &None)
-	}
-
-	/// Create a new `VaultKeyFile` from the given `self`
-	pub fn into_vault_file(self, iterations: u32, password: &Password) -> Result<json::VaultKeyFile, Error> {
-		let meta_plain = json::VaultKeyMeta {
-			address: self.address.into(),
-			name: Some(self.name),
-			meta: Some(self.meta),
-		};
-		let meta_plain = meta_plain.write().map_err(|e| Error::Custom(format!("{:?}", e)))?;
-		let meta_crypto = Crypto::with_plain(&meta_plain, password, iterations)?;
-
-		Ok(json::VaultKeyFile {
-			id: self.id.into(),
-			version: self.version.into(),
-			crypto: self.crypto.into(),
-			metacrypto: meta_crypto.into(),
-		})
-	}
-
-	/// Sign a message.
-	pub fn sign(&self, password: &Password, message: &Message) -> Result<Signature, Error> {
-		let secret = self.crypto.secret(password)?;
-		sign(&secret, message).map_err(From::from)
-	}
-
-	/// Decrypt a message.
-	pub fn decrypt(&self, password: &Password, shared_mac: &[u8], message: &[u8]) -> Result<Vec<u8>, Error> {
-		let secret = self.crypto.secret(password)?;
-		crypto::publickey::ecies::decrypt(&secret, shared_mac, message).map_err(From::from)
-	}
-
-	/// Agree on shared key.
-	pub fn agree(&self, password: &Password, other: &Public) -> Result<Secret, Error> {
-		let secret = self.crypto.secret(password)?;
-		agree(&secret, other).map_err(From::from)
-	}
-
-	/// Derive public key.
-	pub fn public(&self, password: &Password) -> Result<Public, Error> {
-		let secret = self.crypto.secret(password)?;
-		Ok(KeyPair::from_secret(secret)?.public().clone())
-	}
-
-	/// Change account's password.
-	pub fn change_password(&self, old_password: &Password, new_password: &Password, iterations: u32) -> Result<Self, Error> {
-		let secret = self.crypto.secret(old_password)?;
-		let result = SafeAccount {
-			id: self.id.clone(),
-			version: self.version.clone(),
-			crypto: Crypto::with_secret(&secret, new_password, iterations)?,
-			address: self.address.clone(),
-			filename: self.filename.clone(),
-			name: self.name.clone(),
-			meta: self.meta.clone(),
-		};
-		Ok(result)
-	}
-
-	/// Check if password matches the account.
-	pub fn check_password(&self, password: &Password) -> bool {
-		self.crypto.secret(password).is_ok()
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use crypto::publickey::{Generator, Random, verify_public};
-	use super::SafeAccount;
-
-	#[test]
-	fn sign_and_verify_public() {
-		let keypair = Random.generate();
-		let password = "hello world".into();
-		let message = [1u8; 32].into();
-		let account = SafeAccount::create(&keypair, [0u8; 16], &password, 10240, "Test".to_owned(), "{}".to_owned());
-		let signature = account.unwrap().sign(&password, &message).unwrap();
-		assert!(verify_public(keypair.public(), &signature, &message).unwrap());
-	}
-
-	#[test]
-	fn change_password() {
-		let keypair = Random.generate();
-		let first_password = "hello world".into();
-		let sec_password = "this is sparta".into();
-		let i = 10240;
-		let message = [1u8; 32].into();
-		let account = SafeAccount::create(&keypair, [0u8; 16], &first_password, i, "Test".to_owned(), "{}".to_owned()).unwrap();
-		let new_account = account.change_password(&first_password, &sec_password, i).unwrap();
-		assert!(account.sign(&first_password, &message).is_ok());
-		assert!(account.sign(&sec_password, &message).is_err());
-		assert!(new_account.sign(&first_password, &message).is_err());
-		assert!(new_account.sign(&sec_password, &message).is_ok());
-	}
-}

accounts/ethstore/src/accounts_dir/disk.rs

@@ -1,484 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::{fs, io};
-use std::io::Write;
-use std::path::{PathBuf, Path};
-use std::collections::HashMap;
-use time;
-use {json, SafeAccount, Error};
-use json::Uuid;
-use super::{KeyDirectory, VaultKeyDirectory, VaultKeyDirectoryProvider, VaultKey};
-use super::vault::{VAULT_FILE_NAME, VaultDiskDirectory};
-use ethkey::Password;
-
-const IGNORED_FILES: &'static [&'static str] = &[
-	"thumbs.db",
-	"address_book.json",
-	"dapps_policy.json",
-	"dapps_accounts.json",
-	"dapps_history.json",
-	"vault.json",
-];
-
-/// Find a unique filename that does not exist using four-letter random suffix.
-pub fn find_unique_filename_using_random_suffix(parent_path: &Path, original_filename: &str) -> io::Result<String> {
-	let mut path = parent_path.join(original_filename);
-	let mut deduped_filename = original_filename.to_string();
-
-	if path.exists() {
-		const MAX_RETRIES: usize = 500;
-		let mut retries = 0;
-
-		while path.exists() {
-			if retries >= MAX_RETRIES {
-				return Err(io::Error::new(io::ErrorKind::Other, "Exceeded maximum retries when deduplicating filename."));
-			}
-
-			let suffix = ::random::random_string(4);
-			deduped_filename = format!("{}-{}", original_filename, suffix);
-			path.set_file_name(&deduped_filename);
-			retries += 1;
-		}
-	}
-
-	Ok(deduped_filename)
-}
-
-/// Create a new file and restrict permissions to owner only. It errors if the file already exists.
-#[cfg(unix)]
-pub fn create_new_file_with_permissions_to_owner(file_path: &Path) -> io::Result<fs::File> {
-	use std::os::unix::fs::OpenOptionsExt;
-
-	fs::OpenOptions::new()
-		.write(true)
-		.create_new(true)
-		.mode((libc::S_IWUSR | libc::S_IRUSR) as u32)
-		.open(file_path)
-}
-
-/// Create a new file and restrict permissions to owner only. It errors if the file already exists.
-#[cfg(not(unix))]
-pub fn create_new_file_with_permissions_to_owner(file_path: &Path) -> io::Result<fs::File> {
-	fs::OpenOptions::new()
-		.write(true)
-		.create_new(true)
-		.open(file_path)
-}
-
-/// Create a new file and restrict permissions to owner only. It replaces the existing file if it already exists.
-#[cfg(unix)]
-pub fn replace_file_with_permissions_to_owner(file_path: &Path) -> io::Result<fs::File> {
-	use std::os::unix::fs::PermissionsExt;
-
-	let file = fs::File::create(file_path)?;
-	let mut permissions = file.metadata()?.permissions();
-	permissions.set_mode((libc::S_IWUSR | libc::S_IRUSR) as u32);
-	file.set_permissions(permissions)?;
-
-	Ok(file)
-}
-
-/// Create a new file and restrict permissions to owner only. It replaces the existing file if it already exists.
-#[cfg(not(unix))]
-pub fn replace_file_with_permissions_to_owner(file_path: &Path) -> io::Result<fs::File> {
-	fs::File::create(file_path)
-}
-
-/// Root keys directory implementation
-pub type RootDiskDirectory = DiskDirectory<DiskKeyFileManager>;
-
-/// Disk directory key file manager
-pub trait KeyFileManager: Send + Sync {
-	/// Read `SafeAccount` from given key file stream
-	fn read<T>(&self, filename: Option<String>, reader: T) -> Result<SafeAccount, Error> where T: io::Read;
-
-	/// Write `SafeAccount` to given key file stream
-	fn write<T>(&self, account: SafeAccount, writer: &mut T) -> Result<(), Error> where T: io::Write;
-}
-
-/// Disk-based keys directory implementation
-pub struct DiskDirectory<T> where T: KeyFileManager {
-	path: PathBuf,
-	key_manager: T,
-}
-
-/// Keys file manager for root keys directory
-#[derive(Default)]
-pub struct DiskKeyFileManager {
-	password: Option<Password>,
-}
-
-impl RootDiskDirectory {
-	pub fn create<P>(path: P) -> Result<Self, Error> where P: AsRef<Path> {
-		fs::create_dir_all(&path)?;
-		Ok(Self::at(path))
-	}
-
-	/// allows to read keyfiles with given password (needed for keyfiles w/o address)
-	pub fn with_password(&self, password: Option<Password>) -> Self {
-		DiskDirectory::new(&self.path, DiskKeyFileManager { password })
-	}
-
-	pub fn at<P>(path: P) -> Self where P: AsRef<Path> {
-		DiskDirectory::new(path, DiskKeyFileManager::default())
-	}
-}
-
-impl<T> DiskDirectory<T> where T: KeyFileManager {
-	/// Create new disk directory instance
-	pub fn new<P>(path: P, key_manager: T) -> Self where P: AsRef<Path> {
-		DiskDirectory {
-			path: path.as_ref().to_path_buf(),
-			key_manager: key_manager,
-		}
-	}
-
-	fn files(&self) -> Result<Vec<PathBuf>, Error>  {
-		Ok(fs::read_dir(&self.path)?
-			.flat_map(Result::ok)
-			.filter(|entry| {
-				let metadata = entry.metadata().ok();
-				let file_name = entry.file_name();
-				let name = file_name.to_string_lossy();
-				// filter directories
-				metadata.map_or(false, |m| !m.is_dir()) &&
-					// hidden files
-					!name.starts_with(".") &&
-					// other ignored files
-					!IGNORED_FILES.contains(&&*name)
-			})
-			.map(|entry| entry.path())
-			.collect::<Vec<PathBuf>>()
-		)
-	}
-
-	pub fn files_hash(&self) -> Result<u64, Error> {
-		use std::collections::hash_map::DefaultHasher;
-		use std::hash::Hasher;
-
-    	let mut hasher = DefaultHasher::new();
-		let files = self.files()?;
-		for file in files {
-			hasher.write(file.to_str().unwrap_or("").as_bytes())
-		}
-
-		Ok(hasher.finish())
-	}
-
-	fn last_modification_date(&self) -> Result<u64, Error> {
-		use std::time::{Duration, UNIX_EPOCH};
-		let duration = fs::metadata(&self.path)?.modified()?.duration_since(UNIX_EPOCH).unwrap_or(Duration::default());
-		let timestamp = duration.as_secs() ^ (duration.subsec_nanos() as u64);
-		Ok(timestamp)
-	}
-
-	/// all accounts found in keys directory
-	fn files_content(&self) -> Result<HashMap<PathBuf, SafeAccount>, Error> {
-		// it's not done using one iterator cause
-		// there is an issue with rustc and it takes tooo much time to compile
-		let paths = self.files()?;
-		Ok(paths
-			.into_iter()
-			.filter_map(|path| {
-				let filename = Some(path.file_name().and_then(|n| n.to_str()).expect("Keys have valid UTF8 names only.").to_owned());
-				fs::File::open(path.clone())
-					.map_err(Into::into)
-					.and_then(|file| self.key_manager.read(filename, file))
-					.map_err(|err| {
-						warn!("Invalid key file: {:?} ({})", path, err);
-						err
-					})
-					.map(|account| (path, account))
-					.ok()
-			})
-			.collect()
-		)
-	}
-
-	/// insert account with given filename. if the filename is a duplicate of any stored account and dedup is set to
-	/// true, a random suffix is appended to the filename.
-	pub fn insert_with_filename(&self, account: SafeAccount, mut filename: String, dedup: bool) -> Result<SafeAccount, Error> {
-		if dedup {
-			filename = find_unique_filename_using_random_suffix(&self.path, &filename)?;
-		}
-
-		// path to keyfile
-		let keyfile_path = self.path.join(filename.as_str());
-
-		// update account filename
-		let original_account = account.clone();
-		let mut account = account;
-		account.filename = Some(filename);
-
-		{
-			// save the file
-			let mut file = if dedup {
-				create_new_file_with_permissions_to_owner(&keyfile_path)?
-			} else {
-				replace_file_with_permissions_to_owner(&keyfile_path)?
-			};
-
-			// write key content
-			self.key_manager.write(original_account, &mut file).map_err(|e| Error::Custom(format!("{:?}", e)))?;
-
-			file.flush()?;
-			file.sync_all()?;
-		}
-
-		Ok(account)
-	}
-
-	/// Get key file manager referece
-	pub fn key_manager(&self) -> &T {
-		&self.key_manager
-	}
-}
-
-impl<T> KeyDirectory for DiskDirectory<T> where T: KeyFileManager {
-	fn load(&self) -> Result<Vec<SafeAccount>, Error> {
-		let accounts = self.files_content()?
-			.into_iter()
-			.map(|(_, account)| account)
-			.collect();
-		Ok(accounts)
-	}
-
-	fn update(&self, account: SafeAccount) -> Result<SafeAccount, Error> {
-		// Disk store handles updates correctly iff filename is the same
-		let filename = account_filename(&account);
-		self.insert_with_filename(account, filename, false)
-	}
-
-	fn insert(&self, account: SafeAccount) -> Result<SafeAccount, Error> {
-		let filename = account_filename(&account);
-		self.insert_with_filename(account, filename, true)
-	}
-
-	fn remove(&self, account: &SafeAccount) -> Result<(), Error> {
-		// enumerate all entries in keystore
-		// and find entry with given address
-		let to_remove = self.files_content()?
-			.into_iter()
-			.find(|&(_, ref acc)| acc.id == account.id && acc.address == account.address);
-
-		// remove it
-		match to_remove {
-			None => Err(Error::InvalidAccount),
-			Some((path, _)) => fs::remove_file(path).map_err(From::from)
-		}
-	}
-
-	fn path(&self) -> Option<&PathBuf> { Some(&self.path) }
-
-	fn as_vault_provider(&self) -> Option<&dyn VaultKeyDirectoryProvider> {
-		Some(self)
-	}
-
-	fn unique_repr(&self) -> Result<u64, Error> {
-		self.last_modification_date()
-	}
-}
-
-impl<T> VaultKeyDirectoryProvider for DiskDirectory<T> where T: KeyFileManager {
-	fn create(&self, name: &str, key: VaultKey) -> Result<Box<dyn VaultKeyDirectory>, Error> {
-		let vault_dir = VaultDiskDirectory::create(&self.path, name, key)?;
-		Ok(Box::new(vault_dir))
-	}
-
-	fn open(&self, name: &str, key: VaultKey) -> Result<Box<dyn VaultKeyDirectory>, Error> {
-		let vault_dir = VaultDiskDirectory::at(&self.path, name, key)?;
-		Ok(Box::new(vault_dir))
-	}
-
-	fn list_vaults(&self) -> Result<Vec<String>, Error> {
-		Ok(fs::read_dir(&self.path)?
-			.filter_map(|e| e.ok().map(|e| e.path()))
-			.filter_map(|path| {
-				let mut vault_file_path = path.clone();
-				vault_file_path.push(VAULT_FILE_NAME);
-				if vault_file_path.is_file() {
-					path.file_name().and_then(|f| f.to_str()).map(|f| f.to_owned())
-				} else {
-					None
-				}
-			})
-			.collect())
-	}
-
-	fn vault_meta(&self, name: &str) -> Result<String, Error> {
-		VaultDiskDirectory::meta_at(&self.path, name)
-	}
-}
-
-impl KeyFileManager for DiskKeyFileManager {
-	fn read<T>(&self, filename: Option<String>, reader: T) -> Result<SafeAccount, Error> where T: io::Read {
-		let key_file = json::KeyFile::load(reader).map_err(|e| Error::Custom(format!("{:?}", e)))?;
-		SafeAccount::from_file(key_file, filename, &self.password)
-	}
-
-	fn write<T>(&self, mut account: SafeAccount, writer: &mut T) -> Result<(), Error> where T: io::Write {
-		// when account is moved back to root directory from vault
-		// => remove vault field from meta
-		account.meta = json::remove_vault_name_from_json_meta(&account.meta)
-			.map_err(|err| Error::Custom(format!("{:?}", err)))?;
-
-		let key_file: json::KeyFile = account.into();
-		key_file.write(writer).map_err(|e| Error::Custom(format!("{:?}", e)))
-	}
-}
-
-fn account_filename(account: &SafeAccount) -> String {
-	// build file path
-	account.filename.clone().unwrap_or_else(|| {
-		let timestamp = time::strftime("%Y-%m-%dT%H-%M-%S", &time::now_utc()).expect("Time-format string is valid.");
-		format!("UTC--{}Z--{}", timestamp, Uuid::from(account.id))
-	})
-}
-
-#[cfg(test)]
-mod test {
-	extern crate tempfile;
-
-	use std::{env, fs};
-	use super::{KeyDirectory, RootDiskDirectory, VaultKey};
-	use account::SafeAccount;
-	use crypto::publickey::{Random, Generator};
-	use self::tempfile::TempDir;
-
-	#[test]
-	fn should_create_new_account() {
-		// given
-		let mut dir = env::temp_dir();
-		dir.push("ethstore_should_create_new_account");
-		let keypair = Random.generate();
-		let password = "hello world".into();
-		let directory = RootDiskDirectory::create(dir.clone()).unwrap();
-
-		// when
-		let account = SafeAccount::create(&keypair, [0u8; 16], &password, 1024, "Test".to_owned(), "{}".to_owned());
-		let res = directory.insert(account.unwrap());
-
-		// then
-		assert!(res.is_ok(), "Should save account succesfuly.");
-		assert!(res.unwrap().filename.is_some(), "Filename has been assigned.");
-
-		// cleanup
-		let _ = fs::remove_dir_all(dir);
-	}
-
-	#[test]
-	fn should_handle_duplicate_filenames() {
-		// given
-		let mut dir = env::temp_dir();
-		dir.push("ethstore_should_handle_duplicate_filenames");
-		let keypair = Random.generate();
-		let password = "hello world".into();
-		let directory = RootDiskDirectory::create(dir.clone()).unwrap();
-
-		// when
-		let account = SafeAccount::create(&keypair, [0u8; 16], &password, 1024, "Test".to_owned(), "{}".to_owned()).unwrap();
-		let filename = "test".to_string();
-		let dedup = true;
-
-		directory.insert_with_filename(account.clone(), "foo".to_string(), dedup).unwrap();
-		let file1 = directory.insert_with_filename(account.clone(), filename.clone(), dedup).unwrap().filename.unwrap();
-		let file2 = directory.insert_with_filename(account.clone(), filename.clone(), dedup).unwrap().filename.unwrap();
-		let file3 = directory.insert_with_filename(account.clone(), filename.clone(), dedup).unwrap().filename.unwrap();
-
-		// then
-		// the first file should have the original names
-		assert_eq!(file1, filename);
-
-		// the following duplicate files should have a suffix appended
-		assert!(file2 != file3);
-		assert_eq!(file2.len(), filename.len() + 5);
-		assert_eq!(file3.len(), filename.len() + 5);
-
-		// cleanup
-		let _ = fs::remove_dir_all(dir);
-	}
-
-	#[test]
-	fn should_manage_vaults() {
-		// given
-		let mut dir = env::temp_dir();
-		dir.push("should_create_new_vault");
-		let directory = RootDiskDirectory::create(dir.clone()).unwrap();
-		let vault_name = "vault";
-		let password = "password".into();
-
-		// then
-		assert!(directory.as_vault_provider().is_some());
-
-		// and when
-		let before_root_items_count = fs::read_dir(&dir).unwrap().count();
-		let vault = directory.as_vault_provider().unwrap().create(vault_name, VaultKey::new(&password, 1024));
-
-		// then
-		assert!(vault.is_ok());
-		let after_root_items_count = fs::read_dir(&dir).unwrap().count();
-		assert!(after_root_items_count > before_root_items_count);
-
-		// and when
-		let vault = directory.as_vault_provider().unwrap().open(vault_name, VaultKey::new(&password, 1024));
-
-		// then
-		assert!(vault.is_ok());
-		let after_root_items_count2 = fs::read_dir(&dir).unwrap().count();
-		assert!(after_root_items_count == after_root_items_count2);
-
-		// cleanup
-		let _ = fs::remove_dir_all(dir);
-	}
-
-	#[test]
-	fn should_list_vaults() {
-		// given
-		let temp_path = TempDir::new().unwrap();
-		let directory = RootDiskDirectory::create(&temp_path).unwrap();
-		let vault_provider = directory.as_vault_provider().unwrap();
-		vault_provider.create("vault1", VaultKey::new(&"password1".into(), 1)).unwrap();
-		vault_provider.create("vault2", VaultKey::new(&"password2".into(), 1)).unwrap();
-
-		// then
-		let vaults = vault_provider.list_vaults().unwrap();
-		assert_eq!(vaults.len(), 2);
-		assert!(vaults.iter().any(|v| &*v == "vault1"));
-		assert!(vaults.iter().any(|v| &*v == "vault2"));
-	}
-
-	#[test]
-	fn hash_of_files() {
-		let temp_path = TempDir::new().unwrap();
-		let directory = RootDiskDirectory::create(&temp_path).unwrap();
-
-		let hash = directory.files_hash().expect("Files hash should be calculated ok");
-		assert_eq!(
-			hash,
-			15130871412783076140
-		);
-
-		let keypair = Random.generate();
-		let password = "test pass".into();
-		let account = SafeAccount::create(&keypair, [0u8; 16], &password, 1024, "Test".to_owned(), "{}".to_owned());
-		directory.insert(account.unwrap()).expect("Account should be inserted ok");
-
-		let new_hash = directory.files_hash().expect("New files hash should be calculated ok");
-
-		assert!(new_hash != hash, "hash of the file list should change once directory content changed");
-	}
-}

accounts/ethstore/src/accounts_dir/memory.rs

@@ -1,73 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::collections::HashMap;
-use parking_lot::RwLock;
-use crypto::publickey::Address;
-
-use {SafeAccount, Error};
-use super::KeyDirectory;
-
-/// Accounts in-memory storage.
-#[derive(Default)]
-pub struct MemoryDirectory {
-	accounts: RwLock<HashMap<Address, Vec<SafeAccount>>>,
-}
-
-impl KeyDirectory for MemoryDirectory {
-	fn load(&self) -> Result<Vec<SafeAccount>, Error> {
-		Ok(self.accounts.read().values().cloned().flatten().collect())
-	}
-
-	fn update(&self, account: SafeAccount) -> Result<SafeAccount, Error> {
-		let mut lock = self.accounts.write();
-		let accounts = lock.entry(account.address.clone()).or_insert_with(Vec::new);
-		// If the filename is the same we just need to replace the entry
-		accounts.retain(|acc| acc.filename != account.filename);
-		accounts.push(account.clone());
-		Ok(account)
-	}
-
-	fn insert(&self, account: SafeAccount) -> Result<SafeAccount, Error> {
-		let mut lock = self.accounts.write();
-		let accounts = lock.entry(account.address.clone()).or_insert_with(Vec::new);
-		accounts.push(account.clone());
-		Ok(account)
-	}
-
-	fn remove(&self, account: &SafeAccount) -> Result<(), Error> {
-		let mut accounts = self.accounts.write();
-		let is_empty = if let Some(accounts) = accounts.get_mut(&account.address) {
-			if let Some(position) = accounts.iter().position(|acc| acc == account) {
-				accounts.remove(position);
-			}
-			accounts.is_empty()
-		} else {
-			false
-		};
-		if is_empty {
-			accounts.remove(&account.address);
-		}
-		Ok(())
-	}
-
-	fn unique_repr(&self) -> Result<u64, Error> {
-		let mut val = 0u64;
-		let accounts = self.accounts.read();
-		for acc in accounts.keys() { val = val ^ acc.to_low_u64_be() }
-		Ok(val)
-	}
-}

accounts/ethstore/src/accounts_dir/mod.rs

@@ -1,105 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Accounts Directory
-
-use ethkey::Password;
-use std::path::{PathBuf};
-use {SafeAccount, Error};
-
-mod disk;
-mod memory;
-mod vault;
-
-/// `VaultKeyDirectory::set_key` error
-#[derive(Debug)]
-pub enum SetKeyError {
-	/// Error is fatal and directory is probably in inconsistent state
-	Fatal(Error),
-	/// Error is non fatal, directory is reverted to pre-operation state
-	NonFatalOld(Error),
-	/// Error is non fatal, directory is consistent with new key
-	NonFatalNew(Error),
-}
-
-/// Vault key
-#[derive(Clone, PartialEq, Eq)]
-pub struct VaultKey {
-	/// Vault password
-	pub password: Password,
-	/// Number of iterations to produce a derived key from password
-	pub iterations: u32,
-}
-
-/// Keys directory
-pub trait KeyDirectory: Send + Sync {
-	/// Read keys from directory
-	fn load(&self) -> Result<Vec<SafeAccount>, Error>;
-	/// Insert new key to directory
-	fn insert(&self, account: SafeAccount) -> Result<SafeAccount, Error>;
-	/// Update key in the directory
-	fn update(&self, account: SafeAccount) -> Result<SafeAccount, Error>;
-	/// Remove key from directory
-	fn remove(&self, account: &SafeAccount) -> Result<(), Error>;
-	/// Get directory filesystem path, if available
-	fn path(&self) -> Option<&PathBuf> { None }
-	/// Return vault provider, if available
-	fn as_vault_provider(&self) -> Option<&dyn VaultKeyDirectoryProvider> { None }
-	/// Unique representation of directory account collection
-	fn unique_repr(&self) -> Result<u64, Error>;
-}
-
-/// Vaults provider
-pub trait VaultKeyDirectoryProvider {
-	/// Create new vault with given key
-	fn create(&self, name: &str, key: VaultKey) -> Result<Box<dyn VaultKeyDirectory>, Error>;
-	/// Open existing vault with given key
-	fn open(&self, name: &str, key: VaultKey) -> Result<Box<dyn VaultKeyDirectory>, Error>;
-	/// List all vaults
-	fn list_vaults(&self) -> Result<Vec<String>, Error>;
-	/// Get vault meta
-	fn vault_meta(&self, name: &str) -> Result<String, Error>;
-}
-
-/// Vault directory
-pub trait VaultKeyDirectory: KeyDirectory {
-	/// Cast to `KeyDirectory`
-	fn as_key_directory(&self) -> &dyn KeyDirectory;
-	/// Vault name
-	fn name(&self) -> &str;
-	/// Get vault key
-	fn key(&self) -> VaultKey;
-	/// Set new key for vault
-	fn set_key(&self, key: VaultKey) -> Result<(), SetKeyError>;
-	/// Get vault meta
-	fn meta(&self) -> String;
-	/// Set vault meta
-	fn set_meta(&self, meta: &str) -> Result<(), Error>;
-}
-
-pub use self::disk::{RootDiskDirectory, DiskKeyFileManager, KeyFileManager};
-pub use self::memory::MemoryDirectory;
-pub use self::vault::VaultDiskDirectory;
-
-impl VaultKey {
-	/// Create new vault key
-	pub fn new(password: &Password, iterations: u32) -> Self {
-		VaultKey {
-			password: password.clone(),
-			iterations: iterations,
-		}
-	}
-}

accounts/ethstore/src/accounts_dir/vault.rs

@@ -1,443 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::{fs, io};
-use std::path::{PathBuf, Path};
-use parking_lot::Mutex;
-use {json, SafeAccount, Error};
-use crypto::Keccak256;
-use super::super::account::Crypto;
-use super::{KeyDirectory, VaultKeyDirectory, VaultKey, SetKeyError};
-use super::disk::{self, DiskDirectory, KeyFileManager};
-
-/// Name of vault metadata file
-pub const VAULT_FILE_NAME: &'static str = "vault.json";
-/// Name of temporary vault metadata file
-pub const VAULT_TEMP_FILE_NAME: &'static str = "vault_temp.json";
-
-/// Vault directory implementation
-pub type VaultDiskDirectory = DiskDirectory<VaultKeyFileManager>;
-
-/// Vault key file manager
-pub struct VaultKeyFileManager {
-	name: String,
-	key: VaultKey,
-	meta: Mutex<String>,
-}
-
-impl VaultDiskDirectory {
-	/// Create new vault directory with given key
-	pub fn create<P>(root: P, name: &str, key: VaultKey) -> Result<Self, Error> where P: AsRef<Path> {
-		// check that vault directory does not exists
-		let vault_dir_path = make_vault_dir_path(root, name, true)?;
-		if vault_dir_path.exists() {
-			return Err(Error::CreationFailed);
-		}
-
-		// create vault && vault file
-		let vault_meta = "{}";
-		fs::create_dir_all(&vault_dir_path)?;
-		if let Err(err) = create_vault_file(&vault_dir_path, &key, vault_meta) {
-			let _ = fs::remove_dir_all(&vault_dir_path); // can't do anything with this
-			return Err(err);
-		}
-
-		Ok(DiskDirectory::new(vault_dir_path, VaultKeyFileManager::new(name, key, vault_meta)))
-	}
-
-	/// Open existing vault directory with given key
-	pub fn at<P>(root: P, name: &str, key: VaultKey) -> Result<Self, Error> where P: AsRef<Path> {
-		// check that vault directory exists
-		let vault_dir_path = make_vault_dir_path(root, name, true)?;
-		if !vault_dir_path.is_dir() {
-			return Err(Error::CreationFailed);
-		}
-
-		// check that passed key matches vault file
-		let meta = read_vault_file(&vault_dir_path, Some(&key))?;
-
-		Ok(DiskDirectory::new(vault_dir_path, VaultKeyFileManager::new(name, key, &meta)))
-	}
-
-	/// Read vault meta without actually opening the vault
-	pub fn meta_at<P>(root: P, name: &str) -> Result<String, Error> where P: AsRef<Path> {
-		// check that vault directory exists
-		let vault_dir_path = make_vault_dir_path(root, name, true)?;
-		if !vault_dir_path.is_dir() {
-			return Err(Error::VaultNotFound);
-		}
-
-		// check that passed key matches vault file
-		read_vault_file(&vault_dir_path, None)
-	}
-
-	fn create_temp_vault(&self, key: VaultKey) -> Result<VaultDiskDirectory, Error> {
-		let original_path = self.path().expect("self is instance of DiskDirectory; DiskDirectory always returns path; qed");
-		let mut path: PathBuf = original_path.clone();
-		let name = self.name();
-
-		path.push(name); // to jump to the next level
-
-		let mut index = 0;
-		loop {
-			let name = format!("{}_temp_{}", name, index);
-			path.set_file_name(&name);
-			if !path.exists() {
-				return VaultDiskDirectory::create(original_path, &name, key);
-			}
-
-			index += 1;
-		}
-	}
-
-	fn copy_to_vault(&self, vault: &VaultDiskDirectory) -> Result<(), Error> {
-		for account in self.load()? {
-			let filename = account.filename.clone().expect("self is instance of DiskDirectory; DiskDirectory fills filename in load; qed");
-			vault.insert_with_filename(account, filename, true)?;
-		}
-
-		Ok(())
-	}
-
-	fn delete(&self) -> Result<(), Error> {
-		let path = self.path().expect("self is instance of DiskDirectory; DiskDirectory always returns path; qed");
-		fs::remove_dir_all(path).map_err(Into::into)
-	}
-}
-
-impl VaultKeyDirectory for VaultDiskDirectory {
-	fn as_key_directory(&self) -> &dyn KeyDirectory {
-		self
-	}
-
-	fn name(&self) -> &str {
-		&self.key_manager().name
-	}
-
-	fn key(&self) -> VaultKey {
-		self.key_manager().key.clone()
-	}
-
-	fn set_key(&self, new_key: VaultKey) -> Result<(), SetKeyError> {
-		let temp_vault = VaultDiskDirectory::create_temp_vault(self, new_key.clone()).map_err(|err| SetKeyError::NonFatalOld(err))?;
-		let mut source_path = temp_vault.path().expect("temp_vault is instance of DiskDirectory; DiskDirectory always returns path; qed").clone();
-		let mut target_path = self.path().expect("self is instance of DiskDirectory; DiskDirectory always returns path; qed").clone();
-
-		// preserve meta
-		temp_vault.set_meta(&self.meta()).map_err(SetKeyError::NonFatalOld)?;
-
-		// jump to next fs level
-		source_path.push("next");
-		target_path.push("next");
-
-		let temp_accounts = self.copy_to_vault(&temp_vault)
-			.and_then(|_| temp_vault.load())
-			.map_err(|err| {
-				// ignore error, as we already processing error
-				let _ = temp_vault.delete();
-				SetKeyError::NonFatalOld(err)
-			})?;
-
-		// we can't just delete temp vault until all files moved, because
-		// original vault content has already been partially replaced
-		// => when error or crash happens here, we can't do anything
-		for temp_account in temp_accounts {
-			let filename = temp_account.filename.expect("self is instance of DiskDirectory; DiskDirectory fills filename in load; qed");
-			source_path.set_file_name(&filename);
-			target_path.set_file_name(&filename);
-			fs::rename(&source_path, &target_path).map_err(|err| SetKeyError::Fatal(err.into()))?;
-		}
-		source_path.set_file_name(VAULT_FILE_NAME);
-		target_path.set_file_name(VAULT_FILE_NAME);
-		fs::rename(source_path, target_path).map_err(|err| SetKeyError::Fatal(err.into()))?;
-
-		temp_vault.delete().map_err(|err| SetKeyError::NonFatalNew(err))
-	}
-
-	fn meta(&self) -> String {
-		self.key_manager().meta.lock().clone()
-	}
-
-	fn set_meta(&self, meta: &str) -> Result<(), Error> {
-		let key_manager = self.key_manager();
-		let vault_path = self.path().expect("self is instance of DiskDirectory; DiskDirectory always returns path; qed");
-		create_vault_file(vault_path, &key_manager.key, meta)?;
-		*key_manager.meta.lock() = meta.to_owned();
-		Ok(())
-	}
-}
-
-impl VaultKeyFileManager {
-	pub fn new(name: &str, key: VaultKey, meta: &str) -> Self {
-		VaultKeyFileManager {
-			name: name.into(),
-			key: key,
-			meta: Mutex::new(meta.to_owned()),
-		}
-	}
-}
-
-impl KeyFileManager for VaultKeyFileManager {
-	fn read<T>(&self, filename: Option<String>, reader: T) -> Result<SafeAccount, Error> where T: io::Read {
-		let vault_file = json::VaultKeyFile::load(reader).map_err(|e| Error::Custom(format!("{:?}", e)))?;
-		let mut safe_account = SafeAccount::from_vault_file(&self.key.password, vault_file, filename.clone())?;
-
-		safe_account.meta = json::insert_vault_name_to_json_meta(&safe_account.meta, &self.name)
-			.map_err(|err| Error::Custom(format!("{:?}", err)))?;
-		Ok(safe_account)
-	}
-
-	fn write<T>(&self, mut account: SafeAccount, writer: &mut T) -> Result<(), Error> where T: io::Write {
-		account.meta = json::remove_vault_name_from_json_meta(&account.meta)
-			.map_err(|err| Error::Custom(format!("{:?}", err)))?;
-
-		let vault_file: json::VaultKeyFile = account.into_vault_file(self.key.iterations, &self.key.password)?;
-		vault_file.write(writer).map_err(|e| Error::Custom(format!("{:?}", e)))
-	}
-}
-
-/// Makes path to vault directory, checking that vault name is appropriate
-fn make_vault_dir_path<P>(root: P, name: &str, check_name: bool) -> Result<PathBuf, Error> where P: AsRef<Path> {
-	// check vault name
-	if check_name && !check_vault_name(name) {
-		return Err(Error::InvalidVaultName);
-	}
-
-	let mut vault_dir_path: PathBuf = root.as_ref().into();
-	vault_dir_path.push(name);
-	Ok(vault_dir_path)
-}
-
-/// Every vault must have unique name => we rely on filesystem to check this
-/// => vault name must not contain any fs-special characters to avoid directory traversal
-/// => we only allow alphanumeric + separator characters in vault name.
-fn check_vault_name(name: &str) -> bool {
-	!name.is_empty()
-	&& name.chars()
-		.all(|c| c.is_alphanumeric()
-			|| c.is_whitespace()
-			|| c == '-' || c == '_')
-}
-
-/// Vault can be empty, but still must be pluggable => we store vault password in separate file
-fn create_vault_file<P>(vault_dir_path: P, key: &VaultKey, meta: &str) -> Result<(), Error> where P: AsRef<Path> {
-	let password_hash = key.password.as_bytes().keccak256();
-	let crypto = Crypto::with_plain(&password_hash, &key.password, key.iterations)?;
-
-	let vault_file_path = vault_dir_path.as_ref().join(VAULT_FILE_NAME);
-	let temp_vault_file_name = disk::find_unique_filename_using_random_suffix(vault_dir_path.as_ref(), &VAULT_TEMP_FILE_NAME)?;
-	let temp_vault_file_path = vault_dir_path.as_ref().join(&temp_vault_file_name);
-
-	// this method is used to rewrite existing vault file
-	// => write to temporary file first, then rename temporary file to vault file
-	let mut vault_file = disk::create_new_file_with_permissions_to_owner(&temp_vault_file_path)?;
-	let vault_file_contents = json::VaultFile {
-		crypto: crypto.into(),
-		meta: Some(meta.to_owned()),
-	};
-	vault_file_contents.write(&mut vault_file).map_err(|e| Error::Custom(format!("{:?}", e)))?;
-	drop(vault_file);
-	fs::rename(&temp_vault_file_path, &vault_file_path)?;
-
-	Ok(())
-}
-
-/// When vault is opened => we must check that password matches && read metadata
-fn read_vault_file<P>(vault_dir_path: P, key: Option<&VaultKey>) -> Result<String, Error> where P: AsRef<Path> {
-	let mut vault_file_path: PathBuf = vault_dir_path.as_ref().into();
-	vault_file_path.push(VAULT_FILE_NAME);
-
-	let vault_file = fs::File::open(vault_file_path)?;
-	let vault_file_contents = json::VaultFile::load(vault_file).map_err(|e| Error::Custom(format!("{:?}", e)))?;
-	let vault_file_meta = vault_file_contents.meta.unwrap_or("{}".to_owned());
-	let vault_file_crypto: Crypto = vault_file_contents.crypto.into();
-
-	if let Some(key) = key {
-		let password_bytes = vault_file_crypto.decrypt(&key.password)?;
-		let password_hash = key.password.as_bytes().keccak256();
-		if password_hash != password_bytes.as_slice() {
-			return Err(Error::InvalidPassword);
-		}
-	}
-
-	Ok(vault_file_meta)
-}
-
-#[cfg(test)]
-mod test {
-	extern crate tempfile;
-
-	use std::fs;
-	use std::io::Write;
-	use std::path::PathBuf;
-	use super::VaultKey;
-	use super::{VAULT_FILE_NAME, check_vault_name, make_vault_dir_path, create_vault_file, read_vault_file, VaultDiskDirectory};
-	use self::tempfile::TempDir;
-
-	#[test]
-	fn check_vault_name_succeeds() {
-		assert!(check_vault_name("vault"));
-		assert!(check_vault_name("vault with spaces"));
-		assert!(check_vault_name("vault	with	tabs"));
-		assert!(check_vault_name("vault_with_underscores"));
-		assert!(check_vault_name("vault-with-dashes"));
-		assert!(check_vault_name("vault-with-digits-123"));
-		assert!(check_vault_name("vault中文名字"));
-	}
-
-	#[test]
-	fn check_vault_name_fails() {
-		assert!(!check_vault_name(""));
-		assert!(!check_vault_name("."));
-		assert!(!check_vault_name("*"));
-		assert!(!check_vault_name("../.bash_history"));
-		assert!(!check_vault_name("/etc/passwd"));
-		assert!(!check_vault_name("c:\\windows"));
-	}
-
-	#[test]
-	fn make_vault_dir_path_succeeds() {
-		use std::path::Path;
-
-		assert_eq!(&make_vault_dir_path("/home/user/parity", "vault", true).unwrap(), &Path::new("/home/user/parity/vault"));
-		assert_eq!(&make_vault_dir_path("/home/user/parity", "*bad-name*", false).unwrap(), &Path::new("/home/user/parity/*bad-name*"));
-	}
-
-	#[test]
-	fn make_vault_dir_path_fails() {
-		assert!(make_vault_dir_path("/home/user/parity", "*bad-name*", true).is_err());
-	}
-
-	#[test]
-	fn create_vault_file_succeeds() {
-		// given
-		let temp_path = TempDir::new().unwrap();
-		let key = VaultKey::new(&"password".into(), 1024);
-		let mut vault_dir: PathBuf = temp_path.path().into();
-		vault_dir.push("vault");
-		fs::create_dir_all(&vault_dir).unwrap();
-
-		// when
-		let result = create_vault_file(&vault_dir, &key, "{}");
-
-		// then
-		assert!(result.is_ok());
-		let mut vault_file_path = vault_dir.clone();
-		vault_file_path.push(VAULT_FILE_NAME);
-		assert!(vault_file_path.exists() && vault_file_path.is_file());
-	}
-
-	#[test]
-	fn read_vault_file_succeeds() {
-		// given
-		let temp_path = TempDir::new().unwrap();
-		let key = VaultKey::new(&"password".into(), 1024);
-		let vault_file_contents = r#"{"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"758696c8dc6378ab9b25bb42790da2f5"},"ciphertext":"54eb50683717d41caaeb12ea969f2c159daada5907383f26f327606a37dc7168","kdf":"pbkdf2","kdfparams":{"c":1024,"dklen":32,"prf":"hmac-sha256","salt":"3c320fa566a1a7963ac8df68a19548d27c8f40bf92ef87c84594dcd5bbc402b6"},"mac":"9e5c2314c2a0781962db85611417c614bd6756666b6b1e93840f5b6ed895f003"}}"#;
-		let dir: PathBuf = temp_path.path().into();
-		let mut vault_file_path: PathBuf = dir.clone();
-		vault_file_path.push(VAULT_FILE_NAME);
-		{
-			let mut vault_file = fs::File::create(vault_file_path).unwrap();
-			vault_file.write_all(vault_file_contents.as_bytes()).unwrap();
-		}
-
-		// when
-		let result = read_vault_file(&dir, Some(&key));
-
-		// then
-		assert!(result.is_ok());
-	}
-
-	#[test]
-	fn read_vault_file_fails() {
-		// given
-		let temp_path = TempDir::new().unwrap();
-		let key = VaultKey::new(&"password1".into(), 1024);
-		let dir: PathBuf = temp_path.path().into();
-		let mut vault_file_path: PathBuf = dir.clone();
-		vault_file_path.push(VAULT_FILE_NAME);
-
-		// when
-		let result = read_vault_file(&dir, Some(&key));
-
-		// then
-		assert!(result.is_err());
-
-		// and when given
-		let vault_file_contents = r#"{"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"0155e3690be19fbfbecabcd440aa284b"},"ciphertext":"4d6938a1f49b7782","kdf":"pbkdf2","kdfparams":{"c":1024,"dklen":32,"prf":"hmac-sha256","salt":"b6a9338a7ccd39288a86dba73bfecd9101b4f3db9c9830e7c76afdbd4f6872e5"},"mac":"16381463ea11c6eb2239a9f339c2e780516d29d234ce30ac5f166f9080b5a262"}}"#;
-		{
-			let mut vault_file = fs::File::create(vault_file_path).unwrap();
-			vault_file.write_all(vault_file_contents.as_bytes()).unwrap();
-		}
-
-		// when
-		let result = read_vault_file(&dir, Some(&key));
-
-		// then
-		assert!(result.is_err());
-	}
-
-	#[test]
-	fn vault_directory_can_be_created() {
-		// given
-		let temp_path = TempDir::new().unwrap();
-		let key = VaultKey::new(&"password".into(), 1024);
-		let dir: PathBuf = temp_path.path().into();
-
-		// when
-		let vault = VaultDiskDirectory::create(&dir, "vault", key.clone());
-
-		// then
-		assert!(vault.is_ok());
-
-		// and when
-		let vault = VaultDiskDirectory::at(&dir, "vault", key);
-
-		// then
-		assert!(vault.is_ok());
-	}
-
-	#[test]
-	fn vault_directory_cannot_be_created_if_already_exists() {
-		// given
-		let temp_path = TempDir::new().unwrap();
-		let key = VaultKey::new(&"password".into(), 1024);
-		let dir: PathBuf = temp_path.path().into();
-		let mut vault_dir = dir.clone();
-		vault_dir.push("vault");
-		fs::create_dir_all(&vault_dir).unwrap();
-
-		// when
-		let vault = VaultDiskDirectory::create(&dir, "vault", key);
-
-		// then
-		assert!(vault.is_err());
-	}
-
-	#[test]
-	fn vault_directory_cannot_be_opened_if_not_exists() {
-		// given
-		let temp_path = TempDir::new().unwrap();
-		let key = VaultKey::new(&"password".into(), 1024);
-		let dir: PathBuf = temp_path.path().into();
-
-		// when
-		let vault = VaultDiskDirectory::at(&dir, "vault", key);
-
-		// then
-		assert!(vault.is_err());
-	}
-}

accounts/ethstore/src/error.rs

@@ -1,118 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::fmt;
-use std::io::Error as IoError;
-use crypto::{self, Error as EthCryptoError};
-use crypto::publickey::{Error as EthPublicKeyCryptoError, DerivationError};
-
-/// Account-related errors.
-#[derive(Debug)]
-pub enum Error {
-	/// IO error
-	Io(IoError),
-	/// Invalid Password
-	InvalidPassword,
-	/// Account's secret is invalid.
-	InvalidSecret,
-	/// Invalid Vault Crypto meta.
-	InvalidCryptoMeta,
-	/// Invalid Account.
-	InvalidAccount,
-	/// Invalid Message.
-	InvalidMessage,
-	/// Invalid Key File
-	InvalidKeyFile(String),
-	/// Vaults are not supported.
-	VaultsAreNotSupported,
-	/// Unsupported vault
-	UnsupportedVault,
-	/// Invalid vault name
-	InvalidVaultName,
-	/// Vault not found
-	VaultNotFound,
-	/// Account creation failed.
-	CreationFailed,
-	/// `EthCrypto` error
-	EthCrypto(EthCryptoError),
-	/// `EthPublicKeyCryptoError` error
-	EthPublicKeyCrypto(EthPublicKeyCryptoError),
-	/// Derivation error
-	Derivation(DerivationError),
-	/// Custom error
-	Custom(String),
-}
-
-impl fmt::Display for Error {
-	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-		let s = match *self {
-			Error::Io(ref err) => err.to_string(),
-			Error::InvalidPassword => "Invalid password".into(),
-			Error::InvalidSecret => "Invalid secret".into(),
-			Error::InvalidCryptoMeta => "Invalid crypted metadata".into(),
-			Error::InvalidAccount => "Invalid account".into(),
-			Error::InvalidMessage => "Invalid message".into(),
-			Error::InvalidKeyFile(ref reason) => format!("Invalid key file: {}", reason),
-			Error::VaultsAreNotSupported => "Vaults are not supported".into(),
-			Error::UnsupportedVault => "Vault is not supported for this operation".into(),
-			Error::InvalidVaultName => "Invalid vault name".into(),
-			Error::VaultNotFound => "Vault not found".into(),
-			Error::CreationFailed => "Account creation failed".into(),
-			Error::EthCrypto(ref err) => err.to_string(),
-			Error::EthPublicKeyCrypto(ref err) => err.to_string(),
-			Error::Derivation(ref err) => format!("Derivation error: {:?}", err),
-			Error::Custom(ref s) => s.clone(),
-		};
-
-		write!(f, "{}", s)
-	}
-}
-
-impl From<IoError> for Error {
-	fn from(err: IoError) -> Self {
-		Error::Io(err)
-	}
-}
-
-impl From<EthPublicKeyCryptoError> for Error {
-	fn from(err: EthPublicKeyCryptoError) -> Self {
-		Error::EthPublicKeyCrypto(err)
-	}
-}
-
-impl From<EthCryptoError> for Error {
-	fn from(err: EthCryptoError) -> Self {
-		Error::EthCrypto(err)
-	}
-}
-
-impl From<crypto::error::ScryptError> for Error {
-	fn from(err: crypto::error::ScryptError) -> Self {
-		Error::EthCrypto(err.into())
-	}
-}
-
-impl From<crypto::error::SymmError> for Error {
-	fn from(err: crypto::error::SymmError) -> Self {
-		Error::EthCrypto(err.into())
-	}
-}
-
-impl From<DerivationError> for Error {
-	fn from(err: DerivationError) -> Self {
-		Error::Derivation(err)
-	}
-}

accounts/ethstore/src/import.rs

@@ -1,80 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::collections::HashSet;
-use std::path::Path;
-use std::fs;
-
-use crypto::publickey::Address;
-use accounts_dir::{KeyDirectory, RootDiskDirectory, DiskKeyFileManager, KeyFileManager};
-use dir;
-use Error;
-
-/// Import an account from a file.
-pub fn import_account(path: &Path, dst: &dyn KeyDirectory) -> Result<Address, Error> {
-	let key_manager = DiskKeyFileManager::default();
-	let existing_accounts = dst.load()?.into_iter().map(|a| a.address).collect::<HashSet<_>>();
-	let filename = path.file_name().and_then(|n| n.to_str()).map(|f| f.to_owned());
-	let account = fs::File::open(&path)
-		.map_err(Into::into)
-		.and_then(|file| key_manager.read(filename, file))?;
-
-	let address = account.address.clone();
-	if !existing_accounts.contains(&address) {
-		dst.insert(account)?;
-	}
-	Ok(address)
-}
-
-/// Import all accounts from one directory to the other.
-pub fn import_accounts(src: &dyn KeyDirectory, dst: &dyn KeyDirectory) -> Result<Vec<Address>, Error> {
-	let accounts = src.load()?;
-	let existing_accounts = dst.load()?.into_iter()
-		.map(|a| a.address)
-		.collect::<HashSet<_>>();
-
-	accounts.into_iter()
-		.filter(|a| !existing_accounts.contains(&a.address))
-		.map(|a| {
-			let address = a.address.clone();
-			dst.insert(a)?;
-			Ok(address)
-		}).collect()
-}
-
-/// Provide a `HashSet` of all accounts available for import from the Geth keystore.
-pub fn read_geth_accounts(testnet: bool) -> Vec<Address> {
-	RootDiskDirectory::at(dir::geth(testnet))
-		.load()
-		.map(|d| d.into_iter().map(|a| a.address).collect())
-		.unwrap_or_else(|_| Vec::new())
-}
-
-/// Import specific `desired` accounts from the Geth keystore into `dst`.
-pub fn import_geth_accounts(dst: &dyn KeyDirectory, desired: HashSet<Address>, testnet: bool) -> Result<Vec<Address>, Error> {
-	let src = RootDiskDirectory::at(dir::geth(testnet));
-	let accounts = src.load()?;
-	let existing_accounts = dst.load()?.into_iter().map(|a| a.address).collect::<HashSet<_>>();
-
-	accounts.into_iter()
-		.filter(|a| !existing_accounts.contains(&a.address))
-		.filter(|a| desired.contains(&a.address))
-		.map(|a| {
-			let address = a.address.clone();
-			dst.insert(a)?;
-			Ok(address)
-		}).collect()
-}

accounts/ethstore/src/json/bytes.rs

@@ -1,74 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::{ops, str};
-use serde::{Deserialize, Deserializer, Serialize, Serializer};
-use serde::de::Error;
-use rustc_hex::{ToHex, FromHex, FromHexError};
-
-#[derive(Debug, PartialEq)]
-pub struct Bytes(Vec<u8>);
-
-impl ops::Deref for Bytes {
-	type Target = [u8];
-
-	fn deref(&self) -> &Self::Target {
-		&self.0
-	}
-}
-
-impl<'a> Deserialize<'a> for Bytes {
-	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-		where D: Deserializer<'a>
-	{
-		let s = String::deserialize(deserializer)?;
-		let data = s.from_hex().map_err(|e| Error::custom(format!("Invalid hex value {}", e)))?;
-		Ok(Bytes(data))
-	}
-}
-
-impl Serialize for Bytes {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-	where S: Serializer {
-		serializer.serialize_str(&self.0.to_hex::<String>())
-	}
-}
-
-impl str::FromStr for Bytes {
-	type Err = FromHexError;
-
-	fn from_str(s: &str) -> Result<Self, Self::Err> {
-		s.from_hex().map(Bytes)
-	}
-}
-
-impl From<&'static str> for Bytes {
-	fn from(s: &'static str) -> Self {
-		s.parse().expect(&format!("invalid string literal for {}: '{}'", stringify!(Self), s))
-	}
-}
-
-impl From<Vec<u8>> for Bytes {
-	fn from(v: Vec<u8>) -> Self {
-		Bytes(v)
-	}
-}
-
-impl From<Bytes> for Vec<u8> {
-	fn from(b: Bytes) -> Self {
-		b.0
-	}
-}

accounts/ethstore/src/json/cipher.rs

@@ -1,96 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::fmt;
-use serde::{Serialize, Serializer, Deserialize, Deserializer};
-use serde::de::{Visitor, Error as SerdeError};
-use super::{Error, H128};
-
-#[derive(Debug, PartialEq)]
-pub enum CipherSer {
-	Aes128Ctr,
-}
-
-impl Serialize for CipherSer {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-	where S: Serializer {
-		match *self {
-			CipherSer::Aes128Ctr => serializer.serialize_str("aes-128-ctr"),
-		}
-	}
-}
-
-impl<'a> Deserialize<'a> for CipherSer {
-	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-	where D: Deserializer<'a> {
-		deserializer.deserialize_any(CipherSerVisitor)
-	}
-}
-
-struct CipherSerVisitor;
-
-impl<'a> Visitor<'a> for CipherSerVisitor {
-	type Value = CipherSer;
-
-	fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-		write!(formatter, "a valid cipher identifier")
-	}
-
-	fn visit_str<E>(self, value: &str) -> Result<Self::Value, E> where E: SerdeError {
-		match value {
-			"aes-128-ctr" => Ok(CipherSer::Aes128Ctr),
-			_ => Err(SerdeError::custom(Error::UnsupportedCipher))
-		}
-	}
-
-	fn visit_string<E>(self, value: String) -> Result<Self::Value, E> where E: SerdeError {
-		self.visit_str(value.as_ref())
-	}
-}
-
-#[derive(Debug, PartialEq, Serialize, Deserialize)]
-pub struct Aes128Ctr {
-	pub iv: H128,
-}
-
-#[derive(Debug, PartialEq)]
-pub enum CipherSerParams {
-	Aes128Ctr(Aes128Ctr),
-}
-
-impl Serialize for CipherSerParams {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-	where S: Serializer {
-		match *self {
-			CipherSerParams::Aes128Ctr(ref params) => params.serialize(serializer),
-		}
-	}
-}
-
-impl<'a> Deserialize<'a> for CipherSerParams {
-	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-	where D: Deserializer<'a> {
-		Aes128Ctr::deserialize(deserializer)
-			.map(CipherSerParams::Aes128Ctr)
-			.map_err(|_| Error::InvalidCipherParams)
-			.map_err(SerdeError::custom)
-	}
-}
-
-#[derive(Debug, PartialEq)]
-pub enum Cipher {
-	Aes128Ctr(Aes128Ctr),
-}

accounts/ethstore/src/json/crypto.rs

@@ -1,194 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::{fmt, str};
-use serde::{Deserialize, Deserializer, Serialize, Serializer};
-use serde::ser::SerializeStruct;
-use serde::de::{Visitor, MapAccess, Error};
-use serde_json;
-use super::{Cipher, CipherSer, CipherSerParams, Kdf, KdfSer, KdfSerParams, H256, Bytes};
-
-pub type CipherText = Bytes;
-
-#[derive(Debug, PartialEq)]
-pub struct Crypto {
-	pub cipher: Cipher,
-	pub ciphertext: CipherText,
-	pub kdf: Kdf,
-	pub mac: H256,
-}
-
-impl str::FromStr for Crypto {
-	type Err = serde_json::error::Error;
-
-	fn from_str(s: &str) -> Result<Self, Self::Err> {
-		serde_json::from_str(s)
-	}
-}
-
-impl From<Crypto> for String {
-	fn from(c: Crypto) -> Self {
-		serde_json::to_string(&c).expect("Serialization cannot fail, because all crypto keys are strings")
-	}
-}
-
-enum CryptoField {
-	Cipher,
-	CipherParams,
-	CipherText,
-	Kdf,
-	KdfParams,
-	Mac,
-	Version,
-}
-
-impl<'a> Deserialize<'a> for CryptoField {
-	fn deserialize<D>(deserializer: D) -> Result<CryptoField, D::Error>
-		where D: Deserializer<'a>
-	{
-		deserializer.deserialize_any(CryptoFieldVisitor)
-	}
-}
-
-struct CryptoFieldVisitor;
-
-impl<'a> Visitor<'a> for CryptoFieldVisitor {
-	type Value = CryptoField;
-
-	fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-		write!(formatter, "a valid crypto struct description")
-	}
-
-	fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
-		where E: Error
-	{
-		match value {
-			"cipher" => Ok(CryptoField::Cipher),
-			"cipherparams" => Ok(CryptoField::CipherParams),
-			"ciphertext" => Ok(CryptoField::CipherText),
-			"kdf" => Ok(CryptoField::Kdf),
-			"kdfparams" => Ok(CryptoField::KdfParams),
-			"mac" => Ok(CryptoField::Mac),
-			"version" => Ok(CryptoField::Version),
-			_ => Err(Error::custom(format!("Unknown field: '{}'", value))),
-		}
-	}
-}
-
-impl<'a> Deserialize<'a> for Crypto {
-	fn deserialize<D>(deserializer: D) -> Result<Crypto, D::Error>
-		where D: Deserializer<'a>
-	{
-		static FIELDS: &'static [&'static str] = &["id", "version", "crypto", "Crypto", "address"];
-		deserializer.deserialize_struct("Crypto", FIELDS, CryptoVisitor)
-	}
-}
-
-struct CryptoVisitor;
-
-impl<'a> Visitor<'a> for CryptoVisitor {
-	type Value = Crypto;
-
-	fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-		write!(formatter, "a valid vault crypto object")
-	}
-
-	fn visit_map<V>(self, mut visitor: V) -> Result<Self::Value, V::Error>
-		where V: MapAccess<'a>
-	{
-		let mut cipher = None;
-		let mut cipherparams = None;
-		let mut ciphertext = None;
-		let mut kdf = None;
-		let mut kdfparams = None;
-		let mut mac = None;
-
-		loop {
-			match visitor.next_key()? {
-				Some(CryptoField::Cipher) => { cipher = Some(visitor.next_value()?); }
-				Some(CryptoField::CipherParams) => { cipherparams = Some(visitor.next_value()?); }
-				Some(CryptoField::CipherText) => { ciphertext = Some(visitor.next_value()?); }
-				Some(CryptoField::Kdf) => { kdf = Some(visitor.next_value()?); }
-				Some(CryptoField::KdfParams) => { kdfparams = Some(visitor.next_value()?); }
-				Some(CryptoField::Mac) => { mac = Some(visitor.next_value()?); }
-				// skip not required version field (it appears in pyethereum generated keystores)
-				Some(CryptoField::Version) => { visitor.next_value().unwrap_or(()) }
-				None => { break; }
-			}
-		}
-
-		let cipher = match (cipher, cipherparams) {
-			(Some(CipherSer::Aes128Ctr), Some(CipherSerParams::Aes128Ctr(params))) => Cipher::Aes128Ctr(params),
-			(None, _) => return Err(V::Error::missing_field("cipher")),
-			(Some(_), None) => return Err(V::Error::missing_field("cipherparams")),
-		};
-
-		let ciphertext = match ciphertext {
-			Some(ciphertext) => ciphertext,
-			None => return Err(V::Error::missing_field("ciphertext")),
-		};
-
-		let kdf = match (kdf, kdfparams) {
-			(Some(KdfSer::Pbkdf2), Some(KdfSerParams::Pbkdf2(params))) => Kdf::Pbkdf2(params),
-			(Some(KdfSer::Scrypt), Some(KdfSerParams::Scrypt(params))) => Kdf::Scrypt(params),
-			(Some(_), Some(_)) => return Err(V::Error::custom("Invalid cipherparams")),
-			(None, _) => return Err(V::Error::missing_field("kdf")),
-			(Some(_), None) => return Err(V::Error::missing_field("kdfparams")),
-		};
-
-		let mac = match mac {
-			Some(mac) => mac,
-			None => return Err(V::Error::missing_field("mac")),
-		};
-
-		let result = Crypto {
-			cipher: cipher,
-			ciphertext: ciphertext,
-			kdf: kdf,
-			mac: mac,
-		};
-
-		Ok(result)
-	}
-}
-
-impl Serialize for Crypto {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-		where S: Serializer
-	{
-		let mut crypto = serializer.serialize_struct("Crypto", 6)?;
-		match self.cipher {
-			Cipher::Aes128Ctr(ref params) => {
-				crypto.serialize_field("cipher", &CipherSer::Aes128Ctr)?;
-				crypto.serialize_field("cipherparams", params)?;
-			},
-		}
-		crypto.serialize_field("ciphertext", &self.ciphertext)?;
-		match self.kdf {
-			Kdf::Pbkdf2(ref params) => {
-				crypto.serialize_field("kdf", &KdfSer::Pbkdf2)?;
-				crypto.serialize_field("kdfparams", params)?;
-			},
-			Kdf::Scrypt(ref params) => {
-				crypto.serialize_field("kdf", &KdfSer::Scrypt)?;
-				crypto.serialize_field("kdfparams", params)?;
-			},
-		}
-
-		crypto.serialize_field("mac", &self.mac)?;
-		crypto.end()
-	}
-}

accounts/ethstore/src/json/error.rs

@@ -1,50 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::fmt;
-
-#[derive(Debug, PartialEq)]
-pub enum Error {
-	UnsupportedCipher,
-	InvalidCipherParams,
-	UnsupportedKdf,
-	InvalidUuid,
-	UnsupportedVersion,
-	InvalidCiphertext,
-	InvalidH256,
-	InvalidPrf,
-}
-
-impl fmt::Display for Error {
-	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-		match *self {
-			Error::InvalidUuid => write!(f, "Invalid Uuid"),
-			Error::UnsupportedVersion => write!(f, "Unsupported version"),
-			Error::UnsupportedKdf => write!(f, "Unsupported kdf"),
-			Error::InvalidCiphertext => write!(f, "Invalid ciphertext"),
-			Error::UnsupportedCipher => write!(f, "Unsupported cipher"),
-			Error::InvalidCipherParams => write!(f, "Invalid cipher params"),
-			Error::InvalidH256 => write!(f, "Invalid hash"),
-			Error::InvalidPrf => write!(f, "Invalid prf"),
-		}
-	}
-}
-
-impl Into<String> for Error {
-	fn into(self) -> String {
-		format!("{}", self)
-	}
-}

accounts/ethstore/src/json/hash.rs

@@ -1,120 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::{ops, fmt, str};
-use rustc_hex::{FromHex, ToHex};
-use serde::{Serialize, Serializer, Deserialize, Deserializer};
-use serde::de::{Visitor, Error as SerdeError};
-use super::Error;
-
-macro_rules! impl_hash {
-	($name: ident, $size: expr) => {
-		pub struct $name([u8; $size]);
-
-		impl fmt::Debug for $name {
-			fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-				let self_ref: &[u8] = &self.0;
-				write!(f, "{:?}", self_ref)
-			}
-		}
-
-		impl PartialEq for $name {
-			fn eq(&self, other: &Self) -> bool {
-				let self_ref: &[u8] = &self.0;
-				let other_ref: &[u8] = &other.0;
-				self_ref == other_ref
-			}
-		}
-
-		impl ops::Deref for $name {
-			type Target = [u8];
-
-			fn deref(&self) -> &Self::Target {
-				&self.0
-			}
-		}
-
-		impl Serialize for $name {
-			fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-			where S: Serializer
-			{
-				serializer.serialize_str(&self.0.to_hex::<String>())
-			}
-		}
-
-		impl<'a> Deserialize<'a> for $name {
-			fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-			where D: Deserializer<'a> {
-				struct HashVisitor;
-
-				impl<'b> Visitor<'b> for HashVisitor {
-					type Value = $name;
-
-					fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-						write!(formatter, "a hex-encoded {}", stringify!($name))
-					}
-
-					fn visit_str<E>(self, value: &str) -> Result<Self::Value, E> where E: SerdeError {
-						value.parse().map_err(SerdeError::custom)
-					}
-
-					fn visit_string<E>(self, value: String) -> Result<Self::Value, E> where E: SerdeError {
-						self.visit_str(value.as_ref())
-					}
-				}
-
-				deserializer.deserialize_any(HashVisitor)
-			}
-		}
-
-		impl str::FromStr for $name {
-			type Err = Error;
-
-			fn from_str(value: &str) -> Result<Self, Self::Err> {
-				match value.from_hex::<Vec<u8>>() {
-					Ok(ref hex) if hex.len() == $size => {
-						let mut hash = [0u8; $size];
-						hash.clone_from_slice(hex);
-						Ok($name(hash))
-					}
-					_ => Err(Error::InvalidH256),
-				}
-			}
-		}
-
-		impl From<&'static str> for $name {
-			fn from(s: &'static str) -> Self {
-				s.parse().expect(&format!("invalid string literal for {}: '{}'", stringify!($name), s))
-			}
-		}
-
-		impl From<[u8; $size]> for $name {
-			fn from(bytes: [u8; $size]) -> Self {
-				$name(bytes)
-			}
-		}
-
-		impl Into<[u8; $size]> for $name {
-			fn into(self) -> [u8; $size] {
-				self.0
-			}
-		}
-	}
-}
-
-impl_hash!(H128, 16);
-impl_hash!(H160, 20);
-impl_hash!(H256, 32);

accounts/ethstore/src/json/id.rs

@@ -1,154 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Universaly unique identifier.
-
-use std::{fmt, str};
-use rustc_hex::{ToHex, FromHex};
-use serde::{Deserialize, Serialize, Deserializer, Serializer};
-use serde::de::{Visitor, Error as SerdeError};
-use super::Error;
-
-/// Universaly unique identifier.
-#[derive(Debug, PartialEq)]
-pub struct Uuid([u8; 16]);
-
-impl From<[u8; 16]> for Uuid {
-	fn from(uuid: [u8; 16]) -> Self {
-		Uuid(uuid)
-	}
-}
-
-impl<'a> Into<String> for &'a Uuid {
-	fn into(self) -> String {
-		let d1 = &self.0[0..4];
-		let d2 = &self.0[4..6];
-		let d3 = &self.0[6..8];
-		let d4 = &self.0[8..10];
-		let d5 = &self.0[10..16];
-		[d1, d2, d3, d4, d5].iter().map(|d| d.to_hex()).collect::<Vec<String>>().join("-")
-	}
-}
-
-impl Into<String> for Uuid {
-	fn into(self) -> String {
-		Into::into(&self)
-	}
-}
-
-impl Into<[u8; 16]> for Uuid {
-	fn into(self) -> [u8; 16] {
-		self.0
-	}
-}
-
-impl fmt::Display for Uuid {
-	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-		let s: String = (self as &Uuid).into();
-		write!(f, "{}", s)
-	}
-}
-
-fn copy_into(from: &str, into: &mut [u8]) -> Result<(), Error> {
-	let from: Vec<u8> = from.from_hex().map_err(|_| Error::InvalidUuid)?;
-
-	if from.len() != into.len() {
-		return Err(Error::InvalidUuid);
-	}
-
-	into.copy_from_slice(&from);
-	Ok(())
-}
-
-impl str::FromStr for Uuid {
-	type Err = Error;
-
-	fn from_str(s: &str) -> Result<Self, Self::Err> {
-		let parts: Vec<&str> = s.split("-").collect();
-
-		if parts.len() != 5 {
-			return Err(Error::InvalidUuid);
-		}
-
-		let mut uuid = [0u8; 16];
-
-		copy_into(parts[0], &mut uuid[0..4])?;
-		copy_into(parts[1], &mut uuid[4..6])?;
-		copy_into(parts[2], &mut uuid[6..8])?;
-		copy_into(parts[3], &mut uuid[8..10])?;
-		copy_into(parts[4], &mut uuid[10..16])?;
-
-		Ok(Uuid(uuid))
-	}
-}
-
-impl From<&'static str> for Uuid {
-	fn from(s: &'static str) -> Self {
-		s.parse().expect(&format!("invalid string literal for {}: '{}'", stringify!(Self), s))
-	}
-}
-
-impl Serialize for Uuid {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-	where S: Serializer {
-		let s: String = self.into();
-		serializer.serialize_str(&s)
-	}
-}
-
-impl<'a> Deserialize<'a> for Uuid {
-	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-	where D: Deserializer<'a> {
-		deserializer.deserialize_any(UuidVisitor)
-	}
-}
-
-struct UuidVisitor;
-
-impl<'a> Visitor<'a> for UuidVisitor {
-	type Value = Uuid;
-
-	fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-		write!(formatter, "a valid hex-encoded UUID")
-	}
-
-	fn visit_str<E>(self, value: &str) -> Result<Self::Value, E> where E: SerdeError {
-		value.parse().map_err(SerdeError::custom)
-	}
-
-	fn visit_string<E>(self, value: String) -> Result<Self::Value, E> where E: SerdeError {
-		self.visit_str(value.as_ref())
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use super::Uuid;
-
-	#[test]
-	fn uuid_from_str() {
-		let uuid: Uuid = "3198bc9c-6672-5ab3-d995-4942343ae5b6".into();
-		assert_eq!(uuid, Uuid::from([0x31, 0x98, 0xbc, 0x9c, 0x66, 0x72, 0x5a, 0xb3, 0xd9, 0x95, 0x49, 0x42, 0x34, 0x3a, 0xe5, 0xb6]));
-	}
-
-	#[test]
-	fn uuid_from_and_to_str() {
-		let from = "3198bc9c-6672-5ab3-d995-4942343ae5b6";
-		let uuid: Uuid = from.into();
-		let to: String = uuid.into();
-		assert_eq!(from, &to);
-	}
-}

accounts/ethstore/src/json/kdf.rs

@@ -1,159 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::fmt;
-use serde::{Serialize, Serializer, Deserialize, Deserializer};
-use serde::de::{Visitor, Error as SerdeError};
-use super::{Error, Bytes};
-
-#[derive(Debug, PartialEq)]
-pub enum KdfSer {
-	Pbkdf2,
-	Scrypt,
-}
-
-impl Serialize for KdfSer {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-	where S: Serializer {
-		match *self {
-			KdfSer::Pbkdf2 => serializer.serialize_str("pbkdf2"),
-			KdfSer::Scrypt => serializer.serialize_str("scrypt"),
-		}
-	}
-}
-
-impl<'a> Deserialize<'a> for KdfSer {
-	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-	where D: Deserializer<'a> {
-		deserializer.deserialize_any(KdfSerVisitor)
-	}
-}
-
-struct KdfSerVisitor;
-
-impl<'a> Visitor<'a> for KdfSerVisitor {
-	type Value = KdfSer;
-
-	fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-		write!(formatter, "a kdf algorithm identifier")
-	}
-
-	fn visit_str<E>(self, value: &str) -> Result<Self::Value, E> where E: SerdeError {
-		match value {
-			"pbkdf2" => Ok(KdfSer::Pbkdf2),
-			"scrypt" => Ok(KdfSer::Scrypt),
-			_ => Err(SerdeError::custom(Error::UnsupportedKdf))
-		}
-	}
-
-	fn visit_string<E>(self, value: String) -> Result<Self::Value, E> where E: SerdeError {
-		self.visit_str(value.as_ref())
-	}
-}
-
-#[derive(Debug, PartialEq)]
-pub enum Prf {
-	HmacSha256,
-}
-
-impl Serialize for Prf {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-	where S: Serializer {
-		match *self {
-			Prf::HmacSha256 => serializer.serialize_str("hmac-sha256"),
-		}
-	}
-}
-
-impl<'a> Deserialize<'a> for Prf {
-	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-	where D: Deserializer<'a> {
-		deserializer.deserialize_any(PrfVisitor)
-	}
-}
-
-struct PrfVisitor;
-
-impl<'a> Visitor<'a> for PrfVisitor {
-	type Value = Prf;
-
-	fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-		write!(formatter, "a prf algorithm identifier")
-	}
-
-	fn visit_str<E>(self, value: &str) -> Result<Self::Value, E> where E: SerdeError {
-		match value {
-			"hmac-sha256" => Ok(Prf::HmacSha256),
-			_ => Err(SerdeError::custom(Error::InvalidPrf)),
-		}
-	}
-
-	fn visit_string<E>(self, value: String) -> Result<Self::Value, E> where E: SerdeError {
-		self.visit_str(value.as_ref())
-	}
-}
-
-#[derive(Debug, PartialEq, Serialize, Deserialize)]
-pub struct Pbkdf2 {
-	pub c: u32,
-	pub dklen: u32,
-	pub prf: Prf,
-	pub salt: Bytes,
-}
-
-#[derive(Debug, PartialEq, Serialize, Deserialize)]
-pub struct Scrypt {
-	pub dklen: u32,
-	pub p: u32,
-	pub n: u32,
-	pub r: u32,
-	pub salt: Bytes,
-}
-
-#[derive(Debug, PartialEq)]
-pub enum KdfSerParams {
-	Pbkdf2(Pbkdf2),
-	Scrypt(Scrypt),
-}
-
-impl Serialize for KdfSerParams {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-	where S: Serializer {
-		match *self {
-			KdfSerParams::Pbkdf2(ref params) => params.serialize(serializer),
-			KdfSerParams::Scrypt(ref params) => params.serialize(serializer),
-		}
-	}
-}
-
-impl<'a> Deserialize<'a> for KdfSerParams {
-	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-	where D: Deserializer<'a> {
-		use serde_json::{Value, from_value};
-
-		let v: Value = Deserialize::deserialize(deserializer)?;
-
-		from_value(v.clone()).map(KdfSerParams::Pbkdf2)
-			.or_else(|_| from_value(v).map(KdfSerParams::Scrypt))
-			.map_err(|_| D::Error::custom("Invalid KDF algorithm"))
-	}
-}
-
-#[derive(Debug, PartialEq)]
-pub enum Kdf {
-	Pbkdf2(Pbkdf2),
-	Scrypt(Scrypt),
-}

accounts/ethstore/src/json/key_file.rs

@@ -1,324 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::fmt;
-use std::io::{Read, Write};
-use serde::{Serialize, Serializer, Deserialize, Deserializer};
-use serde::de::{Error, Visitor, MapAccess, DeserializeOwned};
-use serde_json;
-use super::{Uuid, Version, Crypto, H160};
-
-/// Public opaque type representing serializable `KeyFile`.
-#[derive(Debug, PartialEq)]
-pub struct OpaqueKeyFile {
-	key_file: KeyFile
-}
-
-impl Serialize for OpaqueKeyFile {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where
-		S: Serializer,
-	{
-		self.key_file.serialize(serializer)
-	}
-}
-
-impl<T> From<T> for OpaqueKeyFile where T: Into<KeyFile> {
-	fn from(val: T) -> Self {
-		OpaqueKeyFile { key_file: val.into() }
-	}
-}
-
-#[derive(Debug, PartialEq, Serialize)]
-pub struct KeyFile {
-	pub id: Uuid,
-	pub version: Version,
-	pub crypto: Crypto,
-	pub address: Option<H160>,
-	pub name: Option<String>,
-	pub meta: Option<String>,
-}
-
-enum KeyFileField {
-	Id,
-	Version,
-	Crypto,
-	Address,
-	Name,
-	Meta,
-}
-
-impl<'a> Deserialize<'a> for KeyFileField {
-	fn deserialize<D>(deserializer: D) -> Result<KeyFileField, D::Error>
-		where D: Deserializer<'a>
-	{
-		deserializer.deserialize_any(KeyFileFieldVisitor)
-	}
-}
-
-struct KeyFileFieldVisitor;
-
-impl<'a> Visitor<'a> for KeyFileFieldVisitor {
-	type Value = KeyFileField;
-
-	fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-		write!(formatter, "a valid key file field")
-	}
-
-	fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
-		where E: Error
-	{
-		match value {
-			"id" => Ok(KeyFileField::Id),
-			"version" => Ok(KeyFileField::Version),
-			"crypto" => Ok(KeyFileField::Crypto),
-			"Crypto" => Ok(KeyFileField::Crypto),
-			"address" => Ok(KeyFileField::Address),
-			"name" => Ok(KeyFileField::Name),
-			"meta" => Ok(KeyFileField::Meta),
-			_ => Err(Error::custom(format!("Unknown field: '{}'", value))),
-		}
-	}
-}
-
-impl<'a> Deserialize<'a> for KeyFile {
-	fn deserialize<D>(deserializer: D) -> Result<KeyFile, D::Error>
-		where D: Deserializer<'a>
-	{
-		static FIELDS: &'static [&'static str] = &["id", "version", "crypto", "Crypto", "address"];
-		deserializer.deserialize_struct("KeyFile", FIELDS, KeyFileVisitor)
-	}
-}
-
-fn none_if_empty<'a, T>(v: Option<serde_json::Value>) -> Option<T> where
-	T: DeserializeOwned
-{
-	v.and_then(|v| if v.is_null() {
-		None
-	} else {
-		serde_json::from_value(v).ok()
-	})
-
-}
-
-struct KeyFileVisitor;
-impl<'a> Visitor<'a> for KeyFileVisitor {
-	type Value = KeyFile;
-
-	fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-		write!(formatter, "a valid key object")
-	}
-
-	fn visit_map<V>(self, mut visitor: V) -> Result<Self::Value, V::Error>
-		where V: MapAccess<'a>
-	{
-		let mut id = None;
-		let mut version = None;
-		let mut crypto = None;
-		let mut address = None;
-		let mut name = None;
-		let mut meta = None;
-
-		loop {
-			match visitor.next_key()? {
-				Some(KeyFileField::Id) => { id = Some(visitor.next_value()?); }
-				Some(KeyFileField::Version) => { version = Some(visitor.next_value()?); }
-				Some(KeyFileField::Crypto) => { crypto = Some(visitor.next_value()?); }
-				Some(KeyFileField::Address) => { address = Some(visitor.next_value()?); }
-				Some(KeyFileField::Name) => { name = none_if_empty(visitor.next_value().ok()) }
-				Some(KeyFileField::Meta) => { meta = none_if_empty(visitor.next_value().ok()) }
-				None => { break; }
-			}
-		}
-
-		let id = match id {
-			Some(id) => id,
-			None => return Err(V::Error::missing_field("id")),
-		};
-
-		let version = match version {
-			Some(version) => version,
-			None => return Err(V::Error::missing_field("version")),
-		};
-
-		let crypto = match crypto {
-			Some(crypto) => crypto,
-			None => return Err(V::Error::missing_field("crypto")),
-		};
-
-		let result = KeyFile {
-			id: id,
-			version: version,
-			crypto: crypto,
-			address: address,
-			name: name,
-			meta: meta,
-		};
-
-		Ok(result)
-	}
-}
-
-impl KeyFile {
-	pub fn load<R>(reader: R) -> Result<Self, serde_json::Error> where R: Read {
-		serde_json::from_reader(reader)
-	}
-
-	pub fn write<W>(&self, writer: &mut W) -> Result<(), serde_json::Error> where W: Write {
-		serde_json::to_writer(writer, self)
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use std::str::FromStr;
-	use serde_json;
-	use json::{KeyFile, Uuid, Version, Crypto, Cipher, Aes128Ctr, Kdf, Scrypt};
-
-	#[test]
-	fn basic_keyfile() {
-		let json = r#"
-		{
-			"address": "6edddfc6349aff20bc6467ccf276c5b52487f7a8",
-			"crypto": {
-				"cipher": "aes-128-ctr",
-				"ciphertext": "7203da0676d141b138cd7f8e1a4365f59cc1aa6978dc5443f364ca943d7cb4bc",
-				"cipherparams": {
-					"iv": "b5a7ec855ec9e2c405371356855fec83"
-				},
-				"kdf": "scrypt",
-				"kdfparams": {
-					"dklen": 32,
-					"n": 262144,
-					"p": 1,
-					"r": 8,
-					"salt": "1e8642fdf1f87172492c1412fc62f8db75d796cdfa9c53c3f2b11e44a2a1b209"
-				},
-				"mac": "46325c5d4e8c991ad2683d525c7854da387138b6ca45068985aa4959fa2b8c8f"
-			},
-			"id": "8777d9f6-7860-4b9b-88b7-0b57ee6b3a73",
-			"version": 3,
-			"name": "Test",
-			"meta": "{}"
-		}"#;
-
-		let expected = KeyFile {
-			id: Uuid::from_str("8777d9f6-7860-4b9b-88b7-0b57ee6b3a73").unwrap(),
-			version: Version::V3,
-			address: Some("6edddfc6349aff20bc6467ccf276c5b52487f7a8".into()),
-			crypto: Crypto {
-				cipher: Cipher::Aes128Ctr(Aes128Ctr {
-					iv: "b5a7ec855ec9e2c405371356855fec83".into(),
-				}),
-				ciphertext: "7203da0676d141b138cd7f8e1a4365f59cc1aa6978dc5443f364ca943d7cb4bc".into(),
-				kdf: Kdf::Scrypt(Scrypt {
-					n: 262144,
-					dklen: 32,
-					p: 1,
-					r: 8,
-					salt: "1e8642fdf1f87172492c1412fc62f8db75d796cdfa9c53c3f2b11e44a2a1b209".into(),
-				}),
-				mac: "46325c5d4e8c991ad2683d525c7854da387138b6ca45068985aa4959fa2b8c8f".into(),
-			},
-			name: Some("Test".to_owned()),
-			meta: Some("{}".to_owned()),
-		};
-
-		let keyfile: KeyFile = serde_json::from_str(json).unwrap();
-		assert_eq!(keyfile, expected);
-	}
-
-	#[test]
-	fn capital_crypto_keyfile() {
-		let json = r#"
-		{
-			"address": "6edddfc6349aff20bc6467ccf276c5b52487f7a8",
-			"Crypto": {
-				"cipher": "aes-128-ctr",
-				"ciphertext": "7203da0676d141b138cd7f8e1a4365f59cc1aa6978dc5443f364ca943d7cb4bc",
-				"cipherparams": {
-					"iv": "b5a7ec855ec9e2c405371356855fec83"
-				},
-				"kdf": "scrypt",
-				"kdfparams": {
-					"dklen": 32,
-					"n": 262144,
-					"p": 1,
-					"r": 8,
-					"salt": "1e8642fdf1f87172492c1412fc62f8db75d796cdfa9c53c3f2b11e44a2a1b209"
-				},
-				"mac": "46325c5d4e8c991ad2683d525c7854da387138b6ca45068985aa4959fa2b8c8f"
-			},
-			"id": "8777d9f6-7860-4b9b-88b7-0b57ee6b3a73",
-			"version": 3
-		}"#;
-
-		let expected = KeyFile {
-			id: "8777d9f6-7860-4b9b-88b7-0b57ee6b3a73".into(),
-			version: Version::V3,
-			address: Some("6edddfc6349aff20bc6467ccf276c5b52487f7a8".into()),
-			crypto: Crypto {
-				cipher: Cipher::Aes128Ctr(Aes128Ctr {
-					iv: "b5a7ec855ec9e2c405371356855fec83".into(),
-				}),
-				ciphertext: "7203da0676d141b138cd7f8e1a4365f59cc1aa6978dc5443f364ca943d7cb4bc".into(),
-				kdf: Kdf::Scrypt(Scrypt {
-					n: 262144,
-					dklen: 32,
-					p: 1,
-					r: 8,
-					salt: "1e8642fdf1f87172492c1412fc62f8db75d796cdfa9c53c3f2b11e44a2a1b209".into(),
-				}),
-				mac: "46325c5d4e8c991ad2683d525c7854da387138b6ca45068985aa4959fa2b8c8f".into(),
-			},
-			name: None,
-			meta: None,
-		};
-
-		let keyfile: KeyFile = serde_json::from_str(json).unwrap();
-		assert_eq!(keyfile, expected);
-	}
-
-	#[test]
-	fn to_and_from_json() {
-		let file = KeyFile {
-			id: "8777d9f6-7860-4b9b-88b7-0b57ee6b3a73".into(),
-			version: Version::V3,
-			address: Some("6edddfc6349aff20bc6467ccf276c5b52487f7a8".into()),
-			crypto: Crypto {
-				cipher: Cipher::Aes128Ctr(Aes128Ctr {
-					iv: "b5a7ec855ec9e2c405371356855fec83".into(),
-				}),
-				ciphertext: "7203da0676d141b138cd7f8e1a4365f59cc1aa6978dc5443f364ca943d7cb4bc".into(),
-				kdf: Kdf::Scrypt(Scrypt {
-					n: 262144,
-					dklen: 32,
-					p: 1,
-					r: 8,
-					salt: "1e8642fdf1f87172492c1412fc62f8db75d796cdfa9c53c3f2b11e44a2a1b209".into(),
-				}),
-				mac: "46325c5d4e8c991ad2683d525c7854da387138b6ca45068985aa4959fa2b8c8f".into(),
-			},
-			name: Some("Test".to_owned()),
-			meta: None,
-		};
-
-		let serialized = serde_json::to_string(&file).unwrap();
-		println!("{}", serialized);
-		let deserialized = serde_json::from_str(&serialized).unwrap();
-
-		assert_eq!(file, deserialized);
-	}
-}

accounts/ethstore/src/json/mod.rs

@@ -1,43 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Contract interface specification.
-
-mod bytes;
-mod cipher;
-mod crypto;
-mod error;
-mod hash;
-mod id;
-mod kdf;
-mod key_file;
-mod presale;
-mod vault_file;
-mod vault_key_file;
-mod version;
-
-pub use self::bytes::Bytes;
-pub use self::cipher::{Cipher, CipherSer, CipherSerParams, Aes128Ctr};
-pub use self::crypto::{Crypto, CipherText};
-pub use self::error::Error;
-pub use self::hash::{H128, H160, H256};
-pub use self::id::Uuid;
-pub use self::kdf::{Kdf, KdfSer, Prf, Pbkdf2, Scrypt, KdfSerParams};
-pub use self::key_file::{KeyFile, OpaqueKeyFile};
-pub use self::presale::{PresaleWallet, Encseed};
-pub use self::vault_file::VaultFile;
-pub use self::vault_key_file::{VaultKeyFile, VaultKeyMeta, insert_vault_name_to_json_meta, remove_vault_name_from_json_meta};
-pub use self::version::Version;

accounts/ethstore/src/json/vault_file.rs

@@ -1,94 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::io::{Read, Write};
-use serde_json;
-use super::Crypto;
-
-/// Vault meta file
-#[derive(Debug, PartialEq, Serialize, Deserialize)]
-pub struct VaultFile {
-	/// Vault password, encrypted with vault password
-	pub crypto: Crypto,
-	/// Vault metadata string
-	pub meta: Option<String>,
-}
-
-impl VaultFile {
-	pub fn load<R>(reader: R) -> Result<Self, serde_json::Error> where R: Read {
-		serde_json::from_reader(reader)
-	}
-
-	pub fn write<W>(&self, writer: &mut W) -> Result<(), serde_json::Error> where W: Write {
-		serde_json::to_writer(writer, self)
-	}
-}
-
-#[cfg(test)]
-mod test {
-	use serde_json;
-	use json::{VaultFile, Crypto, Cipher, Aes128Ctr, Kdf, Pbkdf2, Prf};
-
-	#[test]
-	fn to_and_from_json() {
-		let file = VaultFile {
-			crypto: Crypto {
-				cipher: Cipher::Aes128Ctr(Aes128Ctr {
-					iv: "0155e3690be19fbfbecabcd440aa284b".into(),
-				}),
-				ciphertext: "4d6938a1f49b7782".into(),
-				kdf: Kdf::Pbkdf2(Pbkdf2 {
-					c: 1024,
-					dklen: 32,
-					prf: Prf::HmacSha256,
-					salt: "b6a9338a7ccd39288a86dba73bfecd9101b4f3db9c9830e7c76afdbd4f6872e5".into(),
-				}),
-				mac: "16381463ea11c6eb2239a9f339c2e780516d29d234ce30ac5f166f9080b5a262".into(),
-			},
-			meta: Some("{}".into()),
-		};
-
-		let serialized = serde_json::to_string(&file).unwrap();
-		let deserialized = serde_json::from_str(&serialized).unwrap();
-
-		assert_eq!(file, deserialized);
-	}
-
-	#[test]
-	fn to_and_from_json_no_meta() {
-		let file = VaultFile {
-			crypto: Crypto {
-				cipher: Cipher::Aes128Ctr(Aes128Ctr {
-					iv: "0155e3690be19fbfbecabcd440aa284b".into(),
-				}),
-				ciphertext: "4d6938a1f49b7782".into(),
-				kdf: Kdf::Pbkdf2(Pbkdf2 {
-					c: 1024,
-					dklen: 32,
-					prf: Prf::HmacSha256,
-					salt: "b6a9338a7ccd39288a86dba73bfecd9101b4f3db9c9830e7c76afdbd4f6872e5".into(),
-				}),
-				mac: "16381463ea11c6eb2239a9f339c2e780516d29d234ce30ac5f166f9080b5a262".into(),
-			},
-			meta: None,
-		};
-
-		let serialized = serde_json::to_string(&file).unwrap();
-		let deserialized = serde_json::from_str(&serialized).unwrap();
-
-		assert_eq!(file, deserialized);
-	}
-}

accounts/ethstore/src/json/vault_key_file.rs

@@ -1,172 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::io::{Read, Write};
-use serde::de::Error;
-use serde_json;
-use serde_json::value::Value;
-use serde_json::error;
-use super::{Uuid, Version, Crypto, H160};
-
-/// Meta key name for vault field
-const VAULT_NAME_META_KEY: &'static str = "vault";
-
-/// Key file as stored in vaults
-#[derive(Debug, PartialEq, Serialize, Deserialize)]
-pub struct VaultKeyFile {
-	/// Key id
-	pub id: Uuid,
-	/// Key version
-	pub version: Version,
-	/// Secret, encrypted with account password
-	pub crypto: Crypto,
-	/// Serialized `VaultKeyMeta`, encrypted with vault password
-	pub metacrypto: Crypto,
-}
-
-/// Data, stored in `VaultKeyFile::metacrypto`
-#[derive(Debug, PartialEq, Serialize, Deserialize)]
-pub struct VaultKeyMeta {
-	/// Key address
-	pub address: H160,
-	/// Key name
-	pub name: Option<String>,
-	/// Key metadata
-	pub meta: Option<String>,
-}
-
-/// Insert vault name to the JSON meta field
-pub fn insert_vault_name_to_json_meta(meta: &str, vault_name: &str) -> Result<String, error::Error> {
-	let mut meta = if meta.is_empty() {
-		Value::Object(serde_json::Map::new())
-	} else {
-		serde_json::from_str(meta)?
-	};
-
-	if let Some(meta_obj) = meta.as_object_mut() {
-		meta_obj.insert(VAULT_NAME_META_KEY.to_owned(), Value::String(vault_name.to_owned()));
-		serde_json::to_string(meta_obj)
-	} else {
-		Err(error::Error::custom("Meta is expected to be a serialized JSON object"))
-	}
-}
-
-/// Remove vault name from the JSON meta field
-pub fn remove_vault_name_from_json_meta(meta: &str) -> Result<String, error::Error> {
-	let mut meta = if meta.is_empty() {
-		Value::Object(serde_json::Map::new())
-	} else {
-		serde_json::from_str(meta)?
-	};
-
-	if let Some(meta_obj) = meta.as_object_mut() {
-		meta_obj.remove(VAULT_NAME_META_KEY);
-		serde_json::to_string(meta_obj)
-	} else {
-		Err(error::Error::custom("Meta is expected to be a serialized JSON object"))
-	}
-}
-
-impl VaultKeyFile {
-	pub fn load<R>(reader: R) -> Result<Self, serde_json::Error> where R: Read {
-		serde_json::from_reader(reader)
-	}
-
-	pub fn write<W>(&self, writer: &mut W) -> Result<(), serde_json::Error> where W: Write {
-		serde_json::to_writer(writer, self)
-	}
-}
-
-impl VaultKeyMeta {
-	pub fn load(bytes: &[u8]) -> Result<Self, serde_json::Error> {
-		serde_json::from_slice(&bytes)
-	}
-
-	pub fn write(&self) -> Result<Vec<u8>, serde_json::Error> {
-		let s = serde_json::to_string(self)?;
-		Ok(s.as_bytes().into())
-	}
-}
-
-#[cfg(test)]
-mod test {
-	use serde_json;
-	use json::{VaultKeyFile, Version, Crypto, Cipher, Aes128Ctr, Kdf, Pbkdf2, Prf,
-		insert_vault_name_to_json_meta, remove_vault_name_from_json_meta};
-
-	#[test]
-	fn to_and_from_json() {
-		let file = VaultKeyFile {
-			id: "08d82c39-88e3-7a71-6abb-89c8f36c3ceb".into(),
-			version: Version::V3,
-			crypto: Crypto {
-				cipher: Cipher::Aes128Ctr(Aes128Ctr {
-					iv: "fecb968bbc8c7e608a89ebcfe53a41d0".into(),
-				}),
-				ciphertext: "4befe0a66d9a4b6fec8e39eb5c90ac5dafdeaab005fff1af665fd1f9af925c91".into(),
-				kdf: Kdf::Pbkdf2(Pbkdf2 {
-					c: 10240,
-					dklen: 32,
-					prf: Prf::HmacSha256,
-					salt: "f17731e84ecac390546692dbd4ccf6a3a2720dc9652984978381e61c28a471b2".into(),
-				}),
-				mac: "7c7c3daafb24cf11eb3079dfb9064a11e92f309a0ee1dd676486bab119e686b7".into(),
-			},
-			metacrypto: Crypto {
-				cipher: Cipher::Aes128Ctr(Aes128Ctr {
-					iv: "9c353fb3f894fc05946843616c26bb3f".into(),
-				}),
-				ciphertext: "fef0d113d7576c1702daf380ad6f4c5408389e57991cae2a174facd74bd549338e1014850bddbab7eb486ff5f5c9c5532800c6a6d4db2be2212cd5cd3769244ab230e1f369e8382a9e6d7c0a".into(),
-				kdf: Kdf::Pbkdf2(Pbkdf2 {
-					c: 10240,
-					dklen: 32,
-					prf: Prf::HmacSha256,
-					salt: "aca82865174a82249a198814b263f43a631f272cbf7ed329d0f0839d259c652a".into(),
-				}),
-				mac: "b7413946bfe459d2801268dc331c04b3a84d92be11ef4dd9a507f895e8d9b5bd".into(),
-			}
-		};
-
-		let serialized = serde_json::to_string(&file).unwrap();
-		let deserialized = serde_json::from_str(&serialized).unwrap();
-
-		assert_eq!(file, deserialized);
-	}
-
-	#[test]
-	fn vault_name_inserted_to_json_meta() {
-		assert_eq!(insert_vault_name_to_json_meta(r#""#, "MyVault").unwrap(), r#"{"vault":"MyVault"}"#);
-		assert_eq!(insert_vault_name_to_json_meta(r#"{"tags":["kalabala"]}"#, "MyVault").unwrap(), r#"{"tags":["kalabala"],"vault":"MyVault"}"#);
-	}
-
-	#[test]
-	fn vault_name_not_inserted_to_json_meta() {
-		assert!(insert_vault_name_to_json_meta(r#"///3533"#, "MyVault").is_err());
-		assert!(insert_vault_name_to_json_meta(r#""string""#, "MyVault").is_err());
-	}
-
-	#[test]
-	fn vault_name_removed_from_json_meta() {
-		assert_eq!(remove_vault_name_from_json_meta(r#"{"vault":"MyVault"}"#).unwrap(), r#"{}"#);
-		assert_eq!(remove_vault_name_from_json_meta(r#"{"tags":["kalabala"],"vault":"MyVault"}"#).unwrap(), r#"{"tags":["kalabala"]}"#);
-	}
-
-	#[test]
-	fn vault_name_not_removed_from_json_meta() {
-		assert!(remove_vault_name_from_json_meta(r#"///3533"#).is_err());
-		assert!(remove_vault_name_from_json_meta(r#""string""#).is_err());
-	}
-}

accounts/ethstore/src/json/version.rs

@@ -1,58 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::fmt;
-use serde::{Serialize, Serializer, Deserialize, Deserializer};
-use serde::de::{Error as SerdeError, Visitor};
-use super::Error;
-
-#[derive(Debug, PartialEq)]
-pub enum Version {
-	V3,
-}
-
-impl Serialize for Version {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-	where S: Serializer {
-		match *self {
-			Version::V3 => serializer.serialize_u64(3)
-		}
-	}
-}
-
-impl<'a> Deserialize<'a> for Version {
-	fn deserialize<D>(deserializer: D) -> Result<Version, D::Error>
-	where D: Deserializer<'a> {
-		deserializer.deserialize_any(VersionVisitor)
-	}
-}
-
-struct VersionVisitor;
-
-impl<'a> Visitor<'a> for VersionVisitor {
-	type Value = Version;
-
-	fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-		write!(formatter, "a valid key version identifier")
-	}
-
-	fn visit_u64<E>(self, value: u64) -> Result<Self::Value, E> where E: SerdeError {
-		match value {
-			3 => Ok(Version::V3),
-			_ => Err(SerdeError::custom(Error::UnsupportedVersion))
-		}
-	}
-}

accounts/ethstore/src/lib.rs

@@ -1,98 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Ethereum key-management.
-
-#![warn(missing_docs)]
-
-extern crate dir;
-extern crate libc;
-extern crate parking_lot;
-extern crate rand;
-extern crate rustc_hex;
-extern crate serde;
-extern crate serde_json;
-extern crate smallvec;
-extern crate time;
-extern crate tiny_keccak;
-extern crate tempfile;
-
-extern crate parity_crypto as crypto;
-extern crate ethereum_types;
-extern crate ethkey as ethkey;
-extern crate parity_wordlist;
-
-#[macro_use]
-extern crate log;
-#[macro_use]
-extern crate serde_derive;
-
-#[cfg(test)]
-#[macro_use]
-extern crate matches;
-
-pub mod accounts_dir;
-
-mod account;
-mod json;
-
-mod error;
-mod ethstore;
-mod import;
-mod presale;
-mod random;
-mod secret_store;
-
-pub use self::account::{SafeAccount, Crypto};
-pub use self::error::Error;
-pub use self::ethstore::{EthStore, EthMultiStore};
-pub use self::import::{import_account, import_accounts, read_geth_accounts};
-pub use self::json::OpaqueKeyFile as KeyFile;
-pub use self::presale::PresaleWallet;
-pub use self::secret_store::{
-	SecretVaultRef, StoreAccountRef, SimpleSecretStore, SecretStore,
-	Derivation, IndexDerivation,
-};
-pub use self::random::random_string;
-pub use self::parity_wordlist::random_phrase;
-
-/// An opaque wrapper for secret.
-pub struct OpaqueSecret(crypto::publickey::Secret);
-
-// Additional converters for Address
-use crypto::publickey::Address;
-
-impl Into<json::H160> for Address {
-	fn into(self) -> json::H160 {
-		let a: [u8; 20] = self.into();
-		From::from(a)
-	}
-}
-
-impl From<json::H160> for Address {
-	fn from(json: json::H160) -> Self {
-		let a: [u8; 20] = json.into();
-		From::from(a)
-	}
-}
-
-impl<'a> From<&'a json::H160> for Address {
-	fn from(json: &'a json::H160) -> Self {
-		let mut a = [0u8; 20];
-		a.copy_from_slice(json);
-		From::from(a)
-	}
-}

accounts/ethstore/src/presale.rs

@@ -1,100 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::fs;
-use std::path::Path;
-use json;
-use crypto::publickey::{Address, Secret, KeyPair};
-use ethkey::Password;
-use crypto::{Keccak256, pbkdf2};
-use {crypto, Error};
-
-/// Pre-sale wallet.
-pub struct PresaleWallet {
-	iv: [u8; 16],
-	ciphertext: Vec<u8>,
-	address: Address,
-}
-
-impl From<json::PresaleWallet> for PresaleWallet {
-	fn from(wallet: json::PresaleWallet) -> Self {
-		let mut iv = [0u8; 16];
-		iv.copy_from_slice(&wallet.encseed[..16]);
-
-		let mut ciphertext = vec![];
-		ciphertext.extend_from_slice(&wallet.encseed[16..]);
-
-		PresaleWallet {
-			iv: iv,
-			ciphertext: ciphertext,
-			address: Address::from(wallet.address),
-		}
-	}
-}
-
-impl PresaleWallet {
-	/// Open a pre-sale wallet.
-	pub fn open<P>(path: P) -> Result<Self, Error> where P: AsRef<Path> {
-		let file = fs::File::open(path)?;
-		let presale = json::PresaleWallet::load(file)
-			.map_err(|e| Error::InvalidKeyFile(format!("{}", e)))?;
-		Ok(PresaleWallet::from(presale))
-	}
-
-	/// Decrypt the wallet.
-	pub fn decrypt(&self, password: &Password) -> Result<KeyPair, Error> {
-		let mut derived_key = [0u8; 32];
-		let salt = pbkdf2::Salt(password.as_bytes());
-		let sec = pbkdf2::Secret(password.as_bytes());
-		pbkdf2::sha256(2000, salt, sec, &mut derived_key);
-
-		let mut key = vec![0; self.ciphertext.len()];
-		let len = crypto::aes::decrypt_128_cbc(&derived_key[0..16], &self.iv, &self.ciphertext, &mut key)
-			.map_err(|_| Error::InvalidPassword)?;
-		let unpadded = &key[..len];
-
-		let secret = Secret::import_key(&unpadded.keccak256())?;
-		if let Ok(kp) = KeyPair::from_secret(secret) {
-			if kp.address() == self.address {
-				return Ok(kp)
-			}
-		}
-
-		Err(Error::InvalidPassword)
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use super::PresaleWallet;
-	use json;
-
-	#[test]
-	fn test() {
-		let json = r#"
-		{
-			"encseed": "137103c28caeebbcea5d7f95edb97a289ded151b72159137cb7b2671f394f54cff8c121589dcb373e267225547b3c71cbdb54f6e48ec85cd549f96cf0dedb3bc0a9ac6c79b9c426c5878ca2c9d06ff42a23cb648312fc32ba83649de0928e066",
-			"ethaddr": "ede84640d1a1d3e06902048e67aa7db8d52c2ce1",
-			"email": "123@gmail.com",
-			"btcaddr": "1JvqEc6WLhg6GnyrLBe2ztPAU28KRfuseH"
-		} "#;
-
-		let wallet = json::PresaleWallet::load(json.as_bytes()).unwrap();
-		let wallet = PresaleWallet::from(wallet);
-		assert!(wallet.decrypt(&"123".into()).is_ok());
-		assert!(wallet.decrypt(&"124".into()).is_err());
-	}
-}

accounts/ethstore/src/random.rs

@@ -1,45 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use rand::{Rng, RngCore, rngs::OsRng, distributions::Alphanumeric};
-
-pub trait Random {
-	fn random() -> Self where Self: Sized;
-}
-
-impl Random for [u8; 16] {
-	fn random() -> Self {
-		let mut result = [0u8; 16];
-		let mut rng = OsRng;
-		rng.fill_bytes(&mut result);
-		result
-	}
-}
-
-impl Random for [u8; 32] {
-	fn random() -> Self {
-		let mut result = [0u8; 32];
-		let mut rng = OsRng;
-		rng.fill_bytes(&mut result);
-		result
-	}
-}
-
-/// Generate a random string of given length.
-pub fn random_string(length: usize) -> String {
-	let rng = OsRng;
-	rng.sample_iter(&Alphanumeric).take(length).collect()
-}

accounts/ethstore/src/secret_store.rs

@@ -1,191 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::hash::{Hash, Hasher};
-use std::path::PathBuf;
-use std::cmp::Ordering;
-use crypto::publickey::{Address, Message, Signature, Secret, Public};
-use ethkey::Password;
-use Error;
-use json::{Uuid, OpaqueKeyFile};
-use ethereum_types::H256;
-use OpaqueSecret;
-
-/// Key directory reference
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
-pub enum SecretVaultRef {
-	/// Reference to key in root directory
-	Root,
-	/// Referenc to key in specific vault
-	Vault(String),
-}
-
-/// Stored account reference
-#[derive(Debug, Clone, PartialEq, Eq, Ord)]
-pub struct StoreAccountRef {
-	/// Account address
-	pub address: Address,
-	/// Vault reference
-	pub vault: SecretVaultRef,
-}
-
-impl PartialOrd for StoreAccountRef {
-	fn partial_cmp(&self, other: &StoreAccountRef) -> Option<Ordering> {
-		Some(self.address.cmp(&other.address).then_with(|| self.vault.cmp(&other.vault)))
-	}
-}
-
-impl ::std::borrow::Borrow<Address> for StoreAccountRef {
-	fn borrow(&self) -> &Address {
-		&self.address
-	}
-}
-
-/// Simple Secret Store API
-pub trait SimpleSecretStore: Send + Sync {
-	/// Inserts new accounts to the store (or vault) with given password.
-	fn insert_account(&self, vault: SecretVaultRef, secret: Secret, password: &Password) -> Result<StoreAccountRef, Error>;
-	/// Inserts new derived account to the store (or vault) with given password.
-	fn insert_derived(&self, vault: SecretVaultRef, account_ref: &StoreAccountRef, password: &Password, derivation: Derivation) -> Result<StoreAccountRef, Error>;
-	/// Changes accounts password.
-	fn change_password(&self, account: &StoreAccountRef, old_password: &Password, new_password: &Password) -> Result<(), Error>;
-	/// Exports key details for account.
-	fn export_account(&self, account: &StoreAccountRef, password: &Password) -> Result<OpaqueKeyFile, Error>;
-	/// Entirely removes account from the store and underlying storage.
-	fn remove_account(&self, account: &StoreAccountRef, password: &Password) -> Result<(), Error>;
-	/// Generates new derived account.
-	fn generate_derived(&self, account_ref: &StoreAccountRef, password: &Password, derivation: Derivation) -> Result<Address, Error>;
-	/// Sign a message with given account.
-	fn sign(&self, account: &StoreAccountRef, password: &Password, message: &Message) -> Result<Signature, Error>;
-	/// Sign a message with derived account.
-	fn sign_derived(&self, account_ref: &StoreAccountRef, password: &Password, derivation: Derivation, message: &Message) -> Result<Signature, Error>;
-	/// Decrypt a messages with given account.
-	fn decrypt(&self, account: &StoreAccountRef, password: &Password, shared_mac: &[u8], message: &[u8]) -> Result<Vec<u8>, Error>;
-	/// Agree on shared key.
-	fn agree(&self, account: &StoreAccountRef, password: &Password, other: &Public) -> Result<Secret, Error>;
-
-	/// Returns all accounts in this secret store.
-	fn accounts(&self) -> Result<Vec<StoreAccountRef>, Error>;
-	/// Get reference to some account with given address.
-	/// This method could be removed if we will guarantee that there is max(1) account for given address.
-	fn account_ref(&self, address: &Address) -> Result<StoreAccountRef, Error>;
-
-	/// Create new vault with given password
-	fn create_vault(&self, name: &str, password: &Password) -> Result<(), Error>;
-	/// Open vault with given password
-	fn open_vault(&self, name: &str, password: &Password) -> Result<(), Error>;
-	/// Close vault
-	fn close_vault(&self, name: &str) -> Result<(), Error>;
-	/// List all vaults
-	fn list_vaults(&self) -> Result<Vec<String>, Error>;
-	/// List all currently opened vaults
-	fn list_opened_vaults(&self) -> Result<Vec<String>, Error>;
-	/// Change vault password
-	fn change_vault_password(&self, name: &str, new_password: &Password) -> Result<(), Error>;
-	/// Cnage account' vault
-	fn change_account_vault(&self, vault: SecretVaultRef, account: StoreAccountRef) -> Result<StoreAccountRef, Error>;
-	/// Get vault metadata string.
-	fn get_vault_meta(&self, name: &str) -> Result<String, Error>;
-	/// Set vault metadata string.
-	fn set_vault_meta(&self, name: &str, meta: &str) -> Result<(), Error>;
-}
-
-/// Secret Store API
-pub trait SecretStore: SimpleSecretStore {
-
-	/// Returns a raw opaque Secret that can be later used to sign a message.
-	fn raw_secret(&self, account: &StoreAccountRef, password: &Password) -> Result<OpaqueSecret, Error>;
-
-	/// Signs a message with raw secret.
-	fn sign_with_secret(&self, secret: &OpaqueSecret, message: &Message) -> Result<Signature, Error> {
-		Ok(crypto::publickey::sign(&secret.0, message)?)
-	}
-
-	/// Imports presale wallet
-	fn import_presale(&self, vault: SecretVaultRef, json: &[u8], password: &Password) -> Result<StoreAccountRef, Error>;
-	/// Imports existing JSON wallet
-	fn import_wallet(&self, vault: SecretVaultRef, json: &[u8], password: &Password, gen_id: bool) -> Result<StoreAccountRef, Error>;
-	/// Copies account between stores and vaults.
-	fn copy_account(&self, new_store: &dyn SimpleSecretStore, new_vault: SecretVaultRef, account: &StoreAccountRef, password: &Password, new_password: &Password) -> Result<(), Error>;
-	/// Checks if password matches given account.
-	fn test_password(&self, account: &StoreAccountRef, password: &Password) -> Result<bool, Error>;
-
-	/// Returns a public key for given account.
-	fn public(&self, account: &StoreAccountRef, password: &Password) -> Result<Public, Error>;
-
-	/// Returns uuid of an account.
-	fn uuid(&self, account: &StoreAccountRef) -> Result<Uuid, Error>;
-	/// Returns account's name.
-	fn name(&self, account: &StoreAccountRef) -> Result<String, Error>;
-	/// Returns account's metadata.
-	fn meta(&self, account: &StoreAccountRef) -> Result<String, Error>;
-
-	/// Modifies account metadata.
-	fn set_name(&self, account: &StoreAccountRef, name: String) -> Result<(), Error>;
-	/// Modifies account name.
-	fn set_meta(&self, account: &StoreAccountRef, meta: String) -> Result<(), Error>;
-
-	/// Returns local path of the store.
-	fn local_path(&self) -> PathBuf;
-	/// Lists all found geth accounts.
-	fn list_geth_accounts(&self, testnet: bool) -> Vec<Address>;
-	/// Imports geth accounts to the store/vault.
-	fn import_geth_accounts(&self, vault: SecretVaultRef, desired: Vec<Address>, testnet: bool) -> Result<Vec<StoreAccountRef>, Error>;
-}
-
-impl StoreAccountRef {
-	/// Create reference to root account with given address
-	pub fn root(address: Address) -> Self {
-		StoreAccountRef::new(SecretVaultRef::Root, address)
-	}
-
-	/// Create reference to vault account with given address
-	pub fn vault(vault_name: &str, address: Address) -> Self {
-		StoreAccountRef::new(SecretVaultRef::Vault(vault_name.to_owned()), address)
-	}
-
-	/// Create new account reference
-	pub fn new(vault_ref: SecretVaultRef, address: Address) -> Self {
-		StoreAccountRef {
-			vault: vault_ref,
-			address: address,
-		}
-	}
-}
-
-impl Hash for StoreAccountRef {
-	fn hash<H: Hasher>(&self, state: &mut H) {
-		self.address.hash(state);
-	}
-}
-
-/// Node in hierarchical derivation.
-pub struct IndexDerivation {
-	/// Node is soft (allows proof of parent from parent node).
-	pub soft: bool,
-	/// Index sequence of the node.
-	pub index: u32,
-}
-
-/// Derivation scheme for keys
-pub enum Derivation {
-	/// Hierarchical derivation
-	Hierarchical(Vec<IndexDerivation>),
-	/// Hash derivation, soft.
-	SoftHash(H256),
-	/// Hash derivation, hard.
-	HardHash(H256),
-}

accounts/ethstore/tests/api.rs

@@ -1,160 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate rand;
-extern crate ethstore;
-extern crate ethereum_types;
-extern crate parity_crypto;
-
-mod util;
-
-use ethstore::{EthStore, SimpleSecretStore, SecretVaultRef, StoreAccountRef};
-use parity_crypto::publickey::{Random, Generator, Secret, KeyPair, verify_address};
-use ethstore::accounts_dir::RootDiskDirectory;
-use util::TransientDir;
-use ethereum_types::Address;
-use std::str::FromStr;
-
-#[test]
-fn secret_store_create() {
-	let dir = TransientDir::create().unwrap();
-	let _ = EthStore::open(Box::new(dir)).unwrap();
-}
-
-#[test]
-#[should_panic]
-fn secret_store_open_not_existing() {
-	let dir = TransientDir::open();
-	let _ = EthStore::open(Box::new(dir)).unwrap();
-}
-
-fn random_secret() -> Secret {
-	Random.generate().secret().clone()
-}
-
-#[test]
-fn secret_store_create_account() {
-	let dir = TransientDir::create().unwrap();
-	let store = EthStore::open(Box::new(dir)).unwrap();
-	assert_eq!(store.accounts().unwrap().len(), 0);
-	assert!(store.insert_account(SecretVaultRef::Root, random_secret(), &"".into()).is_ok());
-	assert_eq!(store.accounts().unwrap().len(), 1);
-	assert!(store.insert_account(SecretVaultRef::Root, random_secret(), &"".into()).is_ok());
-	assert_eq!(store.accounts().unwrap().len(), 2);
-}
-
-#[test]
-fn secret_store_sign() {
-	let dir = TransientDir::create().unwrap();
-	let store = EthStore::open(Box::new(dir)).unwrap();
-	assert!(store.insert_account(SecretVaultRef::Root, random_secret(), &"".into()).is_ok());
-	let accounts = store.accounts().unwrap();
-	let message = [1u8; 32].into();
-	assert_eq!(accounts.len(), 1);
-	assert!(store.sign(&accounts[0], &"".into(), &message).is_ok());
-	assert!(store.sign(&accounts[0], &"1".into(), &message).is_err());
-}
-
-#[test]
-fn secret_store_change_password() {
-	let dir = TransientDir::create().unwrap();
-	let store = EthStore::open(Box::new(dir)).unwrap();
-	assert!(store.insert_account(SecretVaultRef::Root, random_secret(), &"".into()).is_ok());
-	let accounts = store.accounts().unwrap();
-	let message = [1u8; 32].into();
-	assert_eq!(accounts.len(), 1);
-	assert!(store.sign(&accounts[0], &"".into(), &message).is_ok());
-	assert!(store.change_password(&accounts[0], &"".into(), &"1".into()).is_ok());
-	assert!(store.sign(&accounts[0], &"".into(), &message).is_err());
-	assert!(store.sign(&accounts[0], &"1".into(), &message).is_ok());
-}
-
-#[test]
-fn secret_store_remove_account() {
-	let dir = TransientDir::create().unwrap();
-	let store = EthStore::open(Box::new(dir)).unwrap();
-	assert!(store.insert_account(SecretVaultRef::Root, random_secret(), &"".into()).is_ok());
-	let accounts = store.accounts().unwrap();
-	assert_eq!(accounts.len(), 1);
-	assert!(store.remove_account(&accounts[0], &"".into()).is_ok());
-	assert_eq!(store.accounts().unwrap().len(), 0);
-	assert!(store.remove_account(&accounts[0], &"".into()).is_err());
-}
-
-fn test_path() -> &'static str {
-	match ::std::fs::metadata("ethstore") {
-		Ok(_) => "ethstore/tests/res/geth_keystore",
-		Err(_) => "tests/res/geth_keystore",
-	}
-}
-
-fn pat_path() -> &'static str {
-	match ::std::fs::metadata("ethstore") {
-		Ok(_) => "ethstore/tests/res/pat",
-		Err(_) => "tests/res/pat",
-	}
-}
-
-fn ciphertext_path() -> &'static str {
-	match ::std::fs::metadata("ethstore") {
-		Ok(_) => "ethstore/tests/res/ciphertext",
-		Err(_) => "tests/res/ciphertext",
-	}
-}
-
-#[test]
-fn secret_store_laod_geth_files() {
-	let dir = RootDiskDirectory::at(test_path());
-	let store = EthStore::open(Box::new(dir)).unwrap();
-	assert_eq!(store.accounts().unwrap(), vec![
-		StoreAccountRef::root(Address::from_str("3f49624084b67849c7b4e805c5988c21a430f9d9").unwrap()),
-		StoreAccountRef::root(Address::from_str("5ba4dcf897e97c2bdf8315b9ef26c13c085988cf").unwrap()),
-		StoreAccountRef::root(Address::from_str("63121b431a52f8043c16fcf0d1df9cb7b5f66649").unwrap()),
-	]);
-}
-
-#[test]
-fn secret_store_load_pat_files() {
-	let dir = RootDiskDirectory::at(pat_path());
-	let store = EthStore::open(Box::new(dir)).unwrap();
-	assert_eq!(store.accounts().unwrap(), vec![
-		StoreAccountRef::root(Address::from_str("3f49624084b67849c7b4e805c5988c21a430f9d9").unwrap()),
-		StoreAccountRef::root(Address::from_str("5ba4dcf897e97c2bdf8315b9ef26c13c085988cf").unwrap()),
-	]);
-}
-
-#[test]
-fn test_decrypting_files_with_short_ciphertext() {
-	// 31e9d1e6d844bd3a536800ef8d8be6a9975db509, 30
-	let kp1 = KeyPair::from_secret("000081c29e8142bb6a81bef5a92bda7a8328a5c85bb2f9542e76f9b0f94fc018".parse().unwrap()).unwrap();
-	// d1e64e5480bfaf733ba7d48712decb8227797a4e , 31
-	let kp2 = KeyPair::from_secret("00fa7b3db73dc7dfdf8c5fbdb796d741e4488628c41fc4febd9160a866ba0f35".parse().unwrap()).unwrap();
-	let dir = RootDiskDirectory::at(ciphertext_path());
-	let store = EthStore::open(Box::new(dir)).unwrap();
-	let accounts = store.accounts().unwrap();
-	assert_eq!(accounts, vec![
-		StoreAccountRef::root(Address::from_str("31e9d1e6d844bd3a536800ef8d8be6a9975db509").unwrap()),
-		StoreAccountRef::root(Address::from_str("d1e64e5480bfaf733ba7d48712decb8227797a4e").unwrap()),
-	]);
-
-	let message = [1u8; 32].into();
-
-	let s1 = store.sign(&accounts[0], &"foo".into(), &message).unwrap();
-	let s2 = store.sign(&accounts[1], &"foo".into(), &message).unwrap();
-	assert!(verify_address(&accounts[0].address, &s1, &message).unwrap());
-	assert!(verify_address(&kp1.address(), &s1, &message).unwrap());
-	assert!(verify_address(&kp2.address(), &s2, &message).unwrap());
-}

accounts/ethstore/tests/util/transient_dir.rs

@@ -1,81 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::path::PathBuf;
-use std::{env, fs};
-use rand::{RngCore, rngs::OsRng};
-use ethstore::accounts_dir::{KeyDirectory, RootDiskDirectory};
-use ethstore::{Error, SafeAccount};
-
-pub fn random_dir() -> PathBuf {
-	let mut rng = OsRng;
-	let mut dir = env::temp_dir();
-	dir.push(format!("{:x}-{:x}", rng.next_u64(), rng.next_u64()));
-	dir
-}
-
-pub struct TransientDir {
-	dir: RootDiskDirectory,
-	path: PathBuf,
-}
-
-impl TransientDir {
-	pub fn create() -> Result<Self, Error> {
-		let path = random_dir();
-		let result = TransientDir {
-			dir: RootDiskDirectory::create(&path)?,
-			path: path,
-		};
-
-		Ok(result)
-	}
-
-	pub fn open() -> Self {
-		let path = random_dir();
-		TransientDir {
-			dir: RootDiskDirectory::at(&path),
-			path: path,
-		}
-	}
-}
-
-impl Drop for TransientDir {
-	fn drop(&mut self) {
-		fs::remove_dir_all(&self.path).expect("Expected to remove temp dir");
-	}
-}
-
-impl KeyDirectory for TransientDir {
-	fn load(&self) -> Result<Vec<SafeAccount>, Error> {
-		self.dir.load()
-	}
-
-	fn update(&self, account: SafeAccount) -> Result<SafeAccount, Error> {
-		self.dir.update(account)
-	}
-
-	fn insert(&self, account: SafeAccount) -> Result<SafeAccount, Error> {
-		self.dir.insert(account)
-	}
-
-	fn remove(&self, account: &SafeAccount) -> Result<(), Error> {
-		self.dir.remove(account)
-	}
-
-	fn unique_repr(&self) -> Result<u64, Error> {
-		self.dir.unique_repr()
-	}
-}

accounts/src/account_data.rs

@@ -1,73 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Account Metadata
-
-use std::{
-	collections::HashMap,
-	time::Instant,
-};
-
-use parity_crypto::publickey::Address;
-use ethkey::Password;
-use serde_derive::{Serialize, Deserialize};
-use serde_json;
-
-/// Type of unlock.
-#[derive(Clone, PartialEq)]
-pub enum Unlock {
-	/// If account is unlocked temporarily, it should be locked after first usage.
-	OneTime,
-	/// Account unlocked permanently can always sign message.
-	/// Use with caution.
-	Perm,
-	/// Account unlocked with a timeout
-	Timed(Instant),
-}
-
-/// Data associated with account.
-#[derive(Clone)]
-pub struct AccountData {
-	pub unlock: Unlock,
-	pub password: Password,
-}
-
-/// Collected account metadata
-#[derive(Default, Clone, Debug, PartialEq, Serialize, Deserialize)]
-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 AccountMeta {
-	/// Read a hash map of Address -> AccountMeta
-	pub fn read<R>(reader: R) -> Result<HashMap<Address, Self>, serde_json::Error> where
-		R: ::std::io::Read,
-	{
-		serde_json::from_reader(reader)
-	}
-
-	/// Write a hash map of Address -> AccountMeta
-	pub fn write<W>(m: &HashMap<Address, Self>, writer: &mut W) -> Result<(), serde_json::Error> where
-		W: ::std::io::Write,
-	{
-		serde_json::to_writer(writer, m)
-	}
-}

accounts/src/error.rs

@@ -1,46 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::fmt;
-
-use ethstore::{Error as SSError};
-
-/// Signing error
-#[derive(Debug)]
-pub enum SignError {
-	/// Account is not unlocked
-	NotUnlocked,
-	/// Account does not exist.
-	NotFound,
-	/// Low-level error from store
-	SStore(SSError),
-}
-
-impl fmt::Display for SignError {
-	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-		match *self {
-			SignError::NotUnlocked => write!(f, "Account is locked"),
-			SignError::NotFound => write!(f, "Account does not exist"),
-			SignError::SStore(ref e) => write!(f, "{}", e),
-		}
-	}
-}
-
-impl From<SSError> for SignError {
-	fn from(e: SSError) -> Self {
-		SignError::SStore(e)
-	}
-}

accounts/src/lib.rs

@@ -1,649 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-#![warn(missing_docs)]
-
-//! Account management.
-
-mod account_data;
-mod error;
-mod stores;
-
-use self::account_data::{Unlock, AccountData};
-use self::stores::AddressBook;
-
-use std::collections::HashMap;
-use std::time::{Instant, Duration};
-
-use ethkey::Password;
-use parity_crypto::publickey::{Address, Message, Public, Secret, Random, Generator, Signature};
-use ethstore::accounts_dir::MemoryDirectory;
-use ethstore::{
-	SimpleSecretStore, SecretStore, EthStore, EthMultiStore,
-	random_string, SecretVaultRef, StoreAccountRef, OpaqueSecret,
-};
-use log::warn;
-use parking_lot::RwLock;
-
-pub use ethstore::{Derivation, IndexDerivation, KeyFile, Error};
-
-pub use self::account_data::AccountMeta;
-pub use self::error::SignError;
-
-type AccountToken = Password;
-
-/// Account management settings.
-#[derive(Debug, Default)]
-pub struct AccountProviderSettings {
-	/// Store raw account secret when unlocking the account permanently.
-	pub unlock_keep_secret: bool,
-	/// Disallowed accounts.
-	pub blacklisted_accounts: Vec<Address>,
-}
-
-/// Account management.
-/// Responsible for unlocking accounts.
-pub struct AccountProvider {
-	/// For performance reasons some methods can re-use unlocked secrets.
-	unlocked_secrets: RwLock<HashMap<StoreAccountRef, OpaqueSecret>>,
-	/// Unlocked account data.
-	unlocked: RwLock<HashMap<StoreAccountRef, AccountData>>,
-	/// Address book.
-	address_book: RwLock<AddressBook>,
-	/// Accounts on disk
-	sstore: Box<dyn SecretStore>,
-	/// Accounts unlocked with rolling tokens
-	transient_sstore: EthMultiStore,
-	/// When unlocking account permanently we additionally keep a raw secret in memory
-	/// to increase the performance of transaction signing.
-	unlock_keep_secret: bool,
-	/// Disallowed accounts.
-	blacklisted_accounts: Vec<Address>,
-}
-
-fn transient_sstore() -> EthMultiStore {
-	EthMultiStore::open(Box::new(MemoryDirectory::default())).expect("MemoryDirectory load always succeeds; qed")
-}
-
-impl AccountProvider {
-	/// Creates new account provider.
-	pub fn new(sstore: Box<dyn SecretStore>, settings: AccountProviderSettings) -> Self {
-		if let Ok(accounts) = sstore.accounts() {
-			for account in accounts.into_iter().filter(|a| settings.blacklisted_accounts.contains(&a.address)) {
-				warn!("Local Account {} has a blacklisted (known to be weak) address and will be ignored",
-					account.address);
-			}
-		}
-
-		// Remove blacklisted accounts from address book.
-		let mut address_book = AddressBook::new(&sstore.local_path());
-		for addr in &settings.blacklisted_accounts {
-			address_book.remove(*addr);
-		}
-
-		AccountProvider {
-			unlocked_secrets: RwLock::new(HashMap::new()),
-			unlocked: RwLock::new(HashMap::new()),
-			address_book: RwLock::new(address_book),
-			sstore,
-			transient_sstore: transient_sstore(),
-			unlock_keep_secret: settings.unlock_keep_secret,
-			blacklisted_accounts: settings.blacklisted_accounts,
-		}
-	}
-
-	/// Creates not disk backed provider.
-	pub fn transient_provider() -> Self {
-		AccountProvider {
-			unlocked_secrets: RwLock::new(HashMap::new()),
-			unlocked: RwLock::new(HashMap::new()),
-			address_book: RwLock::new(AddressBook::transient()),
-			sstore: Box::new(EthStore::open(Box::new(MemoryDirectory::default())).expect("MemoryDirectory load always succeeds; qed")),
-			transient_sstore: transient_sstore(),
-			unlock_keep_secret: false,
-			blacklisted_accounts: vec![],
-		}
-	}
-
-	/// Creates new random account.
-	pub fn new_account(&self, password: &Password) -> 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: &Password) -> Result<(Address, Public), Error> {
-		let acc = Random.generate();
-		let public = acc.public().clone();
-		let secret = acc.secret().clone();
-		let account = self.sstore.insert_account(SecretVaultRef::Root, secret, password)?;
-		Ok((account.address, public))
-	}
-
-	/// Inserts new account into underlying store.
-	/// Does not unlock account!
-	pub fn insert_account(&self, secret: Secret, password: &Password) -> Result<Address, Error> {
-		let account = self.sstore.insert_account(SecretVaultRef::Root, secret, password)?;
-		if self.blacklisted_accounts.contains(&account.address) {
-			self.sstore.remove_account(&account, password)?;
-			return Err(Error::InvalidAccount.into());
-		}
-		Ok(account.address)
-	}
-
-	/// Generates new derived account based on the existing one
-	/// If password is not provided, account must be unlocked
-	/// New account will be created with the same password (if save: true)
-	pub fn derive_account(&self, address: &Address, password: Option<Password>, derivation: Derivation, save: bool)
-		-> Result<Address, SignError>
-	{
-		let account = self.sstore.account_ref(&address)?;
-		let password = password.map(Ok).unwrap_or_else(|| self.password(&account))?;
-		Ok(
-			if save { self.sstore.insert_derived(SecretVaultRef::Root, &account, &password, derivation)?.address }
-			else { self.sstore.generate_derived(&account, &password, derivation)? }
-		)
-	}
-
-	/// Import a new presale wallet.
-	pub fn import_presale(&self, presale_json: &[u8], password: &Password) -> Result<Address, Error> {
-		let account = self.sstore.import_presale(SecretVaultRef::Root, presale_json, password)?;
-		Ok(Address::from(account.address).into())
-	}
-
-	/// Import a new wallet.
-	pub fn import_wallet(&self, json: &[u8], password: &Password, gen_id: bool) -> Result<Address, Error> {
-		let account = self.sstore.import_wallet(SecretVaultRef::Root, json, password, gen_id)?;
-		if self.blacklisted_accounts.contains(&account.address) {
-			self.sstore.remove_account(&account, password)?;
-			return Err(Error::InvalidAccount.into());
-		}
-		Ok(Address::from(account.address).into())
-	}
-
-	/// Checks whether an account with a given address is present.
-	pub fn has_account(&self, address: Address) -> bool {
-		self.sstore.account_ref(&address).is_ok() && !self.blacklisted_accounts.contains(&address)
-	}
-
-	/// Returns addresses of all accounts.
-	pub fn accounts(&self) -> Result<Vec<Address>, Error> {
-		let accounts = self.sstore.accounts()?;
-		Ok(accounts
-			.into_iter()
-			.map(|a| a.address)
-			.filter(|address| !self.blacklisted_accounts.contains(address))
-			.collect()
-		)
-	}
-
-	/// Returns the address of default account.
-	pub fn default_account(&self) -> Result<Address, Error> {
-		Ok(self.accounts()?.first().cloned().unwrap_or_default())
-	}
-
-	/// Returns each address along with metadata.
-	pub fn addresses_info(&self) -> HashMap<Address, AccountMeta> {
-		self.address_book.read().get()
-	}
-
-	/// Returns each address along with metadata.
-	pub fn set_address_name(&self, account: Address, name: String) {
-		self.address_book.write().set_name(account, name)
-	}
-
-	/// Returns each address along with metadata.
-	pub fn set_address_meta(&self, account: Address, meta: String) {
-		self.address_book.write().set_meta(account, meta)
-	}
-
-	/// Removes and address from the address book
-	pub fn remove_address(&self, addr: Address) {
-		self.address_book.write().remove(addr)
-	}
-
-	/// Returns each account along with name and meta.
-	pub fn accounts_info(&self) -> Result<HashMap<Address, AccountMeta>, Error> {
-		let r = self.sstore.accounts()?
-			.into_iter()
-			.filter(|a| !self.blacklisted_accounts.contains(&a.address))
-			.map(|a| (a.address.clone(), self.account_meta(a.address).ok().unwrap_or_default()))
-			.collect();
-		Ok(r)
-	}
-
-	/// Returns each account along with name and meta.
-	pub fn account_meta(&self, address: Address) -> Result<AccountMeta, Error> {
-		let account = self.sstore.account_ref(&address)?;
-		Ok(AccountMeta {
-			name: self.sstore.name(&account)?,
-			meta: self.sstore.meta(&account)?,
-			uuid: self.sstore.uuid(&account).ok().map(Into::into),	// allowed to not have a Uuid
-		})
-	}
-
-	/// Returns account public key.
-	pub fn account_public(&self, address: Address, password: &Password) -> Result<Public, Error> {
-		self.sstore.public(&self.sstore.account_ref(&address)?, password)
-	}
-
-	/// Returns each account along with name and meta.
-	pub fn set_account_name(&self, address: Address, name: String) -> Result<(), Error> {
-		self.sstore.set_name(&self.sstore.account_ref(&address)?, name)?;
-		Ok(())
-	}
-
-	/// Returns each account along with name and meta.
-	pub fn set_account_meta(&self, address: Address, meta: String) -> Result<(), Error> {
-		self.sstore.set_meta(&self.sstore.account_ref(&address)?, meta)?;
-		Ok(())
-	}
-
-	/// Returns `true` if the password for `account` is `password`. `false` if not.
-	pub fn test_password(&self, address: &Address, password: &Password) -> Result<bool, Error> {
-		self.sstore.test_password(&self.sstore.account_ref(&address)?, password)
-			.map_err(Into::into)
-	}
-
-	/// Permanently removes an account.
-	pub fn kill_account(&self, address: &Address, password: &Password) -> Result<(), Error> {
-		self.sstore.remove_account(&self.sstore.account_ref(&address)?, &password)?;
-		Ok(())
-	}
-
-	/// Changes the password of `account` from `password` to `new_password`. Fails if incorrect `password` given.
-	pub fn change_password(&self, address: &Address, password: Password, new_password: Password) -> Result<(), Error> {
-		self.sstore.change_password(&self.sstore.account_ref(address)?, &password, &new_password)
-	}
-
-	/// Exports an account for given address.
-	pub fn export_account(&self, address: &Address, password: Password) -> Result<KeyFile, Error> {
-		self.sstore.export_account(&self.sstore.account_ref(address)?, &password)
-	}
-
-	/// Helper method used for unlocking accounts.
-	fn unlock_account(&self, address: Address, password: Password, unlock: Unlock) -> Result<(), Error> {
-		let account = self.sstore.account_ref(&address)?;
-
-		// check if account is already unlocked permanently, if it is, do nothing
-		let mut unlocked = self.unlocked.write();
-		if let Some(data) = unlocked.get(&account) {
-			if let Unlock::Perm = data.unlock {
-				return Ok(())
-			}
-		}
-
-		if self.unlock_keep_secret && unlock == Unlock::Perm {
-			// verify password and get the secret
-			let secret = self.sstore.raw_secret(&account, &password)?;
-			self.unlocked_secrets.write().insert(account.clone(), secret);
-		} else {
-			// verify password by signing a dummy message
-			// result may be discarded
-			let dummy_msg = [1u8;32].into();
-			let _ = self.sstore.sign(&account, &password, &dummy_msg)?;
-		}
-
-		let data = AccountData { unlock, password };
-
-		unlocked.insert(account, data);
-		Ok(())
-	}
-
-	fn password(&self, account: &StoreAccountRef) -> Result<Password, SignError> {
-		let mut unlocked = self.unlocked.write();
-		let data = unlocked.get(account).ok_or(SignError::NotUnlocked)?.clone();
-		if let Unlock::OneTime = 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(SignError::NotUnlocked);
-			}
-		}
-		Ok(data.password)
-	}
-
-	/// Unlocks account permanently.
-	pub fn unlock_account_permanently(&self, account: Address, password: Password) -> Result<(), Error> {
-		self.unlock_account(account, password, Unlock::Perm)
-	}
-
-	/// Unlocks account temporarily (for one signing).
-	pub fn unlock_account_temporarily(&self, account: Address, password: Password) -> Result<(), Error> {
-		self.unlock_account(account, password, Unlock::OneTime)
-	}
-
-	/// Unlocks account temporarily with a timeout.
-	pub fn unlock_account_timed(&self, account: Address, password: Password, duration: Duration) -> Result<(), Error> {
-		self.unlock_account(account, password, Unlock::Timed(Instant::now() + duration))
-	}
-
-	/// Checks if given account is unlocked
-	pub fn is_unlocked(&self, address: &Address) -> bool {
-		let unlocked = self.unlocked.read();
-		let unlocked_secrets = self.unlocked_secrets.read();
-		self.sstore.account_ref(address)
-			.map(|r| unlocked.get(&r).is_some() || unlocked_secrets.get(&r).is_some())
-			.unwrap_or(false)
-	}
-
-	/// Checks if given account is unlocked permanently
-	pub fn is_unlocked_permanently(&self, address: &Address) -> bool {
-		let unlocked = self.unlocked.read();
-		self.sstore.account_ref(address)
-			.map(|r| unlocked.get(&r).map_or(false, |account| account.unlock == Unlock::Perm))
-			.unwrap_or(false)
-	}
-
-	/// Signs the message. If password is not provided the account must be unlocked.
-	pub fn sign(&self, address: Address, password: Option<Password>, message: Message) -> Result<Signature, SignError> {
-		let account = self.sstore.account_ref(&address)?;
-		match self.unlocked_secrets.read().get(&account) {
-			Some(secret) => {
-				Ok(self.sstore.sign_with_secret(&secret, &message)?)
-			},
-			None => {
-				let password = password.map(Ok).unwrap_or_else(|| self.password(&account))?;
-				Ok(self.sstore.sign(&account, &password, &message)?)
-			}
-		}
-	}
-
-	/// Signs message using the derived secret. If password is not provided the account must be unlocked.
-	pub fn sign_derived(&self, address: &Address, password: Option<Password>, derivation: Derivation, message: Message)
-		-> Result<Signature, SignError>
-	{
-		let account = self.sstore.account_ref(address)?;
-		let password = password.map(Ok).unwrap_or_else(|| self.password(&account))?;
-		Ok(self.sstore.sign_derived(&account, &password, derivation, &message)?)
-	}
-
-	/// Signs given message with supplied token. Returns a token to use in next signing within this session.
-	pub fn sign_with_token(&self, address: Address, token: AccountToken, message: Message) -> Result<(Signature, AccountToken), SignError> {
-		let account = self.sstore.account_ref(&address)?;
-		let is_std_password = self.sstore.test_password(&account, &token)?;
-
-		let new_token = Password::from(random_string(16));
-		let signature = if is_std_password {
-			// Insert to transient store
-			self.sstore.copy_account(&self.transient_sstore, SecretVaultRef::Root, &account, &token, &new_token)?;
-			// sign
-			self.sstore.sign(&account, &token, &message)?
-		} else {
-			// check transient store
-			self.transient_sstore.change_password(&account, &token, &new_token)?;
-			// and sign
-			self.transient_sstore.sign(&account, &new_token, &message)?
-		};
-
-		Ok((signature, new_token))
-	}
-
-	/// Decrypts a message with given token. Returns a token to use in next operation for this account.
-	pub fn decrypt_with_token(&self, address: Address, token: AccountToken, shared_mac: &[u8], message: &[u8])
-		-> Result<(Vec<u8>, AccountToken), SignError>
-	{
-		let account = self.sstore.account_ref(&address)?;
-		let is_std_password = self.sstore.test_password(&account, &token)?;
-
-		let new_token = Password::from(random_string(16));
-		let message = if is_std_password {
-			// Insert to transient store
-			self.sstore.copy_account(&self.transient_sstore, SecretVaultRef::Root, &account, &token, &new_token)?;
-			// decrypt
-			self.sstore.decrypt(&account, &token, shared_mac, message)?
-		} else {
-			// check transient store
-			self.transient_sstore.change_password(&account, &token, &new_token)?;
-			// and decrypt
-			self.transient_sstore.decrypt(&account, &token, shared_mac, message)?
-		};
-
-		Ok((message, new_token))
-	}
-
-	/// Decrypts a message. If password is not provided the account must be unlocked.
-	pub fn decrypt(&self, address: Address, password: Option<Password>, shared_mac: &[u8], message: &[u8]) -> Result<Vec<u8>, SignError> {
-		let account = self.sstore.account_ref(&address)?;
-		let password = password.map(Ok).unwrap_or_else(|| self.password(&account))?;
-		Ok(self.sstore.decrypt(&account, &password, shared_mac, message)?)
-	}
-
-	/// Agree on shared key.
-	pub fn agree(&self, address: Address, password: Option<Password>, other_public: &Public) -> Result<Secret, SignError> {
-		let account = self.sstore.account_ref(&address)?;
-		let password = password.map(Ok).unwrap_or_else(|| self.password(&account))?;
-		Ok(self.sstore.agree(&account, &password, other_public)?)
-	}
-
-	/// 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(SecretVaultRef::Root, desired, testnet)
-			.map(|a| a.into_iter().map(|a| a.address).collect())
-			.map_err(Into::into)
-	}
-
-	/// Create new vault.
-	pub fn create_vault(&self, name: &str, password: &Password) -> Result<(), Error> {
-		self.sstore.create_vault(name, password)
-			.map_err(Into::into)
-	}
-
-	/// Open existing vault.
-	pub fn open_vault(&self, name: &str, password: &Password) -> Result<(), Error> {
-		self.sstore.open_vault(name, password)
-			.map_err(Into::into)
-	}
-
-	/// Close previously opened vault.
-	pub fn close_vault(&self, name: &str) -> Result<(), Error> {
-		self.sstore.close_vault(name)
-			.map_err(Into::into)
-	}
-
-	/// List all vaults
-	pub fn list_vaults(&self) -> Result<Vec<String>, Error> {
-		self.sstore.list_vaults()
-			.map_err(Into::into)
-	}
-
-	/// List all currently opened vaults
-	pub fn list_opened_vaults(&self) -> Result<Vec<String>, Error> {
-		self.sstore.list_opened_vaults()
-			.map_err(Into::into)
-	}
-
-	/// Change vault password.
-	pub fn change_vault_password(&self, name: &str, new_password: &Password) -> Result<(), Error> {
-		self.sstore.change_vault_password(name, new_password)
-			.map_err(Into::into)
-	}
-
-	/// Change vault of the given address.
-	pub fn change_vault(&self, address: Address, new_vault: &str) -> Result<(), Error> {
-		let new_vault_ref = if new_vault.is_empty() { SecretVaultRef::Root } else { SecretVaultRef::Vault(new_vault.to_owned()) };
-		let old_account_ref = self.sstore.account_ref(&address)?;
-		self.sstore.change_account_vault(new_vault_ref, old_account_ref)
-			.map_err(Into::into)
-			.map(|_| ())
-	}
-
-	/// Get vault metadata string.
-	pub fn get_vault_meta(&self, name: &str) -> Result<String, Error> {
-		self.sstore.get_vault_meta(name)
-			.map_err(Into::into)
-	}
-
-	/// Set vault metadata string.
-	pub fn set_vault_meta(&self, name: &str, meta: &str) -> Result<(), Error> {
-		self.sstore.set_vault_meta(name, meta)
-			.map_err(Into::into)
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use super::{AccountProvider, Unlock};
-	use std::time::{Duration, Instant};
-	use parity_crypto::publickey::{Generator, Random, Address};
-	use ethstore::{StoreAccountRef, Derivation};
-	use ethereum_types::H256;
-
-	#[test]
-	fn unlock_account_temp() {
-		let kp = Random.generate();
-		let ap = AccountProvider::transient_provider();
-		let dummy_msg = [1u8; 32].into();
-		assert!(ap.insert_account(kp.secret().clone(), &"test".into()).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, dummy_msg).is_ok());
-		assert!(ap.sign(kp.address(), None, dummy_msg).is_err());
-	}
-
-	#[test]
-	fn derived_account_nosave() {
-		let kp = Random.generate();
-		let ap = AccountProvider::transient_provider();
-		assert!(ap.insert_account(kp.secret().clone(), &"base".into()).is_ok());
-		assert!(ap.unlock_account_permanently(kp.address(), "base".into()).is_ok());
-
-		let derived_addr = ap.derive_account(
-			&kp.address(),
-			None,
-			Derivation::SoftHash(H256::from_low_u64_be(999)),
-			false,
-		).expect("Derivation should not fail");
-
-		assert!(ap.unlock_account_permanently(derived_addr, "base".into()).is_err(),
-			"There should be an error because account is not supposed to be saved");
-	}
-
-	#[test]
-	fn derived_account_save() {
-		let kp = Random.generate();
-		let ap = AccountProvider::transient_provider();
-		assert!(ap.insert_account(kp.secret().clone(), &"base".into()).is_ok());
-		assert!(ap.unlock_account_permanently(kp.address(), "base".into()).is_ok());
-
-		let derived_addr = ap.derive_account(
-			&kp.address(),
-			None,
-			Derivation::SoftHash(H256::from_low_u64_be(999)),
-			true,
-		).expect("Derivation should not fail");
-
-		assert!(ap.unlock_account_permanently(derived_addr, "base_wrong".into()).is_err(),
-			"There should be an error because password is invalid");
-
-		assert!(ap.unlock_account_permanently(derived_addr, "base".into()).is_ok(),
-			"Should be ok because account is saved and password is valid");
-	}
-
-	#[test]
-	fn derived_account_sign() {
-		let kp = Random.generate();
-		let ap = AccountProvider::transient_provider();
-		assert!(ap.insert_account(kp.secret().clone(), &"base".into()).is_ok());
-		assert!(ap.unlock_account_permanently(kp.address(), "base".into()).is_ok());
-
-		let derived_addr = ap.derive_account(
-			&kp.address(),
-			None,
-			Derivation::SoftHash(H256::from_low_u64_be(1999)),
-			true,
-		).expect("Derivation should not fail");
-		ap.unlock_account_permanently(derived_addr, "base".into())
-			.expect("Should be ok because account is saved and password is valid");
-
-		let msg = [2u8; 32].into();
-		let signed_msg1 = ap.sign(derived_addr, None, msg)
-			.expect("Signing with existing unlocked account should not fail");
-		let signed_msg2 = ap.sign_derived(
-			&kp.address(),
-			None,
-			Derivation::SoftHash(H256::from_low_u64_be(1999)),
-			msg,
-		).expect("Derived signing with existing unlocked account should not fail");
-
-		assert_eq!(signed_msg1, signed_msg2,
-			"Signed messages should match");
-	}
-
-	#[test]
-	fn unlock_account_perm() {
-		let kp = Random.generate();
-		let ap = AccountProvider::transient_provider();
-		let dummy_msg = [1u8; 32].into();
-		assert!(ap.insert_account(kp.secret().clone(), &"test".into()).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, dummy_msg).is_ok());
-		assert!(ap.sign(kp.address(), None, dummy_msg).is_ok());
-		assert!(ap.unlock_account_temporarily(kp.address(), "test".into()).is_ok());
-		assert!(ap.sign(kp.address(), None, dummy_msg).is_ok());
-		assert!(ap.sign(kp.address(), None, dummy_msg).is_ok());
-	}
-
-	#[test]
-	fn unlock_account_timer() {
-		let kp = Random.generate();
-		let ap = AccountProvider::transient_provider();
-		let dummy_msg = [1u8; 32].into();
-
-		assert!(ap.insert_account(kp.secret().clone(), &"test".into()).is_ok());
-		assert!(ap.unlock_account_timed(kp.address(), "test1".into(), Duration::from_secs(60)).is_err());
-		assert!(ap.unlock_account_timed(kp.address(), "test".into(), Duration::from_secs(60)).is_ok());
-		assert!(ap.sign(kp.address(), None, dummy_msg).is_ok());
-		ap.unlocked.write().get_mut(&StoreAccountRef::root(kp.address())).unwrap().unlock = Unlock::Timed(Instant::now());
-		assert!(ap.sign(kp.address(), None, dummy_msg).is_err());
-	}
-
-	#[test]
-	fn should_sign_and_return_token() {
-		// given
-		let kp = Random.generate();
-		let ap = AccountProvider::transient_provider();
-		let dummy_msg = [1u8; 32].into();
-		assert!(ap.insert_account(kp.secret().clone(), &"test".into()).is_ok());
-
-		// when
-		let (_signature, token) = ap.sign_with_token(kp.address(), "test".into(), dummy_msg).unwrap();
-
-		// then
-		ap.sign_with_token(kp.address(), token.clone(), dummy_msg)
-			.expect("First usage of token should be correct.");
-		assert!(ap.sign_with_token(kp.address(), token, dummy_msg).is_err(), "Second usage of the same token should fail.");
-	}
-
-	#[test]
-	fn should_not_return_blacklisted_account() {
-		// given
-		let mut ap = AccountProvider::transient_provider();
-		let acc = ap.new_account(&"test".into()).unwrap();
-		ap.blacklisted_accounts = vec![acc];
-
-		// then
-		assert_eq!(ap.accounts_info().unwrap().keys().cloned().collect::<Vec<Address>>(), vec![]);
-		assert_eq!(ap.accounts().unwrap(), vec![]);
-	}
-}

accounts/src/stores.rs

@@ -1,189 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum 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.
-
-// Open Ethereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Address Book Store
-
-use std::{fs, fmt, hash, ops};
-use std::collections::HashMap;
-use std::path::{Path, PathBuf};
-
-use parity_crypto::publickey::Address;
-use log::{trace, warn};
-
-use crate::AccountMeta;
-
-/// Disk-backed map from Address to String. Uses JSON.
-pub struct AddressBook {
-	cache: DiskMap<Address, AccountMeta>,
-}
-
-impl AddressBook {
-	/// Creates new address book at given directory.
-	pub fn new(path: &Path) -> Self {
-		let mut r = AddressBook {
-			cache: DiskMap::new(path, "address_book.json")
-		};
-		r.cache.revert(AccountMeta::read);
-		r
-	}
-
-	/// Creates transient address book (no changes are saved to disk).
-	pub fn transient() -> Self {
-		AddressBook {
-			cache: DiskMap::transient()
-		}
-	}
-
-	/// Get the address book.
-	pub fn get(&self) -> HashMap<Address, AccountMeta> {
-		self.cache.clone()
-	}
-
-	fn save(&self) {
-		self.cache.save(AccountMeta::write)
-	}
-
-	/// Sets new name for given address.
-	pub fn set_name(&mut self, a: Address, name: String) {
-		{
-			let x = self.cache.entry(a)
-				.or_insert_with(|| AccountMeta {name: Default::default(), meta: "{}".to_owned(), uuid: None});
-			x.name = name;
-		}
-		self.save();
-	}
-
-	/// Sets new meta for given address.
-	pub fn set_meta(&mut self, a: Address, meta: String) {
-		{
-			let x = self.cache.entry(a)
-				.or_insert_with(|| AccountMeta {name: "Anonymous".to_owned(), meta: Default::default(), uuid: None});
-			x.meta = meta;
-		}
-		self.save();
-	}
-
-	/// Removes an entry
-	pub fn remove(&mut self, a: Address) {
-		self.cache.remove(&a);
-		self.save();
-	}
-}
-
-/// Disk-serializable HashMap
-#[derive(Debug)]
-struct DiskMap<K: hash::Hash + Eq, V> {
-	path: PathBuf,
-	cache: HashMap<K, V>,
-	transient: bool,
-}
-
-impl<K: hash::Hash + Eq, V> ops::Deref for DiskMap<K, V> {
-	type Target = HashMap<K, V>;
-	fn deref(&self) -> &Self::Target {
-		&self.cache
-	}
-}
-
-impl<K: hash::Hash + Eq, V> ops::DerefMut for DiskMap<K, V> {
-	fn deref_mut(&mut self) -> &mut Self::Target {
-		&mut self.cache
-	}
-}
-
-impl<K: hash::Hash + Eq, V> DiskMap<K, V> {
-	pub fn new(path: &Path, file_name: &str) -> Self {
-		let mut path = path.to_owned();
-		path.push(file_name);
-		trace!(target: "diskmap", "path={:?}", path);
-		DiskMap {
-			path: path,
-			cache: HashMap::new(),
-			transient: false,
-		}
-	}
-
-	pub fn transient() -> Self {
-		let mut map = DiskMap::new(&PathBuf::new(), "diskmap.json".into());
-		map.transient = true;
-		map
-	}
-
-	fn revert<F, E>(&mut self, read: F) where
-		F: Fn(fs::File) -> Result<HashMap<K, V>, E>,
-		E: fmt::Display,
-	{
-		if self.transient { return; }
-		trace!(target: "diskmap", "revert {:?}", self.path);
-		let _ = fs::File::open(self.path.clone())
-			.map_err(|e| trace!(target: "diskmap", "Couldn't open disk map: {}", e))
-			.and_then(|f| read(f).map_err(|e| warn!(target: "diskmap", "Couldn't read disk map at: {:?} {}", self.path, e)))
-			.and_then(|m| {
-				self.cache = m;
-				Ok(())
-			});
-	}
-
-	fn save<F, E>(&self, write: F) where
-		F: Fn(&HashMap<K, V>, &mut fs::File) -> Result<(), E>,
-		E: fmt::Display,
-	{
-		if self.transient { return; }
-		trace!(target: "diskmap", "save {:?}", self.path);
-		let _ = fs::File::create(self.path.clone())
-			.map_err(|e| warn!(target: "diskmap", "Couldn't open disk map for writing at: {:?} {}", self.path, e))
-			.and_then(|mut f| {
-				write(&self.cache, &mut f).map_err(|e| warn!(target: "diskmap", "Couldn't write to disk map at: {:?} {}", self.path, e))
-			});
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use super::{AddressBook, Address};
-	use std::collections::HashMap;
-	use tempfile::TempDir;
-	use crate::account_data::AccountMeta;
-
-	#[test]
-	fn should_save_and_reload_address_book() {
-		let tempdir = TempDir::new().unwrap();
-		let mut b = AddressBook::new(tempdir.path());
-		b.set_name(Address::from_low_u64_be(1), "One".to_owned());
-		b.set_meta(Address::from_low_u64_be(1), "{1:1}".to_owned());
-		let b = AddressBook::new(tempdir.path());
-		assert_eq!(b.get(), vec![
-		   (Address::from_low_u64_be(1), AccountMeta {name: "One".to_owned(), meta: "{1:1}".to_owned(), uuid: None})
-		].into_iter().collect::<HashMap<_, _>>());
-	}
-
-	#[test]
-	fn should_remove_address() {
-		let tempdir = TempDir::new().unwrap();
-		let mut b = AddressBook::new(tempdir.path());
-
-		b.set_name(Address::from_low_u64_be(1), "One".to_owned());
-		b.set_name(Address::from_low_u64_be(2), "Two".to_owned());
-		b.set_name(Address::from_low_u64_be(3), "Three".to_owned());
-		b.remove(Address::from_low_u64_be(2).into());
-
-		let b = AddressBook::new(tempdir.path());
-		assert_eq!(b.get(), vec![
-			(Address::from_low_u64_be(1), AccountMeta{name: "One".to_owned(), meta: "{}".to_owned(), uuid: None}),
-			(Address::from_low_u64_be(3), AccountMeta{name: "Three".to_owned(), meta: "{}".to_owned(), uuid: None}),
-		].into_iter().collect::<HashMap<_, _>>());
-	}
-}

bin/chainspec/Cargo.toml

@@ -1,9 +1,9 @@
 [package]
-description = "OpenEthereum Chain Specification"
+description = "Parity Ethereum Chain Specification"
 name = "chainspec"
 version = "0.1.0"
 authors = ["Marek Kotewicz <marek@parity.io>"]
 
 [dependencies]
-ethjson = { path = "../json" }
+ethjson = { path = "../../crates/ethjson" }
 serde_json = "1.0"

bin/chainspec/src/main.rs

@@ -0,0 +1,51 @@
+// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// This file is part of OpenEthereum.
+
+// OpenEthereum 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.
+
+// OpenEthereum 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 OpenEthereum.  If not, see <http://www.gnu.org/licenses/>.
+
+extern crate ethjson;
+extern crate serde_json;
+
+use ethjson::spec::Spec;
+use std::{env, fs, process};
+
+fn quit(s: &str) -> ! {
+    println!("{}", s);
+    process::exit(1);
+}
+
+fn main() {
+    let mut args = env::args();
+    if args.len() != 2 {
+        quit(
+            "You need to specify chainspec.json\n\
+		\n\
+		./chainspec <chainspec.json>",
+        );
+    }
+
+    let path = args.nth(1).expect("args.len() == 2; qed");
+    let file = match fs::File::open(&path) {
+        Ok(file) => file,
+        Err(_) => quit(&format!("{} could not be opened", path)),
+    };
+
+    let spec: Result<Spec, _> = serde_json::from_reader(file);
+
+    if let Err(err) = spec {
+        quit(&format!("{} {}", path, err.to_string()));
+    }
+
+    println!("{} is valid", path);
+}

bin/ethkey/Cargo.toml

@@ -0,0 +1,22 @@
+[package]
+description = "Parity Ethereum Keys Generator CLI"
+name = "ethkey-cli"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[dependencies]
+docopt = "1.0"
+env_logger = "0.5"
+ethkey = { path = "../../crates/accounts/ethkey" }
+panic_hook = { path = "../../crates/util/panic-hook" }
+parity-crypto = { version = "0.6.2", features = [ "publickey" ] }
+parity-wordlist="1.3"
+rustc-hex = "1.0"
+serde = "1.0"
+serde_derive = "1.0"
+threadpool = "1.7"
+
+[[bin]]
+name = "ethkey"
+path = "src/main.rs"
+doc = false

bin/ethkey/src/main.rs

@@ -0,0 +1,493 @@
+// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// This file is part of OpenEthereum.
+
+// OpenEthereum 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.
+
+// OpenEthereum 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 OpenEthereum.  If not, see <http://www.gnu.org/licenses/>.
+
+extern crate docopt;
+extern crate env_logger;
+extern crate ethkey;
+extern crate panic_hook;
+extern crate parity_crypto as crypto;
+extern crate parity_wordlist;
+extern crate rustc_hex;
+extern crate serde;
+extern crate threadpool;
+
+#[macro_use]
+extern crate serde_derive;
+
+use std::{env, fmt, io, num::ParseIntError, process, sync};
+
+use crypto::publickey::{
+    sign, verify_address, verify_public, Error as EthkeyError, Generator, KeyPair, Random,
+};
+use docopt::Docopt;
+use ethkey::{brain_recover, Brain, BrainPrefix, Prefix};
+use rustc_hex::{FromHex, FromHexError};
+
+const USAGE: &'static str = r#"
+Parity Ethereum keys generator.
+  Copyright 2015-2019 Parity Technologies (UK) Ltd.
+
+Usage:
+    ethkey info <secret-or-phrase> [options]
+    ethkey generate random [options]
+    ethkey generate prefix <prefix> [options]
+    ethkey sign <secret> <message>
+    ethkey verify public <public> <signature> <message>
+    ethkey verify address <address> <signature> <message>
+    ethkey recover <address> <known-phrase>
+    ethkey [-h | --help]
+
+Options:
+    -h, --help         Display this message and exit.
+    -s, --secret       Display only the secret key.
+    -p, --public       Display only the public key.
+    -a, --address      Display only the address.
+    -b, --brain        Use parity brain wallet algorithm. Not recommended.
+
+Commands:
+    info               Display public key and address of the secret.
+    generate random    Generates new random Ethereum key.
+    generate prefix    Random generation, but address must start with a prefix ("vanity address").
+    sign               Sign message using a secret key.
+    verify             Verify signer of the signature by public key or address.
+    recover            Try to find brain phrase matching given address from partial phrase.
+"#;
+
+#[derive(Debug, Deserialize)]
+struct Args {
+    cmd_info: bool,
+    cmd_generate: bool,
+    cmd_random: bool,
+    cmd_prefix: bool,
+    cmd_sign: bool,
+    cmd_verify: bool,
+    cmd_public: bool,
+    cmd_address: bool,
+    cmd_recover: bool,
+    arg_prefix: String,
+    arg_secret: String,
+    arg_secret_or_phrase: String,
+    arg_known_phrase: String,
+    arg_message: String,
+    arg_public: String,
+    arg_address: String,
+    arg_signature: String,
+    flag_secret: bool,
+    flag_public: bool,
+    flag_address: bool,
+    flag_brain: bool,
+}
+
+#[derive(Debug)]
+enum Error {
+    Ethkey(EthkeyError),
+    FromHex(FromHexError),
+    ParseInt(ParseIntError),
+    Docopt(docopt::Error),
+    Io(io::Error),
+}
+
+impl From<EthkeyError> for Error {
+    fn from(err: EthkeyError) -> Self {
+        Error::Ethkey(err)
+    }
+}
+
+impl From<FromHexError> for Error {
+    fn from(err: FromHexError) -> Self {
+        Error::FromHex(err)
+    }
+}
+
+impl From<ParseIntError> for Error {
+    fn from(err: ParseIntError) -> Self {
+        Error::ParseInt(err)
+    }
+}
+
+impl From<docopt::Error> for Error {
+    fn from(err: docopt::Error) -> Self {
+        Error::Docopt(err)
+    }
+}
+
+impl From<io::Error> for Error {
+    fn from(err: io::Error) -> Self {
+        Error::Io(err)
+    }
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+        match *self {
+            Error::Ethkey(ref e) => write!(f, "{}", e),
+            Error::FromHex(ref e) => write!(f, "{}", e),
+            Error::ParseInt(ref e) => write!(f, "{}", e),
+            Error::Docopt(ref e) => write!(f, "{}", e),
+            Error::Io(ref e) => write!(f, "{}", e),
+        }
+    }
+}
+
+enum DisplayMode {
+    KeyPair,
+    Secret,
+    Public,
+    Address,
+}
+
+impl DisplayMode {
+    fn new(args: &Args) -> Self {
+        if args.flag_secret {
+            DisplayMode::Secret
+        } else if args.flag_public {
+            DisplayMode::Public
+        } else if args.flag_address {
+            DisplayMode::Address
+        } else {
+            DisplayMode::KeyPair
+        }
+    }
+}
+
+fn main() {
+    panic_hook::set_abort();
+    env_logger::try_init().expect("Logger initialized only once.");
+
+    match execute(env::args()) {
+        Ok(ok) => println!("{}", ok),
+        Err(Error::Docopt(ref e)) => e.exit(),
+        Err(err) => {
+            eprintln!("{}", err);
+            process::exit(1);
+        }
+    }
+}
+
+fn display(result: (KeyPair, Option<String>), mode: DisplayMode) -> String {
+    let keypair = result.0;
+    match mode {
+        DisplayMode::KeyPair => match result.1 {
+            Some(extra_data) => format!("{}\n{}", extra_data, keypair),
+            None => format!("{}", keypair),
+        },
+        DisplayMode::Secret => format!("{:x}", keypair.secret()),
+        DisplayMode::Public => format!("{:x}", keypair.public()),
+        DisplayMode::Address => format!("{:x}", keypair.address()),
+    }
+}
+
+fn execute<S, I>(command: I) -> Result<String, Error>
+where
+    I: IntoIterator<Item = S>,
+    S: AsRef<str>,
+{
+    let args: Args = Docopt::new(USAGE).and_then(|d| d.argv(command).deserialize())?;
+
+    return if args.cmd_info {
+        let display_mode = DisplayMode::new(&args);
+
+        let result = if args.flag_brain {
+            let phrase = args.arg_secret_or_phrase;
+            let phrase_info = validate_phrase(&phrase);
+            let keypair = Brain::new(phrase).generate();
+            (keypair, Some(phrase_info))
+        } else {
+            let secret = args
+                .arg_secret_or_phrase
+                .parse()
+                .map_err(|_| EthkeyError::InvalidSecretKey)?;
+            (KeyPair::from_secret(secret)?, None)
+        };
+        Ok(display(result, display_mode))
+    } else if args.cmd_generate {
+        let display_mode = DisplayMode::new(&args);
+        let result = if args.cmd_random {
+            if args.flag_brain {
+                let mut brain = BrainPrefix::new(vec![0], usize::max_value(), BRAIN_WORDS);
+                let keypair = brain.generate()?;
+                let phrase = format!("recovery phrase: {}", brain.phrase());
+                (keypair, Some(phrase))
+            } else {
+                (Random.generate(), None)
+            }
+        } else if args.cmd_prefix {
+            let prefix = args.arg_prefix.from_hex()?;
+            let brain = args.flag_brain;
+            in_threads(move || {
+                let iterations = 1024;
+                let prefix = prefix.clone();
+                move || {
+                    let prefix = prefix.clone();
+                    let res = if brain {
+                        let mut brain = BrainPrefix::new(prefix, iterations, BRAIN_WORDS);
+                        let result = brain.generate();
+                        let phrase = format!("recovery phrase: {}", brain.phrase());
+                        result.map(|keypair| (keypair, Some(phrase)))
+                    } else {
+                        let result = Prefix::new(prefix, iterations).generate();
+                        result.map(|res| (res, None))
+                    };
+
+                    Ok(res.map(Some).unwrap_or(None))
+                }
+            })?
+        } else {
+            return Ok(format!("{}", USAGE));
+        };
+        Ok(display(result, display_mode))
+    } else if args.cmd_sign {
+        let secret = args
+            .arg_secret
+            .parse()
+            .map_err(|_| EthkeyError::InvalidSecretKey)?;
+        let message = args
+            .arg_message
+            .parse()
+            .map_err(|_| EthkeyError::InvalidMessage)?;
+        let signature = sign(&secret, &message)?;
+        Ok(format!("{}", signature))
+    } else if args.cmd_verify {
+        let signature = args
+            .arg_signature
+            .parse()
+            .map_err(|_| EthkeyError::InvalidSignature)?;
+        let message = args
+            .arg_message
+            .parse()
+            .map_err(|_| EthkeyError::InvalidMessage)?;
+        let ok = if args.cmd_public {
+            let public = args
+                .arg_public
+                .parse()
+                .map_err(|_| EthkeyError::InvalidPublicKey)?;
+            verify_public(&public, &signature, &message)?
+        } else if args.cmd_address {
+            let address = args
+                .arg_address
+                .parse()
+                .map_err(|_| EthkeyError::InvalidAddress)?;
+            verify_address(&address, &signature, &message)?
+        } else {
+            return Ok(format!("{}", USAGE));
+        };
+        Ok(format!("{}", ok))
+    } else if args.cmd_recover {
+        let display_mode = DisplayMode::new(&args);
+        let known_phrase = args.arg_known_phrase;
+        let address = args
+            .arg_address
+            .parse()
+            .map_err(|_| EthkeyError::InvalidAddress)?;
+        let (phrase, keypair) = in_threads(move || {
+            let mut it =
+                brain_recover::PhrasesIterator::from_known_phrase(&known_phrase, BRAIN_WORDS);
+            move || {
+                let mut i = 0;
+                while let Some(phrase) = it.next() {
+                    i += 1;
+
+                    let keypair = Brain::new(phrase.clone()).generate();
+                    if keypair.address() == address {
+                        return Ok(Some((phrase, keypair)));
+                    }
+
+                    if i >= 1024 {
+                        return Ok(None);
+                    }
+                }
+
+                Err(EthkeyError::Custom("Couldn't find any results.".into()))
+            }
+        })?;
+        Ok(display((keypair, Some(phrase)), display_mode))
+    } else {
+        Ok(format!("{}", USAGE))
+    };
+}
+
+const BRAIN_WORDS: usize = 12;
+
+fn validate_phrase(phrase: &str) -> String {
+    match Brain::validate_phrase(phrase, BRAIN_WORDS) {
+        Ok(()) => format!("The recovery phrase looks correct.\n"),
+        Err(err) => format!("The recover phrase was not generated by Parity: {}", err),
+    }
+}
+
+fn in_threads<F, X, O>(prepare: F) -> Result<O, EthkeyError>
+where
+    O: Send + 'static,
+    X: Send + 'static,
+    F: Fn() -> X,
+    X: FnMut() -> Result<Option<O>, EthkeyError>,
+{
+    let pool = threadpool::Builder::new().build();
+
+    let (tx, rx) = sync::mpsc::sync_channel(1);
+    let is_done = sync::Arc::new(sync::atomic::AtomicBool::default());
+
+    for _ in 0..pool.max_count() {
+        let is_done = is_done.clone();
+        let tx = tx.clone();
+        let mut task = prepare();
+        pool.execute(move || {
+            loop {
+                if is_done.load(sync::atomic::Ordering::SeqCst) {
+                    return;
+                }
+
+                let res = match task() {
+                    Ok(None) => continue,
+                    Ok(Some(v)) => Ok(v),
+                    Err(err) => Err(err),
+                };
+
+                // We are interested only in the first response.
+                let _ = tx.send(res);
+            }
+        });
+    }
+
+    if let Ok(solution) = rx.recv() {
+        is_done.store(true, sync::atomic::Ordering::SeqCst);
+        return solution;
+    }
+
+    Err(EthkeyError::Custom("No results found.".into()))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::execute;
+
+    #[test]
+    fn info() {
+        let command = vec![
+            "ethkey",
+            "info",
+            "17d08f5fe8c77af811caa0c9a187e668ce3b74a99acc3f6d976f075fa8e0be55",
+        ]
+        .into_iter()
+        .map(Into::into)
+        .collect::<Vec<String>>();
+
+        let expected =
+"secret:  17d08f5fe8c77af811caa0c9a187e668ce3b74a99acc3f6d976f075fa8e0be55
+public:  689268c0ff57a20cd299fa60d3fb374862aff565b20b5f1767906a99e6e09f3ff04ca2b2a5cd22f62941db103c0356df1a8ed20ce322cab2483db67685afd124
+address: 26d1ec50b4e62c1d1a40d16e7cacc6a6580757d5".to_owned();
+        assert_eq!(execute(command).unwrap(), expected);
+    }
+
+    #[test]
+    fn brain() {
+        let command = vec!["ethkey", "info", "--brain", "this is sparta"]
+            .into_iter()
+            .map(Into::into)
+            .collect::<Vec<String>>();
+
+        let expected =
+"The recover phrase was not generated by Parity: The word 'this' does not come from the dictionary.
+
+secret:  aa22b54c0cb43ee30a014afe5ef3664b1cde299feabca46cd3167a85a57c39f2
+public:  c4c5398da6843632c123f543d714d2d2277716c11ff612b2a2f23c6bda4d6f0327c31cd58c55a9572c3cc141dade0c32747a13b7ef34c241b26c84adbb28fcf4
+address: 006e27b6a72e1f34c626762f3c4761547aff1421".to_owned();
+        assert_eq!(execute(command).unwrap(), expected);
+    }
+
+    #[test]
+    fn secret() {
+        let command = vec!["ethkey", "info", "--brain", "this is sparta", "--secret"]
+            .into_iter()
+            .map(Into::into)
+            .collect::<Vec<String>>();
+
+        let expected =
+            "aa22b54c0cb43ee30a014afe5ef3664b1cde299feabca46cd3167a85a57c39f2".to_owned();
+        assert_eq!(execute(command).unwrap(), expected);
+    }
+
+    #[test]
+    fn public() {
+        let command = vec!["ethkey", "info", "--brain", "this is sparta", "--public"]
+            .into_iter()
+            .map(Into::into)
+            .collect::<Vec<String>>();
+
+        let expected = "c4c5398da6843632c123f543d714d2d2277716c11ff612b2a2f23c6bda4d6f0327c31cd58c55a9572c3cc141dade0c32747a13b7ef34c241b26c84adbb28fcf4".to_owned();
+        assert_eq!(execute(command).unwrap(), expected);
+    }
+
+    #[test]
+    fn address() {
+        let command = vec!["ethkey", "info", "-b", "this is sparta", "--address"]
+            .into_iter()
+            .map(Into::into)
+            .collect::<Vec<String>>();
+
+        let expected = "006e27b6a72e1f34c626762f3c4761547aff1421".to_owned();
+        assert_eq!(execute(command).unwrap(), expected);
+    }
+
+    #[test]
+    fn sign() {
+        let command = vec![
+            "ethkey",
+            "sign",
+            "17d08f5fe8c77af811caa0c9a187e668ce3b74a99acc3f6d976f075fa8e0be55",
+            "bd50b7370c3f96733b31744c6c45079e7ae6c8d299613246d28ebcef507ec987",
+        ]
+        .into_iter()
+        .map(Into::into)
+        .collect::<Vec<String>>();
+
+        let expected = "c1878cf60417151c766a712653d26ef350c8c75393458b7a9be715f053215af63dfd3b02c2ae65a8677917a8efa3172acb71cb90196e42106953ea0363c5aaf200".to_owned();
+        assert_eq!(execute(command).unwrap(), expected);
+    }
+
+    #[test]
+    fn verify_valid_public() {
+        let command = vec!["ethkey", "verify", "public", "689268c0ff57a20cd299fa60d3fb374862aff565b20b5f1767906a99e6e09f3ff04ca2b2a5cd22f62941db103c0356df1a8ed20ce322cab2483db67685afd124", "c1878cf60417151c766a712653d26ef350c8c75393458b7a9be715f053215af63dfd3b02c2ae65a8677917a8efa3172acb71cb90196e42106953ea0363c5aaf200", "bd50b7370c3f96733b31744c6c45079e7ae6c8d299613246d28ebcef507ec987"]
+			.into_iter()
+			.map(Into::into)
+			.collect::<Vec<String>>();
+
+        let expected = "true".to_owned();
+        assert_eq!(execute(command).unwrap(), expected);
+    }
+
+    #[test]
+    fn verify_valid_address() {
+        let command = vec!["ethkey", "verify", "address", "26d1ec50b4e62c1d1a40d16e7cacc6a6580757d5", "c1878cf60417151c766a712653d26ef350c8c75393458b7a9be715f053215af63dfd3b02c2ae65a8677917a8efa3172acb71cb90196e42106953ea0363c5aaf200", "bd50b7370c3f96733b31744c6c45079e7ae6c8d299613246d28ebcef507ec987"]
+			.into_iter()
+			.map(Into::into)
+			.collect::<Vec<String>>();
+
+        let expected = "true".to_owned();
+        assert_eq!(execute(command).unwrap(), expected);
+    }
+
+    #[test]
+    fn verify_invalid() {
+        let command = vec!["ethkey", "verify", "public", "689268c0ff57a20cd299fa60d3fb374862aff565b20b5f1767906a99e6e09f3ff04ca2b2a5cd22f62941db103c0356df1a8ed20ce322cab2483db67685afd124", "c1878cf60417151c766a712653d26ef350c8c75393458b7a9be715f053215af63dfd3b02c2ae65a8677917a8efa3172acb71cb90196e42106953ea0363c5aaf200", "bd50b7370c3f96733b31744c6c45079e7ae6c8d299613246d28ebcef507ec986"]
+			.into_iter()
+			.map(Into::into)
+			.collect::<Vec<String>>();
+
+        let expected = "false".to_owned();
+        assert_eq!(execute(command).unwrap(), expected);
+    }
+}

bin/ethstore/Cargo.toml

@@ -0,0 +1,25 @@
+[package]
+description = "Parity Ethereum Key Management CLI"
+name = "ethstore-cli"
+version = "0.1.1"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[dependencies]
+docopt = "1.0"
+env_logger = "0.5"
+num_cpus = "1.6"
+rustc-hex = "1.0"
+serde = "1.0"
+serde_derive = "1.0"
+parking_lot = "0.11.1"
+ethstore = { path = "../../crates/accounts/ethstore" }
+dir = { path = '../../crates/util/dir' }
+panic_hook = { path = "../../crates/util/panic-hook" }
+
+[[bin]]
+name = "ethstore"
+path = "src/main.rs"
+doc = false
+
+[dev-dependencies]
+tempdir = "0.3.5"

bin/ethstore/src/crack.rs

@@ -0,0 +1,66 @@
+// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// This file is part of OpenEthereum.
+
+// OpenEthereum 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.
+
+// OpenEthereum 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 OpenEthereum.  If not, see <http://www.gnu.org/licenses/>.
+
+use parking_lot::Mutex;
+use std::{cmp, collections::VecDeque, sync::Arc, thread};
+
+use ethstore::{ethkey::Password, Error, PresaleWallet};
+use num_cpus;
+
+pub fn run(passwords: VecDeque<Password>, wallet_path: &str) -> Result<(), Error> {
+    let passwords = Arc::new(Mutex::new(passwords));
+
+    let mut handles = Vec::new();
+
+    for _ in 0..num_cpus::get() {
+        let passwords = passwords.clone();
+        let wallet = PresaleWallet::open(&wallet_path)?;
+        handles.push(thread::spawn(move || {
+            look_for_password(passwords, wallet);
+        }));
+    }
+
+    for handle in handles {
+        handle
+            .join()
+            .map_err(|err| Error::Custom(format!("Error finishing thread: {:?}", err)))?;
+    }
+
+    Ok(())
+}
+
+fn look_for_password(passwords: Arc<Mutex<VecDeque<Password>>>, wallet: PresaleWallet) {
+    let mut counter = 0;
+    while !passwords.lock().is_empty() {
+        let package = {
+            let mut passwords = passwords.lock();
+            let len = passwords.len();
+            passwords.split_off(cmp::min(len, 32))
+        };
+        for pass in package {
+            counter += 1;
+            match wallet.decrypt(&pass) {
+                Ok(_) => {
+                    println!("Found password: {}", pass.as_str());
+                    passwords.lock().clear();
+                    return;
+                }
+                _ if counter % 100 == 0 => print!("."),
+                _ => {}
+            }
+        }
+    }
+}

bin/ethstore/src/main.rs

@@ -0,0 +1,363 @@
+// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// This file is part of OpenEthereum.
+
+// OpenEthereum 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.
+
+// OpenEthereum 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 OpenEthereum.  If not, see <http://www.gnu.org/licenses/>.
+
+extern crate dir;
+extern crate docopt;
+extern crate ethstore;
+extern crate num_cpus;
+extern crate panic_hook;
+extern crate parking_lot;
+extern crate rustc_hex;
+extern crate serde;
+
+extern crate env_logger;
+
+#[macro_use]
+extern crate serde_derive;
+
+use std::{collections::VecDeque, env, fmt, fs, io::Read, process};
+
+use docopt::Docopt;
+use ethstore::{
+    accounts_dir::{KeyDirectory, RootDiskDirectory},
+    ethkey::{Address, Password},
+    import_accounts, EthStore, PresaleWallet, SecretStore, SecretVaultRef, SimpleSecretStore,
+    StoreAccountRef,
+};
+
+mod crack;
+
+pub const USAGE: &'static str = r#"
+Parity Ethereum key management tool.
+  Copyright 2015-2019 Parity Technologies (UK) Ltd.
+
+Usage:
+    ethstore insert <secret> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
+    ethstore change-pwd <address> <old-pwd> <new-pwd> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
+    ethstore list [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
+    ethstore import [<password>] [--src DIR] [--dir DIR]
+    ethstore import-wallet <path> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
+    ethstore find-wallet-pass <path> <password>
+    ethstore remove <address> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
+    ethstore sign <address> <password> <message> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
+    ethstore public <address> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
+    ethstore list-vaults [--dir DIR]
+    ethstore create-vault <vault> <password> [--dir DIR]
+    ethstore change-vault-pwd <vault> <old-pwd> <new-pwd> [--dir DIR]
+    ethstore move-to-vault <address> <vault> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
+    ethstore move-from-vault <address> <vault> <password> [--dir DIR]
+    ethstore [-h | --help]
+
+Options:
+    -h, --help               Display this message and exit.
+    --dir DIR                Specify the secret store directory. It may be either
+                             parity, parity-(chain), geth, geth-test
+                             or a path [default: parity].
+    --vault VAULT            Specify vault to use in this operation.
+    --vault-pwd VAULTPWD     Specify vault password to use in this operation. Please note
+                             that this option is required when vault option is set.
+                             Otherwise it is ignored.
+    --src DIR                Specify import source. It may be either
+                             parity, parity-(chain), geth, geth-test
+                             or a path [default: geth].
+
+Commands:
+    insert             Save account with password.
+    change-pwd         Change password.
+    list               List accounts.
+    import             Import accounts from src.
+    import-wallet      Import presale wallet.
+    find-wallet-pass   Tries to open a wallet with list of passwords given.
+    remove             Remove account.
+    sign               Sign message.
+    public             Displays public key for an address.
+    list-vaults        List vaults.
+    create-vault       Create new vault.
+    change-vault-pwd   Change vault password.
+    move-to-vault      Move account to vault from another vault/root directory.
+    move-from-vault    Move account to root directory from given vault.
+"#;
+
+#[derive(Debug, Deserialize)]
+struct Args {
+    cmd_insert: bool,
+    cmd_change_pwd: bool,
+    cmd_list: bool,
+    cmd_import: bool,
+    cmd_import_wallet: bool,
+    cmd_find_wallet_pass: bool,
+    cmd_remove: bool,
+    cmd_sign: bool,
+    cmd_public: bool,
+    cmd_list_vaults: bool,
+    cmd_create_vault: bool,
+    cmd_change_vault_pwd: bool,
+    cmd_move_to_vault: bool,
+    cmd_move_from_vault: bool,
+    arg_secret: String,
+    arg_password: String,
+    arg_old_pwd: String,
+    arg_new_pwd: String,
+    arg_address: String,
+    arg_message: String,
+    arg_path: String,
+    arg_vault: String,
+    flag_src: String,
+    flag_dir: String,
+    flag_vault: String,
+    flag_vault_pwd: String,
+}
+
+enum Error {
+    Ethstore(ethstore::Error),
+    Docopt(docopt::Error),
+}
+
+impl From<ethstore::Error> for Error {
+    fn from(err: ethstore::Error) -> Self {
+        Error::Ethstore(err)
+    }
+}
+
+impl From<docopt::Error> for Error {
+    fn from(err: docopt::Error) -> Self {
+        Error::Docopt(err)
+    }
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match *self {
+            Error::Ethstore(ref err) => fmt::Display::fmt(err, f),
+            Error::Docopt(ref err) => fmt::Display::fmt(err, f),
+        }
+    }
+}
+
+fn main() {
+    panic_hook::set_abort();
+    if env::var("RUST_LOG").is_err() {
+        env::set_var("RUST_LOG", "warn")
+    }
+    env_logger::try_init().expect("Logger initialized only once.");
+
+    match execute(env::args()) {
+        Ok(result) => println!("{}", result),
+        Err(Error::Docopt(ref e)) => e.exit(),
+        Err(err) => {
+            eprintln!("{}", err);
+            process::exit(1);
+        }
+    }
+}
+
+fn key_dir(location: &str, password: Option<Password>) -> Result<Box<dyn KeyDirectory>, Error> {
+    let dir: RootDiskDirectory = match location {
+        path if path.starts_with("parity") => {
+            let chain = path.split('-').nth(1).unwrap_or("ethereum");
+            let mut path = dir::default_data_pathbuf();
+            path.push("keys");
+            path.push(chain);
+            RootDiskDirectory::create(path)?
+        }
+        path => RootDiskDirectory::create(path)?,
+    };
+
+    Ok(Box::new(dir.with_password(password)))
+}
+
+fn open_args_vault(store: &EthStore, args: &Args) -> Result<SecretVaultRef, Error> {
+    if args.flag_vault.is_empty() {
+        return Ok(SecretVaultRef::Root);
+    }
+
+    let vault_pwd = load_password(&args.flag_vault_pwd)?;
+    store.open_vault(&args.flag_vault, &vault_pwd)?;
+    Ok(SecretVaultRef::Vault(args.flag_vault.clone()))
+}
+
+fn open_args_vault_account(
+    store: &EthStore,
+    address: Address,
+    args: &Args,
+) -> Result<StoreAccountRef, Error> {
+    match open_args_vault(store, args)? {
+        SecretVaultRef::Root => Ok(StoreAccountRef::root(address)),
+        SecretVaultRef::Vault(name) => Ok(StoreAccountRef::vault(&name, address)),
+    }
+}
+
+fn format_accounts(accounts: &[Address]) -> String {
+    accounts
+        .iter()
+        .enumerate()
+        .map(|(i, a)| format!("{:2}: 0x{:x}", i, a))
+        .collect::<Vec<String>>()
+        .join("\n")
+}
+
+fn format_vaults(vaults: &[String]) -> String {
+    vaults.join("\n")
+}
+
+fn load_password(path: &str) -> Result<Password, Error> {
+    let mut file = fs::File::open(path).map_err(|e| {
+        ethstore::Error::Custom(format!("Error opening password file '{}': {}", path, e))
+    })?;
+    let mut password = String::new();
+    file.read_to_string(&mut password).map_err(|e| {
+        ethstore::Error::Custom(format!("Error reading password file '{}': {}", path, e))
+    })?;
+    // drop EOF
+    let _ = password.pop();
+    Ok(password.into())
+}
+
+fn execute<S, I>(command: I) -> Result<String, Error>
+where
+    I: IntoIterator<Item = S>,
+    S: AsRef<str>,
+{
+    let args: Args = Docopt::new(USAGE).and_then(|d| d.argv(command).deserialize())?;
+
+    let store = EthStore::open(key_dir(&args.flag_dir, None)?)?;
+
+    return if args.cmd_insert {
+        let secret = args
+            .arg_secret
+            .parse()
+            .map_err(|_| ethstore::Error::InvalidSecret)?;
+        let password = load_password(&args.arg_password)?;
+        let vault_ref = open_args_vault(&store, &args)?;
+        let account_ref = store.insert_account(vault_ref, secret, &password)?;
+        Ok(format!("0x{:x}", account_ref.address))
+    } else if args.cmd_change_pwd {
+        let address = args
+            .arg_address
+            .parse()
+            .map_err(|_| ethstore::Error::InvalidAccount)?;
+        let old_pwd = load_password(&args.arg_old_pwd)?;
+        let new_pwd = load_password(&args.arg_new_pwd)?;
+        let account_ref = open_args_vault_account(&store, address, &args)?;
+        let ok = store
+            .change_password(&account_ref, &old_pwd, &new_pwd)
+            .is_ok();
+        Ok(format!("{}", ok))
+    } else if args.cmd_list {
+        let vault_ref = open_args_vault(&store, &args)?;
+        let accounts = store.accounts()?;
+        let accounts: Vec<_> = accounts
+            .into_iter()
+            .filter(|a| &a.vault == &vault_ref)
+            .map(|a| a.address)
+            .collect();
+        Ok(format_accounts(&accounts))
+    } else if args.cmd_import {
+        let password = match args.arg_password.as_ref() {
+            "" => None,
+            _ => Some(load_password(&args.arg_password)?),
+        };
+        let src = key_dir(&args.flag_src, password)?;
+        let dst = key_dir(&args.flag_dir, None)?;
+
+        let accounts = import_accounts(&*src, &*dst)?;
+        Ok(format_accounts(&accounts))
+    } else if args.cmd_import_wallet {
+        let wallet = PresaleWallet::open(&args.arg_path)?;
+        let password = load_password(&args.arg_password)?;
+        let kp = wallet.decrypt(&password)?;
+        let vault_ref = open_args_vault(&store, &args)?;
+        let account_ref = store.insert_account(vault_ref, kp.secret().clone(), &password)?;
+        Ok(format!("0x{:x}", account_ref.address))
+    } else if args.cmd_find_wallet_pass {
+        let passwords = load_password(&args.arg_password)?;
+        let passwords = passwords
+            .as_str()
+            .lines()
+            .map(|line| str::to_owned(line).into())
+            .collect::<VecDeque<_>>();
+        crack::run(passwords, &args.arg_path)?;
+        Ok(format!("Password not found."))
+    } else if args.cmd_remove {
+        let address = args
+            .arg_address
+            .parse()
+            .map_err(|_| ethstore::Error::InvalidAccount)?;
+        let password = load_password(&args.arg_password)?;
+        let account_ref = open_args_vault_account(&store, address, &args)?;
+        let ok = store.remove_account(&account_ref, &password).is_ok();
+        Ok(format!("{}", ok))
+    } else if args.cmd_sign {
+        let address = args
+            .arg_address
+            .parse()
+            .map_err(|_| ethstore::Error::InvalidAccount)?;
+        let message = args
+            .arg_message
+            .parse()
+            .map_err(|_| ethstore::Error::InvalidMessage)?;
+        let password = load_password(&args.arg_password)?;
+        let account_ref = open_args_vault_account(&store, address, &args)?;
+        let signature = store.sign(&account_ref, &password, &message)?;
+        Ok(format!("0x{}", signature))
+    } else if args.cmd_public {
+        let address = args
+            .arg_address
+            .parse()
+            .map_err(|_| ethstore::Error::InvalidAccount)?;
+        let password = load_password(&args.arg_password)?;
+        let account_ref = open_args_vault_account(&store, address, &args)?;
+        let public = store.public(&account_ref, &password)?;
+        Ok(format!("0x{:x}", public))
+    } else if args.cmd_list_vaults {
+        let vaults = store.list_vaults()?;
+        Ok(format_vaults(&vaults))
+    } else if args.cmd_create_vault {
+        let password = load_password(&args.arg_password)?;
+        store.create_vault(&args.arg_vault, &password)?;
+        Ok("OK".to_owned())
+    } else if args.cmd_change_vault_pwd {
+        let old_pwd = load_password(&args.arg_old_pwd)?;
+        let new_pwd = load_password(&args.arg_new_pwd)?;
+        store.open_vault(&args.arg_vault, &old_pwd)?;
+        store.change_vault_password(&args.arg_vault, &new_pwd)?;
+        Ok("OK".to_owned())
+    } else if args.cmd_move_to_vault {
+        let address = args
+            .arg_address
+            .parse()
+            .map_err(|_| ethstore::Error::InvalidAccount)?;
+        let password = load_password(&args.arg_password)?;
+        let account_ref = open_args_vault_account(&store, address, &args)?;
+        store.open_vault(&args.arg_vault, &password)?;
+        store.change_account_vault(SecretVaultRef::Vault(args.arg_vault), account_ref)?;
+        Ok("OK".to_owned())
+    } else if args.cmd_move_from_vault {
+        let address = args
+            .arg_address
+            .parse()
+            .map_err(|_| ethstore::Error::InvalidAccount)?;
+        let password = load_password(&args.arg_password)?;
+        store.open_vault(&args.arg_vault, &password)?;
+        store.change_account_vault(
+            SecretVaultRef::Root,
+            StoreAccountRef::vault(&args.arg_vault, address),
+        )?;
+        Ok("OK".to_owned())
+    } else {
+        Ok(format!("{}", USAGE))
+    };
+}

bin/evmbin/Cargo.toml

@@ -0,0 +1,33 @@
+[package]
+description = "Parity EVM Implementation"
+name = "evmbin"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[[bin]]
+name = "openethereum-evm"
+path = "./src/main.rs"
+
+[dependencies]
+common-types = { path = "../../crates/ethcore/types", features = ["test-helpers"] }
+docopt = "1.0"
+env_logger = "0.5"
+ethcore = { path = "../../crates/ethcore", features = ["test-helpers", "json-tests", "to-pod-full"] }
+ethereum-types = "0.9.2"
+ethjson = { path = "../../crates/ethjson" }
+evm = { path = "../../crates/vm/evm" }
+panic_hook = { path = "../../crates/util/panic-hook" }
+parity-bytes = "0.1"
+rustc-hex = "1.0"
+serde = "1.0"
+serde_derive = "1.0"
+serde_json = "1.0"
+vm = { path = "../../crates/vm/vm" }
+
+[dev-dependencies]
+criterion = "0.3.0"
+pretty_assertions = "0.1"
+tempdir = "0.3"
+
+[features]
+evm-debug = ["ethcore/evm-debug-tests"]

bin/evmbin/README.md

@@ -5,11 +5,11 @@ EVM implementation for OpenEthereum.
 ### Usage
 
 ```
-EVM implementation for OpenEthereum.
+EVM implementation for Parity.
   Copyright 2015-2020 Parity Technologies (UK) Ltd.
 
 Usage:
-    openethereum-evm state-test <file> [--json --std-json --std-dump-json --only NAME --chain CHAIN --std-out-only --std-err-only]
+    openethereum-evm state-test <file> [--json --std-json --std-dump-json --only NAME --chain CHAIN --std-out-only --std-err-only --omit-storage-output --omit-memory-output]
     openethereum-evm stats [options]
     openethereum-evm stats-jsontests-vm <file>
     openethereum-evm [options]
@@ -30,16 +30,22 @@ Transaction options:
     --gas-price WEI    Supplied gas price as hex (without 0x).
 
 State test options:
-    --only NAME        Runs only a single state test matching the name.
-    --chain CHAIN      Run only tests from specific chain.
+    --chain CHAIN      Run only from specific chain name (i.e. one of EIP150, EIP158,
+                       Frontier, Homestead, Byzantium, Constantinople,
+                       ConstantinopleFix, Istanbul, EIP158ToByzantiumAt5, FrontierToHomesteadAt5,
+                       HomesteadToDaoAt5, HomesteadToEIP150At5, Berlin, Yolo3).
+    --only NAME        Runs only a single test matching the name.
 
 General options:
-    --json             Display verbose results in JSON.
-    --std-json         Display results in standardized JSON format.
-    --std-err-only     With --std-json redirect to err output only.
-    --std-out-only     With --std-json redirect to out output only.
-    --std-dump-json    Display results in standardized JSON format
-                       with additional state dump.
+    --json                    Display verbose results in JSON.
+    --std-json                Display results in standardized JSON format.
+    --std-err-only            With --std-json redirect to err output only.
+    --std-out-only            With --std-json redirect to out output only.
+    --omit-storage-output     With --std-json omit storage output.
+    --omit-memory-output      With --std-json omit memory output.
+    --std-dump-json           Display results in standardized JSON format
+                              with additional state dump.
+
 Display result state dump in standardized JSON format.
     --chain CHAIN      Chain spec file path.
     -h, --help         Display this message and exit.
@@ -49,6 +55,6 @@ Display result state dump in standardized JSON format.
 _This project is a part of the OpenEthereum toolchain._
 
 - [evmbin](https://github.com/openethereum/openethereum/blob/master/evmbin/) - EVM implementation for OpenEthereum
-- [ethabi](https://github.com/paritytech/ethabi) - OpenEthereum function calls encoding.
+- [ethabi](https://github.com/openethereum/ethabi) - OpenEthereum function calls encoding.
 - [ethstore](https://github.com/openethereum/openethereum/blob/master/accounts/ethstore) - OpenEthereum key management.
 - [ethkey](https://github.com/openethereum/openethereum/blob/master/accounts/ethkey) - OpenEthereum keys generator.

bin/evmbin/benches/mod.rs

@@ -0,0 +1,98 @@
+// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// This file is part of OpenEthereum.
+
+// OpenEthereum 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.
+
+// OpenEthereum 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 OpenEthereum.  If not, see <http://www.gnu.org/licenses/>.
+
+//! benchmarking for EVM
+//! should be started with:
+//! ```bash
+//! cargo bench
+//! ```
+
+#[macro_use]
+extern crate criterion;
+extern crate ethcore;
+extern crate ethereum_types;
+extern crate evm;
+extern crate rustc_hex;
+extern crate vm;
+
+use criterion::{black_box, Criterion};
+use std::sync::Arc;
+
+use ethereum_types::U256;
+use evm::Factory;
+use rustc_hex::FromHex;
+use vm::{tests::FakeExt, ActionParams, Ext};
+
+criterion_group!(
+    evmbin,
+    bench_simple_loop_usize,
+    bench_simple_loop_u256,
+    bench_rng_usize,
+    bench_rng_u256
+);
+criterion_main!(evmbin);
+
+fn bench_simple_loop_usize(c: &mut Criterion) {
+    simple_loop(U256::from(::std::usize::MAX), c, "simple_loop_usize")
+}
+
+fn bench_simple_loop_u256(c: &mut Criterion) {
+    simple_loop(!U256::zero(), c, "simple_loop_u256")
+}
+
+fn simple_loop(gas: U256, c: &mut Criterion, bench_id: &str) {
+    let code = black_box(
+		"606060405260005b620042408112156019575b6001016007565b600081905550600680602b6000396000f3606060405200".from_hex().unwrap()
+	);
+
+    c.bench_function(bench_id, move |b| {
+        b.iter(|| {
+            let mut params = ActionParams::default();
+            params.gas = gas;
+            params.code = Some(Arc::new(code.clone()));
+
+            let mut ext = FakeExt::new();
+            let evm = Factory::default().create(params, ext.schedule(), ext.depth());
+            let _ = evm.exec(&mut ext);
+        })
+    });
+}
+
+fn bench_rng_usize(c: &mut Criterion) {
+    rng(U256::from(::std::usize::MAX), c, "rng_usize")
+}
+
+fn bench_rng_u256(c: &mut Criterion) {
+    rng(!U256::zero(), c, "rng_u256")
+}
+
+fn rng(gas: U256, c: &mut Criterion, bench_id: &str) {
+    let code = black_box(
+		"6060604052600360056007600b60005b62004240811215607f5767ffe7649d5eca84179490940267f47ed85c4b9a6379019367f8e5dd9a5c994bba9390930267f91d87e4b8b74e55019267ff97f6f3b29cda529290920267f393ada8dd75c938019167fe8d437c45bb3735830267f47d9a7b5428ffec019150600101600f565b838518831882186000555050505050600680609a6000396000f3606060405200".from_hex().unwrap()
+	);
+
+    c.bench_function(bench_id, move |b| {
+        b.iter(|| {
+            let mut params = ActionParams::default();
+            params.gas = gas;
+            params.code = Some(Arc::new(code.clone()));
+
+            let mut ext = FakeExt::new();
+            let evm = Factory::default().create(params, ext.schedule(), ext.depth());
+            let _ = evm.exec(&mut ext);
+        })
+    });
+}

bin/evmbin/src/display/config.rs

@@ -0,0 +1,40 @@
+// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// This file is part of OpenEthereum.
+
+// OpenEthereum 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.
+
+// OpenEthereum 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 OpenEthereum.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Config used by display informants
+
+#[derive(Default, Copy, Clone, Debug)]
+pub struct Config {
+    omit_storage_output: bool,
+    omit_memory_output: bool,
+}
+
+impl Config {
+    pub fn new(omit_storage_output: bool, omit_memory_output: bool) -> Config {
+        Config {
+            omit_storage_output,
+            omit_memory_output,
+        }
+    }
+
+    pub fn omit_storage_output(&self) -> bool {
+        self.omit_storage_output
+    }
+
+    pub fn omit_memory_output(&self) -> bool {
+        self.omit_memory_output
+    }
+}

bin/evmbin/src/display/json.rs

@@ -0,0 +1,425 @@
+// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// This file is part of OpenEthereum.
+
+// OpenEthereum 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.
+
+// OpenEthereum 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 OpenEthereum.  If not, see <http://www.gnu.org/licenses/>.
+
+//! JSON VM output.
+
+use std::{collections::HashMap, mem};
+
+use super::config::Config;
+use bytes::ToPretty;
+use display;
+use ethcore::trace;
+use ethereum_types::{BigEndianHash, H256, U256};
+use info as vm;
+
+/// JSON formatting informant.
+#[derive(Default)]
+pub struct Informant {
+    code: Vec<u8>,
+    depth: usize,
+    pc: usize,
+    instruction: u8,
+    gas_cost: U256,
+    gas_used: U256,
+    mem_written: Option<(usize, usize)>,
+    store_written: Option<(U256, U256)>,
+    stack: Vec<U256>,
+    memory: Vec<u8>,
+    storage: HashMap<H256, H256>,
+    traces: Vec<String>,
+    subtraces: Vec<String>,
+    subinfos: Vec<Informant>,
+    subdepth: usize,
+    unmatched: bool,
+    config: Config,
+}
+
+impl Informant {
+    pub fn new(config: Config) -> Informant {
+        let mut def = Informant::default();
+        def.config = config;
+        def
+    }
+
+    fn with_informant_in_depth<F: Fn(&mut Informant)>(
+        informant: &mut Informant,
+        depth: usize,
+        f: F,
+    ) {
+        if depth == 0 {
+            f(informant);
+        } else {
+            Self::with_informant_in_depth(
+                informant
+                    .subinfos
+                    .last_mut()
+                    .expect("prepare/done_trace are not balanced"),
+                depth - 1,
+                f,
+            );
+        }
+    }
+
+    fn informant_trace(informant: &Informant, gas_used: U256) -> String {
+        let memory = if informant.config.omit_memory_output() {
+            "".to_string()
+        } else {
+            format!("0x{}", informant.memory.to_hex())
+        };
+        let storage = if informant.config.omit_storage_output() {
+            None
+        } else {
+            Some(&informant.storage)
+        };
+        let info = ::evm::Instruction::from_u8(informant.instruction).map(|i| i.info());
+        json!({
+            "pc": informant.pc,
+            "op": informant.instruction,
+            "opName": info.map(|i| i.name).unwrap_or(""),
+            "gas": format!("{:#x}", gas_used.saturating_add(informant.gas_cost)),
+            "gasCost": format!("{:#x}", informant.gas_cost),
+            "memory": memory,
+            "stack": informant.stack,
+            "storage": storage,
+            "depth": informant.depth,
+        })
+        .to_string()
+    }
+}
+
+impl vm::Informant for Informant {
+    type Sink = Config;
+
+    fn before_test(&mut self, name: &str, action: &str) {
+        println!("{}", json!({"action": action, "test": name}));
+    }
+
+    fn set_gas(&mut self, gas: U256) {
+        self.gas_used = gas;
+    }
+
+    fn clone_sink(&self) -> Self::Sink {
+        self.config
+    }
+
+    fn finish(result: vm::RunResult<Self::Output>, config: &mut Self::Sink) {
+        match result {
+            Ok(success) => {
+                for trace in success.traces.unwrap_or_else(Vec::new) {
+                    println!("{}", trace);
+                }
+
+                let success_msg = json!({
+                    "output": format!("0x{}", success.output.to_hex()),
+                    "gasUsed": format!("{:#x}", success.gas_used),
+                    "time": display::as_micros(&success.time),
+                });
+
+                println!("{}", success_msg)
+            }
+            Err(failure) => {
+                if !config.omit_storage_output() {
+                    for trace in failure.traces.unwrap_or_else(Vec::new) {
+                        println!("{}", trace);
+                    }
+                }
+
+                let failure_msg = json!({
+                    "error": &failure.error.to_string(),
+                    "gasUsed": format!("{:#x}", failure.gas_used),
+                    "time": display::as_micros(&failure.time),
+                });
+
+                println!("{}", failure_msg)
+            }
+        }
+    }
+}
+
+impl trace::VMTracer for Informant {
+    type Output = Vec<String>;
+
+    fn trace_next_instruction(&mut self, pc: usize, instruction: u8, _current_gas: U256) -> bool {
+        let subdepth = self.subdepth;
+        Self::with_informant_in_depth(self, subdepth, |informant: &mut Informant| {
+            informant.pc = pc;
+            informant.instruction = instruction;
+            informant.unmatched = true;
+        });
+        true
+    }
+
+    fn trace_prepare_execute(
+        &mut self,
+        pc: usize,
+        instruction: u8,
+        gas_cost: U256,
+        mem_written: Option<(usize, usize)>,
+        store_written: Option<(U256, U256)>,
+    ) {
+        let subdepth = self.subdepth;
+        Self::with_informant_in_depth(self, subdepth, |informant: &mut Informant| {
+            informant.pc = pc;
+            informant.instruction = instruction;
+            informant.gas_cost = gas_cost;
+            informant.mem_written = mem_written;
+            informant.store_written = store_written;
+        });
+    }
+
+    fn trace_executed(&mut self, gas_used: U256, stack_push: &[U256], mem: &[u8]) {
+        let subdepth = self.subdepth;
+        Self::with_informant_in_depth(self, subdepth, |informant: &mut Informant| {
+            let store_diff = informant.store_written.clone();
+            let info = ::evm::Instruction::from_u8(informant.instruction).map(|i| i.info());
+
+            let trace = Self::informant_trace(informant, gas_used);
+            informant.traces.push(trace);
+
+            informant.unmatched = false;
+            informant.gas_used = gas_used;
+
+            let len = informant.stack.len();
+            let info_args = info.map(|i| i.args).unwrap_or(0);
+            informant
+                .stack
+                .truncate(if len > info_args { len - info_args } else { 0 });
+            informant.stack.extend_from_slice(stack_push);
+
+            // TODO [ToDr] Align memory?
+            if let Some((pos, size)) = informant.mem_written.clone() {
+                if informant.memory.len() < (pos + size) {
+                    informant.memory.resize(pos + size, 0);
+                }
+                informant.memory[pos..(pos + size)].copy_from_slice(&mem[pos..(pos + size)]);
+            }
+
+            if let Some((pos, val)) = store_diff {
+                informant.storage.insert(
+                    BigEndianHash::from_uint(&pos),
+                    BigEndianHash::from_uint(&val),
+                );
+            }
+
+            if !informant.subtraces.is_empty() {
+                informant
+                    .traces
+                    .extend(mem::replace(&mut informant.subtraces, vec![]));
+            }
+        });
+    }
+
+    fn prepare_subtrace(&mut self, code: &[u8]) {
+        let subdepth = self.subdepth;
+        Self::with_informant_in_depth(self, subdepth, |informant: &mut Informant| {
+            let mut vm = Informant::default();
+            vm.config = informant.config;
+            vm.depth = informant.depth + 1;
+            vm.code = code.to_vec();
+            vm.gas_used = informant.gas_used;
+            informant.subinfos.push(vm);
+        });
+        self.subdepth += 1;
+    }
+
+    fn done_subtrace(&mut self) {
+        self.subdepth -= 1;
+        let subdepth = self.subdepth;
+        Self::with_informant_in_depth(self, subdepth, |informant: &mut Informant| {
+            if let Some(subtraces) = informant
+                .subinfos
+                .pop()
+                .expect("prepare/done_subtrace are not balanced")
+                .drain()
+            {
+                informant.subtraces.extend(subtraces);
+            }
+        });
+    }
+
+    fn drain(mut self) -> Option<Self::Output> {
+        if self.unmatched {
+            // print last line with final state:
+            self.gas_cost = 0.into();
+            let gas_used = self.gas_used;
+            let subdepth = self.subdepth;
+
+            Self::with_informant_in_depth(&mut self, subdepth, |informant: &mut Informant| {
+                let trace = Self::informant_trace(informant, gas_used);
+                informant.traces.push(trace);
+            });
+        } else if !self.subtraces.is_empty() {
+            self.traces
+                .extend(mem::replace(&mut self.subtraces, vec![]));
+        }
+        Some(self.traces)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use info::tests::run_test;
+    use serde_json;
+
+    #[derive(Serialize, Deserialize, Debug, PartialEq)]
+    #[serde(rename_all = "camelCase")]
+    struct TestTrace {
+        pc: usize,
+        #[serde(rename = "op")]
+        instruction: u8,
+        op_name: String,
+        #[serde(rename = "gas")]
+        gas_used: U256,
+        gas_cost: U256,
+        memory: String,
+        stack: Vec<U256>,
+        storage: Option<HashMap<H256, H256>>,
+        depth: usize,
+    }
+
+    fn assert_traces_eq(a: &[String], b: &[String]) {
+        let mut ita = a.iter();
+        let mut itb = b.iter();
+
+        loop {
+            match (ita.next(), itb.next()) {
+                (Some(a), Some(b)) => {
+                    // Compare both without worrying about the order of the fields
+                    let actual: TestTrace = serde_json::from_str(a).unwrap();
+                    let expected: TestTrace = serde_json::from_str(b).unwrap();
+                    assert_eq!(actual, expected);
+                    println!("{}", a);
+                }
+                (None, None) => return,
+                e => {
+                    panic!("Traces mismatch: {:?}", e);
+                }
+            }
+        }
+    }
+
+    fn compare_json(traces: Option<Vec<String>>, expected: &str) {
+        let expected = expected
+            .split("\n")
+            .map(|x| x.trim())
+            .map(|x| x.to_owned())
+            .filter(|x| !x.is_empty())
+            .collect::<Vec<_>>();
+        assert_traces_eq(&traces.unwrap(), &expected);
+    }
+
+    #[test]
+    fn should_trace_failure() {
+        run_test(
+            Informant::default(),
+            &compare_json,
+            "60F8d6",
+            0xffff,
+            r#"
+{"pc":0,"op":96,"opName":"PUSH1","gas":"0xffff","gasCost":"0x3","memory":"0x","stack":[],"storage":{},"depth":1}
+{"pc":2,"op":214,"opName":"","gas":"0xfffc","gasCost":"0x0","memory":"0x","stack":["0xf8"],"storage":{},"depth":1}
+			"#,
+        );
+
+        run_test(
+            Informant::default(),
+            &compare_json,
+            "F8d6",
+            0xffff,
+            r#"
+{"pc":0,"op":248,"opName":"","gas":"0xffff","gasCost":"0x0","memory":"0x","stack":[],"storage":{},"depth":1}
+			"#,
+        );
+
+        run_test(
+            Informant::default(),
+            &compare_json,
+            "5A51",
+            0xfffff,
+            r#"
+{"depth":1,"gas":"0xfffff","gasCost":"0x2","memory":"0x","op":90,"opName":"GAS","pc":0,"stack":[],"storage":{}}
+{"depth":1,"gas":"0xffffd","gasCost":"0x0","memory":"0x","op":81,"opName":"MLOAD","pc":1,"stack":["0xffffd"],"storage":{}}
+			"#,
+        );
+    }
+
+    #[test]
+    fn should_trace_create_correctly() {
+        run_test(
+            Informant::default(),
+            &compare_json,
+            "32343434345830f138343438323439f0",
+            0xffff,
+            r#"
+{"pc":0,"op":50,"opName":"ORIGIN","gas":"0xffff","gasCost":"0x2","memory":"0x","stack":[],"storage":{},"depth":1}
+{"pc":1,"op":52,"opName":"CALLVALUE","gas":"0xfffd","gasCost":"0x2","memory":"0x","stack":["0x0"],"storage":{},"depth":1}
+{"pc":2,"op":52,"opName":"CALLVALUE","gas":"0xfffb","gasCost":"0x2","memory":"0x","stack":["0x0","0x0"],"storage":{},"depth":1}
+{"pc":3,"op":52,"opName":"CALLVALUE","gas":"0xfff9","gasCost":"0x2","memory":"0x","stack":["0x0","0x0","0x0"],"storage":{},"depth":1}
+{"pc":4,"op":52,"opName":"CALLVALUE","gas":"0xfff7","gasCost":"0x2","memory":"0x","stack":["0x0","0x0","0x0","0x0"],"storage":{},"depth":1}
+{"pc":5,"op":88,"opName":"PC","gas":"0xfff5","gasCost":"0x2","memory":"0x","stack":["0x0","0x0","0x0","0x0","0x0"],"storage":{},"depth":1}
+{"pc":6,"op":48,"opName":"ADDRESS","gas":"0xfff3","gasCost":"0x2","memory":"0x","stack":["0x0","0x0","0x0","0x0","0x0","0x5"],"storage":{},"depth":1}
+{"pc":7,"op":241,"opName":"CALL","gas":"0xfff1","gasCost":"0x61d0","memory":"0x","stack":["0x0","0x0","0x0","0x0","0x0","0x5","0x0"],"storage":{},"depth":1}
+{"pc":8,"op":56,"opName":"CODESIZE","gas":"0x9e21","gasCost":"0x2","memory":"0x","stack":["0x1"],"storage":{},"depth":1}
+{"pc":9,"op":52,"opName":"CALLVALUE","gas":"0x9e1f","gasCost":"0x2","memory":"0x","stack":["0x1","0x10"],"storage":{},"depth":1}
+{"pc":10,"op":52,"opName":"CALLVALUE","gas":"0x9e1d","gasCost":"0x2","memory":"0x","stack":["0x1","0x10","0x0"],"storage":{},"depth":1}
+{"pc":11,"op":56,"opName":"CODESIZE","gas":"0x9e1b","gasCost":"0x2","memory":"0x","stack":["0x1","0x10","0x0","0x0"],"storage":{},"depth":1}
+{"pc":12,"op":50,"opName":"ORIGIN","gas":"0x9e19","gasCost":"0x2","memory":"0x","stack":["0x1","0x10","0x0","0x0","0x10"],"storage":{},"depth":1}
+{"pc":13,"op":52,"opName":"CALLVALUE","gas":"0x9e17","gasCost":"0x2","memory":"0x","stack":["0x1","0x10","0x0","0x0","0x10","0x0"],"storage":{},"depth":1}
+{"pc":14,"op":57,"opName":"CODECOPY","gas":"0x9e15","gasCost":"0x9","memory":"0x","stack":["0x1","0x10","0x0","0x0","0x10","0x0","0x0"],"storage":{},"depth":1}
+{"pc":15,"op":240,"opName":"CREATE","gas":"0x9e0c","gasCost":"0x9e0c","memory":"0x32343434345830f138343438323439f0","stack":["0x1","0x10","0x0","0x0"],"storage":{},"depth":1}
+{"pc":0,"op":50,"opName":"ORIGIN","gas":"0x210c","gasCost":"0x2","memory":"0x","stack":[],"storage":{},"depth":2}
+{"pc":1,"op":52,"opName":"CALLVALUE","gas":"0x210a","gasCost":"0x2","memory":"0x","stack":["0x0"],"storage":{},"depth":2}
+{"pc":2,"op":52,"opName":"CALLVALUE","gas":"0x2108","gasCost":"0x2","memory":"0x","stack":["0x0","0x0"],"storage":{},"depth":2}
+{"pc":3,"op":52,"opName":"CALLVALUE","gas":"0x2106","gasCost":"0x2","memory":"0x","stack":["0x0","0x0","0x0"],"storage":{},"depth":2}
+{"pc":4,"op":52,"opName":"CALLVALUE","gas":"0x2104","gasCost":"0x2","memory":"0x","stack":["0x0","0x0","0x0","0x0"],"storage":{},"depth":2}
+{"pc":5,"op":88,"opName":"PC","gas":"0x2102","gasCost":"0x2","memory":"0x","stack":["0x0","0x0","0x0","0x0","0x0"],"storage":{},"depth":2}
+{"pc":6,"op":48,"opName":"ADDRESS","gas":"0x2100","gasCost":"0x2","memory":"0x","stack":["0x0","0x0","0x0","0x0","0x0","0x5"],"storage":{},"depth":2}
+{"pc":7,"op":241,"opName":"CALL","gas":"0x20fe","gasCost":"0x0","memory":"0x","stack":["0x0","0x0","0x0","0x0","0x0","0x5","0xbd770416a3345f91e4b34576cb804a576fa48eb1"],"storage":{},"depth":2}
+"#,
+        );
+
+        run_test(
+            Informant::default(),
+            &compare_json,
+            "3260D85554",
+            0xffff,
+            r#"
+{"pc":0,"op":50,"opName":"ORIGIN","gas":"0xffff","gasCost":"0x2","memory":"0x","stack":[],"storage":{},"depth":1}
+{"pc":1,"op":96,"opName":"PUSH1","gas":"0xfffd","gasCost":"0x3","memory":"0x","stack":["0x0"],"storage":{},"depth":1}
+{"pc":3,"op":85,"opName":"SSTORE","gas":"0xfffa","gasCost":"0x1388","memory":"0x","stack":["0x0","0xd8"],"storage":{},"depth":1}
+{"pc":4,"op":84,"opName":"SLOAD","gas":"0xec72","gasCost":"0x0","memory":"0x","stack":[],"storage":{"0x00000000000000000000000000000000000000000000000000000000000000d8":"0x0000000000000000000000000000000000000000000000000000000000000000"},"depth":1}
+"#,
+        );
+    }
+
+    #[test]
+    fn should_omit_storage_and_memory_flag() {
+        // should omit storage
+        run_test(
+            Informant::new(Config::new(true, true)),
+            &compare_json,
+            "3260D85554",
+            0xffff,
+            r#"
+{"pc":0,"op":50,"opName":"ORIGIN","gas":"0xffff","gasCost":"0x2","memory":"","stack":[],"storage":null,"depth":1}
+{"pc":1,"op":96,"opName":"PUSH1","gas":"0xfffd","gasCost":"0x3","memory":"","stack":["0x0"],"storage":null,"depth":1}
+{"pc":3,"op":85,"opName":"SSTORE","gas":"0xfffa","gasCost":"0x1388","memory":"","stack":["0x0","0xd8"],"storage":null,"depth":1}
+{"pc":4,"op":84,"opName":"SLOAD","gas":"0xec72","gasCost":"0x0","memory":"","stack":[],"storage":null,"depth":1}
+"#,
+        )
+    }
+}

bin/evmbin/src/display/mod.rs

@@ -1,33 +1,34 @@
 // Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// This file is part of OpenEthereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// OpenEthereum 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// OpenEthereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with OpenEthereum.  If not, see <http://www.gnu.org/licenses/>.
 
-//! EVM output display utils.
+//! VM Output display utils.
 
 use std::time::Duration;
 
+pub mod config;
 pub mod json;
-pub mod std_json;
 pub mod simple;
+pub mod std_json;
 
 /// Formats duration into human readable format.
 pub fn format_time(time: &Duration) -> String {
-	format!("{}.{:09}s", time.as_secs(), time.subsec_nanos())
+    format!("{}.{:.9}s", time.as_secs(), time.subsec_nanos())
 }
 
 /// Formats the time as microseconds.
 pub fn as_micros(time: &Duration) -> u64 {
-	time.as_secs() * 1_000_000 + time.subsec_nanos() as u64 / 1_000
+    time.as_secs() * 1_000_000 + time.subsec_nanos() as u64 / 1_000
 }

bin/evmbin/src/display/simple.rs

@@ -0,0 +1,74 @@
+// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// This file is part of OpenEthereum.
+
+// OpenEthereum 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.
+
+// OpenEthereum 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 OpenEthereum.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Simple VM output.
+
+use super::config::Config;
+use bytes::ToPretty;
+use ethcore::trace;
+
+use display;
+use info as vm;
+
+/// Simple formatting informant.
+#[derive(Default)]
+pub struct Informant {
+    config: Config,
+}
+
+impl Informant {
+    pub fn new(config: Config) -> Informant {
+        Informant { config }
+    }
+}
+
+impl vm::Informant for Informant {
+    type Sink = Config;
+
+    fn before_test(&mut self, name: &str, action: &str) {
+        println!("Test: {} ({})", name, action);
+    }
+
+    fn clone_sink(&self) -> Self::Sink {
+        self.config
+    }
+
+    fn finish(result: vm::RunResult<Self::Output>, _sink: &mut Self::Sink) {
+        match result {
+            Ok(success) => {
+                println!("Output: 0x{}", success.output.to_hex());
+                println!("Gas used: {:x}", success.gas_used);
+                println!("Time: {}", display::format_time(&success.time));
+            }
+            Err(failure) => {
+                println!("Error: {}", failure.error);
+                println!("Time: {}", display::format_time(&failure.time));
+            }
+        }
+    }
+}
+
+impl trace::VMTracer for Informant {
+    type Output = ();
+
+    fn prepare_subtrace(&mut self, _code: &[u8]) {
+        Default::default()
+    }
+    fn done_subtrace(&mut self) {}
+    fn drain(self) -> Option<()> {
+        None
+    }
+}

bin/evmbin/src/display/std_json.rs

@@ -0,0 +1,413 @@
+// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// This file is part of OpenEthereum.
+
+// OpenEthereum 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.
+
+// OpenEthereum 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 OpenEthereum.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Standardized JSON VM output.
+
+use std::{collections::HashMap, io};
+
+use super::config::Config;
+use bytes::ToPretty;
+use display;
+use ethcore::{pod_state, trace};
+use ethereum_types::{BigEndianHash, H256, U256};
+use info as vm;
+
+pub trait Writer: io::Write + Send + Sized {
+    fn clone(&self) -> Self;
+    fn default() -> Self;
+}
+
+impl Writer for io::Stdout {
+    fn clone(&self) -> Self {
+        io::stdout()
+    }
+
+    fn default() -> Self {
+        io::stdout()
+    }
+}
+
+impl Writer for io::Stderr {
+    fn clone(&self) -> Self {
+        io::stderr()
+    }
+
+    fn default() -> Self {
+        io::stderr()
+    }
+}
+
+/// JSON formatting informant.
+pub struct Informant<Trace, Out> {
+    code: Vec<u8>,
+    instruction: u8,
+    depth: usize,
+    stack: Vec<U256>,
+    storage: HashMap<H256, H256>,
+    subinfos: Vec<Informant<Trace, Out>>,
+    subdepth: usize,
+    trace_sink: Trace,
+    out_sink: Out,
+    config: Config,
+}
+
+impl Default for Informant<io::Stderr, io::Stdout> {
+    fn default() -> Self {
+        Self::new(io::stderr(), io::stdout(), Config::default())
+    }
+}
+
+impl Informant<io::Stdout, io::Stdout> {
+    /// std json informant using out only.
+    pub fn out_only(config: Config) -> Self {
+        Self::new(io::stdout(), io::stdout(), config)
+    }
+}
+
+impl Informant<io::Stderr, io::Stderr> {
+    /// std json informant using err only.
+    pub fn err_only(config: Config) -> Self {
+        Self::new(io::stderr(), io::stderr(), config)
+    }
+}
+
+impl Informant<io::Stderr, io::Stdout> {
+    pub fn new_default(config: Config) -> Self {
+        let mut informant = Self::default();
+        informant.config = config;
+        informant
+    }
+}
+
+impl<Trace: Writer, Out: Writer> Informant<Trace, Out> {
+    pub fn new(trace_sink: Trace, out_sink: Out, config: Config) -> Self {
+        Informant {
+            code: Default::default(),
+            instruction: Default::default(),
+            depth: Default::default(),
+            stack: Default::default(),
+            storage: Default::default(),
+            subinfos: Default::default(),
+            subdepth: 0,
+            trace_sink,
+            out_sink,
+            config,
+        }
+    }
+
+    fn with_informant_in_depth<F: Fn(&mut Informant<Trace, Out>)>(
+        informant: &mut Informant<Trace, Out>,
+        depth: usize,
+        f: F,
+    ) {
+        if depth == 0 {
+            f(informant);
+        } else {
+            Self::with_informant_in_depth(
+                informant
+                    .subinfos
+                    .last_mut()
+                    .expect("prepare/done_trace are not balanced"),
+                depth - 1,
+                f,
+            );
+        }
+    }
+
+    fn dump_state_into(
+        trace_sink: &mut Trace,
+        root: H256,
+        end_state: &Option<pod_state::PodState>,
+    ) {
+        if let Some(ref end_state) = end_state {
+            let dump_data = json!({
+                "root": root,
+                "accounts": end_state,
+            });
+            writeln!(trace_sink, "{}", dump_data).expect("The sink must be writeable.");
+        }
+    }
+}
+
+impl<Trace: Writer, Out: Writer> vm::Informant for Informant<Trace, Out> {
+    type Sink = (Trace, Out, Config);
+
+    fn before_test(&mut self, name: &str, action: &str) {
+        let out_data = json!({
+            "action": action,
+            "test": name,
+        });
+
+        writeln!(&mut self.out_sink, "{}", out_data).expect("The sink must be writeable.");
+    }
+
+    fn set_gas(&mut self, _gas: U256) {}
+
+    fn clone_sink(&self) -> Self::Sink {
+        (
+            self.trace_sink.clone(),
+            self.out_sink.clone(),
+            self.config.clone(),
+        )
+    }
+    fn finish(
+        result: vm::RunResult<<Self as trace::VMTracer>::Output>,
+        (ref mut trace_sink, ref mut out_sink, _): &mut Self::Sink,
+    ) {
+        match result {
+            Ok(success) => {
+                let trace_data = json!({"stateRoot": success.state_root});
+                writeln!(trace_sink, "{}", trace_data).expect("The sink must be writeable.");
+
+                Self::dump_state_into(trace_sink, success.state_root, &success.end_state);
+
+                let out_data = json!({
+                    "output": format!("0x{}", success.output.to_hex()),
+                    "gasUsed": format!("{:#x}", success.gas_used),
+                    "time": display::as_micros(&success.time),
+                });
+
+                writeln!(out_sink, "{}", out_data).expect("The sink must be writeable.");
+            }
+            Err(failure) => {
+                let out_data = json!({
+                    "error": &failure.error.to_string(),
+                    "gasUsed": format!("{:#x}", failure.gas_used),
+                    "time": display::as_micros(&failure.time),
+                });
+
+                Self::dump_state_into(trace_sink, failure.state_root, &failure.end_state);
+
+                writeln!(out_sink, "{}", out_data).expect("The sink must be writeable.");
+            }
+        }
+    }
+}
+
+impl<Trace: Writer, Out: Writer> trace::VMTracer for Informant<Trace, Out> {
+    type Output = ();
+
+    fn trace_next_instruction(&mut self, pc: usize, instruction: u8, current_gas: U256) -> bool {
+        let subdepth = self.subdepth;
+        Self::with_informant_in_depth(self, subdepth, |informant: &mut Informant<Trace, Out>| {
+            let storage = if informant.config.omit_storage_output() {
+                None
+            } else {
+                Some(&informant.storage)
+            };
+            let info = ::evm::Instruction::from_u8(instruction).map(|i| i.info());
+            informant.instruction = instruction;
+            let trace_data = json!({
+                "pc": pc,
+                "op": instruction,
+                "opName": info.map(|i| i.name).unwrap_or(""),
+                "gas": format!("{:#x}", current_gas),
+                "stack": informant.stack,
+                "storage": storage,
+                "depth": informant.depth,
+            });
+
+            writeln!(&mut informant.trace_sink, "{}", trace_data)
+                .expect("The sink must be writeable.");
+        });
+        true
+    }
+
+    fn trace_prepare_execute(
+        &mut self,
+        _pc: usize,
+        _instruction: u8,
+        _gas_cost: U256,
+        _mem_written: Option<(usize, usize)>,
+        store_written: Option<(U256, U256)>,
+    ) {
+        let subdepth = self.subdepth;
+        Self::with_informant_in_depth(self, subdepth, |informant: &mut Informant<Trace, Out>| {
+            if let Some((pos, val)) = store_written {
+                informant.storage.insert(
+                    BigEndianHash::from_uint(&pos),
+                    BigEndianHash::from_uint(&val),
+                );
+            }
+        });
+    }
+
+    fn trace_executed(&mut self, _gas_used: U256, stack_push: &[U256], _mem: &[u8]) {
+        let subdepth = self.subdepth;
+        Self::with_informant_in_depth(self, subdepth, |informant: &mut Informant<Trace, Out>| {
+            let info = ::evm::Instruction::from_u8(informant.instruction).map(|i| i.info());
+
+            let len = informant.stack.len();
+            let info_args = info.map(|i| i.args).unwrap_or(0);
+            informant
+                .stack
+                .truncate(if len > info_args { len - info_args } else { 0 });
+            informant.stack.extend_from_slice(stack_push);
+        });
+    }
+
+    fn prepare_subtrace(&mut self, code: &[u8]) {
+        let subdepth = self.subdepth;
+        Self::with_informant_in_depth(self, subdepth, |informant: &mut Informant<Trace, Out>| {
+            let mut vm = Informant::new(
+                informant.trace_sink.clone(),
+                informant.out_sink.clone(),
+                informant.config,
+            );
+            vm.depth = informant.depth + 1;
+            vm.code = code.to_vec();
+            informant.subinfos.push(vm);
+        });
+        self.subdepth += 1;
+    }
+
+    fn done_subtrace(&mut self) {
+        self.subdepth -= 1;
+        let subdepth = self.subdepth;
+        Self::with_informant_in_depth(self, subdepth, |informant: &mut Informant<Trace, Out>| {
+            informant.subinfos.pop();
+        });
+    }
+
+    fn drain(self) -> Option<Self::Output> {
+        None
+    }
+}
+
+#[cfg(test)]
+pub mod tests {
+    use super::*;
+    use info::tests::run_test;
+    use std::sync::{Arc, Mutex};
+
+    #[derive(Debug, Clone, Default)]
+    pub struct TestWriter(pub Arc<Mutex<Vec<u8>>>);
+
+    impl Writer for TestWriter {
+        fn clone(&self) -> Self {
+            Clone::clone(self)
+        }
+        fn default() -> Self {
+            Default::default()
+        }
+    }
+
+    impl io::Write for TestWriter {
+        fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+            self.0.lock().unwrap().write(buf)
+        }
+
+        fn flush(&mut self) -> io::Result<()> {
+            self.0.lock().unwrap().flush()
+        }
+    }
+
+    pub fn informant(config: Config) -> (Informant<TestWriter, TestWriter>, Arc<Mutex<Vec<u8>>>) {
+        let trace_writer: TestWriter = Default::default();
+        let out_writer: TestWriter = Default::default();
+        let res = trace_writer.0.clone();
+        (Informant::new(trace_writer, out_writer, config), res)
+    }
+
+    #[test]
+    fn should_trace_failure() {
+        let (inf, res) = informant(Config::default());
+        run_test(
+            inf,
+            move |_, expected| {
+                let bytes = res.lock().unwrap();
+                assert_eq!(expected, &String::from_utf8_lossy(&**bytes))
+            },
+            "60F8d6",
+            0xffff,
+            r#"{"depth":1,"gas":"0xffff","op":96,"opName":"PUSH1","pc":0,"stack":[],"storage":{}}
+{"depth":1,"gas":"0xfffc","op":214,"opName":"","pc":2,"stack":["0xf8"],"storage":{}}
+"#,
+        );
+
+        let (inf, res) = informant(Config::default());
+        run_test(
+            inf,
+            move |_, expected| {
+                let bytes = res.lock().unwrap();
+                assert_eq!(expected, &String::from_utf8_lossy(&**bytes))
+            },
+            "F8d6",
+            0xffff,
+            r#"{"depth":1,"gas":"0xffff","op":248,"opName":"","pc":0,"stack":[],"storage":{}}
+"#,
+        );
+    }
+
+    #[test]
+    fn should_trace_create_correctly() {
+        let (informant, res) = informant(Config::default());
+        run_test(
+            informant,
+            move |_, expected| {
+                let bytes = res.lock().unwrap();
+                assert_eq!(expected, &String::from_utf8_lossy(&**bytes))
+            },
+            "32343434345830f138343438323439f0",
+            0xffff,
+            r#"{"depth":1,"gas":"0xffff","op":50,"opName":"ORIGIN","pc":0,"stack":[],"storage":{}}
+{"depth":1,"gas":"0xfffd","op":52,"opName":"CALLVALUE","pc":1,"stack":["0x0"],"storage":{}}
+{"depth":1,"gas":"0xfffb","op":52,"opName":"CALLVALUE","pc":2,"stack":["0x0","0x0"],"storage":{}}
+{"depth":1,"gas":"0xfff9","op":52,"opName":"CALLVALUE","pc":3,"stack":["0x0","0x0","0x0"],"storage":{}}
+{"depth":1,"gas":"0xfff7","op":52,"opName":"CALLVALUE","pc":4,"stack":["0x0","0x0","0x0","0x0"],"storage":{}}
+{"depth":1,"gas":"0xfff5","op":88,"opName":"PC","pc":5,"stack":["0x0","0x0","0x0","0x0","0x0"],"storage":{}}
+{"depth":1,"gas":"0xfff3","op":48,"opName":"ADDRESS","pc":6,"stack":["0x0","0x0","0x0","0x0","0x0","0x5"],"storage":{}}
+{"depth":1,"gas":"0xfff1","op":241,"opName":"CALL","pc":7,"stack":["0x0","0x0","0x0","0x0","0x0","0x5","0x0"],"storage":{}}
+{"depth":1,"gas":"0x9e21","op":56,"opName":"CODESIZE","pc":8,"stack":["0x1"],"storage":{}}
+{"depth":1,"gas":"0x9e1f","op":52,"opName":"CALLVALUE","pc":9,"stack":["0x1","0x10"],"storage":{}}
+{"depth":1,"gas":"0x9e1d","op":52,"opName":"CALLVALUE","pc":10,"stack":["0x1","0x10","0x0"],"storage":{}}
+{"depth":1,"gas":"0x9e1b","op":56,"opName":"CODESIZE","pc":11,"stack":["0x1","0x10","0x0","0x0"],"storage":{}}
+{"depth":1,"gas":"0x9e19","op":50,"opName":"ORIGIN","pc":12,"stack":["0x1","0x10","0x0","0x0","0x10"],"storage":{}}
+{"depth":1,"gas":"0x9e17","op":52,"opName":"CALLVALUE","pc":13,"stack":["0x1","0x10","0x0","0x0","0x10","0x0"],"storage":{}}
+{"depth":1,"gas":"0x9e15","op":57,"opName":"CODECOPY","pc":14,"stack":["0x1","0x10","0x0","0x0","0x10","0x0","0x0"],"storage":{}}
+{"depth":1,"gas":"0x9e0c","op":240,"opName":"CREATE","pc":15,"stack":["0x1","0x10","0x0","0x0"],"storage":{}}
+{"depth":2,"gas":"0x210c","op":50,"opName":"ORIGIN","pc":0,"stack":[],"storage":{}}
+{"depth":2,"gas":"0x210a","op":52,"opName":"CALLVALUE","pc":1,"stack":["0x0"],"storage":{}}
+{"depth":2,"gas":"0x2108","op":52,"opName":"CALLVALUE","pc":2,"stack":["0x0","0x0"],"storage":{}}
+{"depth":2,"gas":"0x2106","op":52,"opName":"CALLVALUE","pc":3,"stack":["0x0","0x0","0x0"],"storage":{}}
+{"depth":2,"gas":"0x2104","op":52,"opName":"CALLVALUE","pc":4,"stack":["0x0","0x0","0x0","0x0"],"storage":{}}
+{"depth":2,"gas":"0x2102","op":88,"opName":"PC","pc":5,"stack":["0x0","0x0","0x0","0x0","0x0"],"storage":{}}
+{"depth":2,"gas":"0x2100","op":48,"opName":"ADDRESS","pc":6,"stack":["0x0","0x0","0x0","0x0","0x0","0x5"],"storage":{}}
+{"depth":2,"gas":"0x20fe","op":241,"opName":"CALL","pc":7,"stack":["0x0","0x0","0x0","0x0","0x0","0x5","0xbd770416a3345f91e4b34576cb804a576fa48eb1"],"storage":{}}
+"#,
+        )
+    }
+
+    #[test]
+    fn should_omit_storage_and_memory_flag() {
+        // should omit storage
+        let (informant, res) = informant(Config::new(true, true));
+        run_test(
+            informant,
+            move |_, expected| {
+                let bytes = res.lock().unwrap();
+                assert_eq!(expected, &String::from_utf8_lossy(&**bytes))
+            },
+            "3260D85554",
+            0xffff,
+            r#"{"depth":1,"gas":"0xffff","op":50,"opName":"ORIGIN","pc":0,"stack":[],"storage":null}
+{"depth":1,"gas":"0xfffd","op":96,"opName":"PUSH1","pc":1,"stack":["0x0"],"storage":null}
+{"depth":1,"gas":"0xfffa","op":85,"opName":"SSTORE","pc":3,"stack":["0x0","0xd8"],"storage":null}
+{"depth":1,"gas":"0xec72","op":84,"opName":"SLOAD","pc":4,"stack":[],"storage":null}
+"#,
+        )
+    }
+}

bin/evmbin/src/info.rs

@@ -0,0 +1,316 @@
+// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// This file is part of OpenEthereum.
+
+// OpenEthereum 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.
+
+// OpenEthereum 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 OpenEthereum.  If not, see <http://www.gnu.org/licenses/>.
+
+//! VM runner.
+
+use ethcore::{
+    client::{self, EvmTestClient, EvmTestError, TransactErr, TransactSuccess},
+    pod_state, spec, state, state_db, trace, TrieSpec,
+};
+use ethereum_types::{H256, U256};
+use ethjson;
+use std::time::{Duration, Instant};
+use types::transaction;
+use vm::ActionParams;
+
+/// VM execution informant
+pub trait Informant: trace::VMTracer {
+    /// Sink to use with finish
+    type Sink;
+    /// Display a single run init message
+    fn before_test(&mut self, test: &str, action: &str);
+    /// Set initial gas.
+    fn set_gas(&mut self, _gas: U256) {}
+    /// Clone sink.
+    fn clone_sink(&self) -> Self::Sink;
+    /// Display final result.
+    fn finish(result: RunResult<Self::Output>, &mut Self::Sink);
+}
+
+/// Execution finished correctly
+#[derive(Debug)]
+pub struct Success<T> {
+    /// State root
+    pub state_root: H256,
+    /// Used gas
+    pub gas_used: U256,
+    /// Output as bytes
+    pub output: Vec<u8>,
+    /// Time Taken
+    pub time: Duration,
+    /// Traces
+    pub traces: Option<T>,
+    /// Optional end state dump
+    pub end_state: Option<pod_state::PodState>,
+}
+
+/// Execution failed
+#[derive(Debug)]
+pub struct Failure<T> {
+    /// State root
+    pub state_root: H256,
+    /// Used gas
+    pub gas_used: U256,
+    /// Internal error
+    pub error: EvmTestError,
+    /// Duration
+    pub time: Duration,
+    /// Traces
+    pub traces: Option<T>,
+    /// Optional end state dump
+    pub end_state: Option<pod_state::PodState>,
+}
+
+/// EVM Execution result
+pub type RunResult<T> = Result<Success<T>, Failure<T>>;
+
+/// Execute given `ActionParams` and return the result.
+pub fn run_action<T: Informant>(
+    spec: &spec::Spec,
+    mut params: ActionParams,
+    mut informant: T,
+    trie_spec: TrieSpec,
+) -> RunResult<T::Output> {
+    informant.set_gas(params.gas);
+
+    // if the code is not overwritten from CLI, use code from spec file.
+    if params.code.is_none() {
+        if let Some(acc) = spec.genesis_state().get().get(&params.code_address) {
+            params.code = acc.code.clone().map(::std::sync::Arc::new);
+            params.code_hash = None;
+        }
+    }
+    run(
+        spec,
+        trie_spec,
+        params.gas,
+        spec.genesis_state(),
+        |mut client| {
+            let result = match client.call(params, &mut trace::NoopTracer, &mut informant) {
+                Ok(r) => (Ok(r.return_data.to_vec()), Some(r.gas_left)),
+                Err(err) => (Err(err), None),
+            };
+            (result.0, H256::zero(), None, result.1, informant.drain())
+        },
+    )
+}
+
+/// Execute given Transaction and verify resulting state root.
+pub fn run_transaction<T: Informant>(
+    name: &str,
+    idx: usize,
+    spec: &ethjson::spec::ForkSpec,
+    pre_state: &pod_state::PodState,
+    post_root: H256,
+    env_info: &client::EnvInfo,
+    transaction: transaction::SignedTransaction,
+    mut informant: T,
+    trie_spec: TrieSpec,
+) {
+    let spec_name = format!("{:?}", spec).to_lowercase();
+    let spec = match EvmTestClient::spec_from_json(spec) {
+        Some(spec) => {
+            informant.before_test(&format!("{}:{}:{}", name, spec_name, idx), "starting");
+            spec
+        }
+        None => {
+            informant.before_test(
+                &format!("{}:{}:{}", name, spec_name, idx),
+                "skipping because of missing spec",
+            );
+            return;
+        }
+    };
+
+    informant.set_gas(env_info.gas_limit);
+
+    let mut sink = informant.clone_sink();
+    let result = run(
+        &spec,
+        trie_spec,
+        transaction.tx().gas,
+        pre_state,
+        |mut client| {
+            let result = client.transact(env_info, transaction, trace::NoopTracer, informant);
+            match result {
+                Ok(TransactSuccess {
+                    state_root,
+                    gas_left,
+                    output,
+                    vm_trace,
+                    end_state,
+                    ..
+                }) => {
+                    if state_root != post_root {
+                        (
+                            Err(EvmTestError::PostCondition(format!(
+                                "State root mismatch (got: {:#x}, expected: {:#x})",
+                                state_root, post_root,
+                            ))),
+                            state_root,
+                            end_state,
+                            Some(gas_left),
+                            None,
+                        )
+                    } else {
+                        (Ok(output), state_root, end_state, Some(gas_left), vm_trace)
+                    }
+                }
+                Err(TransactErr {
+                    state_root,
+                    error,
+                    end_state,
+                }) => (
+                    Err(EvmTestError::PostCondition(format!(
+                        "Unexpected execution error: {:?}",
+                        error
+                    ))),
+                    state_root,
+                    end_state,
+                    None,
+                    None,
+                ),
+            }
+        },
+    );
+
+    T::finish(result, &mut sink)
+}
+
+fn dump_state(state: &state::State<state_db::StateDB>) -> Option<pod_state::PodState> {
+    state.to_pod_full().ok()
+}
+
+/// Execute VM with given `ActionParams`
+pub fn run<'a, F, X>(
+    spec: &'a spec::Spec,
+    trie_spec: TrieSpec,
+    initial_gas: U256,
+    pre_state: &'a pod_state::PodState,
+    run: F,
+) -> RunResult<X>
+where
+    F: FnOnce(
+        EvmTestClient,
+    ) -> (
+        Result<Vec<u8>, EvmTestError>,
+        H256,
+        Option<pod_state::PodState>,
+        Option<U256>,
+        Option<X>,
+    ),
+{
+    let do_dump = trie_spec == TrieSpec::Fat;
+
+    let mut test_client =
+        EvmTestClient::from_pod_state_with_trie(spec, pre_state.clone(), trie_spec).map_err(
+            |error| Failure {
+                gas_used: 0.into(),
+                error,
+                time: Duration::from_secs(0),
+                traces: None,
+                state_root: H256::default(),
+                end_state: None,
+            },
+        )?;
+
+    if do_dump {
+        test_client.set_dump_state_fn(dump_state);
+    }
+
+    let start = Instant::now();
+    let result = run(test_client);
+    let time = start.elapsed();
+
+    match result {
+        (Ok(output), state_root, end_state, gas_left, traces) => Ok(Success {
+            state_root,
+            gas_used: gas_left
+                .map(|gas_left| initial_gas - gas_left)
+                .unwrap_or(initial_gas),
+            output,
+            time,
+            traces,
+            end_state,
+        }),
+        (Err(error), state_root, end_state, gas_left, traces) => Err(Failure {
+            gas_used: gas_left
+                .map(|gas_left| initial_gas - gas_left)
+                .unwrap_or(initial_gas),
+            error,
+            time,
+            traces,
+            state_root,
+            end_state,
+        }),
+    }
+}
+
+#[cfg(test)]
+pub mod tests {
+    use super::*;
+    use ethereum_types::Address;
+    use rustc_hex::FromHex;
+    use std::sync::Arc;
+    use tempdir::TempDir;
+
+    pub fn run_test<T, I, F>(informant: I, compare: F, code: &str, gas: T, expected: &str)
+    where
+        T: Into<U256>,
+        I: Informant,
+        F: FnOnce(Option<I::Output>, &str),
+    {
+        let mut params = ActionParams::default();
+        params.code = Some(Arc::new(code.from_hex().unwrap()));
+        params.gas = gas.into();
+
+        let tempdir = TempDir::new("").unwrap();
+        let spec = ::ethcore::ethereum::new_foundation(&tempdir.path());
+        let result = run_action(&spec, params, informant, TrieSpec::Secure);
+        match result {
+            Ok(Success { traces, .. }) => compare(traces, expected),
+            Err(Failure { traces, .. }) => compare(traces, expected),
+        }
+    }
+
+    #[test]
+    fn should_call_account_from_spec() {
+        use display::{config::Config, std_json::tests::informant};
+
+        let (inf, res) = informant(Config::default());
+        let mut params = ActionParams::default();
+        params.code_address = Address::from_low_u64_be(0x20);
+        params.gas = 0xffff.into();
+
+        let spec = ::ethcore::ethereum::load(None, include_bytes!("../res/testchain.json"));
+        let _result = run_action(&spec, params, inf, TrieSpec::Secure);
+
+        assert_eq!(
+            &String::from_utf8_lossy(&**res.lock().unwrap()),
+            r#"{"depth":1,"gas":"0xffff","op":98,"opName":"PUSH3","pc":0,"stack":[],"storage":{}}
+{"depth":1,"gas":"0xfffc","op":96,"opName":"PUSH1","pc":4,"stack":["0xaaaaaa"],"storage":{}}
+{"depth":1,"gas":"0xfff9","op":96,"opName":"PUSH1","pc":6,"stack":["0xaaaaaa","0xaa"],"storage":{}}
+{"depth":1,"gas":"0xfff6","op":80,"opName":"POP","pc":8,"stack":["0xaaaaaa","0xaa","0xaa"],"storage":{}}
+{"depth":1,"gas":"0xfff4","op":96,"opName":"PUSH1","pc":9,"stack":["0xaaaaaa","0xaa"],"storage":{}}
+{"depth":1,"gas":"0xfff1","op":96,"opName":"PUSH1","pc":11,"stack":["0xaaaaaa","0xaa","0xaa"],"storage":{}}
+{"depth":1,"gas":"0xffee","op":96,"opName":"PUSH1","pc":13,"stack":["0xaaaaaa","0xaa","0xaa","0xaa"],"storage":{}}
+{"depth":1,"gas":"0xffeb","op":96,"opName":"PUSH1","pc":15,"stack":["0xaaaaaa","0xaa","0xaa","0xaa","0xaa"],"storage":{}}
+{"depth":1,"gas":"0xffe8","op":96,"opName":"PUSH1","pc":17,"stack":["0xaaaaaa","0xaa","0xaa","0xaa","0xaa","0xaa"],"storage":{}}
+{"depth":1,"gas":"0xffe5","op":96,"opName":"PUSH1","pc":19,"stack":["0xaaaaaa","0xaa","0xaa","0xaa","0xaa","0xaa","0xaa"],"storage":{}}
+"#
+        );
+    }
+}

bin/evmbin/src/main.rs

@@ -0,0 +1,511 @@
+// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// This file is part of OpenEthereum.
+
+// OpenEthereum 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.
+
+// OpenEthereum 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 OpenEthereum.  If not, see <http://www.gnu.org/licenses/>.
+
+//! OpenEthereum EVM interpreter binary.
+
+#![warn(missing_docs)]
+
+extern crate common_types as types;
+extern crate ethcore;
+extern crate ethjson;
+extern crate rustc_hex;
+extern crate serde;
+#[macro_use]
+extern crate serde_derive;
+#[macro_use]
+extern crate serde_json;
+extern crate docopt;
+extern crate env_logger;
+extern crate ethereum_types;
+extern crate evm;
+extern crate panic_hook;
+extern crate parity_bytes as bytes;
+extern crate vm;
+
+#[cfg(test)]
+#[macro_use]
+extern crate pretty_assertions;
+
+#[cfg(test)]
+extern crate tempdir;
+
+use bytes::Bytes;
+use docopt::Docopt;
+use ethcore::{json_tests, spec, TrieSpec};
+use ethereum_types::{Address, U256};
+use ethjson::spec::ForkSpec;
+use evm::EnvInfo;
+use rustc_hex::FromHex;
+use std::{fmt, fs, path::PathBuf, sync::Arc};
+use vm::{ActionParams, CallType};
+
+mod display;
+mod info;
+
+use info::Informant;
+
+const USAGE: &'static str = r#"
+EVM implementation for Parity.
+  Copyright 2015-2020 Parity Technologies (UK) Ltd.
+
+Usage:
+    openethereum-evm state-test <file> [--json --std-json --std-dump-json --only NAME --chain CHAIN --std-out-only --std-err-only --omit-storage-output --omit-memory-output]
+    openethereum-evm stats [options]
+    openethereum-evm stats-jsontests-vm <file>
+    openethereum-evm [options]
+    openethereum-evm [-h | --help]
+
+Commands:
+    state-test         Run a state test from a json file.
+    stats              Execute EVM runtime code and return the statistics.
+    stats-jsontests-vm Execute standard json-tests format VMTests and return
+                       timing statistics in tsv format.
+
+Transaction options:
+    --code CODE        Contract code as hex (without 0x).
+    --to ADDRESS       Recipient address (without 0x).
+    --from ADDRESS     Sender address (without 0x).
+    --input DATA       Input data as hex (without 0x).
+    --gas GAS          Supplied gas as hex (without 0x).
+    --gas-price WEI    Supplied gas price as hex (without 0x).
+
+State test options:
+    --chain CHAIN      Run only from specific chain name (i.e. one of EIP150, EIP158,
+                       Frontier, Homestead, Byzantium, Constantinople,
+                       ConstantinopleFix, Istanbul, EIP158ToByzantiumAt5, FrontierToHomesteadAt5,
+                       HomesteadToDaoAt5, HomesteadToEIP150At5, Berlin, Yolo3).
+    --only NAME        Runs only a single test matching the name.
+
+General options:
+    --json                    Display verbose results in JSON.
+    --std-json                Display results in standardized JSON format.
+    --std-err-only            With --std-json redirect to err output only.
+    --std-out-only            With --std-json redirect to out output only.
+    --omit-storage-output     With --std-json omit storage output.
+    --omit-memory-output      With --std-json omit memory output.
+    --std-dump-json           Display results in standardized JSON format
+                              with additional state dump.
+
+Display result state dump in standardized JSON format.
+    --chain CHAIN      Chain spec file path.
+    -h, --help         Display this message and exit.
+"#;
+
+fn main() {
+    panic_hook::set_abort();
+    env_logger::init();
+
+    let args: Args = Docopt::new(USAGE)
+        .and_then(|d| d.deserialize())
+        .unwrap_or_else(|e| e.exit());
+
+    let config = args.config();
+
+    if args.cmd_state_test {
+        run_state_test(args)
+    } else if args.cmd_stats_jsontests_vm {
+        run_stats_jsontests_vm(args)
+    } else if args.flag_json {
+        run_call(args, display::json::Informant::new(config))
+    } else if args.flag_std_dump_json || args.flag_std_json {
+        if args.flag_std_err_only {
+            run_call(args, display::std_json::Informant::err_only(config))
+        } else if args.flag_std_out_only {
+            run_call(args, display::std_json::Informant::out_only(config))
+        } else {
+            run_call(args, display::std_json::Informant::new_default(config))
+        };
+    } else {
+        run_call(args, display::simple::Informant::new(config))
+    }
+}
+
+fn run_stats_jsontests_vm(args: Args) {
+    use json_tests::HookType;
+    use std::{
+        collections::HashMap,
+        time::{Duration, Instant},
+    };
+
+    let file = args.arg_file.expect("FILE (or PATH) is required");
+
+    let mut timings: HashMap<String, (Instant, Option<Duration>)> = HashMap::new();
+
+    {
+        let mut record_time = |name: &str, typ: HookType| match typ {
+            HookType::OnStart => {
+                timings.insert(name.to_string(), (Instant::now(), None));
+            }
+            HookType::OnStop => {
+                timings.entry(name.to_string()).and_modify(|v| {
+                    v.1 = Some(v.0.elapsed());
+                });
+            }
+        };
+        for file_path in json_tests::find_json_files_recursive(&file) {
+            let json_data = std::fs::read(&file_path).unwrap();
+            json_tests::json_executive_test(&file_path, &json_data, &mut record_time);
+        }
+    }
+
+    for (name, v) in timings {
+        println!(
+            "{}\t{}",
+            name,
+            display::as_micros(&v.1.expect("All hooks are called with OnStop; qed"))
+        );
+    }
+}
+
+fn run_state_test(args: Args) {
+    use ethjson::state::test::Test;
+    let config = args.config();
+    let file = args.arg_file.expect("FILE is required");
+    let mut file = match fs::File::open(&file) {
+        Err(err) => die(format!("Unable to open: {:?}: {}", file, err)),
+        Ok(file) => file,
+    };
+    let state_test = match Test::load(&mut file) {
+        Err(err) => die(format!("Unable to load the test file: {}", err)),
+        Ok(test) => test,
+    };
+    let only_test = args.flag_only.map(|s| s.to_lowercase());
+    let only_chain = args.flag_chain.map(|s| s.to_lowercase());
+
+    for (name, test) in state_test {
+        if let Some(false) = only_test
+            .as_ref()
+            .map(|only_test| &name.to_lowercase() == only_test)
+        {
+            continue;
+        }
+
+        let multitransaction = test.transaction;
+        let env_info: EnvInfo = test.env.into();
+        let pre = test.pre_state.into();
+
+        for (spec, states) in test.post_states {
+            //hardcode base fee for part of the london tests, that miss base fee field in env
+            let mut test_env = env_info.clone();
+            if spec >= ForkSpec::London {
+                if test_env.base_fee.is_none() {
+                    test_env.base_fee = Some(0x0a.into());
+                }
+            }
+
+            if let Some(false) = only_chain
+                .as_ref()
+                .map(|only_chain| &format!("{:?}", spec).to_lowercase() == only_chain)
+            {
+                continue;
+            }
+            for (idx, state) in states.into_iter().enumerate() {
+                let post_root = state.hash.into();
+                let transaction = multitransaction.select(&state.indexes);
+
+                let trie_spec = if args.flag_std_dump_json {
+                    TrieSpec::Fat
+                } else {
+                    TrieSpec::Secure
+                };
+                if args.flag_json {
+                    info::run_transaction(
+                        &name,
+                        idx,
+                        &spec,
+                        &pre,
+                        post_root,
+                        &test_env,
+                        transaction,
+                        display::json::Informant::new(config),
+                        trie_spec,
+                    )
+                } else if args.flag_std_dump_json || args.flag_std_json {
+                    if args.flag_std_err_only {
+                        info::run_transaction(
+                            &name,
+                            idx,
+                            &spec,
+                            &pre,
+                            post_root,
+                            &test_env,
+                            transaction,
+                            display::std_json::Informant::err_only(config),
+                            trie_spec,
+                        )
+                    } else if args.flag_std_out_only {
+                        info::run_transaction(
+                            &name,
+                            idx,
+                            &spec,
+                            &pre,
+                            post_root,
+                            &test_env,
+                            transaction,
+                            display::std_json::Informant::out_only(config),
+                            trie_spec,
+                        )
+                    } else {
+                        info::run_transaction(
+                            &name,
+                            idx,
+                            &spec,
+                            &pre,
+                            post_root,
+                            &test_env,
+                            transaction,
+                            display::std_json::Informant::new_default(config),
+                            trie_spec,
+                        )
+                    }
+                } else {
+                    info::run_transaction(
+                        &name,
+                        idx,
+                        &spec,
+                        &pre,
+                        post_root,
+                        &test_env,
+                        transaction,
+                        display::simple::Informant::new(config),
+                        trie_spec,
+                    )
+                }
+            }
+        }
+    }
+}
+
+fn run_call<T: Informant>(args: Args, informant: T) {
+    let from = arg(args.from(), "--from");
+    let to = arg(args.to(), "--to");
+    let code = arg(args.code(), "--code");
+    let spec = arg(args.spec(), "--chain");
+    let gas = arg(args.gas(), "--gas");
+    let gas_price = arg(args.gas_price(), "--gas-price");
+    let data = arg(args.data(), "--input");
+
+    if code.is_none() && to == Address::default() {
+        die("Either --code or --to is required.");
+    }
+    let mut params = ActionParams::default();
+    if spec.engine.params().eip2929_transition == 0 {
+        params.access_list.enable();
+        params.access_list.insert_address(from);
+        params.access_list.insert_address(to);
+        for (builtin, _) in spec.engine.builtins() {
+            params.access_list.insert_address(*builtin);
+        }
+    }
+
+    params.call_type = if code.is_none() {
+        CallType::Call
+    } else {
+        CallType::None
+    };
+    params.code_address = to;
+    params.address = to;
+    params.sender = from;
+    params.origin = from;
+    params.gas = gas;
+    params.gas_price = gas_price;
+    params.code = code.map(Arc::new);
+    params.data = data;
+
+    let mut sink = informant.clone_sink();
+    let result = if args.flag_std_dump_json {
+        info::run_action(&spec, params, informant, TrieSpec::Fat)
+    } else {
+        info::run_action(&spec, params, informant, TrieSpec::Secure)
+    };
+    T::finish(result, &mut sink);
+}
+
+#[derive(Debug, Deserialize)]
+struct Args {
+    cmd_stats: bool,
+    cmd_state_test: bool,
+    cmd_stats_jsontests_vm: bool,
+    arg_file: Option<PathBuf>,
+    flag_only: Option<String>,
+    flag_from: Option<String>,
+    flag_to: Option<String>,
+    flag_code: Option<String>,
+    flag_gas: Option<String>,
+    flag_gas_price: Option<String>,
+    flag_input: Option<String>,
+    flag_chain: Option<String>,
+    flag_json: bool,
+    flag_std_json: bool,
+    flag_std_dump_json: bool,
+    flag_std_err_only: bool,
+    flag_std_out_only: bool,
+    flag_omit_storage_output: bool,
+    flag_omit_memory_output: bool,
+}
+
+impl Args {
+    pub fn gas(&self) -> Result<U256, String> {
+        match self.flag_gas {
+            Some(ref gas) => gas.parse().map_err(to_string),
+            None => Ok(U256::from(u64::max_value())),
+        }
+    }
+
+    pub fn gas_price(&self) -> Result<U256, String> {
+        match self.flag_gas_price {
+            Some(ref gas_price) => gas_price.parse().map_err(to_string),
+            None => Ok(U256::zero()),
+        }
+    }
+
+    pub fn from(&self) -> Result<Address, String> {
+        match self.flag_from {
+            Some(ref from) => from.parse().map_err(to_string),
+            None => Ok(Address::default()),
+        }
+    }
+
+    pub fn to(&self) -> Result<Address, String> {
+        match self.flag_to {
+            Some(ref to) => to.parse().map_err(to_string),
+            None => Ok(Address::default()),
+        }
+    }
+
+    pub fn code(&self) -> Result<Option<Bytes>, String> {
+        match self.flag_code {
+            Some(ref code) => code.from_hex().map(Some).map_err(to_string),
+            None => Ok(None),
+        }
+    }
+
+    pub fn data(&self) -> Result<Option<Bytes>, String> {
+        match self.flag_input {
+            Some(ref input) => input.from_hex().map_err(to_string).map(Some),
+            None => Ok(None),
+        }
+    }
+
+    pub fn spec(&self) -> Result<spec::Spec, String> {
+        Ok(match self.flag_chain {
+            Some(ref spec_name) => {
+                let fork_spec: Result<ethjson::spec::ForkSpec, _> =
+                    serde_json::from_str(&format!("{:?}", spec_name));
+                if let Ok(fork_spec) = fork_spec {
+                    ethcore::client::EvmTestClient::spec_from_json(&fork_spec)
+                        .expect("this forkspec is not defined")
+                } else {
+                    let file = fs::File::open(spec_name).map_err(|e| format!("{}", e))?;
+                    spec::Spec::load(&::std::env::temp_dir(), file)?
+                }
+            }
+            None => ethcore::ethereum::new_foundation(&::std::env::temp_dir()),
+        })
+    }
+
+    pub fn config(&self) -> display::config::Config {
+        display::config::Config::new(self.flag_omit_storage_output, self.flag_omit_memory_output)
+    }
+}
+
+fn arg<T>(v: Result<T, String>, param: &str) -> T {
+    v.unwrap_or_else(|e| die(format!("Invalid {}: {}", param, e)))
+}
+
+fn to_string<T: fmt::Display>(msg: T) -> String {
+    format!("{}", msg)
+}
+
+fn die<T: fmt::Display>(msg: T) -> ! {
+    println!("{}", msg);
+    ::std::process::exit(-1)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{Args, USAGE};
+    use docopt::Docopt;
+    use ethereum_types::Address;
+
+    fn run<T: AsRef<str>>(args: &[T]) -> Args {
+        Docopt::new(USAGE)
+            .and_then(|d| d.argv(args.into_iter()).deserialize())
+            .unwrap()
+    }
+
+    #[test]
+    fn should_parse_all_the_options() {
+        let args = run(&[
+            "openethereum-evm",
+            "--json",
+            "--std-json",
+            "--std-dump-json",
+            "--gas",
+            "1",
+            "--gas-price",
+            "2",
+            "--from",
+            "0000000000000000000000000000000000000003",
+            "--to",
+            "0000000000000000000000000000000000000004",
+            "--code",
+            "05",
+            "--input",
+            "06",
+            "--chain",
+            "./testfile",
+            "--std-err-only",
+            "--std-out-only",
+        ]);
+
+        assert_eq!(args.flag_json, true);
+        assert_eq!(args.flag_std_json, true);
+        assert_eq!(args.flag_std_dump_json, true);
+        assert_eq!(args.flag_std_err_only, true);
+        assert_eq!(args.flag_std_out_only, true);
+        assert_eq!(args.gas(), Ok(1.into()));
+        assert_eq!(args.gas_price(), Ok(2.into()));
+        assert_eq!(args.from(), Ok(Address::from_low_u64_be(3)));
+        assert_eq!(args.to(), Ok(Address::from_low_u64_be(4)));
+        assert_eq!(args.code(), Ok(Some(vec![05])));
+        assert_eq!(args.data(), Ok(Some(vec![06])));
+        assert_eq!(args.flag_chain, Some("./testfile".to_owned()));
+    }
+
+    #[test]
+    fn should_parse_state_test_command() {
+        let args = run(&[
+            "openethereum-evm",
+            "state-test",
+            "./file.json",
+            "--chain",
+            "homestead",
+            "--only=add11",
+            "--json",
+            "--std-json",
+            "--std-dump-json",
+        ]);
+
+        assert_eq!(args.cmd_state_test, true);
+        assert!(args.arg_file.is_some());
+        assert_eq!(args.flag_json, true);
+        assert_eq!(args.flag_std_json, true);
+        assert_eq!(args.flag_std_dump_json, true);
+        assert_eq!(args.flag_chain, Some("homestead".to_owned()));
+        assert_eq!(args.flag_only, Some("add11".to_owned()));
+    }
+}

bin/oe/account.rs

@@ -0,0 +1,141 @@
+// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// This file is part of OpenEthereum.
+
+// OpenEthereum 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.
+
+// OpenEthereum 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 OpenEthereum.  If not, see <http://www.gnu.org/licenses/>.
+
+use crate::params::SpecType;
+use std::num::NonZeroU32;
+
+#[derive(Debug, PartialEq)]
+pub enum AccountCmd {
+    New(NewAccount),
+    List(ListAccounts),
+    Import(ImportAccounts),
+}
+
+#[derive(Debug, PartialEq)]
+pub struct ListAccounts {
+    pub path: String,
+    pub spec: SpecType,
+}
+
+#[derive(Debug, PartialEq)]
+pub struct NewAccount {
+    pub iterations: NonZeroU32,
+    pub path: String,
+    pub spec: SpecType,
+    pub password_file: Option<String>,
+}
+
+#[derive(Debug, PartialEq)]
+pub struct ImportAccounts {
+    pub from: Vec<String>,
+    pub to: String,
+    pub spec: SpecType,
+}
+
+#[cfg(not(feature = "accounts"))]
+pub fn execute(_cmd: AccountCmd) -> Result<String, String> {
+    Err("Account management is deprecated. Please see #9997 for alternatives:\nhttps://github.com/openethereum/openethereum/issues/9997".into())
+}
+
+#[cfg(feature = "accounts")]
+mod command {
+    use super::*;
+    use crate::{
+        accounts::{AccountProvider, AccountProviderSettings},
+        helpers::{password_from_file, password_prompt},
+    };
+    use ethstore::{accounts_dir::RootDiskDirectory, import_account, import_accounts, EthStore};
+    use std::path::PathBuf;
+
+    pub fn execute(cmd: AccountCmd) -> Result<String, String> {
+        match cmd {
+            AccountCmd::New(new_cmd) => new(new_cmd),
+            AccountCmd::List(list_cmd) => list(list_cmd),
+            AccountCmd::Import(import_cmd) => import(import_cmd),
+        }
+    }
+
+    fn keys_dir(path: String, spec: SpecType) -> Result<RootDiskDirectory, String> {
+        let spec = spec.spec(&::std::env::temp_dir())?;
+        let mut path = PathBuf::from(&path);
+        path.push(spec.data_dir);
+        RootDiskDirectory::create(path).map_err(|e| format!("Could not open keys directory: {}", e))
+    }
+
+    fn secret_store(
+        dir: Box<RootDiskDirectory>,
+        iterations: Option<NonZeroU32>,
+    ) -> Result<EthStore, String> {
+        match iterations {
+            Some(i) => EthStore::open_with_iterations(dir, i),
+            _ => EthStore::open(dir),
+        }
+        .map_err(|e| format!("Could not open keys store: {}", e))
+    }
+
+    fn new(n: NewAccount) -> Result<String, String> {
+        let password = match n.password_file {
+            Some(file) => password_from_file(file)?,
+            None => password_prompt()?,
+        };
+
+        let dir = Box::new(keys_dir(n.path, n.spec)?);
+        let secret_store = Box::new(secret_store(dir, Some(n.iterations))?);
+        let acc_provider = AccountProvider::new(secret_store, AccountProviderSettings::default());
+        let new_account = acc_provider
+            .new_account(&password)
+            .map_err(|e| format!("Could not create new account: {}", e))?;
+        Ok(format!("0x{:x}", new_account))
+    }
+
+    fn list(list_cmd: ListAccounts) -> Result<String, String> {
+        let dir = Box::new(keys_dir(list_cmd.path, list_cmd.spec)?);
+        let secret_store = Box::new(secret_store(dir, None)?);
+        let acc_provider = AccountProvider::new(secret_store, AccountProviderSettings::default());
+        let accounts = acc_provider.accounts().map_err(|e| format!("{}", e))?;
+        let result = accounts
+            .into_iter()
+            .map(|a| format!("0x{:x}", a))
+            .collect::<Vec<String>>()
+            .join("\n");
+
+        Ok(result)
+    }
+
+    fn import(i: ImportAccounts) -> Result<String, String> {
+        let to = keys_dir(i.to, i.spec)?;
+        let mut imported = 0;
+
+        for path in &i.from {
+            let path = PathBuf::from(path);
+            if path.is_dir() {
+                let from = RootDiskDirectory::at(&path);
+                imported += import_accounts(&from, &to)
+                    .map_err(|e| format!("Importing accounts from {:?} failed: {}", path, e))?
+                    .len();
+            } else if path.is_file() {
+                import_account(&path, &to)
+                    .map_err(|e| format!("Importing account from {:?} failed: {}", path, e))?;
+                imported += 1;
+            }
+        }
+
+        Ok(format!("{} account(s) imported", imported))
+    }
+}
+
+#[cfg(feature = "accounts")]
+pub use self::command::execute;

bin/oe/account_utils.rs

@@ -0,0 +1,263 @@
+// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// This file is part of OpenEthereum.
+
+// OpenEthereum 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.
+
+// OpenEthereum 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 OpenEthereum.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::sync::Arc;
+
+use crypto::publickey;
+use dir::Directories;
+use ethereum_types::{Address, H160};
+use ethkey::Password;
+
+use crate::params::{AccountsConfig, SpecType};
+
+#[cfg(not(feature = "accounts"))]
+mod accounts {
+    use super::*;
+
+    /// Dummy AccountProvider
+    pub struct AccountProvider;
+
+    impl ::ethcore::miner::LocalAccounts for AccountProvider {
+        fn is_local(&self, _address: &Address) -> bool {
+            false
+        }
+    }
+
+    pub fn prepare_account_provider(
+        _spec: &SpecType,
+        _dirs: &Directories,
+        _data_dir: &str,
+        _cfg: AccountsConfig,
+        _passwords: &[Password],
+    ) -> Result<AccountProvider, String> {
+        warn!("Note: Your instance of OpenEthereum is running without account support. Some CLI options are ignored.");
+        Ok(AccountProvider)
+    }
+
+    pub fn miner_local_accounts(_: Arc<AccountProvider>) -> AccountProvider {
+        AccountProvider
+    }
+
+    pub fn miner_author(
+        _spec: &SpecType,
+        _dirs: &Directories,
+        _account_provider: &Arc<AccountProvider>,
+        _engine_signer: Address,
+        _passwords: &[Password],
+    ) -> Result<Option<::ethcore::miner::Author>, String> {
+        Ok(None)
+    }
+
+    pub fn accounts_list(
+        _account_provider: Arc<AccountProvider>,
+    ) -> Arc<dyn Fn() -> Vec<Address> + Send + Sync> {
+        Arc::new(|| vec![])
+    }
+}
+
+#[cfg(feature = "accounts")]
+mod accounts {
+    use super::*;
+    use crate::{ethereum_types::H256, upgrade::upgrade_key_location};
+    use std::str::FromStr;
+
+    pub use crate::accounts::AccountProvider;
+
+    /// Pops along with error messages when a password is missing or invalid.
+    const VERIFY_PASSWORD_HINT: &str = "Make sure valid password is present in files passed using `--password` or in the configuration file.";
+
+    /// Initialize account provider
+    pub fn prepare_account_provider(
+        spec: &SpecType,
+        dirs: &Directories,
+        data_dir: &str,
+        cfg: AccountsConfig,
+        passwords: &[Password],
+    ) -> Result<AccountProvider, String> {
+        use crate::accounts::AccountProviderSettings;
+        use ethstore::{accounts_dir::RootDiskDirectory, EthStore};
+
+        let path = dirs.keys_path(data_dir);
+        upgrade_key_location(&dirs.legacy_keys_path(cfg.testnet), &path);
+        let dir = Box::new(
+            RootDiskDirectory::create(&path)
+                .map_err(|e| format!("Could not open keys directory: {}", e))?,
+        );
+        let account_settings = AccountProviderSettings {
+            unlock_keep_secret: cfg.enable_fast_unlock,
+            blacklisted_accounts: match *spec {
+                SpecType::Morden
+                | SpecType::Ropsten
+                | SpecType::Kovan
+                | SpecType::Goerli
+                | SpecType::Sokol
+                | SpecType::Dev => vec![],
+                _ => vec![H160::from_str("00a329c0648769a73afac7f9381e08fb43dbea72")
+                    .expect("the string is valid hex; qed")],
+            },
+        };
+
+        let ethstore = EthStore::open_with_iterations(dir, cfg.iterations)
+            .map_err(|e| format!("Could not open keys directory: {}", e))?;
+        if cfg.refresh_time > 0 {
+            ethstore.set_refresh_time(::std::time::Duration::from_secs(cfg.refresh_time));
+        }
+        let account_provider = AccountProvider::new(Box::new(ethstore), account_settings);
+
+        // Add development account if running dev chain:
+        if let SpecType::Dev = *spec {
+            insert_dev_account(&account_provider);
+        }
+
+        for a in cfg.unlocked_accounts {
+            // Check if the account exists
+            if !account_provider.has_account(a) {
+                return Err(format!(
+                    "Account {} not found for the current chain. {}",
+                    a,
+                    build_create_account_hint(spec, &dirs.keys)
+                ));
+            }
+
+            // Check if any passwords have been read from the password file(s)
+            if passwords.is_empty() {
+                return Err(format!(
+                    "No password found to unlock account {}. {}",
+                    a, VERIFY_PASSWORD_HINT
+                ));
+            }
+
+            if !passwords.iter().any(|p| {
+                account_provider
+                    .unlock_account_permanently(a, (*p).clone())
+                    .is_ok()
+            }) {
+                return Err(format!(
+                    "No valid password to unlock account {}. {}",
+                    a, VERIFY_PASSWORD_HINT
+                ));
+            }
+        }
+
+        Ok(account_provider)
+    }
+
+    pub struct LocalAccounts(Arc<AccountProvider>);
+    impl ::ethcore::miner::LocalAccounts for LocalAccounts {
+        fn is_local(&self, address: &Address) -> bool {
+            self.0.has_account(*address)
+        }
+    }
+
+    pub fn miner_local_accounts(account_provider: Arc<AccountProvider>) -> LocalAccounts {
+        LocalAccounts(account_provider)
+    }
+
+    pub fn miner_author(
+        spec: &SpecType,
+        dirs: &Directories,
+        account_provider: &Arc<AccountProvider>,
+        engine_signer: Address,
+        passwords: &[Password],
+    ) -> Result<Option<::ethcore::miner::Author>, String> {
+        use ethcore::engines::EngineSigner;
+
+        // Check if engine signer exists
+        if !account_provider.has_account(engine_signer) {
+            return Err(format!(
+                "Consensus signer account not found for the current chain. {}",
+                build_create_account_hint(spec, &dirs.keys)
+            ));
+        }
+
+        // Check if any passwords have been read from the password file(s)
+        if passwords.is_empty() {
+            return Err(format!(
+                "No password found for the consensus signer {}. {}",
+                engine_signer, VERIFY_PASSWORD_HINT
+            ));
+        }
+
+        let mut author = None;
+        for password in passwords {
+            let signer = parity_rpc::signer::EngineSigner::new(
+                account_provider.clone(),
+                engine_signer,
+                password.clone(),
+            );
+            // sign dummy msg to check if password and account can be used.
+            if signer.sign(H256::from_low_u64_be(1)).is_ok() {
+                author = Some(::ethcore::miner::Author::Sealer(Box::new(signer)));
+            }
+        }
+        if author.is_none() {
+            return Err(format!(
+                "No valid password for the consensus signer {}. {}",
+                engine_signer, VERIFY_PASSWORD_HINT
+            ));
+        }
+
+        Ok(author)
+    }
+
+    pub fn accounts_list(
+        account_provider: Arc<AccountProvider>,
+    ) -> Arc<dyn Fn() -> Vec<Address> + Send + Sync> {
+        Arc::new(move || account_provider.accounts().unwrap_or_default())
+    }
+
+    fn insert_dev_account(account_provider: &AccountProvider) {
+        let secret = publickey::Secret::from_str(
+            "4d5db4107d237df6a3d58ee5f70ae63d73d7658d4026f2eefd2f204c81682cb7",
+        )
+        .expect("Valid account;qed");
+        let dev_account = publickey::KeyPair::from_secret(secret.clone())
+            .expect("Valid secret produces valid key;qed");
+        if !account_provider.has_account(dev_account.address()) {
+            match account_provider.insert_account(secret, &Password::from(String::new())) {
+                Err(e) => warn!("Unable to add development account: {}", e),
+                Ok(address) => {
+                    let _ = account_provider
+                        .set_account_name(address.clone(), "Development Account".into());
+                    let _ = account_provider.set_account_meta(
+                        address,
+                        ::serde_json::to_string(
+                            &(vec![
+                                (
+                                    "description",
+                                    "Never use this account outside of development chain!",
+                                ),
+                                ("passwordHint", "Password is empty string"),
+                            ]
+                            .into_iter()
+                            .collect::<::std::collections::HashMap<_, _>>()),
+                        )
+                        .expect("Serialization of hashmap does not fail."),
+                    );
+                }
+            }
+        }
+    }
+
+    // Construct an error `String` with an adaptive hint on how to create an account.
+    fn build_create_account_hint(spec: &SpecType, keys: &str) -> String {
+        format!("You can create an account via RPC, UI or `openethereum account new --chain {} --keys-path {}`.", spec, keys)
+    }
+}
+
+pub use self::accounts::{
+    accounts_list, miner_author, miner_local_accounts, prepare_account_provider, AccountProvider,
+};

bin/oe/blockchain.rs

@@ -0,0 +1,551 @@
+// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// This file is part of OpenEthereum.
+
+// OpenEthereum 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.
+
+// OpenEthereum 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 OpenEthereum.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::{fs, io, sync::Arc, time::Instant};
+
+use crate::{
+    bytes::ToPretty,
+    cache::CacheConfig,
+    db,
+    hash::{keccak, KECCAK_NULL_RLP},
+    helpers::{execute_upgrades, to_client_config},
+    informant::{FullNodeInformantData, Informant, MillisecondDuration},
+    params::{fatdb_switch_to_bool, tracing_switch_to_bool, Pruning, SpecType, Switch},
+    types::data_format::DataFormat,
+    user_defaults::UserDefaults,
+};
+use ansi_term::Colour;
+use dir::Directories;
+use ethcore::{
+    client::{
+        Balance, BlockChainClient, BlockChainReset, BlockId, DatabaseCompactionProfile,
+        ImportExportBlocks, Mode, Nonce, VMType,
+    },
+    miner::Miner,
+    verification::queue::VerifierSettings,
+};
+use ethcore_service::ClientService;
+use ethereum_types::{Address, H256, U256};
+
+#[derive(Debug, PartialEq)]
+pub enum BlockchainCmd {
+    Kill(KillBlockchain),
+    Import(ImportBlockchain),
+    Export(ExportBlockchain),
+    ExportState(ExportState),
+    Reset(ResetBlockchain),
+}
+
+#[derive(Debug, PartialEq)]
+pub struct ResetBlockchain {
+    pub dirs: Directories,
+    pub spec: SpecType,
+    pub pruning: Pruning,
+    pub pruning_history: u64,
+    pub pruning_memory: usize,
+    pub tracing: Switch,
+    pub fat_db: Switch,
+    pub compaction: DatabaseCompactionProfile,
+    pub cache_config: CacheConfig,
+    pub num: u32,
+}
+
+#[derive(Debug, PartialEq)]
+pub struct KillBlockchain {
+    pub spec: SpecType,
+    pub dirs: Directories,
+    pub pruning: Pruning,
+}
+
+#[derive(Debug, PartialEq)]
+pub struct ImportBlockchain {
+    pub spec: SpecType,
+    pub cache_config: CacheConfig,
+    pub dirs: Directories,
+    pub file_path: Option<String>,
+    pub format: Option<DataFormat>,
+    pub pruning: Pruning,
+    pub pruning_history: u64,
+    pub pruning_memory: usize,
+    pub compaction: DatabaseCompactionProfile,
+    pub tracing: Switch,
+    pub fat_db: Switch,
+    pub vm_type: VMType,
+    pub check_seal: bool,
+    pub with_color: bool,
+    pub verifier_settings: VerifierSettings,
+    pub max_round_blocks_to_import: usize,
+}
+
+#[derive(Debug, PartialEq)]
+pub struct ExportBlockchain {
+    pub spec: SpecType,
+    pub cache_config: CacheConfig,
+    pub dirs: Directories,
+    pub file_path: Option<String>,
+    pub format: Option<DataFormat>,
+    pub pruning: Pruning,
+    pub pruning_history: u64,
+    pub pruning_memory: usize,
+    pub compaction: DatabaseCompactionProfile,
+    pub fat_db: Switch,
+    pub tracing: Switch,
+    pub from_block: BlockId,
+    pub to_block: BlockId,
+    pub check_seal: bool,
+    pub max_round_blocks_to_import: usize,
+}
+
+#[derive(Debug, PartialEq)]
+pub struct ExportState {
+    pub spec: SpecType,
+    pub cache_config: CacheConfig,
+    pub dirs: Directories,
+    pub file_path: Option<String>,
+    pub format: Option<DataFormat>,
+    pub pruning: Pruning,
+    pub pruning_history: u64,
+    pub pruning_memory: usize,
+    pub compaction: DatabaseCompactionProfile,
+    pub fat_db: Switch,
+    pub tracing: Switch,
+    pub at: BlockId,
+    pub storage: bool,
+    pub code: bool,
+    pub min_balance: Option<U256>,
+    pub max_balance: Option<U256>,
+    pub max_round_blocks_to_import: usize,
+}
+
+pub fn execute(cmd: BlockchainCmd) -> Result<(), String> {
+    match cmd {
+        BlockchainCmd::Kill(kill_cmd) => kill_db(kill_cmd),
+        BlockchainCmd::Import(import_cmd) => execute_import(import_cmd),
+        BlockchainCmd::Export(export_cmd) => execute_export(export_cmd),
+        BlockchainCmd::ExportState(export_cmd) => execute_export_state(export_cmd),
+        BlockchainCmd::Reset(reset_cmd) => execute_reset(reset_cmd),
+    }
+}
+
+fn execute_import(cmd: ImportBlockchain) -> Result<(), String> {
+    let timer = Instant::now();
+
+    // load spec file
+    let spec = cmd.spec.spec(&cmd.dirs.cache)?;
+
+    // load genesis hash
+    let genesis_hash = spec.genesis_header().hash();
+
+    // database paths
+    let db_dirs = cmd.dirs.database(genesis_hash, None, spec.data_dir.clone());
+
+    // user defaults path
+    let user_defaults_path = db_dirs.user_defaults_path();
+
+    // load user defaults
+    let mut user_defaults = UserDefaults::load(&user_defaults_path)?;
+
+    // select pruning algorithm
+    let algorithm = cmd.pruning.to_algorithm(&user_defaults);
+
+    // check if tracing is on
+    let tracing = tracing_switch_to_bool(cmd.tracing, &user_defaults)?;
+
+    // check if fatdb is on
+    let fat_db = fatdb_switch_to_bool(cmd.fat_db, &user_defaults, algorithm)?;
+
+    // prepare client and snapshot paths.
+    let client_path = db_dirs.client_path(algorithm);
+    let snapshot_path = db_dirs.snapshot_path();
+
+    // execute upgrades
+    execute_upgrades(&cmd.dirs.base, &db_dirs, algorithm, &cmd.compaction)?;
+
+    // create dirs used by parity
+    cmd.dirs.create_dirs(false, false)?;
+
+    // prepare client config
+    let mut client_config = to_client_config(
+        &cmd.cache_config,
+        spec.name.to_lowercase(),
+        Mode::Active,
+        tracing,
+        fat_db,
+        cmd.compaction,
+        cmd.vm_type,
+        "".into(),
+        algorithm,
+        cmd.pruning_history,
+        cmd.pruning_memory,
+        cmd.check_seal,
+        12,
+    );
+
+    client_config.queue.verifier_settings = cmd.verifier_settings;
+
+    let restoration_db_handler = db::restoration_db_handler(&client_path, &client_config);
+    let client_db = restoration_db_handler
+        .open(&client_path)
+        .map_err(|e| format!("Failed to open database {:?}", e))?;
+
+    // build client
+    let service = ClientService::start(
+        client_config,
+        &spec,
+        client_db,
+        &snapshot_path,
+        restoration_db_handler,
+        &cmd.dirs.ipc_path(),
+        // TODO [ToDr] don't use test miner here
+        // (actually don't require miner at all)
+        Arc::new(Miner::new_for_tests(&spec, None)),
+    )
+    .map_err(|e| format!("Client service error: {:?}", e))?;
+
+    // free up the spec in memory.
+    drop(spec);
+
+    let client = service.client();
+
+    let instream: Box<dyn io::Read> = match cmd.file_path {
+        Some(f) => {
+            Box::new(fs::File::open(&f).map_err(|_| format!("Cannot open given file: {}", f))?)
+        }
+        None => Box::new(io::stdin()),
+    };
+
+    let informant = Arc::new(Informant::new(
+        FullNodeInformantData {
+            client: client.clone(),
+            sync: None,
+            net: None,
+        },
+        None,
+        None,
+        cmd.with_color,
+    ));
+
+    service
+        .register_io_handler(informant)
+        .map_err(|_| "Unable to register informant handler".to_owned())?;
+
+    client.import_blocks(instream, cmd.format)?;
+
+    // save user defaults
+    user_defaults.pruning = algorithm;
+    user_defaults.tracing = tracing;
+    user_defaults.fat_db = fat_db;
+    user_defaults.save(&user_defaults_path)?;
+
+    let report = client.report();
+
+    let ms = timer.elapsed().as_milliseconds();
+    info!("Import completed in {} seconds, {} blocks, {} blk/s, {} transactions, {} tx/s, {} Mgas, {} Mgas/s",
+		ms / 1000,
+		report.blocks_imported,
+		(report.blocks_imported * 1000) as u64 / ms,
+		report.transactions_applied,
+		(report.transactions_applied * 1000) as u64 / ms,
+		report.gas_processed / 1_000_000,
+		(report.gas_processed / (ms * 1000)).low_u64(),
+	);
+    Ok(())
+}
+
+fn start_client(
+    dirs: Directories,
+    spec: SpecType,
+    pruning: Pruning,
+    pruning_history: u64,
+    pruning_memory: usize,
+    tracing: Switch,
+    fat_db: Switch,
+    compaction: DatabaseCompactionProfile,
+    cache_config: CacheConfig,
+    require_fat_db: bool,
+    max_round_blocks_to_import: usize,
+) -> Result<ClientService, String> {
+    // load spec file
+    let spec = spec.spec(&dirs.cache)?;
+
+    // load genesis hash
+    let genesis_hash = spec.genesis_header().hash();
+
+    // database paths
+    let db_dirs = dirs.database(genesis_hash, None, spec.data_dir.clone());
+
+    // user defaults path
+    let user_defaults_path = db_dirs.user_defaults_path();
+
+    // load user defaults
+    let user_defaults = UserDefaults::load(&user_defaults_path)?;
+
+    // select pruning algorithm
+    let algorithm = pruning.to_algorithm(&user_defaults);
+
+    // check if tracing is on
+    let tracing = tracing_switch_to_bool(tracing, &user_defaults)?;
+
+    // check if fatdb is on
+    let fat_db = fatdb_switch_to_bool(fat_db, &user_defaults, algorithm)?;
+    if !fat_db && require_fat_db {
+        return Err("This command requires OpenEthereum to be synced with --fat-db on.".to_owned());
+    }
+
+    // prepare client and snapshot paths.
+    let client_path = db_dirs.client_path(algorithm);
+    let snapshot_path = db_dirs.snapshot_path();
+
+    // execute upgrades
+    execute_upgrades(&dirs.base, &db_dirs, algorithm, &compaction)?;
+
+    // create dirs used by OpenEthereum.
+    dirs.create_dirs(false, false)?;
+
+    // prepare client config
+    let client_config = to_client_config(
+        &cache_config,
+        spec.name.to_lowercase(),
+        Mode::Active,
+        tracing,
+        fat_db,
+        compaction,
+        VMType::default(),
+        "".into(),
+        algorithm,
+        pruning_history,
+        pruning_memory,
+        true,
+        max_round_blocks_to_import,
+    );
+
+    let restoration_db_handler = db::restoration_db_handler(&client_path, &client_config);
+    let client_db = restoration_db_handler
+        .open(&client_path)
+        .map_err(|e| format!("Failed to open database {:?}", e))?;
+
+    let service = ClientService::start(
+        client_config,
+        &spec,
+        client_db,
+        &snapshot_path,
+        restoration_db_handler,
+        &dirs.ipc_path(),
+        // It's fine to use test version here,
+        // since we don't care about miner parameters at all
+        Arc::new(Miner::new_for_tests(&spec, None)),
+    )
+    .map_err(|e| format!("Client service error: {:?}", e))?;
+
+    drop(spec);
+    Ok(service)
+}
+
+fn execute_export(cmd: ExportBlockchain) -> Result<(), String> {
+    let service = start_client(
+        cmd.dirs,
+        cmd.spec,
+        cmd.pruning,
+        cmd.pruning_history,
+        cmd.pruning_memory,
+        cmd.tracing,
+        cmd.fat_db,
+        cmd.compaction,
+        cmd.cache_config,
+        false,
+        cmd.max_round_blocks_to_import,
+    )?;
+    let client = service.client();
+
+    let out: Box<dyn io::Write> = match cmd.file_path {
+        Some(f) => Box::new(
+            fs::File::create(&f).map_err(|_| format!("Cannot write to file given: {}", f))?,
+        ),
+        None => Box::new(io::stdout()),
+    };
+
+    client.export_blocks(out, cmd.from_block, cmd.to_block, cmd.format)?;
+
+    info!("Export completed.");
+    Ok(())
+}
+
+fn execute_export_state(cmd: ExportState) -> Result<(), String> {
+    let service = start_client(
+        cmd.dirs,
+        cmd.spec,
+        cmd.pruning,
+        cmd.pruning_history,
+        cmd.pruning_memory,
+        cmd.tracing,
+        cmd.fat_db,
+        cmd.compaction,
+        cmd.cache_config,
+        true,
+        cmd.max_round_blocks_to_import,
+    )?;
+
+    let client = service.client();
+
+    let mut out: Box<dyn io::Write> = match cmd.file_path {
+        Some(f) => Box::new(
+            fs::File::create(&f).map_err(|_| format!("Cannot write to file given: {}", f))?,
+        ),
+        None => Box::new(io::stdout()),
+    };
+
+    let mut last: Option<Address> = None;
+    let at = cmd.at;
+    let mut i = 0usize;
+
+    out.write_fmt(format_args!("{{ \"state\": {{",))
+        .expect("Couldn't write to stream.");
+    loop {
+        let accounts = client
+            .list_accounts(at, last.as_ref(), 1000)
+            .ok_or("Specified block not found")?;
+        if accounts.is_empty() {
+            break;
+        }
+
+        for account in accounts.into_iter() {
+            let balance = client
+                .balance(&account, at.into())
+                .unwrap_or_else(U256::zero);
+            if cmd.min_balance.map_or(false, |m| balance < m)
+                || cmd.max_balance.map_or(false, |m| balance > m)
+            {
+                last = Some(account);
+                continue; //filtered out
+            }
+
+            if i != 0 {
+                out.write(b",").expect("Write error");
+            }
+            out.write_fmt(format_args!(
+                "\n\"0x{:x}\": {{\"balance\": \"{:x}\", \"nonce\": \"{:x}\"",
+                account,
+                balance,
+                client.nonce(&account, at).unwrap_or_else(U256::zero)
+            ))
+            .expect("Write error");
+            let code = client
+                .code(&account, at.into())
+                .unwrap_or(None)
+                .unwrap_or_else(Vec::new);
+            if !code.is_empty() {
+                out.write_fmt(format_args!(", \"code_hash\": \"0x{:x}\"", keccak(&code)))
+                    .expect("Write error");
+                if cmd.code {
+                    out.write_fmt(format_args!(", \"code\": \"{}\"", code.to_hex()))
+                        .expect("Write error");
+                }
+            }
+            let storage_root = client.storage_root(&account, at).unwrap_or(KECCAK_NULL_RLP);
+            if storage_root != KECCAK_NULL_RLP {
+                out.write_fmt(format_args!(", \"storage_root\": \"0x{:x}\"", storage_root))
+                    .expect("Write error");
+                if cmd.storage {
+                    out.write_fmt(format_args!(", \"storage\": {{"))
+                        .expect("Write error");
+                    let mut last_storage: Option<H256> = None;
+                    loop {
+                        let keys = client
+                            .list_storage(at, &account, last_storage.as_ref(), 1000)
+                            .ok_or("Specified block not found")?;
+                        if keys.is_empty() {
+                            break;
+                        }
+
+                        for key in keys.into_iter() {
+                            if last_storage.is_some() {
+                                out.write(b",").expect("Write error");
+                            }
+                            out.write_fmt(format_args!(
+                                "\n\t\"0x{:x}\": \"0x{:x}\"",
+                                key,
+                                client
+                                    .storage_at(&account, &key, at.into())
+                                    .unwrap_or_else(Default::default)
+                            ))
+                            .expect("Write error");
+                            last_storage = Some(key);
+                        }
+                    }
+                    out.write(b"\n}").expect("Write error");
+                }
+            }
+            out.write(b"}").expect("Write error");
+            i += 1;
+            if i % 10000 == 0 {
+                info!("Account #{}", i);
+            }
+            last = Some(account);
+        }
+    }
+    out.write_fmt(format_args!("\n}}}}")).expect("Write error");
+    info!("Export completed.");
+    Ok(())
+}
+
+fn execute_reset(cmd: ResetBlockchain) -> Result<(), String> {
+    let service = start_client(
+        cmd.dirs,
+        cmd.spec,
+        cmd.pruning,
+        cmd.pruning_history,
+        cmd.pruning_memory,
+        cmd.tracing,
+        cmd.fat_db,
+        cmd.compaction,
+        cmd.cache_config,
+        false,
+        0,
+    )?;
+
+    let client = service.client();
+    client.reset(cmd.num)?;
+    info!("{}", Colour::Green.bold().paint("Successfully reset db!"));
+
+    Ok(())
+}
+
+pub fn kill_db(cmd: KillBlockchain) -> Result<(), String> {
+    let spec = cmd.spec.spec(&cmd.dirs.cache)?;
+    let genesis_hash = spec.genesis_header().hash();
+    let db_dirs = cmd.dirs.database(genesis_hash, None, spec.data_dir);
+    let user_defaults_path = db_dirs.user_defaults_path();
+    let mut user_defaults = UserDefaults::load(&user_defaults_path)?;
+    let algorithm = cmd.pruning.to_algorithm(&user_defaults);
+    let dir = db_dirs.db_path(algorithm);
+    fs::remove_dir_all(&dir).map_err(|e| format!("Error removing database: {:?}", e))?;
+    user_defaults.is_first_launch = true;
+    user_defaults.save(&user_defaults_path)?;
+    info!("Database deleted.");
+    Ok(())
+}
+
+#[cfg(test)]
+mod test {
+    use super::DataFormat;
+
+    #[test]
+    fn test_data_format_parsing() {
+        assert_eq!(DataFormat::Binary, "binary".parse().unwrap());
+        assert_eq!(DataFormat::Binary, "bin".parse().unwrap());
+        assert_eq!(DataFormat::Hex, "hex".parse().unwrap());
+    }
+}

bin/oe/cache.rs

@@ -0,0 +1,142 @@
+// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// This file is part of OpenEthereum.
+
+// OpenEthereum 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.
+
+// OpenEthereum 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 OpenEthereum.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::cmp::max;
+
+const MIN_BC_CACHE_MB: u32 = 4;
+const MIN_DB_CACHE_MB: u32 = 8;
+const MIN_BLOCK_QUEUE_SIZE_LIMIT_MB: u32 = 16;
+const DEFAULT_DB_CACHE_SIZE: u32 = 128;
+const DEFAULT_BC_CACHE_SIZE: u32 = 8;
+const DEFAULT_BLOCK_QUEUE_SIZE_LIMIT_MB: u32 = 40;
+const DEFAULT_TRACE_CACHE_SIZE: u32 = 20;
+const DEFAULT_STATE_CACHE_SIZE: u32 = 25;
+
+/// Configuration for application cache sizes.
+/// All	values are represented in MB.
+#[derive(Debug, PartialEq)]
+pub struct CacheConfig {
+    /// Size of rocksDB cache. Almost all goes to the state column.
+    db: u32,
+    /// Size of blockchain cache.
+    blockchain: u32,
+    /// Size of transaction queue cache.
+    queue: u32,
+    /// Size of traces cache.
+    traces: u32,
+    /// Size of the state cache.
+    state: u32,
+}
+
+impl Default for CacheConfig {
+    fn default() -> Self {
+        CacheConfig::new(
+            DEFAULT_DB_CACHE_SIZE,
+            DEFAULT_BC_CACHE_SIZE,
+            DEFAULT_BLOCK_QUEUE_SIZE_LIMIT_MB,
+            DEFAULT_STATE_CACHE_SIZE,
+        )
+    }
+}
+
+impl CacheConfig {
+    /// Creates new cache config with cumulative size equal `total`.
+    pub fn new_with_total_cache_size(total: u32) -> Self {
+        CacheConfig {
+            db: total * 7 / 10,
+            blockchain: total / 10,
+            queue: DEFAULT_BLOCK_QUEUE_SIZE_LIMIT_MB,
+            traces: DEFAULT_TRACE_CACHE_SIZE,
+            state: total * 2 / 10,
+        }
+    }
+
+    /// Creates new cache config with gitven details.
+    pub fn new(db: u32, blockchain: u32, queue: u32, state: u32) -> Self {
+        CacheConfig {
+            db: db,
+            blockchain: blockchain,
+            queue: queue,
+            traces: DEFAULT_TRACE_CACHE_SIZE,
+            state: state,
+        }
+    }
+
+    /// Size of db cache.
+    pub fn db_cache_size(&self) -> u32 {
+        max(MIN_DB_CACHE_MB, self.db)
+    }
+
+    /// Size of block queue size limit
+    pub fn queue(&self) -> u32 {
+        max(self.queue, MIN_BLOCK_QUEUE_SIZE_LIMIT_MB)
+    }
+
+    /// Size of the blockchain cache.
+    pub fn blockchain(&self) -> u32 {
+        max(self.blockchain, MIN_BC_CACHE_MB)
+    }
+
+    /// Size of the traces cache.
+    pub fn traces(&self) -> u32 {
+        self.traces
+    }
+
+    /// Size of the state cache.
+    pub fn state(&self) -> u32 {
+        self.state * 3 / 4
+    }
+
+    /// Size of the jump-tables cache.
+    pub fn jump_tables(&self) -> u32 {
+        self.state / 4
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::CacheConfig;
+
+    #[test]
+    fn test_cache_config_constructor() {
+        let config = CacheConfig::new_with_total_cache_size(200);
+        assert_eq!(config.db, 140);
+        assert_eq!(config.blockchain(), 20);
+        assert_eq!(config.queue(), 40);
+        assert_eq!(config.state(), 30);
+        assert_eq!(config.jump_tables(), 10);
+    }
+
+    #[test]
+    fn test_cache_config_db_cache_sizes() {
+        let config = CacheConfig::new_with_total_cache_size(400);
+        assert_eq!(config.db, 280);
+        assert_eq!(config.db_cache_size(), 280);
+    }
+
+    #[test]
+    fn test_cache_config_default() {
+        assert_eq!(
+            CacheConfig::default(),
+            CacheConfig::new(
+                super::DEFAULT_DB_CACHE_SIZE,
+                super::DEFAULT_BC_CACHE_SIZE,
+                super::DEFAULT_BLOCK_QUEUE_SIZE_LIMIT_MB,
+                super::DEFAULT_STATE_CACHE_SIZE
+            )
+        );
+    }
+}

bin/oe/cli/presets/config.dev-insecure.toml

@@ -1,5 +1,4 @@
 [parity]
-no_consensus = true
 chain = "dev"
 
 [mining]

bin/oe/cli/presets/config.insecure.toml

@@ -1,6 +1,3 @@
-[parity]
-no_consensus = true
-
 [rpc]
 interface = "all"
 apis = ["all"]

bin/oe/cli/presets/config.mining.toml

@@ -1,15 +1,11 @@
 [network]
-# Parity will try to maintain connection to at least 50 peers.
+# OpenEthereum will try to maintain connection to at least 50 peers.
 min_peers = 50
-# Parity will maintain at most 100 peers.
+# OpenEthereum will maintain at most 100 peers.
 max_peers = 100
 
 [ipc]
-# You won't be able to use IPC to interact with Parity.
-disable = true
-
-[dapps]
-# You won't be able to access any web Dapps.
+# You won't be able to use IPC to interact with OpenEthereum.
 disable = true
 
 [mining]
@@ -19,7 +15,7 @@ force_sealing = true
 reseal_on_txs = "all"
 # New pending block will be created only once per 4000 milliseconds.
 reseal_min_period = 4000
-# Parity will keep/relay at most 8192 transactions in queue.
+# OpenEthereum will keep/relay at most 8192 transactions in queue.
 tx_queue_size = 8192
 tx_queue_per_sender = 128
 

bin/oe/cli/presets/config.non-standard-ports.toml

@@ -1,5 +1,5 @@
 [network]
-# Parity will listen for connections on port 30305.
+# OpenEthereum will listen for connections on port 30305.
 port = 30305
 
 [rpc]

bin/oe/cli/presets/mod.rs

@@ -1,18 +1,18 @@
 // Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// This file is part of OpenEthereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// OpenEthereum 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// OpenEthereum 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with OpenEthereum.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::io::{Error, ErrorKind};
 

bin/oe/cli/tests/config.full.toml

@@ -2,13 +2,6 @@
 mode = "last"
 mode_timeout = 300
 mode_alarm = 3600
-auto_update = "none"
-auto_update_delay = 200
-auto_update_check_frequency = 50
-release_track = "current"
-public_node = false
-no_download = false
-no_consensus = false
 no_persistent_txqueue = false
 
 chain = "homestead"
@@ -16,28 +9,13 @@ base_path = "$HOME/.parity"
 db_path = "$HOME/.parity/chains"
 keys_path = "$HOME/.parity/keys"
 identity = ""
-light = false
-no_hardcoded_sync = false
 
 [account]
 unlock = ["0xdeadbeefcafe0000000000000000000000000000"]
 password = ["~/.safe/password.file"]
 keys_iterations = 10240
 
-[private_tx]
-enabled = true
-signer = "0xdeadbeefcafe0000000000000000000000000000"
-validators = ["0xdeadbeefcafe0000000000000000000000000000"]
-passwords = "~/.safe/password.file"
-account = "0xdeadbeefcafe0000000000000000000000000000"
-sstore_url = "http://localhost:8082"
-sstore_threshold = 0
-
 [ui]
-force = false
-disable = false
-port = 8180
-interface = "127.0.0.1"
 path = "$HOME/.parity/signer"
 
 [network]
@@ -52,7 +30,6 @@ warp = true
 allow_ips = "all"
 snapshot_peers = 0
 max_pending_peers = 64
-no_serve_light = false
 
 reserved_only = false
 reserved_peers = "./path_to_file"
@@ -75,21 +52,10 @@ apis = ["web3", "eth", "net", "parity", "traces", "rpc", "secretstore"]
 hosts = ["none"]
 
 [ipc]
-chmod = "660"
 disable = false
 path = "$HOME/.parity/jsonrpc.ipc"
 apis = ["web3", "eth", "net", "parity", "parity_accounts", "personal", "traces", "rpc", "secretstore"]
 
-[dapps]
-disable = false
-port = 8080
-interface = "local"
-hosts = ["none"]
-path = "$HOME/.parity/dapps"
-# authorization:
-user = "test_user"
-pass = "test_pass"
-
 [secretstore]
 disable = false
 disable_http = false
@@ -106,7 +72,6 @@ http_port = 8082
 interface = "local"
 port = 8083
 path = "$HOME/.parity/secretstore"
-cors = ["null"]
 
 [mining]
 author = "0xdeadbeefcafe0000000000000000000000000001"
@@ -152,21 +117,10 @@ fat_db = "auto"
 scale_verifiers = true
 num_verifiers = 6
 
-[light]
-on_demand_response_time_window = 2
-on_demand_request_backoff_start = 9
-on_demand_request_backoff_max = 15
-on_demand_request_backoff_rounds_max = 100
-on_demand_request_consecutive_failures = 1
-
 [snapshots]
-disable_periodic = false
+enable = false
 
 [misc]
 logging = "own_tx=trace"
-log_file = "/var/log/parity.log"
+log_file = "/var/log/openethereum.log"
 color = true
-
-[whisper]
-enabled = false
-pool_size = 20