Add docker deployment for Github actions

.cargo/config

@@ -1,3 +1,3 @@
 [target.x86_64-pc-windows-msvc]
-# Link the C runtime statically ; https://github.com/openethereum/parity-ethereum/issues/6643
+# Link the C runtime statically ; https://github.com/openethereum/openethereum/issues/6643
 rustflags = ["-Ctarget-feature=+crt-static"]

.github/CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 ## Do you have a question?
 
-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/)!
+Check out our [Basic Usage](https://openethereum.github.io/wiki/Basic-Usage), [Configuration](https://openethereum.github.io/wiki/Configuring-OpenEthereum), and [FAQ](https://openethereum.github.io/wiki/FAQ) articles on our [wiki](https://openethereum.github.io/wiki)!
 
 See also frequently asked questions [tagged with `parity`](https://ethereum.stackexchange.com/questions/tagged/parity?sort=votes&pageSize=50) on Stack Exchange.
 
@@ -35,7 +35,7 @@ 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.
-* All code changed should be formated by running `cargo fmt -- --config=merge_imports=true`
+* Contributors should adhere to the [Parity Ethereum Style Guide](https://openethereum.github.io/wiki/Parity-Ethereum-Style-Guide).
 
 ### Recommendations
 

.github/ISSUE_TEMPLATE.md

@@ -1,8 +1,6 @@
-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**._
 
-- **OpenEthereum version (>=3.1.0)**: 0.0.0
+- **OpenEthereum version**: 0.0.0
 - **Operating system**: Windows / MacOS / Linux
 - **Installation**: homebrew / one-line installer / built from source
 - **Fully synchronized**: no / yes

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

@@ -1,33 +0,0 @@
-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:
-          - stable
-    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

@@ -5,15 +5,19 @@ on:
   push:
     branches:
       - main
-      - dev
+      - stable
 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
     runs-on:                    ${{ matrix.platform }}
@@ -28,13 +32,68 @@ jobs:
           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 }}	
-        uses:                   actions-rs/cargo@v1	
-        with:	
-          command:              test	
+      - 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
           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,6 +2,8 @@ name:                           Build Release Suite
 
 on:
   push:
+    branches:
+      - stable
     tags:
       - v*
 
@@ -9,16 +11,19 @@ on:
 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
     runs-on:                    ${{ matrix.platform }}
@@ -31,32 +36,71 @@ jobs:
           toolchain:            ${{ matrix.toolchain }}
           profile:              minimal
           override:             true
+      - name:                   Cache cargo registry
+        uses:                   actions/cache@v2
+        with:
+          path:                 ~/.cargo/registry
+          key:                  ${{ runner.os }}-cargo-registry-build-${{ hashFiles('**/Cargo.lock') }}
+      - name:                   Cache cargo index
+        uses:                   actions/cache@v2
+        with:
+          path:                 ~/.cargo/git
+          key:                  ${{ runner.os }}-cargo-git-build-${{ hashFiles('**/Cargo.lock') }}
+      - name:                   Cache cargo build
+        uses:                   actions/cache@v2
+        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@v2
+        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@v2
+        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@v2
+        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}}
 
       # ==============================
       #       Windows Build
       # ==============================
 
-      # - name:                   Install LLVM for Windows
-      #   if:                     matrix.platform == 'windows2019'
-      #   run:                    choco install llvm
+      - name:                   Install LLVM for Windows
+        if:                     matrix.platform == 'windows-latest'
+        run:                    choco install llvm
 
-      # - name:                   Build OpenEthereum for Windows
-      #   if:                     matrix.platform == 'windows2019'
-      #   run:                    sh scripts/actions/build-windows.sh ${{matrix.platform}}
+      - name:                   Sccache statistics
+        run:                    sccache --show-stats
 
-      # - name:                   Upload Windows build
-      #   uses:                   actions/upload-artifact@v2
-      #   if:                     matrix.platform == 'windows2019'
-      #   with:
-      #     name:                 windows-artifacts
-      #     path:                 artifacts
+      - name:                   Build OpenEthereum for Windows
+        if:                     matrix.platform == 'windows-latest'
+        run:                    sh scripts/actions/build-windows.sh ${{matrix.platform}}
+
+      - name:                   Upload Windows build
+        uses:                   actions/upload-artifact@v2
+        if:                     matrix.platform == 'windows-latest'
+        with:
+          name:                 windows-artifacts
+          path:                 artifacts
 
       # ==============================
       #       Linux/Macos Build
       # ==============================
-    
+
       - name:                   Build OpenEthereum for ${{matrix.platform}}
-        if:                     matrix.platform != 'windows2019'
+        if:                     matrix.platform != 'windows-latest'
         run:                    sh scripts/actions/build-linux.sh ${{matrix.platform}}
 
       - name:                   Upload Linux build
@@ -73,23 +117,35 @@ jobs:
           name:                 macos-artifacts
           path:                 artifacts
 
+      # ==============================
+      #       End builds
+      # ==============================
+
+      - name:                   Stop sccache
+        if:                     always()
+        run:                    sccache --stop-server
+
+      - name:                   Prepare build directory for cache
+        shell:                  bash
+        run:                    bash scripts/actions/clean-target.sh
+
   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
+        run:                    echo ::set-env name=RELEASE_VERSION::${GITHUB_REF#refs/*/}
 
       # ==============================
       #       Create ZIP files
       # ==============================
 
-      # - name:                   Download Windows artifacts
-      #   uses:                   actions/download-artifact@v2
-      #   with:
-      #     name:                 windows-artifacts
-      #     path:                 windows-artifacts
+      - 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
@@ -132,18 +188,18 @@ jobs:
           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 .
+      - 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}')
+          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
@@ -162,11 +218,11 @@ jobs:
           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
+      - 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
@@ -191,8 +247,8 @@ jobs:
       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 }}
+      windows-artifact:         ${{ steps.create_zip_windows.outputs.WINDOWS_ARTIFACT }}
+      windows-shasum:           ${{ steps.create_zip_windows.outputs.WINDOWS_SHASUM }}
 
   draft-release:
     name:                       Draft Release
@@ -200,7 +256,7 @@ jobs:
     runs-on:                    ubuntu-16.04
     steps:
       - name:                   Set env
-        run:                    echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+        run:                    echo ::set-env name=RELEASE_VERSION::${GITHUB_REF#refs/*/}
 
       # ==============================
       #       Download artifacts
@@ -216,10 +272,10 @@ jobs:
         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:                   Download artifacts
+        uses:                   actions/download-artifact@v2
+        with:
+          name:                 openethereum-windows-${{ env.RELEASE_VERSION }}.zip
 
       - name:                   Display structure of downloaded files
         run:                    ls
@@ -273,13 +329,13 @@ jobs:
           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
+      - 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

@@ -5,11 +5,14 @@ on:
   push:
     branches:
       - main
-      - dev
+      - stable
 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@main
@@ -21,6 +24,32 @@ jobs:
           toolchain:            stable
           profile:              minimal
           override:             true
+      - name:                   Cache cargo registry
+        uses:                   actions/cache@v2
+        with:
+          path:                 ~/.cargo/registry
+          key:                  ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
+      - name:                   Cache cargo index
+        uses:                   actions/cache@v2
+        with:
+          path:                 ~/.cargo/git
+          key:                  ${{ runner.os }}-cargo-git-${{ hashFiles('**/Cargo.lock') }}
+      - name:                   Cache cargo build
+        uses:                   actions/cache@v2
+        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@v2
+        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:
@@ -30,12 +59,12 @@ jobs:
         uses:                   actions-rs/cargo@v1
         with:
           command:              check
-          args:                 --locked --manifest-path crates/runtime/io/Cargo.toml --no-default-features --verbose
+          args:                 --locked --manifest-path util/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 crates/runtime/io/Cargo.toml --features "mio" --verbose
+          args:                 --locked --manifest-path util/io/Cargo.toml --features "mio" --verbose
       - name:                   Run cargo check evmbin
         uses:                   actions-rs/cargo@v1
         with:
@@ -48,3 +77,10 @@ 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
+        continue-on-error:      true
+      - name:                   Prepare build directory for cache
+        shell: bash
+        run:                    bash scripts/actions/clean-target.sh

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

@@ -1,29 +0,0 @@
-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:            stable
-          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

@@ -1,30 +0,0 @@
-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:            stable
-          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 }}"

.gitmodules

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

CHANGELOG.md

@@ -1,28 +1,34 @@
-## OpenEthereum v3.2.4
+## OpenEthereum v3.1RC1
 
-* Fix for Typed transaction broadcast.
+OpenEthereum 3.1rc1 is a candidate release based on v2.5.13 which is the last stable version known of the client that does not include any of the issues introduced in v2.7. 
+It removes non core features like Ethereum Classic, Private Transactions, Light Client, Updater, IPFS and Swarm support, currently deprecated flags such as expanse, kotti, mordor testnets.
 
-## OpenEthereum v3.2.3
+Database migration utility currently in beta: https://github.com/openethereum/3.1-db-upgrade-tool
 
-* Hotfix for berlin consensus error.
+The full list of included changes from v2.5.13 to v3.1:
 
-## OpenEthereum v3.2.1
+- Remove classic, kotti, mordor, expanse (#52) 
+- Added bad block header hash for ropsten (#49) 
+- Remove accounts bloom (#33) 
+- Bump jsonrpc-- to v15 
+- Implement eth/64, remove eth/62 (#46) 
+- No snapshotting by default (#11814) 
+- Update Ellaism chainspec 
+- Prometheus, heavy memory calls removed (#27) 
+- Update ethereum/tests 
+- Implement JSON test suite (#11801) 
+- Fix issues during block sync (#11265) 
+- Fix race same block (#11400) 
+- EIP-2537: Precompile for BLS12-381 curve operations (#11707) 
+- Remove private transactions 
+- Remove GetNodeData 
+- Remove IPFS integration (#11532) 
+- Remove updater 
+- Remove light client 
+- Remove C and Java bindings (#11346) 
+- Remove whisper (#10855) 
+- EIP-2315: Simple Subroutines for the EVM (#11629) 
+- Remove deprecated flags (removal of --geth flag)
+- Remove support for hardware wallets (#10678) 
+- Update bootnodes 
 
-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.lock

@@ -439,6 +439,7 @@ name = "common-types"
 version = "0.1.0"
 dependencies = [
  "ethereum-types 0.4.2",
+ "ethjson",
  "ethkey",
  "heapsize",
  "keccak-hash",
@@ -446,9 +447,6 @@ dependencies = [
  "rlp 0.3.0",
  "rlp_derive",
  "rustc-hex 1.0.0",
- "serde",
- "serde_json",
- "serde_repr",
  "unexpected",
 ]
 
@@ -1102,7 +1100,6 @@ dependencies = [
  "num",
  "parity-bytes",
  "parity-crypto 0.4.2",
- "rustc-hex 1.0.0",
 ]
 
 [[package]]
@@ -1248,6 +1245,47 @@ dependencies = [
  "tiny-keccak 1.5.0",
 ]
 
+[[package]]
+name = "ethcore-secretstore"
+version = "1.0.0"
+dependencies = [
+ "byteorder",
+ "common-types",
+ "env_logger",
+ "ethabi",
+ "ethabi-contract",
+ "ethabi-derive",
+ "ethcore",
+ "ethcore-accounts",
+ "ethcore-call-contract",
+ "ethcore-sync",
+ "ethereum-types 0.4.2",
+ "ethkey",
+ "futures",
+ "hyper 0.12.35",
+ "jsonrpc-server-utils",
+ "keccak-hash",
+ "kvdb",
+ "kvdb-rocksdb",
+ "lazy_static",
+ "log",
+ "parity-bytes",
+ "parity-crypto 0.3.1",
+ "parity-runtime",
+ "parking_lot 0.7.1",
+ "percent-encoding 2.1.0",
+ "rustc-hex 1.0.0",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "tempdir",
+ "tiny-keccak 1.5.0",
+ "tokio",
+ "tokio-io",
+ "tokio-service",
+ "url 2.1.0",
+]
+
 [[package]]
 name = "ethcore-service"
 version = "0.1.0"
@@ -1374,9 +1412,7 @@ dependencies = [
 name = "ethjson"
 version = "0.1.0"
 dependencies = [
- "common-types",
  "ethereum-types 0.4.2",
- "ethkey",
  "macros",
  "maplit",
  "rustc-hex 1.0.0",
@@ -1424,6 +1460,7 @@ dependencies = [
 name = "ethstore"
 version = "0.2.1"
 dependencies = [
+ "dir",
  "ethereum-types 0.4.2",
  "ethkey",
  "itertools 0.5.10",
@@ -1442,6 +1479,7 @@ dependencies = [
  "smallvec 0.6.13",
  "tempdir",
  "time",
+ "tiny-keccak 1.5.0",
 ]
 
 [[package]]
@@ -1467,7 +1505,6 @@ version = "0.1.0"
 dependencies = [
  "bit-set",
  "criterion 0.2.11",
- "ethcore-builtin",
  "ethereum-types 0.4.2",
  "heapsize",
  "hex-literal",
@@ -2401,9 +2438,9 @@ dependencies = [
 
 [[package]]
 name = "linked-hash-map"
-version = "0.5.3"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a"
+checksum = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
 
 [[package]]
 name = "local-encoding"
@@ -2825,7 +2862,7 @@ checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
 
 [[package]]
 name = "openethereum"
-version = "3.2.4"
+version = "3.1.0"
 dependencies = [
  "ansi_term 0.10.2",
  "atty",
@@ -2845,6 +2882,7 @@ dependencies = [
  "ethcore-logger",
  "ethcore-miner",
  "ethcore-network",
+ "ethcore-secretstore",
  "ethcore-service",
  "ethcore-sync",
  "ethereum-types 0.4.2",
@@ -2879,6 +2917,7 @@ dependencies = [
  "pretty_assertions",
  "prometheus",
  "regex 1.3.9",
+ "registrar",
  "rlp 0.3.0",
  "rpassword",
  "rustc-hex 1.0.0",
@@ -2964,7 +3003,7 @@ dependencies = [
  "rustc-hex 2.0.1",
  "scrypt 0.2.0",
  "sha2 0.8.0",
- "subtle 2.3.0",
+ "subtle 2.1.0",
  "tiny-keccak 1.5.0",
  "zeroize",
 ]
@@ -3188,7 +3227,7 @@ dependencies = [
 
 [[package]]
 name = "parity-version"
-version = "3.2.4"
+version = "3.1.0"
 dependencies = [
  "parity-bytes",
  "rlp 0.3.0",
@@ -3562,6 +3601,22 @@ dependencies = [
  "getopts",
 ]
 
+[[package]]
+name = "pwasm-run-test"
+version = "0.1.0"
+dependencies = [
+ "clap",
+ "env_logger",
+ "ethereum-types 0.4.2",
+ "ethjson",
+ "rustc-hex 1.0.0",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "vm",
+ "wasm",
+]
+
 [[package]]
 name = "pwasm-utils"
 version = "0.6.2"
@@ -3903,6 +3958,17 @@ version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
 
+[[package]]
+name = "registrar"
+version = "0.0.1"
+dependencies = [
+ "ethabi",
+ "ethabi-contract",
+ "ethabi-derive",
+ "futures",
+ "keccak-hash",
+]
+
 [[package]]
 name = "relay"
 version = "0.1.1"
@@ -4208,17 +4274,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_repr"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dc6b7951b17b051f3210b063f12cc17320e2fe30ae05b0fe2a3abb068551c76"
-dependencies = [
- "proc-macro2 1.0.20",
- "quote 1.0.7",
- "syn 1.0.40",
-]
-
 [[package]]
 name = "sha-1"
 version = "0.8.1"
@@ -4401,9 +4456,9 @@ checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
 
 [[package]]
 name = "subtle"
-version = "2.3.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "343f3f510c2915908f155e94f17220b19ccfacf2a64a2a5d8004f2c3e311e7fd"
+checksum = "01dca13cf6c3b179864ab3292bd794e757618d35a7766b7c46050c614ba00829"
 
 [[package]]
 name = "syn"

Cargo.toml

@@ -2,7 +2,7 @@
 description = "OpenEthereum"
 name = "openethereum"
 # NOTE Make sure to update util/version/Cargo.toml as well
-version = "3.2.4"
+version = "3.1.0"
 license = "GPL-3.0"
 authors = [
 	"OpenEthereum developers",
@@ -10,7 +10,7 @@ authors = [
 ]
 
 [dependencies]
-blooms-db = { path = "crates/db/blooms-db" }
+blooms-db = { path = "util/blooms-db" }
 log = "0.4"
 rustc-hex = "1.0"
 docopt = "1.0"
@@ -35,42 +35,44 @@ 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" }
+common-types = { path = "ethcore/types" }
+ethcore = { path = "ethcore", features = ["parity"] }
+ethcore-accounts = { path = "accounts", optional = true }
+ethcore-blockchain = { path = "ethcore/blockchain" }
+ethcore-call-contract = { path = "ethcore/call-contract"}
+ethcore-db = { path = "ethcore/db" }
+ethcore-io = { path = "util/io" }
+ethcore-logger = { path = "parity/logger" }
+ethcore-miner = { path = "miner" }
+ethcore-network = { path = "util/network" }
+ethcore-service = { path = "ethcore/service" }
+ethcore-sync = { path = "ethcore/sync" }
 ethereum-types = "0.4"
-ethkey = { path = "crates/accounts/ethkey" }
-ethstore = { path = "crates/accounts/ethstore" }
-fetch = { path = "crates/net/fetch" }
-node-filter = { path = "crates/net/node-filter" }
+ethkey = { path = "accounts/ethkey" }
+ethstore = { path = "accounts/ethstore" }
+fetch = { path = "util/fetch" }
+node-filter = { path = "ethcore/node-filter" }
 rlp = { version = "0.3.0", features = ["ethereum"] }
-cli-signer= { path = "crates/util/cli-signer" }
+cli-signer= { path = "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-local-store = { path = "miner/local-store" }
+parity-runtime = { path = "util/runtime" }
+parity-rpc = { path = "rpc" }
+parity-version = { path = "util/version" }
 parity-path = "0.1"
-dir = { path = "crates/util/dir" }
-panic_hook = { path = "crates/util/panic-hook" }
+dir = { path = "util/dir" }
+panic_hook = { path = "util/panic-hook" }
 keccak-hash = "0.1"
-migration-rocksdb = { path = "crates/db/migration-rocksdb" }
+migration-rocksdb = { path = "util/migration-rocksdb" }
 kvdb = "0.1"
 kvdb-rocksdb = "0.1.3"
-journaldb = { path = "crates/db/journaldb" }
-stats = { path = "crates/util/stats" }
+journaldb = { path = "util/journaldb" }
+stats = { path = "util/stats" }
 prometheus = "0.9.0"
 
-# ethcore-secretstore = { path = "crates/util/secret-store", optional = true }
+ethcore-secretstore = { path = "secret-store", optional = true }
+
+registrar = { path = "util/registrar" }
 
 [build-dependencies]
 rustc_version = "0.2"
@@ -79,7 +81,7 @@ rustc_version = "0.2"
 pretty_assertions = "0.1"
 ipnetwork = "0.12.6"
 tempdir = "0.3"
-fake-fetch = { path = "crates/net/fake-fetch" }
+fake-fetch = { path = "util/fake-fetch" }
 lazy_static = "1.2.0"
 
 [target.'cfg(windows)'.dependencies]
@@ -95,6 +97,7 @@ test-heavy = ["ethcore/test-heavy"]
 evm-debug = ["ethcore/evm-debug"]
 evm-debug-tests = ["ethcore/evm-debug-tests"]
 slow-blocks = ["ethcore/slow-blocks"]
+secretstore = ["ethcore-secretstore", "ethcore-secretstore/accounts"]
 final = ["parity-version/final"]
 deadlock_detection = ["parking_lot/deadlock_detection"]
 # to create a memory profile (requires nightly rust), use e.g.
@@ -106,10 +109,10 @@ deadlock_detection = ["parking_lot/deadlock_detection"]
 memory_profiling = []
 
 [lib]
-path = "bin/oe/lib.rs"
+path = "parity/lib.rs"
 
 [[bin]]
-path = "bin/oe/main.rs"
+path = "parity/main.rs"
 name = "openethereum"
 
 [profile.test]
@@ -125,10 +128,16 @@ lto = true
 # in the dependency tree in any other way
 # (i.e. pretty much only standalone CLI tools)
 members = [
-	"bin/ethkey",
-	"bin/ethstore",
-	"bin/evmbin",
-	"bin/chainspec"
+	"accounts/ethkey/cli",
+	"accounts/ethstore/cli",
+	"chainspec",
+	"ethcore/wasm/run",
+	"evmbin",
+	"util/triehash-ethereum",
+	"util/keccak-hasher",
+	"util/patricia-trie-ethereum",
+	"util/fastmap",
+	"util/time-utils"
 ]
 
 [patch.crates-io]

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://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!
+If you run into problems while using OpenEthereum, check out the [old wiki for documentation](https://openethereum.github.io/wiki/), 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 wiki](https://openethereum.github.io/Configuring-OpenEthereum) for details.
+3. To configure OpenEthereum, see [our old wiki](https://openethereum.github.io/wiki/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 wiki](https://openethereum.github.io/) for more information.
+Be sure to [check out our old wiki](https://openethereum.github.io/wiki/) for more information.
 
 ### Viewing documentation for OpenEthereum packages
 
@@ -297,9 +297,9 @@ Caching, Importing Blocks, and Block Information
 
 In addition to the OpenEthereum client, there are additional tools in this repository available:
 
-- [evmbin](./bin/evmbin) - OpenEthereum EVM Implementation.
-- [ethstore](./crates/accounts/ethstore) - OpenEthereum Key Management.
-- [ethkey](./crates/accounts/ethkey) - OpenEthereum Keys Generator.
+- [evmbin](./evmbin) - OpenEthereum EVM Implementation.
+- [ethstore](./accounts/ethstore) - OpenEthereum Key Management.
+- [ethkey](./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)

accounts/ethkey/Cargo.toml

@@ -11,7 +11,7 @@ eth-secp256k1 = { git = "https://github.com/paritytech/rust-secp256k1", rev = "c
 ethereum-types = "0.4"
 lazy_static = "1.0"
 log = "0.4"
-memzero = { path = "../../../crates/util/memzero" }
+memzero = { path = "../../util/memzero" }
 parity-wordlist = "1.3"
 quick-error = "1.2.2"
 rand = "0.4"

accounts/ethkey/cli/Cargo.toml

@@ -7,8 +7,8 @@ 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" }
+ethkey = { path = "../" }
+panic_hook = { path = "../../../util/panic-hook" }
 parity-wordlist="1.3"
 rustc-hex = "1.0"
 serde = "1.0"

accounts/ethkey/src/random.rs

@@ -25,7 +25,10 @@ impl Generator for Random {
 
     fn generate(&mut self) -> Result<KeyPair, Self::Error> {
         let mut rng = OsRng::new()?;
-        rng.generate().or_else(|void| match void {})
+        match rng.generate() {
+            Ok(pair) => Ok(pair),
+            Err(void) => match void {}, // LLVM unreachable
+        }
     }
 }
 

accounts/ethstore/Cargo.toml

@@ -13,11 +13,13 @@ serde = "1.0"
 serde_json = "1.0"
 serde_derive = "1.0"
 rustc-hex = "1.0"
+tiny-keccak = "1.4"
 time = "0.1.34"
 itertools = "0.5"
 parking_lot = "0.7"
 parity-crypto = "0.3.0"
 ethereum-types = "0.4"
+dir = { path = "../../util/dir" }
 smallvec = "0.6"
 parity-wordlist = "1.3"
 tempdir = "0.3"

accounts/ethstore/cli/Cargo.toml

@@ -12,9 +12,9 @@ rustc-hex = "1.0"
 serde = "1.0"
 serde_derive = "1.0"
 parking_lot = "0.7"
-ethstore = { path = "../../crates/accounts/ethstore" }
-dir = { path = '../../crates/util/dir' }
-panic_hook = { path = "../../crates/util/panic-hook" }
+ethstore = { path = "../" }
+dir = { path = '../../../util/dir' }
+panic_hook = { path = "../../../util/panic-hook" }
 
 [[bin]]
 name = "ethstore"

accounts/ethstore/src/json/crypto.rs

@@ -159,7 +159,10 @@ impl<'a> Visitor<'a> for CryptoVisitor {
             (Some(_), None) => return Err(V::Error::missing_field("cipherparams")),
         };
 
-        let ciphertext = ciphertext.ok_or_else(|| V::Error::missing_field("ciphertext"))?;
+        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),
@@ -169,7 +172,10 @@ impl<'a> Visitor<'a> for CryptoVisitor {
             (Some(_), None) => return Err(V::Error::missing_field("kdfparams")),
         };
 
-        let mac = mac.ok_or_else(|| V::Error::missing_field("mac"))?;
+        let mac = match mac {
+            Some(mac) => mac,
+            None => return Err(V::Error::missing_field("mac")),
+        };
 
         let result = Crypto {
             cipher: cipher,

accounts/ethstore/src/json/key_file.rs

@@ -169,11 +169,20 @@ impl<'a> Visitor<'a> for KeyFileVisitor {
             }
         }
 
-        let id = id.ok_or_else(|| V::Error::missing_field("id"))?;
+        let id = match id {
+            Some(id) => id,
+            None => return Err(V::Error::missing_field("id")),
+        };
 
-        let version = version.ok_or_else(|| V::Error::missing_field("version"))?;
+        let version = match version {
+            Some(version) => version,
+            None => return Err(V::Error::missing_field("version")),
+        };
 
-        let crypto = crypto.ok_or_else(|| V::Error::missing_field("crypto"))?;
+        let crypto = match crypto {
+            Some(crypto) => crypto,
+            None => return Err(V::Error::missing_field("crypto")),
+        };
 
         let result = KeyFile {
             id: id,

accounts/ethstore/src/lib.rs

@@ -18,6 +18,7 @@
 
 #![warn(missing_docs)]
 
+extern crate dir;
 extern crate itertools;
 extern crate libc;
 extern crate parking_lot;
@@ -28,6 +29,7 @@ extern crate serde_json;
 extern crate smallvec;
 extern crate tempdir;
 extern crate time;
+extern crate tiny_keccak;
 
 extern crate ethereum_types;
 extern crate ethkey as _ethkey;

chainspec/Cargo.toml

@@ -5,5 +5,5 @@ version = "0.1.0"
 authors = ["Marek Kotewicz <marek@parity.io>"]
 
 [dependencies]
-ethjson = { path = "../../crates/ethjson" }
+ethjson = { path = "../json" }
 serde_json = "1.0"

cli-signer/Cargo.toml

@@ -10,5 +10,5 @@ authors = ["Parity <admin@parity.io>"]
 ethereum-types = "0.4"
 futures = "0.1"
 rpassword = "1.0"
-parity-rpc = { path = "../../rpc" }
+parity-rpc = { path = "../rpc" }
 parity-rpc-client = { path = "rpc-client" }

cli-signer/rpc-client/Cargo.toml

@@ -17,5 +17,5 @@ matches = "0.1"
 parking_lot = "0.9"
 jsonrpc-core = "15.0.0"
 jsonrpc-ws-server = "15.0.0"
-parity-rpc = { path = "../../../rpc" }
+parity-rpc = { path = "../../rpc" }
 keccak-hash = "0.1"

crates/ethcore/res/chainspec/test/berlin_test.json

@@ -1,205 +0,0 @@
-{
-	"name": "Berlin (test)",
-	"engine": {
-		"Ethash": {
-			"params": {
-				"minimumDifficulty": "0x020000",
-				"difficultyBoundDivisor": "0x0800",
-				"durationLimit": "0x0d",
-				"blockReward": "0x1BC16D674EC80000",
-				"homesteadTransition": "0x0",
-				"eip100bTransition": "0x0",
-				"difficultyBombDelays": {
-					"0": 5000000
-				}
-			}
-		}
-	},
-	"params": {
-		"gasLimitBoundDivisor": "0x0400",
-		"registrar": "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
-		"accountStartNonce": "0x00",
-		"maximumExtraDataSize": "0x20",
-		"minGasLimit": "0x1388",
-		"networkID": "0x1",
-		"maxCodeSize": 24576,
-		"maxCodeSizeTransition": "0x0",
-		"eip150Transition": "0x0",
-		"eip160Transition": "0x0",
-		"eip161abcTransition": "0x0",
-		"eip161dTransition": "0x0",
-		"eip140Transition": "0x0",
-		"eip211Transition": "0x0",
-		"eip214Transition": "0x0",
-		"eip155Transition": "0x0",
-		"eip658Transition": "0x0",
-		"eip145Transition": "0x0",
-		"eip1014Transition": "0x0",
-		"eip1052Transition": "0x0",
-		"eip1283Transition": "0x0",
-		"eip1283DisableTransition": "0x0",
-		"eip1283ReenableTransition": "0x0",
-		"eip1344Transition": "0x0",
-		"eip1706Transition": "0x0",
-		"eip1884Transition": "0x0",
-		"eip2028Transition": "0x0",
-		"eip2929Transition": "0x0",
-		"eip2930Transition": "0x0"
-	},
-	"genesis": {
-		"seal": {
-			"ethereum": {
-				"nonce": "0x0000000000000042",
-				"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
-			}
-		},
-		"difficulty": "0x400000000",
-		"author": "0x0000000000000000000000000000000000000000",
-		"timestamp": "0x00",
-		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-		"extraData": "0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa",
-		"gasLimit": "0x1388"
-	},
-	"accounts": {
-		"0000000000000000000000000000000000000001": {
-			"balance": "1",
-			"builtin": {
-				"name": "ecrecover",
-				"pricing": {
-					"linear": {
-						"base": 3000,
-						"word": 0
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000002": {
-			"balance": "1",
-			"builtin": {
-				"name": "sha256",
-				"pricing": {
-					"linear": {
-						"base": 60,
-						"word": 12
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000003": {
-			"balance": "1",
-			"builtin": {
-				"name": "ripemd160",
-				"pricing": {
-					"linear": {
-						"base": 600,
-						"word": 120
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000004": {
-			"balance": "1",
-			"builtin": {
-				"name": "identity",
-				"pricing": {
-					"linear": {
-						"base": 15,
-						"word": 3
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000005": {
-			"builtin": {
-				"name": "modexp",
-				"activate_at": "0x00",
-				"pricing": {
-					"0": {
-						"price": {
-							"modexp2565": {}
-						}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000006": {
-			"builtin": {
-				"name": "alt_bn128_add",
-				"pricing": {
-					"0": {
-						"price": {
-							"alt_bn128_const_operations": {
-								"price": 500
-							}
-						}
-					},
-					"0": {
-						"info": "EIP 1108 transition",
-						"price": {
-							"alt_bn128_const_operations": {
-								"price": 150
-							}
-						}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000007": {
-			"builtin": {
-				"name": "alt_bn128_mul",
-				"pricing": {
-					"0": {
-						"price": {
-							"alt_bn128_const_operations": {
-								"price": 40000
-							}
-						}
-					},
-					"0": {
-						"info": "EIP 1108 transition",
-						"price": {
-							"alt_bn128_const_operations": {
-								"price": 6000
-							}
-						}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000008": {
-			"builtin": {
-				"name": "alt_bn128_pairing",
-				"pricing": {
-					"0": {
-						"price": {
-							"alt_bn128_pairing": {
-								"base": 100000,
-								"pair": 80000
-							}
-						}
-					},
-					"0": {
-						"info": "EIP 1108 transition",
-						"price": {
-							"alt_bn128_pairing": {
-								"base": 45000,
-								"pair": 34000
-							}
-						}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000009": {
-			"builtin": {
-				"name": "blake2_f",
-				"activate_at": "0x00",
-				"pricing": {
-					"blake2_f": {
-						"gas_per_round": 1
-					}
-				}
-			}
-		}
-	}
-}

crates/ethcore/res/chainspec/yolo3.json

@@ -1,953 +0,0 @@
-{
-	"name": "Yolo3",
-	"engine": {
-		"clique": {
-			"params": {
-				"epoch": 30000,
-				"period": 15
-			}
-		}
-	},
-	"params": {
-		"accountStartNonce": "0x00",
-		"eip1014Transition": "0x0",
-		"eip1052Transition": "0x0",
-		"eip1283DisableTransition": "0x0",
-		"eip1283ReenableTransition": "0x0",
-		"eip1283Transition": "0x0",
-		"eip1344Transition": "0x0",
-		"eip140Transition": "0x0",
-		"eip145Transition": "0x0",
-		"eip150Transition": "0x0",
-		"eip155Transition": "0x0",
-		"eip160Transition": "0x0",
-		"eip161abcTransition": "0x0",
-		"eip161dTransition": "0x0",
-		"eip1706Transition": "0x0",
-		"eip1884Transition": "0x0",
-		"eip2028Transition": "0x0",
-		"eip211Transition": "0x0",
-		"eip214Transition": "0x0",
-		"eip2929Transition": "0x0",
-		"eip2930Transition": "0x0",
-		"eip658Transition": "0x0",
-		"gasLimitBoundDivisor": "0x0400",
-		"maxCodeSize": 24576,
-		"maxCodeSizeTransition": "0x0",
-		"maximumExtraDataSize": "0xffff",
-		"minGasLimit": "0x1388",
-		"networkID": "34180983699157880",
-		"chainID": "34180983699157880",
-		"registrar": "0xc6d9d2cd449a754c494264e1809c50e34d64562b"
-	},
-	"genesis": {
-		"author": "0x0000000000000000000000000000000000000000",
-		"difficulty": "0x1",
-		"extraData": "0x00000000000000000000000000000000000000000000000000000000000000001041afbcb359d5a8dc58c15b2ff51354ff8a217d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-		"gasLimit": "0x47b760",
-		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-		"seal": {
-			"ethereum": {
-				"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-				"nonce": "0x0000000000000000"
-			}
-		},
-		"timestamp": "0x6027dd2e"
-	},
-	"nodes": [
-		"enode://9e1096aa59862a6f164994cb5cb16f5124d6c992cdbf4535ff7dea43ea1512afe5448dca9df1b7ab0726129603f1a3336b631e4d7a1a44c94daddd03241587f9@3.9.20.133:30303"
-	],
-	"accounts": {
-		"0000000000000000000000000000000000000000": {
-			"balance": "0x1"
-		},
-		"0000000000000000000000000000000000000001": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "ecrecover",
-				"pricing": {
-					"linear": {
-						"base": 3000,
-						"word": 0
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000002": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "sha256",
-				"pricing": {
-					"linear": {
-						"base": 60,
-						"word": 12
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000003": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "ripemd160",
-				"pricing": {
-					"linear": {
-						"base": 600,
-						"word": 120
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000004": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "identity",
-				"pricing": {
-					"linear": {
-						"base": 15,
-						"word": 3
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000005": {
-			"balance": "0x1",
-			"builtin": {
-				"activate_at": "0x00",
-				"name": "modexp",
-				"pricing": {
-					"0": {
-						"price": {
-							"modexp2565": {}
-						}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000006": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "alt_bn128_add",
-				"pricing": {
-					"0": {
-						"info": "EIP 1108 transition",
-						"price": {
-							"alt_bn128_const_operations": {
-								"price": 150
-							}
-						}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000007": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "alt_bn128_mul",
-				"pricing": {
-					"0": {
-						"info": "EIP 1108 transition",
-						"price": {
-							"alt_bn128_const_operations": {
-								"price": 6000
-							}
-						}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000008": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "alt_bn128_pairing",
-				"pricing": {
-					"0": {
-						"info": "EIP 1108 transition",
-						"price": {
-							"alt_bn128_pairing": {
-								"base": 45000,
-								"pair": 34000
-							}
-						}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000009": {
-			"balance": "0x1",
-			"builtin": {
-				"activate_at": "0x00",
-				"name": "blake2_f",
-				"pricing": {
-					"blake2_f": {
-						"gas_per_round": 1
-					}
-				}
-			}
-		},
-		"0x000000000000000000000000000000000000000a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000000b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000000c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000000d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000000e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000000f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000010": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000011": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000012": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000013": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000014": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000015": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000016": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000017": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000018": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000019": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000001a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000001b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000001c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000001d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000001e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000001f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000020": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000021": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000022": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000023": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000024": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000025": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000026": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000027": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000028": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000029": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000002a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000002b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000002c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000002d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000002e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000002f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000030": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000031": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000032": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000033": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000034": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000035": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000036": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000037": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000038": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000039": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000003a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000003b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000003c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000003d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000003e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000003f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000040": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000041": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000042": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000043": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000044": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000045": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000046": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000047": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000048": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000049": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000004a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000004b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000004c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000004d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000004e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000004f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000050": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000051": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000052": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000053": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000054": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000055": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000056": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000057": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000058": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000059": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000005a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000005b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000005c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000005d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000005e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000005f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000060": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000061": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000062": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000063": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000064": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000065": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000066": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000067": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000068": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000069": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000006a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000006b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000006c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000006d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000006e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000006f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000070": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000071": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000072": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000073": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000074": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000075": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000076": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000077": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000078": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000079": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000007a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000007b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000007c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000007d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000007e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000007f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000080": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000081": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000082": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000083": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000084": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000085": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000086": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000087": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000088": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000089": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000008a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000008b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000008c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000008d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000008e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000008f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000090": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000091": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000092": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000093": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000094": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000095": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000096": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000097": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000098": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000099": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000009a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000009b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000009c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000009d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000009e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000009f": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a0": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a1": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a2": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a3": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a4": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a5": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a6": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a7": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a8": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a9": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000aa": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ab": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ac": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ad": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ae": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000af": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b0": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b1": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b2": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b3": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b4": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b5": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b6": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b7": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b8": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b9": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ba": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000bb": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000bc": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000bd": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000be": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000bf": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c0": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c1": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c2": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c3": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c4": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c5": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c6": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c7": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c8": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c9": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ca": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000cb": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000cc": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000cd": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ce": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000cf": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d0": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d1": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d2": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d3": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d4": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d5": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d6": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d7": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d8": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d9": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000da": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000db": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000dc": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000dd": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000de": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000df": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e0": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e1": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e2": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e3": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e4": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e5": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e6": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e7": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e8": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e9": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ea": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000eb": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ec": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ed": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ee": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ef": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f0": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f1": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f2": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f3": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f4": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f5": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f6": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f7": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f8": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f9": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000fa": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000fb": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000fc": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000fd": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000fe": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ff": {
-			"balance": "0x1"
-		},
-		"0e89e2aedb1cfcdb9424d41a1f218f4132738172": {
-			"balance": "0x200000000000000000000000000000000000000000000000000000000000000"
-		},
-		"1041afbcb359d5a8dc58c15b2ff51354ff8a217d": {
-			"balance": "0x200000000000000000000000000000000000000000000000000000000000000"
-		},
-		"60adc0f89a41af237ce73554ede170d733ec14e0": {
-			"balance": "0x200000000000000000000000000000000000000000000000000000000000000"
-		},
-		"799d329e5f583419167cd722962485926e338f4a": {
-			"balance": "0x200000000000000000000000000000000000000000000000000000000000000"
-		},
-		"7cf5b79bfe291a67ab02b393e456ccc4c266f753": {
-			"balance": "0x200000000000000000000000000000000000000000000000000000000000000"
-		},
-		"8a8eafb1cf62bfbeb1741769dae1a9dd47996192": {
-			"balance": "0x200000000000000000000000000000000000000000000000000000000000000"
-		},
-		"8ba1f109551bd432803012645ac136ddd64dba72": {
-			"balance": "0x200000000000000000000000000000000000000000000000000000000000000"
-		},
-		"b02a2eda1b317fbd16760128836b0ac59b560e9d": {
-			"balance": "0x200000000000000000000000000000000000000000000000000000000000000"
-		},
-		"df0a88b2b68c673713a8ec826003676f272e3573": {
-			"balance": "0x200000000000000000000000000000000000000000000000000000000000000"
-		}
-	}
-}