From 10d82ef119468f04284addb050f147755df8cbc9 Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Mon, 9 Mar 2020 15:07:15 +0100 Subject: [PATCH] initial cleanup (#11542) * cleanup * upbork * review grumble: rename client id prefix * rpc-tests: make one of the clients open-ethereum * fix doctest * README: mention clang version and that our wiki is old --- .github/CONTRIBUTING.md | 12 +- .github/ISSUE_TEMPLATE.md | 2 +- .gitlab-ci.yml | 356 ---------------------- Cargo.lock | 162 +++++----- Cargo.toml | 6 +- README.md | 141 ++++----- accounts/Cargo.toml | 3 +- accounts/ethkey/Cargo.toml | 2 +- accounts/ethkey/README.md | 18 +- accounts/ethkey/cli/Cargo.toml | 2 +- accounts/ethkey/cli/src/main.rs | 2 +- accounts/ethstore/Cargo.toml | 3 +- accounts/ethstore/README.md | 18 +- accounts/ethstore/cli/Cargo.toml | 2 +- accounts/ethstore/cli/src/main.rs | 2 +- chainspec/Cargo.toml | 2 +- cli-signer/Cargo.toml | 4 +- cli-signer/rpc-client/Cargo.toml | 4 +- ethash/Cargo.toml | 2 +- ethash/src/compute.rs | 2 +- ethcore/Cargo.toml | 4 +- ethcore/blockchain/Cargo.toml | 4 +- ethcore/call-contract/Cargo.toml | 2 +- ethcore/db/Cargo.toml | 2 +- ethcore/db/src/lib.rs | 2 +- ethcore/evm/Cargo.toml | 2 +- ethcore/light/Cargo.toml | 4 +- ethcore/node-filter/Cargo.toml | 2 +- ethcore/service/Cargo.toml | 2 +- ethcore/spec/src/chain.rs | 2 +- ethcore/sync/Cargo.toml | 2 +- ethcore/sync/src/chain/propagator.rs | 4 +- ethcore/trace/src/types/trace.rs | 2 +- ethcore/types/Cargo.toml | 2 +- ethcore/types/src/errors/mod.rs | 2 +- ethcore/types/src/lib.rs | 2 +- evmbin/README.md | 12 +- evmbin/src/main.rs | 4 +- json/Cargo.toml | 2 +- miner/Cargo.toml | 4 +- miner/price-info/Cargo.toml | 2 +- miner/stratum/src/lib.rs | 2 +- parity/account_utils.rs | 2 +- parity/cli/usage_header.txt | 2 +- parity/cli/version.txt | 2 +- parity/configuration.rs | 6 +- parity/logger/Cargo.toml | 2 +- parity/main.rs | 6 +- rpc/Cargo.toml | 2 +- rpc/src/lib.rs | 2 +- rpc/src/v1/helpers/errors.rs | 8 - rpc/src/v1/tests/helpers/sync_provider.rs | 2 +- rpc/src/v1/tests/mocked/parity.rs | 71 ++++- scripts/docker/README.md | 2 +- scripts/docker/centos/Dockerfile.build | 8 +- scripts/docker/centos/build.sh | 2 +- scripts/docker/hub/Dockerfile | 4 +- scripts/docker/hub/publish-docker.sh | 4 +- scripts/gitlab/build-linux.sh | 49 --- scripts/gitlab/build-windows.sh | 52 ---- scripts/gitlab/publish-onchain.sh | 33 -- scripts/gitlab/publish-snap.sh | 2 +- scripts/gitlab/safe-curl.sh | 19 -- scripts/gitlab/sign-win.cmd | 1 - scripts/gitlab/test-linux.sh | 24 -- scripts/gitlab/validate-chainspecs.sh | 29 -- scripts/parity.service | 2 +- scripts/snap/parity.desktop | 2 +- updater/hash-fetch/Cargo.toml | 2 +- util/fetch/Cargo.toml | 2 +- util/io/Cargo.toml | 2 +- util/len-caching-lock/Cargo.toml | 2 +- util/network-devp2p/Cargo.toml | 2 +- util/network-devp2p/src/discovery.rs | 2 +- util/network/Cargo.toml | 2 +- util/network/src/client_version.rs | 32 +- util/panic-hook/Cargo.toml | 2 +- util/version/Cargo.toml | 2 +- util/version/src/lib.rs | 4 +- 79 files changed, 340 insertions(+), 863 deletions(-) delete mode 100644 .gitlab-ci.yml delete mode 100755 scripts/gitlab/build-linux.sh delete mode 100755 scripts/gitlab/build-windows.sh delete mode 100755 scripts/gitlab/publish-onchain.sh delete mode 100755 scripts/gitlab/safe-curl.sh delete mode 100755 scripts/gitlab/sign-win.cmd delete mode 100755 scripts/gitlab/test-linux.sh delete mode 100755 scripts/gitlab/validate-chainspecs.sh diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 62fbd39c4..14dc3c856 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -12,9 +12,9 @@ Do **not** open an issue on Github if you think your discovered bug could be a * Otherwise, just create a [new issue](https://github.com/OpenEthereum/open-ethereum/issues/new) in our repository and state: -- What's your Parity Ethereum version? +- What's your Open Ethereum version? - What's your operating system and version? -- How did you install Parity Ethereum? +- How did you install Open Ethereum? - Is your node fully synchronized? - Did you try turning it off and on again? @@ -22,7 +22,7 @@ Also, try to include **steps to reproduce** the issue and expand on the **actual ## Contribute! -If you would like to contribute to Parity Ethereum, please **fork it**, fix bugs or implement features, and [propose a pull request](https://github.com/OpenEthereum/open-ethereum/compare). +If you would like to contribute to Open Ethereum, please **fork it**, fix bugs or implement features, and [propose a pull request](https://github.com/OpenEthereum/open-ethereum/compare). ### Labels & Milestones @@ -39,7 +39,7 @@ There are a few basic ground-rules for contributors (including the maintainer(s) ### 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 `--` (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/open-ethereum/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 `--` (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 Open Ethereum [Projects](https://github.com/OpenEthereum/open-ethereum/projects). * **Remove stale branches periodically** ### Preparing Pull Requests @@ -63,6 +63,4 @@ When doing a review, make sure to look for any: ## 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. +By contributing to Open Ethereum, you agree that your contributions will be licensed under the [GPLv3 License](../LICENSE). \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 0484d1fd7..755d0451f 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -4,7 +4,7 @@ _If you think that your issue is an exploitable security vulnerability, please m _You can find mode info on the reporting process in [SECURITY.md](https://github.com/OpenEthereum/open-ethereum/blob/master/SECURITY.md)_ -- **Parity Ethereum version**: 0.0.0 +- **Open Ethereum version**: 0.0.0 - **Operating system**: Windows / MacOS / Linux - **Installation**: homebrew / one-line installer / built from source - **Fully synchronized**: no / yes diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 0f1ae9f82..000000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,356 +0,0 @@ -stages: - - test - - build - - publish - - optional - -image: ${REGISTRY}/parity-ci-linux:latest - -variables: - GIT_STRATEGY: fetch - GIT_SUBMODULE_STRATEGY: recursive - GIT_DEPTH: 3 - CI_SERVER_NAME: "GitLab CI" - CARGO_HOME: "/ci-cache/${CI_PROJECT_NAME}/cargo/${CI_JOB_NAME}" - CARGO_TARGET: x86_64-unknown-linux-gnu - CARGO_INCREMENTAL: 0 - REGISTRY: registry.parity.io/parity/infrastructure/scripts - -.releaseable_branches: # list of git refs for building GitLab artifacts (think "pre-release binaries") - only: &releaseable_branches - - stable - - tags - - schedules - -.collect_artifacts: &collect_artifacts - artifacts: - name: "${CI_JOB_NAME}_${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}" - when: on_success - expire_in: 1 mos - paths: - - artifacts/ - - tools/ - -.docker-cache-status: &docker-cache-status - dependencies: [] - interruptible: true - before_script: - - rustup show - - cargo --version - retry: - max: 2 - when: - - runner_system_failure - - unknown_failure - - api_failure - tags: - - linux-docker - -.build-on-linux: &build-on-linux - stage: build - <<: *docker-cache-status - <<: *collect_artifacts - script: - - scripts/gitlab/build-linux.sh - after_script: - - mkdir -p tools - - cp -r scripts/docker/hub/* ./tools - - cp scripts/gitlab/publish-snap.sh ./tools - - cp scripts/gitlab/publish-onchain.sh ./tools - - cp scripts/gitlab/safe-curl.sh ./tools - - echo v"$(sed -r -n '1,/^version/s/^version\s*=\s*"([^"]+)".*$/\1/p' Cargo.toml)" | - tee ./tools/VERSION - - echo "$(sed -r -n '1,/^track/s/^track\s*=\s*"([^"]+)".*$/\1/p' ./util/version/Cargo.toml)" | - tee ./tools/TRACK - - -cargo-check 0 3: - stage: test - <<: *docker-cache-status - script: - - time cargo check --target $CARGO_TARGET --locked --no-default-features --verbose --color=always - - sccache --show-stats - -cargo-check 1 3: - stage: test - <<: *docker-cache-status - script: - - time cargo check --target $CARGO_TARGET --locked --manifest-path util/io/Cargo.toml --no-default-features --verbose --color=always - - sccache --show-stats - -cargo-check 2 3: - stage: test - <<: *docker-cache-status - script: - - time cargo check --target $CARGO_TARGET --locked --manifest-path util/io/Cargo.toml --features "mio" --verbose --color=always - - sccache --show-stats - -cargo-check-evmbin: - stage: test - <<: *docker-cache-status - script: - - time cargo check -p evmbin --target $CARGO_TARGET --locked --verbose --color=always - - sccache --show-stats - -cargo-check-benches: - stage: test - <<: *docker-cache-status - script: - - time cargo check --workspace --benches --target $CARGO_TARGET --locked --verbose --color=always --all-features - - sccache --show-stats - -cargo-audit: - stage: test - <<: *docker-cache-status - script: - - cargo audit - allow_failure: true # failed cargo audit shouldn't prevent a PR from being merged - -validate-chainspecs: - stage: test - <<: *docker-cache-status - script: - - ./scripts/gitlab/validate-chainspecs.sh - -test-linux: - stage: build - <<: *docker-cache-status - script: - - ./scripts/gitlab/test-linux.sh stable - -test-linux-beta: - stage: build - only: *releaseable_branches - <<: *docker-cache-status - script: - - ./scripts/gitlab/test-linux.sh beta - -test-linux-nightly: - stage: build - only: *releaseable_branches - <<: *docker-cache-status - script: - - ./scripts/gitlab/test-linux.sh nightly - allow_failure: true - -build-linux: - <<: *build-on-linux - only: *releaseable_branches - -build-linux-i386: - <<: *build-on-linux - only: *releaseable_branches - image: ${REGISTRY}/parity-ci-i386:latest - variables: - CARGO_TARGET: i686-unknown-linux-gnu - -build-linux-arm64: - <<: *build-on-linux - only: *releaseable_branches - image: ${REGISTRY}/parity-ci-arm64:latest - variables: - CARGO_TARGET: aarch64-unknown-linux-gnu - -build-linux-armhf: - <<: *build-on-linux - only: *releaseable_branches - image: ${REGISTRY}/parity-ci-armhf:latest - variables: - CARGO_TARGET: armv7-unknown-linux-gnueabihf - -build-darwin: - stage: build - <<: *collect_artifacts - only: *releaseable_branches - variables: - CARGO_TARGET: x86_64-apple-darwin - CARGO_HOME: "${CI_PROJECT_DIR}/.cargo" - script: - - scripts/gitlab/build-linux.sh - tags: - - rust-osx - -build-windows: - stage: build - <<: *collect_artifacts - only: *releaseable_branches - variables: - CARGO_TARGET: x86_64-pc-windows-msvc - CARGO_HOME: "C:/ci-cache/parity-ethereum/cargo/$CI_JOB_NAME" - GIT_SUBMODULE_STRATEGY: none - script: - - sh scripts/gitlab/build-windows.sh - tags: - - rust-windows - -publish-docker: - stage: publish - only: *releaseable_branches - except: - - nightly - when: manual - dependencies: - - build-linux - environment: - name: parity-build - cache: {} - image: docker:stable - services: - - docker:dind - variables: - GIT_STRATEGY: none - DOCKER_HOST: tcp://localhost:2375 - DOCKER_DRIVER: overlay2 - GIT_STRATEGY: none - # DOCKERFILE: tools/Dockerfile - # CONTAINER_IMAGE: parity/parity - script: - - ./tools/publish-docker.sh - tags: - - kubernetes-parity-build - -publish-snap-nightly: &publish-snap - stage: publish - only: - - nightly - image: snapcore/snapcraft - variables: - GIT_STRATEGY: none - BUILD_ARCH: amd64 - cache: {} - dependencies: - - build-linux - tags: - - linux-docker - script: - - ./tools/publish-snap.sh - -publish-snap-manually: - <<: *publish-snap - only: *releaseable_branches - when: manual - -publish-snap-i386-nightly: &publish-snap-i386 - <<: *publish-snap - variables: - BUILD_ARCH: i386 - CARGO_TARGET: i686-unknown-linux-gnu - dependencies: - - build-linux-i386 - -publish-snap-i386-manually: - <<: *publish-snap-i386 - only: *releaseable_branches - when: manual - -publish-snap-arm64-nightly: &publish-snap-arm64 - <<: *publish-snap - variables: - BUILD_ARCH: arm64 - CARGO_TARGET: aarch64-unknown-linux-gnu - dependencies: - - build-linux-arm64 - -publish-snap-arm64-manually: - <<: *publish-snap-arm64 - only: *releaseable_branches - when: manual - -publish-snap-armhf-nightly: &publish-snap-armhf - <<: *publish-snap - variables: - BUILD_ARCH: armhf - CARGO_TARGET: armv7-unknown-linux-gnueabihf - dependencies: - - build-linux-armhf - -publish-snap-armhf-manually: - <<: *publish-snap-armhf - only: *releaseable_branches - when: manual - -publish-onchain-nightly: &publish-onchain - stage: publish - only: - - nightly - cache: {} - variables: - GIT_STRATEGY: none - dependencies: - - build-linux - - build-darwin - - build-windows - script: - - ./tools/publish-onchain.sh - tags: - - linux-docker - -publish-onchain-manually: - <<: *publish-onchain - only: *releaseable_branches - when: manual - -publish-release-awss3-nightly: &publish-release-awss3 - image: ${REGISTRY}/awscli:latest - stage: publish - only: - - nightly - variables: - GIT_STRATEGY: none - cache: {} - dependencies: - - build-linux - - build-darwin - - build-windows - script: - - echo "__________Push binaries to AWS S3____________" - - case "${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}" in - (stable|nightly) - export BUCKET=releases.parity.io/ethereum; - ;; - (*) - export BUCKET=builds-parity; - ;; - esac - - aws s3 sync ./artifacts s3://${BUCKET}/${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}/ - - echo "__________Read from S3____________" - - aws s3 ls s3://${BUCKET}/${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}} --recursive --human-readable --summarize - tags: - - linux-docker - -publish-release-awss3-manually: - <<: *publish-release-awss3 - only: *releaseable_branches - when: manual - -publish-docs: - stage: publish - image: ${REGISTRY}/parity-ci-docs:latest - only: - - tags - except: - - nightly - when: manual - cache: {} - dependencies: [] - script: - - scripts/gitlab/publish-docs.sh - tags: - - linux-docker - allow_failure: true - -publish-av-whitelist: - stage: publish - variables: - GIT_STRATEGY: none - only: *releaseable_branches - except: - - nightly - when: manual - cache: {} - dependencies: - - build-windows - script: - - scripts/gitlab/publish-av-whitelists.sh - tags: - - linux-docker diff --git a/Cargo.lock b/Cargo.lock index b6590f784..246f9bfd3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3129,6 +3129,87 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93f5bb2e8e8dec81642920ccff6b61f1eb94fa3020c5a325c9851ff604152409" +[[package]] +name = "open-ethereum" +version = "2.8.0" +dependencies = [ + "ansi_term", + "atty", + "blooms-db", + "clap", + "cli-signer", + "client-traits", + "common-types", + "ctrlc", + "dir", + "docopt", + "engine", + "ethabi", + "ethcore", + "ethcore-accounts", + "ethcore-blockchain", + "ethcore-call-contract", + "ethcore-db", + "ethcore-io", + "ethcore-light", + "ethcore-logger", + "ethcore-miner", + "ethcore-network", + "ethcore-private-tx", + "ethcore-service", + "ethcore-sync", + "ethereum-types", + "ethkey", + "ethstore", + "fake-fetch", + "fdlimit", + "futures", + "ipnetwork", + "journaldb", + "jsonrpc-core", + "keccak-hash", + "kvdb", + "kvdb-rocksdb", + "log", + "migration-rocksdb", + "node-filter", + "num_cpus", + "number_prefix", + "panic_hook", + "parity-bytes", + "parity-crypto", + "parity-daemonize", + "parity-hash-fetch", + "parity-local-store", + "parity-path", + "parity-rpc", + "parity-runtime", + "parity-secretstore", + "parity-updater", + "parity-util-mem", + "parity-version", + "parking_lot 0.10.0", + "pretty_assertions", + "regex", + "registrar", + "rlp", + "rpassword", + "rustc-hex 2.1.0", + "rustc_version", + "semver", + "serde", + "serde_derive", + "serde_json", + "snapshot", + "spec", + "tempdir", + "term_size", + "textwrap 0.9.0", + "toml", + "verification", + "winapi 0.3.8", +] + [[package]] name = "openssl-probe" version = "0.1.2" @@ -3216,87 +3297,6 @@ dependencies = [ "mio", ] -[[package]] -name = "parity-ethereum" -version = "2.8.0" -dependencies = [ - "ansi_term", - "atty", - "blooms-db", - "clap", - "cli-signer", - "client-traits", - "common-types", - "ctrlc", - "dir", - "docopt", - "engine", - "ethabi", - "ethcore", - "ethcore-accounts", - "ethcore-blockchain", - "ethcore-call-contract", - "ethcore-db", - "ethcore-io", - "ethcore-light", - "ethcore-logger", - "ethcore-miner", - "ethcore-network", - "ethcore-private-tx", - "ethcore-service", - "ethcore-sync", - "ethereum-types", - "ethkey", - "ethstore", - "fake-fetch", - "fdlimit", - "futures", - "ipnetwork", - "journaldb", - "jsonrpc-core", - "keccak-hash", - "kvdb", - "kvdb-rocksdb", - "log", - "migration-rocksdb", - "node-filter", - "num_cpus", - "number_prefix", - "panic_hook", - "parity-bytes", - "parity-crypto", - "parity-daemonize", - "parity-hash-fetch", - "parity-local-store", - "parity-path", - "parity-rpc", - "parity-runtime", - "parity-secretstore", - "parity-updater", - "parity-util-mem", - "parity-version", - "parking_lot 0.10.0", - "pretty_assertions", - "regex", - "registrar", - "rlp", - "rpassword", - "rustc-hex 2.1.0", - "rustc_version", - "semver", - "serde", - "serde_derive", - "serde_json", - "snapshot", - "spec", - "tempdir", - "term_size", - "textwrap 0.9.0", - "toml", - "verification", - "winapi 0.3.8", -] - [[package]] name = "parity-hash-fetch" version = "1.12.0" diff --git a/Cargo.toml b/Cargo.toml index c9dc4b661..c6398e079 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,10 +1,10 @@ [package] -description = "Parity Ethereum client" -name = "parity-ethereum" +description = "Open Ethereum client" +name = "open-ethereum" # NOTE Make sure to update util/version/Cargo.toml as well version = "2.8.0" license = "GPL-3.0" -authors = ["Parity Technologies "] +authors = ["Open Ethereum developers", "Parity Technologies "] [dependencies] ansi_term = "0.11" diff --git a/README.md b/README.md index 8f5989775..efe26897a 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -![Parity Ethereum](docs/logo-parity-ethereum.svg) +![Open Ethereum](docs/logo-parity-ethereum.svg)

The Fastest and most Advanced Ethereum Client.

» Download the latest release «

-

+

## Table of Contents @@ -14,8 +14,7 @@ 3. [Building](#chapter-003)
3.1 [Building Dependencies](#chapter-0031)
3.2 [Building from Source Code](#chapter-0032)
- 3.3 [Simple One-Line Installer for Mac and Linux](#chapter-0033)
- 3.4 [Starting Parity Ethereum](#chapter-0034) + 3.3 [Starting Open Ethereum](#chapter-0034) 4. [Testing](#chapter-004) 5. [Documentation](#chapter-005) 6. [Toolchain](#chapter-006) @@ -26,7 +25,7 @@ ## 1. Description -**Built for mission-critical use**: Miners, service providers, and exchanges need fast synchronisation and maximum uptime. Parity Ethereum provides the core infrastructure essential for speedy and reliable services. +**Built for mission-critical use**: Miners, service providers, and exchanges need fast synchronisation and maximum uptime. Open Ethereum provides the core infrastructure essential for speedy and reliable services. - Clean, modular codebase for easy customisation - Advanced CLI-based client @@ -36,19 +35,19 @@ ## 2. Technical Overview -Parity Ethereum's goal is to be the fastest, lightest, and most secure Ethereum client. We are developing Parity Ethereum using the sophisticated and cutting-edge **Rust programming language**. Parity Ethereum is licensed under the GPLv3 and can be used for all your Ethereum needs. +Open Ethereum's goal is to be the fastest, lightest, and most secure Ethereum client. We are developing Open Ethereum using the sophisticated and cutting-edge **Rust programming language**. Open Ethereum is licensed under the GPLv3 and can be used for all your Ethereum needs. -By default, Parity Ethereum 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. +By default, Open Ethereum 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 Parity Ethereum, check out the [wiki for documentation](https://wiki.parity.io/), feel free to [file an issue in this repository](https://github.com/OpenEthereum/open-ethereum/issues/new), or hop on our [Gitter](https://gitter.im/paritytech/parity) or [Riot](https://riot.im/app/#/group/+parity:matrix.parity.io) chat room to ask a question. We are glad to help! **For security-critical issues**, please refer to the security policy outlined in [SECURITY.md](SECURITY.md). +If you run into problems while using Open Ethereum, check out the [old wiki for documentation](https://wiki.parity.io/), feel free to [file an issue in this repository](https://github.com/OpenEthereum/open-ethereum/issues/new), or hop on our [Discord](https://discord.gg/FJUgGe) chat room to ask a question. We are glad to help! **For security-critical issues**, please refer to the security policy outlined in [SECURITY.md](SECURITY.md). -You can download Parity Ethereum's latest release at [the releases page](https://github.com/OpenEthereum/open-ethereum/releases) or follow the instructions below to build from source. Please, mind the [CHANGELOG.md](CHANGELOG.md) for a list of all changes between different versions. +You can download Open Ethereum's latest release at [the releases page](https://github.com/OpenEthereum/open-ethereum/releases) or follow the instructions below to build from source. Please, mind the [CHANGELOG.md](CHANGELOG.md) for a list of all changes between different versions. ## 3. Building ### 3.1 Build Dependencies -Parity Ethereum requires **latest stable Rust version** to build. +Open Ethereum requires **latest stable Rust version** to build. We recommend installing Rust through [rustup](https://www.rustup.rs/). If you don't already have `rustup`, you can install it like this: @@ -57,7 +56,7 @@ We recommend installing Rust through [rustup](https://www.rustup.rs/). If you do $ curl https://sh.rustup.rs -sSf | sh ``` - Parity Ethereum also requires `gcc`, `g++`, `pkg-config`, `file`, `make`, and `cmake` packages to be installed. + Open Ethereum also requires `clang` (>= 9.0), `clang++`, `pkg-config`, `file`, `make`, and `cmake` packages to be installed. - OSX: ```bash @@ -77,14 +76,14 @@ Once you have `rustup` installed, then you need to install: * [Perl](https://www.perl.org) * [Yasm](https://yasm.tortall.net) -Make sure that these binaries are in your `PATH`. After that, you should be able to build Parity Ethereum from source. +Make sure that these binaries are in your `PATH`. After that, you should be able to build Open Ethereum from source. ### 3.2 Build from Source Code ```bash -# download Parity Ethereum code +# download Open Ethereum code $ git clone https://github.com/OpenEthereum/open-ethereum -$ cd parity-ethereum +$ cd open-ethereum # build in release mode $ cargo build --release --features final @@ -110,32 +109,26 @@ This always compiles the latest nightly builds. If you want to build stable, do $ git checkout stable ``` -### 3.3 Simple One-Line Installer for Mac and Linux - -```bash -bash <(curl https://get.parity.io -L) -``` - -### 3.4 Starting Parity Ethereum +### 3.3 Starting Open Ethereum #### Manually -To start Parity Ethereum manually, just run +To start Open Ethereum manually, just run ```bash $ ./target/release/parity ``` -so Parity Ethereum begins syncing the Ethereum blockchain. +so Open Ethereum begins syncing the Ethereum blockchain. #### Using `systemd` service file -To start Parity Ethereum as a regular user using `systemd` init: +To start Open Ethereum as a regular user using `systemd` init: 1. Copy `./scripts/parity.service` to your `systemd` user directory (usually `~/.config/systemd/user`). 2. Copy release to bin folder, write `sudo install ./target/release/parity /usr/bin/parity` -3. To configure Parity Ethereum, write a `/etc/parity/config.toml` config file, see [Configuring Parity Ethereum](https://paritytech.github.io/wiki/Configuring-Parity) for details. +3. To configure Open Ethereum, write a `/etc/parity/config.toml` config file, see [our old wiki](https://paritytech.github.io/wiki/Configuring-Parity) for details. ## 4. Testing @@ -157,13 +150,11 @@ You can show your logs in the test output by passing `--nocapture` (i.e. `cargo ## 5. Documentation -Official website: https://parity.io +Be sure to [check out our old wiki](https://wiki.parity.io) for more information. -Be sure to [check out our wiki](https://wiki.parity.io) for more information. +### Viewing documentation for Open Ethereum packages -### Viewing documentation for Parity Ethereum packages - -You can generate documentation for Parity Ethereum Rust packages that automatically opens in your web browser using [rustdoc with Cargo](https://doc.rust-lang.org/rustdoc/what-is-rustdoc.html#using-rustdoc-with-cargo) (of the The Rustdoc Book), by running the the following commands: +You can generate documentation for Open Ethereum Rust packages that automatically opens in your web browser using [rustdoc with Cargo](https://doc.rust-lang.org/rustdoc/what-is-rustdoc.html#using-rustdoc-with-cargo) (of the The Rustdoc Book), by running the the following commands: * **All** packages ``` @@ -177,135 +168,131 @@ You can generate documentation for Parity Ethereum Rust packages that automatica Use`--document-private-items` to also view private documentation and `--no-deps` to exclude building documentation for dependencies. -Replacing `` with one of the following from the details section below (i.e. `cargo doc --package parity-ethereum --open`): +Replacing `` with one of the following from the details section below (i.e. `cargo doc --package open-ethereum --open`): **Package List**

-* Parity Ethereum (EthCore) Client Application +* Open Ethereum (EthCore) Client Application ```bash - parity-ethereum + open-ethereum ``` -* Parity Ethereum Account Management, Key Management Tool, and Keys Generator +* Open Ethereum Account Management, Key Management Tool, and Keys Generator ```bash ethcore-accounts, ethkey-cli, ethstore, ethstore-cli ``` -* Parity Chain Specification +* Open Ethereum Chain Specification ```bash chainspec ``` -* Parity CLI Signer Tool & RPC Client +* Open Ethereum CLI Signer Tool & RPC Client ```bash cli-signer parity-rpc-client ``` -* Parity Ethereum Ethash & ProgPoW Implementations +* Open Ethereum Ethash & ProgPoW Implementations ```bash ethash ``` -* Parity (EthCore) Library +* EthCore Library ```bash ethcore ``` - * Parity Ethereum Blockchain Database, Test Generator, Configuration, + * Open Ethereum Blockchain Database, Test Generator, Configuration, Caching, Importing Blocks, and Block Information ```bash ethcore-blockchain ``` - * Parity Ethereum (EthCore) Contract Calls and Blockchain Service & Registry Information + * Open Ethereum (EthCore) Contract Calls and Blockchain Service & Registry Information ```bash ethcore-call-contract ``` - * Parity Ethereum (EthCore) Database Access & Utilities, Database Cache Manager + * Open Ethereum (EthCore) Database Access & Utilities, Database Cache Manager ```bash ethcore-db ``` - * Parity Ethereum Virtual Machine (EVM) Rust Implementation + * Open Ethereum Virtual Machine (EVM) Rust Implementation ```bash evm ``` - * Parity Ethereum (EthCore) Light Client Implementation + * Open Ethereum (EthCore) Light Client Implementation ```bash ethcore-light ``` - * Parity Smart Contract based Node Filter, Manage Permissions of Network Connections + * Smart Contract based Node Filter, Manage Permissions of Network Connections ```bash node-filter ``` - * Parity Private Transactions + * Private Transactions ```bash ethcore-private-tx ``` - * Parity Ethereum (EthCore) Client & Network Service Creation & Registration with the I/O Subsystem + * Open Ethereum (EthCore) Client & Network Service Creation & Registration with the I/O Subsystem ```bash ethcore-service ``` - * Parity Ethereum (EthCore) Blockchain Synchronization + * Open Ethereum (EthCore) Blockchain Synchronization ```bash ethcore-sync ``` - * Parity Ethereum Common Types + * Open Ethereum Common Types ```bash common-types ``` - * Parity Ethereum Virtual Machines (VM) Support Library + * Open Ethereum Virtual Machines (VM) Support Library ```bash vm ``` - * Parity Ethereum WASM Interpreter + * Open Ethereum WASM Interpreter ```bash wasm ``` - * Parity Ethereum WASM Test Runner + * Open Ethereum WASM Test Runner ```bash pwasm-run-test ``` - * Parity EVM Implementation + * Open Ethereum EVM Implementation ```bash evmbin ``` - * Parity Ethereum JSON Deserialization + * Open Ethereum JSON Deserialization ```bash ethjson ``` - * Parity Ethereum State Machine Generalization for Consensus Engines + * Open Ethereum State Machine Generalization for Consensus Engines ```bash parity-machine ``` -* Parity Ethereum (EthCore) Miner Interface +* Open Ethereum (EthCore) Miner Interface ```bash ethcore-miner parity-local-store price-info ethcore-stratum using_queue ``` -* Parity Ethereum (EthCore) Logger Implementation +* Open Ethereum (EthCore) Logger Implementation ```bash ethcore-logger ``` -* C bindings library for the Parity Ethereum client - ```bash - parity-clib - ``` -* Parity Ethereum JSON-RPC Servers +* Open Ethereum JSON-RPC Servers ```bash parity-rpc ``` -* Parity Updater Service +* Open Ethereum Updater Service ```bash parity-updater parity-hash-fetch ``` -* Parity Core Libraries (Parity Util) +* Open Ethereum Core Libraries (`util`) ```bash ethcore-bloom-journal blooms-db dir eip-712 fake-fetch fastmap fetch ethcore-io journaldb keccak-hasher len-caching-lock memory-cache memzero migration-rocksdb ethcore-network ethcore-network-devp2p panic_hook - patricia-trie-ethereum registrar rlp_compress parity-runtime stats + patricia-trie-ethereum registrar rlp_compress stats time-utils triehash-ethereum unexpected parity-version ```

-### Contributing to documentation for Parity Ethereum packages +### Contributing to documentation for Open Ethereum packages -[Document source code](https://doc.rust-lang.org/1.9.0/book/documentation.html) for Parity Ethereum packages by annotating the source code with documentation comments. +[Document source code](https://doc.rust-lang.org/1.9.0/book/documentation.html) for Open Ethereum packages by annotating the source code with documentation comments. Example (generic documentation comment): ```markdown @@ -331,28 +318,22 @@ Example (generic documentation comment): ## 6. Toolchain -In addition to the Parity Ethereum client, there are additional tools in this repository available: +In addition to the Open Ethereum client, there are additional tools in this repository available: -- [evmbin](./evmbin) - Parity Ethereum EVM Implementation. -- [ethstore](./accounts/ethstore) - Parity Ethereum Key Management. -- [ethkey](./accounts/ethkey) - Parity Ethereum Keys Generator. +- [evmbin](./evmbin) - Open Ethereum EVM Implementation. +- [ethstore](./accounts/ethstore) - Open Ethereum Key Management. +- [ethkey](./accounts/ethkey) - Open Ethereum Keys Generator. The following tool is available in a separate repository: -- [ethabi](https://github.com/paritytech/ethabi) - Parity Ethereum Encoding of Function Calls. [Docs here](https://crates.io/crates/ethabi) -- [whisper](https://github.com/paritytech/whisper) - Parity Ethereum Whisper-v2 PoC Implementation. +- [ethabi](https://github.com/OpenEthereum/ethabi) - Open Ethereum Encoding of Function Calls. [Docs here](https://crates.io/crates/ethabi) +- [whisper](https://github.com/OpenEthereum/whisper) - Open Ethereum Whisper-v2 PoC Implementation. ## 7. Community ### Join the chat! -Questions? Get in touch with us on Gitter: -[![Gitter: Parity](https://img.shields.io/badge/gitter-parity-4AB495.svg)](https://gitter.im/paritytech/parity) -[![Gitter: Parity.js](https://img.shields.io/badge/gitter-parity.js-4AB495.svg)](https://gitter.im/paritytech/parity.js) -[![Gitter: Parity/Miners](https://img.shields.io/badge/gitter-parity/miners-4AB495.svg)](https://gitter.im/paritytech/parity/miners) -[![Gitter: Parity-PoA](https://img.shields.io/badge/gitter-parity--poa-4AB495.svg)](https://gitter.im/paritytech/parity-poa) - -Alternatively, join our community on Matrix: -[![Riot: +Parity](https://img.shields.io/badge/riot-%2Bparity%3Amatrix.parity.io-orange.svg)](https://riot.im/app/#/group/+parity:matrix.parity.io) +Questions? Get in touch with us on Discord: +[![Discord: Open Ethereum](https://img.shields.io/discord/669192218728202270.svg?logo=discord)](https://discord.gg/FJUgGe) ## 8. Contributing diff --git a/accounts/Cargo.toml b/accounts/Cargo.toml index ea303c8a2..3317aeb5a 100644 --- a/accounts/Cargo.toml +++ b/accounts/Cargo.toml @@ -1,6 +1,5 @@ [package] -description = "Parity Ethereum Account Management" -homepage = "http://parity.io" +description = "Open Ethereum Account Management" license = "GPL-3.0" name = "ethcore-accounts" version = "0.1.0" diff --git a/accounts/ethkey/Cargo.toml b/accounts/ethkey/Cargo.toml index 9bf8afc44..8bd710914 100644 --- a/accounts/ethkey/Cargo.toml +++ b/accounts/ethkey/Cargo.toml @@ -1,5 +1,5 @@ [package] -description = "Parity Ethereum Keys Generator" +description = "Open Ethereum Keys Generator" name = "ethkey" version = "0.4.0" authors = ["Parity Technologies "] diff --git a/accounts/ethkey/README.md b/accounts/ethkey/README.md index 3b487a086..fb34045df 100644 --- a/accounts/ethkey/README.md +++ b/accounts/ethkey/README.md @@ -1,11 +1,11 @@ ## ethkey-cli -Parity Ethereum keys generator. +Open Ethereum keys generator. ### Usage ``` -Parity Ethereum Keys Generator. +Open Ethereum Keys Generator. Copyright 2015-2020 Parity Technologies (UK) Ltd. Usage: @@ -211,11 +211,11 @@ public: 4e19a5fdae82596e1485c69b687c9cc52b5078e5b0668ef3ce8543cd90e712cb00df822 address: 00cf3711cbd3a1512570639280758118ba0b2bcb ``` -## Parity Ethereum toolchain -_This project is a part of the Parity Ethereum toolchain._ +## Open Ethereum toolchain +_This project is a part of the Open Ethereum toolchain._ -- [evmbin](https://github.com/OpenEthereum/open-ethereum/blob/master/evmbin/) - EVM implementation for Parity Ethereum. -- [ethabi](https://github.com/paritytech/ethabi) - Parity Ethereum function calls encoding. -- [ethstore](https://github.com/OpenEthereum/open-ethereum/blob/master/accounts/ethstore) - Parity Ethereum key management. -- [ethkey](https://github.com/OpenEthereum/open-ethereum/blob/master/accounts/ethkey) - Parity Ethereum keys generator. -- [whisper](https://github.com/paritytech/whisper) - Implementation of Whisper-v2 PoC. +- [evmbin](https://github.com/OpenEthereum/open-ethereum/blob/master/evmbin/) - EVM implementation for Open Ethereum. +- [ethabi](https://github.com/OpenEthereum/ethabi) - Open Ethereum function calls encoding. +- [ethstore](https://github.com/OpenEthereum/open-ethereum/blob/master/accounts/ethstore) - Open Ethereum key management. +- [ethkey](https://github.com/OpenEthereum/open-ethereum/blob/master/accounts/ethkey) - Open Ethereum keys generator. +- [whisper](https://github.com/OpenEthereum/whisper) - Implementation of Whisper-v2 PoC. diff --git a/accounts/ethkey/cli/Cargo.toml b/accounts/ethkey/cli/Cargo.toml index ca7f1e725..0cd5a4877 100644 --- a/accounts/ethkey/cli/Cargo.toml +++ b/accounts/ethkey/cli/Cargo.toml @@ -1,5 +1,5 @@ [package] -description = "Parity Ethereum Keys Generator CLI" +description = "Open Ethereum Keys Generator CLI" name = "ethkey-cli" version = "0.1.0" authors = ["Parity Technologies "] diff --git a/accounts/ethkey/cli/src/main.rs b/accounts/ethkey/cli/src/main.rs index 98b968359..19789f511 100644 --- a/accounts/ethkey/cli/src/main.rs +++ b/accounts/ethkey/cli/src/main.rs @@ -36,7 +36,7 @@ use parity_crypto::publickey::{KeyPair, Random, Error as EthkeyError, Generator, use rustc_hex::{FromHex, FromHexError}; const USAGE: &'static str = r#" -Parity Ethereum keys generator. +Open Ethereum keys generator. Copyright 2015-2020 Parity Technologies (UK) Ltd. Usage: diff --git a/accounts/ethstore/Cargo.toml b/accounts/ethstore/Cargo.toml index 9ebdaabca..fca161703 100644 --- a/accounts/ethstore/Cargo.toml +++ b/accounts/ethstore/Cargo.toml @@ -1,8 +1,9 @@ [package] -description = "Parity Ethereum Key Management" +description = "Open Ethereum Key Management" name = "ethstore" version = "0.2.1" authors = ["Parity Technologies "] +repository = "https://github.com/OpenEthereum/open-ethereum" [dependencies] log = "0.4" diff --git a/accounts/ethstore/README.md b/accounts/ethstore/README.md index c0764fcad..fa62cb117 100644 --- a/accounts/ethstore/README.md +++ b/accounts/ethstore/README.md @@ -1,11 +1,11 @@ ## ethstore-cli -Parity Ethereum key management. +Open Ethereum key management. ### Usage ``` -Parity Ethereum key management tool. +Open Ethereum key management tool. Copyright 2015-2020 Parity Technologies (UK) Ltd. Usage: @@ -330,11 +330,11 @@ ethstore move-from-vault 00e63fdb87ceb815ec96ae185b8f7381a0b4a5ea vault1 vault1_ OK ``` -## Parity Ethereum toolchain -_This project is a part of the Parity Ethereum toolchain._ +## Open Ethereum toolchain +_This project is a part of the Open Ethereum toolchain._ -- [evmbin](https://github.com/OpenEthereum/open-ethereum/blob/master/evmbin/) - EVM implementation for Parity Ethereum. -- [ethabi](https://github.com/paritytech/ethabi) - Parity Ethereum function calls encoding. -- [ethstore](https://github.com/OpenEthereum/open-ethereum/blob/master/accounts/ethstore) - Parity Ethereum key management. -- [ethkey](https://github.com/OpenEthereum/open-ethereum/blob/master/accounts/ethkey) - Parity Ethereum keys generator. -- [whisper](https://github.com/paritytech/whisper) - Implementation of Whisper-v2 PoC. +- [evmbin](https://github.com/OpenEthereum/open-ethereum/blob/master/evmbin/) - EVM implementation for Open Ethereum. +- [ethabi](https://github.com/OpenEthereum/ethabi) - Open Ethereum function calls encoding. +- [ethstore](https://github.com/OpenEthereum/open-ethereum/blob/master/accounts/ethstore) - Open Ethereum key management. +- [ethkey](https://github.com/OpenEthereum/open-ethereum/blob/master/accounts/ethkey) - Open Ethereum keys generator. +- [whisper](https://github.com/OpenEthereum/whisper) - Implementation of Whisper-v2 PoC. diff --git a/accounts/ethstore/cli/Cargo.toml b/accounts/ethstore/cli/Cargo.toml index 4d48900c3..4bc70ce16 100644 --- a/accounts/ethstore/cli/Cargo.toml +++ b/accounts/ethstore/cli/Cargo.toml @@ -1,5 +1,5 @@ [package] -description = "Parity Ethereum Key Management CLI" +description = "Open Ethereum Key Management CLI" name = "ethstore-cli" version = "0.1.1" authors = ["Parity Technologies "] diff --git a/accounts/ethstore/cli/src/main.rs b/accounts/ethstore/cli/src/main.rs index ee20fee54..0df6a0a7f 100644 --- a/accounts/ethstore/cli/src/main.rs +++ b/accounts/ethstore/cli/src/main.rs @@ -43,7 +43,7 @@ use ethstore::{EthStore, SimpleSecretStore, SecretStore, import_accounts, Presal mod crack; pub const USAGE: &'static str = r#" -Parity Ethereum key management tool. +Open Ethereum key management tool. Copyright 2015-2020 Parity Technologies (UK) Ltd. Usage: diff --git a/chainspec/Cargo.toml b/chainspec/Cargo.toml index c0308edd3..dbcfdfa23 100644 --- a/chainspec/Cargo.toml +++ b/chainspec/Cargo.toml @@ -1,5 +1,5 @@ [package] -description = "Parity Ethereum Chain Specification" +description = "Open Ethereum Chain Specification" name = "chainspec" version = "0.1.0" authors = ["Marek Kotewicz "] diff --git a/cli-signer/Cargo.toml b/cli-signer/Cargo.toml index 3fc0b3329..607f20042 100644 --- a/cli-signer/Cargo.toml +++ b/cli-signer/Cargo.toml @@ -1,6 +1,6 @@ [package] -description = "Parity Ethereum CLI Signer Tool" -homepage = "http://parity.io" +description = "Open Ethereum CLI Signer Tool" +repository = "https://github.com/OpenEthereum/open-ethereum" license = "GPL-3.0" name = "cli-signer" version = "1.4.0" diff --git a/cli-signer/rpc-client/Cargo.toml b/cli-signer/rpc-client/Cargo.toml index de47e2567..d9777f15a 100644 --- a/cli-signer/rpc-client/Cargo.toml +++ b/cli-signer/rpc-client/Cargo.toml @@ -1,6 +1,6 @@ [package] -description = "Parity Ethereum RPC Client" -homepage = "http://parity.io" +description = "Open Ethereum RPC Client" +repository = "https://github.com/OpenEthereum/open-ethereum" license = "GPL-3.0" name = "parity-rpc-client" version = "1.4.0" diff --git a/ethash/Cargo.toml b/ethash/Cargo.toml index abf932f2d..b436e7c7f 100644 --- a/ethash/Cargo.toml +++ b/ethash/Cargo.toml @@ -1,5 +1,5 @@ [package] -description = "Parity Ethereum Ethash & ProgPoW Implementations" +description = "Open Ethereum Ethash & ProgPoW Implementations" name = "ethash" version = "1.12.0" authors = ["Parity Technologies "] diff --git a/ethash/src/compute.rs b/ethash/src/compute.rs index 7d72fd5e9..67ef0e589 100644 --- a/ethash/src/compute.rs +++ b/ethash/src/compute.rs @@ -264,7 +264,7 @@ fn hash_compute(light: &Light, full_size: usize, header_hash: &H256, nonce: u64) unsafe { make_const_array!(MIX_WORDS / 4, &mut buf.compress_bytes) }; #[cfg(target_endian = "big")] { - compile_error!("parity-ethereum currently only supports little-endian targets"); + compile_error!("open-ethereum currently only supports little-endian targets"); } // Compress mix diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml index 9767a75cc..c6d09a6ba 100644 --- a/ethcore/Cargo.toml +++ b/ethcore/Cargo.toml @@ -1,6 +1,6 @@ [package] -description = "Parity Ethereum (EthCore) Library" -homepage = "http://parity.io" +description = "Open Ethereum (EthCore) Library" +repository = "https://github.com/OpenEthereum/open-ethereum" license = "GPL-3.0" name = "ethcore" version = "1.12.0" diff --git a/ethcore/blockchain/Cargo.toml b/ethcore/blockchain/Cargo.toml index 9531d3664..b7f2357b4 100644 --- a/ethcore/blockchain/Cargo.toml +++ b/ethcore/blockchain/Cargo.toml @@ -1,6 +1,6 @@ [package] -description = "Parity Ethereum Blockchain Database, Test Generator, Configuration, Caching, Importing Blocks, and Block Information" -homepage = "http://parity.io" +description = "Open Ethereum Blockchain Database, Test Generator, Configuration, Caching, Importing Blocks, and Block Information" +repository = "https://github.com/OpenEthereum/open-ethereum" license = "GPL-3.0" name = "ethcore-blockchain" version = "0.1.0" diff --git a/ethcore/call-contract/Cargo.toml b/ethcore/call-contract/Cargo.toml index 03bd32475..397a44ed0 100644 --- a/ethcore/call-contract/Cargo.toml +++ b/ethcore/call-contract/Cargo.toml @@ -1,5 +1,5 @@ [package] -description = "Parity Ethereum (EthCore) Contract Calls and Blockchain Service & Registry Information" +description = "Open Ethereum (EthCore) Contract Calls and Blockchain Service & Registry Information" name = "ethcore-call-contract" version = "0.1.0" license = "GPL-3.0" diff --git a/ethcore/db/Cargo.toml b/ethcore/db/Cargo.toml index 47d71f859..9edf70c04 100644 --- a/ethcore/db/Cargo.toml +++ b/ethcore/db/Cargo.toml @@ -1,6 +1,6 @@ [package] description = "Ethcore DB access utilities" -homepage = "http://parity.io" +repository = "https://github.com/OpenEthereum/open-ethereum" license = "GPL-3.0" name = "ethcore-db" version = "0.1.0" diff --git a/ethcore/db/src/lib.rs b/ethcore/db/src/lib.rs index 84d52df03..ea7045a14 100644 --- a/ethcore/db/src/lib.rs +++ b/ethcore/db/src/lib.rs @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Open Ethereum. If not, see . -//! Parity Ethereum database access utilities. +//! Open Ethereum database access utilities. #![warn(missing_docs)] diff --git a/ethcore/evm/Cargo.toml b/ethcore/evm/Cargo.toml index f4f8f2665..71fc08a02 100644 --- a/ethcore/evm/Cargo.toml +++ b/ethcore/evm/Cargo.toml @@ -1,5 +1,5 @@ [package] -description = "Parity Ethereum Virtual Machine (EVM) Rust Implementation" +description = "Open Ethereum Virtual Machine (EVM) Rust Implementation" name = "evm" version = "0.1.0" authors = ["Parity Technologies "] diff --git a/ethcore/light/Cargo.toml b/ethcore/light/Cargo.toml index 41efd17c4..3d93e53c9 100644 --- a/ethcore/light/Cargo.toml +++ b/ethcore/light/Cargo.toml @@ -1,6 +1,6 @@ [package] -description = "Parity Ethereum (EthCore) Light Client Implementation (Block Import IO Service, Blockchain Data Fetching, Light Client Header Chain Storage, Parity Light Protocol (PLP) Provider, Light Transaction Queue, CHT Definitions, Light Client Data Cache), Parity Light Protocol (PLP) Implementation, P2P Network I/O and Event Context Generalization, Peer Error Handling & Punishment, Request Load Timer & Distribution Manager, Pending Request Set Storage, Request Credit Management, Light Client Request Types, Request Chain Builder Utility, On-demand Chain Request Service over LES (for RPCs), ResponseGuard Implementation)" -homepage = "http://parity.io" +description = "Open Ethereum (EthCore) Light Client Implementation (Block Import IO Service, Blockchain Data Fetching, Light Client Header Chain Storage, Parity Light Protocol (PLP) Provider, Light Transaction Queue, CHT Definitions, Light Client Data Cache), Parity Light Protocol (PLP) Implementation, P2P Network I/O and Event Context Generalization, Peer Error Handling & Punishment, Request Load Timer & Distribution Manager, Pending Request Set Storage, Request Credit Management, Light Client Request Types, Request Chain Builder Utility, On-demand Chain Request Service over LES (for RPCs), ResponseGuard Implementation)" +repository = "https://github.com/OpenEthereum/open-ethereum" license = "GPL-3.0" name = "ethcore-light" version = "1.12.0" diff --git a/ethcore/node-filter/Cargo.toml b/ethcore/node-filter/Cargo.toml index c46b5e399..8a0cc7a2e 100644 --- a/ethcore/node-filter/Cargo.toml +++ b/ethcore/node-filter/Cargo.toml @@ -1,6 +1,6 @@ [package] description = "Parity Smart Contract based Node Filter, Manage Permissions of Network Connections" -homepage = "http://parity.io" +repository = "https://github.com/OpenEthereum/open-ethereum" license = "GPL-3.0" name = "node-filter" version = "1.12.0" diff --git a/ethcore/service/Cargo.toml b/ethcore/service/Cargo.toml index 0dcedc972..d9b158682 100644 --- a/ethcore/service/Cargo.toml +++ b/ethcore/service/Cargo.toml @@ -1,5 +1,5 @@ [package] -description = "Parity Ethereum (EthCore) Client & Network Service Creation & Registration with the I/O Subsystem" +description = "Open Ethereum (EthCore) Client & Network Service Creation & Registration with the I/O Subsystem" name = "ethcore-service" version = "0.1.0" authors = ["Parity Technologies "] diff --git a/ethcore/spec/src/chain.rs b/ethcore/spec/src/chain.rs index 355c16974..d2e95efae 100644 --- a/ethcore/spec/src/chain.rs +++ b/ethcore/spec/src/chain.rs @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Open Ethereum. If not, see . -//! Load chain specifications for all chains supported by the parity-ethereum client. +//! Load chain specifications for all chains supported by the open-ethereum client. macro_rules! bundle_release_spec { ($($path: expr => $name: ident), *) => { diff --git a/ethcore/sync/Cargo.toml b/ethcore/sync/Cargo.toml index 58898303c..ae970bf98 100644 --- a/ethcore/sync/Cargo.toml +++ b/ethcore/sync/Cargo.toml @@ -1,5 +1,5 @@ [package] -description = "Parity Ethereum (EthCore) Blockchain Synchronization (Strategy, Blockchain Downloader, Blockchain Synchronization Implementation of Ethereum Protocol, Propagating Data to Peers, Requesting Data from Peers, Supplying Data in Response to Peer Requests, Handling Peer Responses, Matching Packet IDs and Protocol, Light Client Synchronization of Header Chain, Header Download State Machine, Light Decoding & Verifying Header Responses, Private Transaction Handling, Synchronization Snapshot Service to Download & Verify Block Chunks, Peer Connection Management and Blockchain Client I/O Interface for Synchronization Handler, Transaction Statistics)" +description = "Open Ethereum (EthCore) Blockchain Synchronization (Strategy, Blockchain Downloader, Blockchain Synchronization Implementation of Ethereum Protocol, Propagating Data to Peers, Requesting Data from Peers, Supplying Data in Response to Peer Requests, Handling Peer Responses, Matching Packet IDs and Protocol, Light Client Synchronization of Header Chain, Header Download State Machine, Light Decoding & Verifying Header Responses, Private Transaction Handling, Synchronization Snapshot Service to Download & Verify Block Chunks, Peer Connection Management and Blockchain Client I/O Interface for Synchronization Handler, Transaction Statistics)" name = "ethcore-sync" version = "1.12.0" license = "GPL-3.0" diff --git a/ethcore/sync/src/chain/propagator.rs b/ethcore/sync/src/chain/propagator.rs index 943a21dfa..9775d3c40 100644 --- a/ethcore/sync/src/chain/propagator.rs +++ b/ethcore/sync/src/chain/propagator.rs @@ -600,7 +600,7 @@ mod tests { io.peers_info.insert(2, "Parity-Ethereum/v2.6.0/linux/rustc".to_owned()); // and peer#3 is Parity, accepting service transactions insert_dummy_peer(&mut sync, 3, block_hash); - io.peers_info.insert(3, "Parity-Ethereum/ABCDEFGH/v2.7.3/linux/rustc".to_owned()); + io.peers_info.insert(3, "Open-Ethereum/ABCDEFGH/v2.7.3/linux/rustc".to_owned()); // and new service transaction is propagated to peers SyncPropagator::propagate_new_transactions(&mut sync, &mut io, || true); @@ -624,7 +624,7 @@ mod tests { // when peer#1 is Parity, accepting service transactions insert_dummy_peer(&mut sync, 1, block_hash); - io.peers_info.insert(1, "Parity-Ethereum/v2.6.0/linux/rustc".to_owned()); + io.peers_info.insert(1, "Open-Ethereum/v2.6.0/linux/rustc".to_owned()); // and service + non-service transactions are propagated to peers SyncPropagator::propagate_new_transactions(&mut sync, &mut io, || true); diff --git a/ethcore/trace/src/types/trace.rs b/ethcore/trace/src/types/trace.rs index f75a0d84f..f62e10f9c 100644 --- a/ethcore/trace/src/types/trace.rs +++ b/ethcore/trace/src/types/trace.rs @@ -147,7 +147,7 @@ pub struct Call { /// This is essentially an `Option`, but with a custom /// `rlp` en/de-coding which preserves backwards compatibility with -/// the older encodings used in parity-ethereum versions < 2.7 and 2.7.0. +/// the older encodings used in open-ethereum versions < 2.7 and 2.7.0. #[derive(Debug, Clone, Copy, PartialEq)] pub struct BackwardsCompatibleCallType(pub Option); diff --git a/ethcore/types/Cargo.toml b/ethcore/types/Cargo.toml index 5916d80ea..7006323ed 100644 --- a/ethcore/types/Cargo.toml +++ b/ethcore/types/Cargo.toml @@ -1,5 +1,5 @@ [package] -description = "Parity Ethereum Common Types" +description = "Open Ethereum Common Types" name = "common-types" version = "0.1.0" authors = ["Parity Technologies "] diff --git a/ethcore/types/src/errors/mod.rs b/ethcore/types/src/errors/mod.rs index 821af0f73..abf172631 100644 --- a/ethcore/types/src/errors/mod.rs +++ b/ethcore/types/src/errors/mod.rs @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Open Ethereum. If not, see . -//! General error types for use in parity-ethereum. +//! General error types for use in open-ethereum. mod block_error; mod engine_error; diff --git a/ethcore/types/src/lib.rs b/ethcore/types/src/lib.rs index 7f25fdb38..c6ad572ee 100644 --- a/ethcore/types/src/lib.rs +++ b/ethcore/types/src/lib.rs @@ -25,7 +25,7 @@ //! structures from that crate. //! //! NOTE If you can specify your data type in the same crate as your trait, please do that. -//! Don't treat this crate as a bag for any types that we use in Parity Ethereum. +//! Don't treat this crate as a bag for any types that we use in Open Ethereum. //! This one is reserved for types that are shared heavily (like transactions), //! historically this contains types extracted from `ethcore` crate, if possible //! we should try to dissolve that crate in favour of more fine-grained crates, diff --git a/evmbin/README.md b/evmbin/README.md index 298862924..1c17b4c88 100644 --- a/evmbin/README.md +++ b/evmbin/README.md @@ -45,10 +45,10 @@ Display result state dump in standardized JSON format. -h, --help Display this message and exit. ``` -## Parity Ethereum toolchain -_This project is a part of the Parity Ethereum toolchain._ +## Open Ethereum toolchain +_This project is a part of the Open Ethereum toolchain._ -- [evmbin](https://github.com/OpenEthereum/open-ethereum/blob/master/evmbin/) - EVM implementation for Parity Ethereum. -- [ethabi](https://github.com/paritytech/ethabi) - Parity Ethereum function calls encoding. -- [ethstore](https://github.com/OpenEthereum/open-ethereum/blob/master/accounts/ethstore) - Parity Ethereum key management. -- [ethkey](https://github.com/OpenEthereum/open-ethereum/blob/master/accounts/ethkey) - Parity Ethereum keys generator. +- [evmbin](https://github.com/OpenEthereum/open-ethereum/blob/master/evmbin/) - EVM implementation for Open Ethereum +- [ethabi](https://github.com/paritytech/ethabi) - Open Ethereum function calls encoding. +- [ethstore](https://github.com/OpenEthereum/open-ethereum/blob/master/accounts/ethstore) - Open Ethereum key management. +- [ethkey](https://github.com/OpenEthereum/open-ethereum/blob/master/accounts/ethkey) - Open Ethereum keys generator. diff --git a/evmbin/src/main.rs b/evmbin/src/main.rs index cbf8af694..20dbef6e6 100644 --- a/evmbin/src/main.rs +++ b/evmbin/src/main.rs @@ -19,12 +19,12 @@ //! ## Overview //! //! The Parity EVM interpreter binary is a tool in the Parity -//! Ethereum toolchain. It is an EVM implementation for Parity Ethereum that +//! Ethereum toolchain. It is an EVM implementation for Open Ethereum that //! is used to run a standalone version of the EVM interpreter. //! //! ## Usage //! -//! The evmbin tool is not distributed with regular Parity Ethereum releases +//! The evmbin tool is not distributed with regular Open Ethereum releases //! so you need to build it from source and run it like so: //! //! ```bash diff --git a/json/Cargo.toml b/json/Cargo.toml index 097563289..5ab9ae4a8 100644 --- a/json/Cargo.toml +++ b/json/Cargo.toml @@ -1,5 +1,5 @@ [package] -description = "Parity Ethereum JSON Deserialization" +description = "Open Ethereum JSON Deserialization" name = "ethjson" version = "0.1.0" authors = ["Parity Technologies "] diff --git a/miner/Cargo.toml b/miner/Cargo.toml index 91edeb1d7..3eb68b81e 100644 --- a/miner/Cargo.toml +++ b/miner/Cargo.toml @@ -1,7 +1,7 @@ [package] -description = "Parity Ethereum Miner Interface." +description = "Open Ethereum Miner Interface." name = "ethcore-miner" -homepage = "http://parity.io" +repository = "https://github.com/OpenEthereum/open-ethereum" license = "GPL-3.0" version = "1.12.0" authors = ["Parity Technologies "] diff --git a/miner/price-info/Cargo.toml b/miner/price-info/Cargo.toml index fa3cd8aee..df5400716 100644 --- a/miner/price-info/Cargo.toml +++ b/miner/price-info/Cargo.toml @@ -1,6 +1,6 @@ [package] description = "Fetch current ETH price" -homepage = "http://parity.io" +repository = "https://github.com/OpenEthereum/open-ethereum" license = "GPL-3.0" name = "price-info" version = "1.12.0" diff --git a/miner/stratum/src/lib.rs b/miner/stratum/src/lib.rs index 6c6067e56..bfedecbec 100644 --- a/miner/stratum/src/lib.rs +++ b/miner/stratum/src/lib.rs @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Open Ethereum. If not, see . -//! Stratum protocol implementation for parity ethereum/bitcoin clients +//! Stratum protocol implementation for Open Ethereum/bitcoin clients extern crate jsonrpc_tcp_server; extern crate jsonrpc_core; diff --git a/parity/account_utils.rs b/parity/account_utils.rs index 9f846bdd1..e122ee98b 100644 --- a/parity/account_utils.rs +++ b/parity/account_utils.rs @@ -36,7 +36,7 @@ mod accounts { } pub fn prepare_account_provider(_spec: &SpecType, _dirs: &Directories, _data_dir: &str, _cfg: AccountsConfig, _passwords: &[Password]) -> Result { - warn!("Note: Your instance of Parity Ethereum is running without account support. Some CLI options are ignored."); + warn!("Note: Your instance of Open Ethereum is running without account support. Some CLI options are ignored."); Ok(AccountProvider) } diff --git a/parity/cli/usage_header.txt b/parity/cli/usage_header.txt index 77c64a702..92775d63b 100644 --- a/parity/cli/usage_header.txt +++ b/parity/cli/usage_header.txt @@ -1,4 +1,4 @@ -Parity Ethereum Client. +Open Ethereum Client. By Wood/Paronyan/Kotewicz/Drwięga/Volf/Greeff Habermeier/Czaban/Gotchac/Redman/Nikolsky Schoedon/Tang/Adolfsson/Silva/Palm/Hirsz et al. diff --git a/parity/cli/version.txt b/parity/cli/version.txt index 8c4dffbe7..d68843e94 100644 --- a/parity/cli/version.txt +++ b/parity/cli/version.txt @@ -1,4 +1,4 @@ -Parity Ethereum Client. +Open Ethereum Client. version {} Copyright 2015-2020 Parity Technologies (UK) Ltd. License GPLv3+: GNU GPL version 3 or later . diff --git a/parity/configuration.rs b/parity/configuration.rs index d139bf550..4fb797478 100644 --- a/parity/configuration.rs +++ b/parity/configuration.rs @@ -104,7 +104,7 @@ impl Configuration { /// # Example /// /// ``` - /// let _cfg = parity_ethereum::Configuration::parse_cli(&["--light", "--chain", "kovan"]).unwrap(); + /// let _cfg = open_ethereum::Configuration::parse_cli(&["--light", "--chain", "kovan"]).unwrap(); /// ``` pub fn parse_cli>(command: &[S]) -> Result { let config = Configuration { @@ -762,7 +762,7 @@ impl Configuration { ret.client_version = { let mut client_version = version(); if !self.args.arg_identity.is_empty() { - // Insert name after the "Parity-Ethereum/" at the beginning of version string. + // Insert name after the "Open-Ethereum/" at the beginning of version string. let idx = client_version.find('/').unwrap_or(client_version.len()); client_version.insert_str(idx, &format!("/{}", self.args.arg_identity)); } @@ -1748,7 +1748,7 @@ mod tests { match conf.into_command().unwrap().cmd { Cmd::Run(c) => { assert_eq!(c.name, "Somebody"); - assert!(c.net_conf.client_version.starts_with("Parity-Ethereum/Somebody/")); + assert!(c.net_conf.client_version.starts_with("Open-Ethereum/Somebody/")); } _ => panic!("Should be Cmd::Run"), } diff --git a/parity/logger/Cargo.toml b/parity/logger/Cargo.toml index 2bc163e45..6b5713dfa 100644 --- a/parity/logger/Cargo.toml +++ b/parity/logger/Cargo.toml @@ -1,5 +1,5 @@ [package] -description = "Parity Ethereum Logger Implementation" +description = "Open Ethereum Logger Implementation" name = "ethcore-logger" version = "1.12.0" license = "GPL-3.0" diff --git a/parity/main.rs b/parity/main.rs index 7ffc9ff19..9884a9482 100644 --- a/parity/main.rs +++ b/parity/main.rs @@ -24,7 +24,7 @@ extern crate fdlimit; #[macro_use] extern crate log; extern crate panic_hook; -extern crate parity_ethereum; +extern crate open_ethereum; extern crate parking_lot; extern crate parity_daemonize; extern crate ansi_term; @@ -45,7 +45,7 @@ use ctrlc::CtrlC; use dir::default_hypervisor_path; use fdlimit::raise_fd_limit; use ethcore_logger::setup_log; -use parity_ethereum::{start, ExecutionAction}; +use open_ethereum::{start, ExecutionAction}; use parity_daemonize::AsHandle; use parking_lot::{Condvar, Mutex}; @@ -187,7 +187,7 @@ fn main_direct(force_can_restart: bool) -> i32 { let mut conf = { let args = std::env::args().collect::>(); - parity_ethereum::Configuration::parse_cli(&args).unwrap_or_else(|e| e.exit()) + open_ethereum::Configuration::parse_cli(&args).unwrap_or_else(|e| e.exit()) }; let logger = setup_log(&conf.logger_config()).unwrap_or_else(|e| { diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 3aeb5fa68..1f55126de 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -1,5 +1,5 @@ [package] -description = "Parity Ethereum JSON-RPC Servers (WS, HTTP, IPC)" +description = "Open Ethereum JSON-RPC Servers (WS, HTTP, IPC)" name = "parity-rpc" version = "1.12.0" license = "GPL-3.0" diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs index 0eb4b2ca3..1dfe69b08 100644 --- a/rpc/src/lib.rs +++ b/rpc/src/lib.rs @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Open Ethereum. If not, see . -//! Parity Ethereum JSON-RPC Servers (WS, HTTP, IPC). +//! Open Ethereum JSON-RPC Servers (WS, HTTP, IPC). #![warn(missing_docs, unused_extern_crates)] #![cfg_attr(feature = "cargo-clippy", warn(clippy::all, clippy::pedantic))] diff --git a/rpc/src/v1/helpers/errors.rs b/rpc/src/v1/helpers/errors.rs index 4d8ce9583..a6cbe0e90 100644 --- a/rpc/src/v1/helpers/errors.rs +++ b/rpc/src/v1/helpers/errors.rs @@ -347,14 +347,6 @@ pub fn encryption(error: T) -> Error { } } -pub fn encoding(error: T) -> Error { - Error { - code: ErrorCode::ServerError(codes::ENCODING_ERROR), - message: "Encoding error.".into(), - data: Some(Value::String(format!("{:?}", error))), - } -} - pub fn database(error: T) -> Error { Error { code: ErrorCode::ServerError(codes::DATABASE_ERROR), diff --git a/rpc/src/v1/tests/helpers/sync_provider.rs b/rpc/src/v1/tests/helpers/sync_provider.rs index 8578f653a..3e6fb9770 100644 --- a/rpc/src/v1/tests/helpers/sync_provider.rs +++ b/rpc/src/v1/tests/helpers/sync_provider.rs @@ -94,7 +94,7 @@ impl SyncProvider for TestSyncProvider { }, PeerInfo { id: None, - client_version: ClientVersion::from("Parity-Ethereum/2/v2.4.0/linux/rustc"), + client_version: ClientVersion::from("Open-Ethereum/2/v2.7.0/linux/rustc"), capabilities: vec!["eth/64".to_owned(), "eth/65".to_owned()], remote_address: "Handshake".to_owned(), local_address: "127.0.0.1:3333".to_owned(), diff --git a/rpc/src/v1/tests/mocked/parity.rs b/rpc/src/v1/tests/mocked/parity.rs index b20bd042c..b539e7112 100644 --- a/rpc/src/v1/tests/mocked/parity.rs +++ b/rpc/src/v1/tests/mocked/parity.rs @@ -255,7 +255,76 @@ fn rpc_parity_net_peers() { let io = deps.default_client(); let request = r#"{"jsonrpc": "2.0", "method": "parity_netPeers", "params":[], "id": 1}"#; - let response = r#"{"jsonrpc":"2.0","result":{"active":0,"connected":120,"max":50,"peers":[{"caps":["eth/63","eth/64"],"id":"node1","name":{"ParityClient":{"can_handle_large_requests":true,"compiler":"rustc","identity":"1","name":"Parity-Ethereum","os":"linux","semver":"2.4.0"}},"network":{"localAddress":"127.0.0.1:8888","remoteAddress":"127.0.0.1:7777"},"protocols":{"eth":{"difficulty":"0x28","head":"0000000000000000000000000000000000000000000000000000000000000032","version":63},"pip":null}},{"caps":["eth/64","eth/65"],"id":null,"name":{"ParityClient":{"can_handle_large_requests":true,"compiler":"rustc","identity":"2","name":"Parity-Ethereum","os":"linux","semver":"2.4.0"}},"network":{"localAddress":"127.0.0.1:3333","remoteAddress":"Handshake"},"protocols":{"eth":{"difficulty":null,"head":"000000000000000000000000000000000000000000000000000000000000003c","version":65},"pip":null}}]},"id":1}"#; + let response = r#" + { + "jsonrpc": "2.0", + "result": { + "active": 0, + "connected": 120, + "max": 50, + "peers": [ + { + "caps": [ + "eth/63", + "eth/64" + ], + "id": "node1", + "name": { + "ParityClient": { + "can_handle_large_requests": true, + "compiler": "rustc", + "identity": "1", + "name": "Parity-Ethereum", + "os": "linux", + "semver": "2.4.0" + } + }, + "network": { + "localAddress": "127.0.0.1:8888", + "remoteAddress": "127.0.0.1:7777" + }, + "protocols": { + "eth": { + "difficulty": "0x28", + "head": "0000000000000000000000000000000000000000000000000000000000000032", + "version": 63 + }, + "pip": null + } + }, + { + "caps": [ + "eth/64", + "eth/65" + ], + "id": null, + "name": { + "ParityClient": { + "can_handle_large_requests": true, + "compiler": "rustc", + "identity": "2", + "name": "Open-Ethereum", + "os": "linux", + "semver": "2.7.0" + } + }, + "network": { + "localAddress": "127.0.0.1:3333", + "remoteAddress": "Handshake" + }, + "protocols": { + "eth": { + "difficulty": null, + "head": "000000000000000000000000000000000000000000000000000000000000003c", + "version": 65 + }, + "pip": null + } + } + ] + }, + "id": 1 + }"#.replace(char::is_whitespace, ""); assert_eq!(io.handle_request_sync(request), Some(response.to_owned())); } diff --git a/scripts/docker/README.md b/scripts/docker/README.md index 2156c3d2e..a4916deab 100644 --- a/scripts/docker/README.md +++ b/scripts/docker/README.md @@ -7,7 +7,7 @@ Builds a lightweight non-root Parity docker image: ``` git clone https://github.com/OpenEthereum/open-ethereum.git -cd parity-ethereum +cd open-ethereum ./scripts/docker/centos/build.sh ``` diff --git a/scripts/docker/centos/Dockerfile.build b/scripts/docker/centos/Dockerfile.build index 454af403a..6fbcbafc2 100644 --- a/scripts/docker/centos/Dockerfile.build +++ b/scripts/docker/centos/Dockerfile.build @@ -2,7 +2,7 @@ FROM centos:latest WORKDIR /build -ADD . /build/parity-ethereum +ADD . /build/open-ethereum RUN yum -y update && \ yum install -y systemd-devel git make gcc-c++ gcc file binutils && \ @@ -17,9 +17,9 @@ RUN yum -y update && \ gcc -v && \ g++ -v && \ cmake --version && \ - cd parity-ethereum && \ + cd open-ethereum && \ cargo build --verbose --release --features final && \ - strip /build/parity-ethereum/target/release/parity && \ - file /build/parity-ethereum/target/release/parity + strip /build/open-ethereum/target/release/parity && \ + file /build/open-ethereum/target/release/parity diff --git a/scripts/docker/centos/build.sh b/scripts/docker/centos/build.sh index df4796b91..d251a26dc 100755 --- a/scripts/docker/centos/build.sh +++ b/scripts/docker/centos/build.sh @@ -13,7 +13,7 @@ docker build --no-cache -t $PARITY_IMAGE_REPO:$PARITY_BUILDER_IMAGE_TAG-$(git lo echo Creating $PARITY_BUILDER_IMAGE_TAG-$(git log -1 --format="%H"), extracting binary docker create --name extract $PARITY_IMAGE_REPO:$PARITY_BUILDER_IMAGE_TAG-$(git log -1 --format="%H") mkdir scripts/docker/centos/parity -docker cp extract:/build/parity-ethereum/target/release/parity scripts/docker/centos/parity +docker cp extract:/build/open-ethereum/target/release/parity scripts/docker/centos/parity echo Building $PARITY_IMAGE_REPO:$PARITY_RUNNER_IMAGE_TAG docker build --no-cache -t $PARITY_IMAGE_REPO:$PARITY_RUNNER_IMAGE_TAG scripts/docker/centos/ -f scripts/docker/centos/Dockerfile diff --git a/scripts/docker/hub/Dockerfile b/scripts/docker/hub/Dockerfile index 6ef3734b3..eb133441e 100644 --- a/scripts/docker/hub/Dockerfile +++ b/scripts/docker/hub/Dockerfile @@ -7,7 +7,7 @@ ARG BUILD_DATE LABEL io.parity.image.authors="devops-team@parity.io" \ io.parity.image.vendor="Parity Technologies" \ io.parity.image.title="parity/parity" \ - io.parity.image.description="Parity Ethereum. The Fastest and most Advanced Ethereum Client." \ + io.parity.image.description="Open Ethereum. The Fastest and most Advanced Ethereum Client." \ io.parity.image.source="https://github.com/OpenEthereum/open-ethereum/blob/${VCS_REF}/\ scripts/docker/hub/Dockerfile" \ io.parity.image.documentation="https://wiki.parity.io/Parity-Ethereum" \ @@ -33,7 +33,7 @@ RUN set -eux; \ WORKDIR /home/parity -# add parity-ethereum binary to docker image +# add open-ethereum binary to docker image COPY artifacts/x86_64-unknown-linux-gnu/parity /bin/parity COPY tools/check_sync.sh /check_sync.sh diff --git a/scripts/docker/hub/publish-docker.sh b/scripts/docker/hub/publish-docker.sh index a341ccc12..5b7fefa38 100755 --- a/scripts/docker/hub/publish-docker.sh +++ b/scripts/docker/hub/publish-docker.sh @@ -4,8 +4,8 @@ set -e # fail on any error VERSION=$(cat ./tools/VERSION) TRACK=$(cat ./tools/TRACK) -echo "Parity Ethereum version = ${VERSION}" -echo "Parity Ethereum track = ${TRACK}" +echo "Open Ethereum version = ${VERSION}" +echo "Open Ethereum track = ${TRACK}" test "$Docker_Hub_User_Parity" -a "$Docker_Hub_Pass_Parity" \ || ( echo "no docker credentials provided"; exit 1 ) diff --git a/scripts/gitlab/build-linux.sh b/scripts/gitlab/build-linux.sh deleted file mode 100755 index 1552d9ec4..000000000 --- a/scripts/gitlab/build-linux.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -set -e # fail on any error -set -u # treat unset variables as error - -export CC="sccache "$CC -export CXX="sccache "$CXX -echo "__________Show ENVIROMENT__________" -echo "CARGO_TARGET: " $CARGO_TARGET -echo "CC: " $CC -echo "CXX: " $CXX -#strip ON -export RUSTFLAGS+=" -C link-arg=-s" - -echo "_____ Building target: "$CARGO_TARGET" _____" -if [ "${CARGO_TARGET}" = "x86_64-unknown-linux-gnu" ] || [ "${CARGO_TARGET}" = "x86_64-apple-darwin" ] -then - # NOTE: Enables the aes-ni instructions for RustCrypto dependency. - # If you change this please remember to also update .cargo/config - export RUSTFLAGS+=" -C target-feature=+aes,+sse2,+ssse3" -fi -time cargo build --target $CARGO_TARGET --verbose --color=always --release --features final -time cargo build --target $CARGO_TARGET --verbose --color=always --release -p evmbin -time cargo build --target $CARGO_TARGET --verbose --color=always --release -p ethstore-cli -time cargo build --target $CARGO_TARGET --verbose --color=always --release -p ethkey-cli - -echo "_____ Post-processing binaries _____" -rm -rf artifacts/* -mkdir -p artifacts/$CARGO_TARGET -cd artifacts/$CARGO_TARGET - -cp -v ../../target/$CARGO_TARGET/release/parity ./parity -cp -v ../../target/$CARGO_TARGET/release/parity-evm ./parity-evm -cp -v ../../target/$CARGO_TARGET/release/ethstore ./ethstore -cp -v ../../target/$CARGO_TARGET/release/ethkey ./ethkey - -echo "_____ Calculating checksums _____" -for binary in $(ls) -do - rhash --sha256 $binary -o $binary.sha256 #do we still need this hash (SHA2)? - if [[ $CARGO_TARGET == *"x86_64"* ]]; - then - ./parity tools hash $binary > $binary.sha3 - else - echo ">[WARN] ${binary} cannot be hashed with cross-compiled binary (keccak256)" - fi -done -#show sccache statistics -sccache --show-stats diff --git a/scripts/gitlab/build-windows.sh b/scripts/gitlab/build-windows.sh deleted file mode 100755 index 477a8edde..000000000 --- a/scripts/gitlab/build-windows.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash -set -e # fail on any error -set -u # treat unset variables as error - -set INCLUDE="C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Include;C:\vs2015\VC\include;C:\Program Files (x86)\Windows Kits\10\Include\10.0.10240.0\ucrt" -set LIB="C:\vs2015\VC\lib;C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10240.0\ucrt\x64" -sccache -s - -echo "__________Show ENVIROMENT__________" -echo "CI_SERVER_NAME: " $CI_SERVER_NAME -echo "CARGO_HOME: " $CARGO_HOME -echo "CARGO_TARGET: " $CARGO_TARGET -echo "RUSTC_WRAPPER: " $RUSTC_WRAPPER -echo "SCCACHE_DIR: " $SCCACHE_DIR - -echo "_____ Building target: "$CARGO_TARGET" _____" - # NOTE: Enables the aes-ni instructions for RustCrypto dependency. - # If you change this please remember to also update .cargo/config -export RUSTFLAGS=" -Ctarget-feature=+aes,+sse2,+ssse3 -Ctarget-feature=+crt-static" - -time cargo build --target $CARGO_TARGET --verbose --release --features final -time cargo build --target $CARGO_TARGET --verbose --release -p evmbin -time cargo build --target $CARGO_TARGET --verbose --release -p ethstore-cli -time cargo build --target $CARGO_TARGET --verbose --release -p ethkey-cli - -echo "__________Sign binaries__________" -scripts/gitlab/sign-win.cmd $keyfile $certpass target/$CARGO_TARGET/release/parity.exe -scripts/gitlab/sign-win.cmd $keyfile $certpass target/$CARGO_TARGET/release/parity-evm.exe -scripts/gitlab/sign-win.cmd $keyfile $certpass target/$CARGO_TARGET/release/ethstore.exe -scripts/gitlab/sign-win.cmd $keyfile $certpass target/$CARGO_TARGET/release/ethkey.exe - -echo "_____ Post-processing binaries _____" -rm -rf artifacts -mkdir -p artifacts -cd artifacts -mkdir -p $CARGO_TARGET -cd $CARGO_TARGET -cp --verbose ../../target/$CARGO_TARGET/release/parity.exe ./parity.exe -cp --verbose ../../target/$CARGO_TARGET/release/parity-evm.exe ./parity-evm.exe -cp --verbose ../../target/$CARGO_TARGET/release/ethstore.exe ./ethstore.exe -cp --verbose ../../target/$CARGO_TARGET/release/ethkey.exe ./ethkey.exe - -echo "_____ Calculating checksums _____" -for binary in $(ls) -do - rhash --sha256 $binary -o $binary.sha256 - ./parity.exe tools hash $binary > $binary.sha3 -done -cp parity.exe.sha256 parity.sha256 -cp parity.exe.sha3 parity.sha3 - -sccache -s diff --git a/scripts/gitlab/publish-onchain.sh b/scripts/gitlab/publish-onchain.sh deleted file mode 100755 index 9c2ac1dbb..000000000 --- a/scripts/gitlab/publish-onchain.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -set -e # fail on any error -set -u # treat unset variables as error - -echo "__________Register Release__________" -DATA="secret=$RELEASES_SECRET" - -echo "Pushing release to Mainnet" -./tools/safe-curl.sh $DATA "https://update.parity.io/push-release/${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}/$CI_COMMIT_SHA" - -cd artifacts -ls -l | sort -k9 -filetest=( * ) -echo ${filetest[*]} -for DIR in "${filetest[@]}"; -do - cd $DIR - if [[ $DIR =~ "windows" ]]; - then - WIN=".exe"; - else - WIN=""; - fi - sha3=$(cat parity.sha3 | awk '{print $1}') - case $DIR in - x86_64* ) - DATA="commit=$CI_COMMIT_SHA&sha3=$sha3&filename=parity$WIN&secret=$RELEASES_SECRET" - ../../tools/safe-curl.sh $DATA "https://update.parity.io/push-build/${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}/$DIR" - ;; - esac - cd .. -done diff --git a/scripts/gitlab/publish-snap.sh b/scripts/gitlab/publish-snap.sh index f33be15b6..771b6fca7 100755 --- a/scripts/gitlab/publish-snap.sh +++ b/scripts/gitlab/publish-snap.sh @@ -8,7 +8,7 @@ TRACK=$(cat ./tools/TRACK) echo "Track is: ${TRACK}" VERSION=$(cat ./tools/VERSION) SNAP_PACKAGE="parity_"$VERSION"_"$BUILD_ARCH".snap" -# Choose snap release channel based on parity ethereum version track +# Choose snap release channel based on Open Ethereum version track case ${TRACK} in nightly) export GRADE="devel" CHANNEL="edge";; stable) export GRADE="stable" CHANNEL="stable";; diff --git a/scripts/gitlab/safe-curl.sh b/scripts/gitlab/safe-curl.sh deleted file mode 100755 index f5bb2ee4e..000000000 --- a/scripts/gitlab/safe-curl.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -set -eu - -DATA=$1 -ADDRESS=$2 - -CODE=$(curl -o out.txt -w '%{http_code}' --data $DATA $ADDRESS) -cat out.txt && rm out.txt -echo "\n" - -if [[ $CODE -eq 200 ]]; then - echo 'Pushed to updater service.'; -elif [[ $CODE -eq 202 ]]; then - echo 'Updater service ignored request.'; -else - echo 'Unable to push info to updater service.'; - exit 2 -fi diff --git a/scripts/gitlab/sign-win.cmd b/scripts/gitlab/sign-win.cmd deleted file mode 100755 index 2b014a023..000000000 --- a/scripts/gitlab/sign-win.cmd +++ /dev/null @@ -1 +0,0 @@ -@signtool sign /f %1 /p %2 /tr http://timestamp.comodoca.com /du https://parity.io %3 diff --git a/scripts/gitlab/test-linux.sh b/scripts/gitlab/test-linux.sh deleted file mode 100755 index 5c5280233..000000000 --- a/scripts/gitlab/test-linux.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -# ARGUMENT $1 Rust flavor to run test with (stable/beta/nightly) - -echo "________Running test-linux.sh________" -set -e # fail on any error -set -u # treat unset variables as error - -export CC="sccache "$CC -export CXX="sccache "$CXX -FEATURES="json-tests" - -OPTIONS="--release" -#use nproc `linux only -THREADS=$(nproc) - -rustup default $1 -rustup show - -echo "________Running Parity Full Test Suite________" -# Why are we using RUSTFLAGS? See https://github.com/OpenEthereum/open-ethereum/pull/10719 -CARGO_INCREMENTAL=0 RUSTFLAGS="-C opt-level=3 -C overflow-checks=on -C debuginfo=2 -Ctarget-feature=+aes,+sse2,+ssse3" time cargo test $OPTIONS --features "$FEATURES" --locked --all --target $CARGO_TARGET --verbose --color=never -- --test-threads $THREADS - -#show sccache statistics -sccache --show-stats diff --git a/scripts/gitlab/validate-chainspecs.sh b/scripts/gitlab/validate-chainspecs.sh deleted file mode 100755 index fd0f73926..000000000 --- a/scripts/gitlab/validate-chainspecs.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -set -e # fail on any error -set -u # treat unset variables as error -echo "________Running validate_chainspecs.sh________" - -ERR=0 - -echo "________Validate chainspecs________" -time cargo build --release -p chainspec --verbose --color=always - -for spec in ethcore/res/*.json; do - if ! ./target/release/chainspec "$spec"; then ERR=1; fi -done - -for spec in ethcore/res/ethereum/*.json; do - if ! ./target/release/chainspec "$spec"; then ERR=1; fi -done - -echo "________Mainnet contains Istanbul EIPs________" -for eip in $(grep --only-matching "eip.*Transition" ethcore/res/ethereum/istanbul_test.json); do - if ! grep -q $eip ethcore/res/ethereum/foundation.json; then - echo "ERROR: $eip is missing in the foundation json spec" - ERR=1 - fi -done - -#show sccache statistics -sccache --show-stats -exit $ERR diff --git a/scripts/parity.service b/scripts/parity.service index 24e14282b..5a32cd0f4 100644 --- a/scripts/parity.service +++ b/scripts/parity.service @@ -1,5 +1,5 @@ [Unit] -Description=Parity Ethereum Daemon +Description=Open Ethereum Daemon After=network.target [Service] diff --git a/scripts/snap/parity.desktop b/scripts/snap/parity.desktop index 1833865de..140ed0003 100644 --- a/scripts/snap/parity.desktop +++ b/scripts/snap/parity.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Encoding=UTF-8 -Name=Parity Ethereum +Name=Open Ethereum Comment=The fastest and most advanced Ethereum client. Exec=parity Icon=/usr/share/pixmaps/icon.png diff --git a/updater/hash-fetch/Cargo.toml b/updater/hash-fetch/Cargo.toml index c3ea793a5..ac11fc58e 100644 --- a/updater/hash-fetch/Cargo.toml +++ b/updater/hash-fetch/Cargo.toml @@ -1,6 +1,6 @@ [package] description = "Fetching hash-addressed content." -homepage = "http://parity.io" +repository = "https://github.com/OpenEthereum/open-ethereum" license = "GPL-3.0" name = "parity-hash-fetch" version = "1.12.0" diff --git a/util/fetch/Cargo.toml b/util/fetch/Cargo.toml index 72039a1a4..eb9a44071 100644 --- a/util/fetch/Cargo.toml +++ b/util/fetch/Cargo.toml @@ -1,6 +1,6 @@ [package] description = "HTTP/HTTPS fetching library" -homepage = "http://parity.io" +repository = "https://github.com/OpenEthereum/open-ethereum" license = "GPL-3.0" name = "fetch" version = "0.1.0" diff --git a/util/io/Cargo.toml b/util/io/Cargo.toml index 8705cb52a..829b1a61c 100644 --- a/util/io/Cargo.toml +++ b/util/io/Cargo.toml @@ -2,7 +2,7 @@ name = "ethcore-io" description = "Ethcore IO library" version = "1.12.0" -homepage = "http://parity.io" +repository = "https://github.com/OpenEthereum/open-ethereum" license = "GPL-3.0" authors = ["Parity Technologies "] edition = "2018" diff --git a/util/len-caching-lock/Cargo.toml b/util/len-caching-lock/Cargo.toml index 3e02dc1a2..c799cde10 100644 --- a/util/len-caching-lock/Cargo.toml +++ b/util/len-caching-lock/Cargo.toml @@ -1,6 +1,6 @@ [package] description = "Atomically cached len(), for use with collections contained in parking_lot Mutex and RwLock" -homepage = "http://parity.io" +repository = "https://github.com/OpenEthereum/open-ethereum" license = "GPL-3.0" name = "len-caching-lock" version = "0.1.1" diff --git a/util/network-devp2p/Cargo.toml b/util/network-devp2p/Cargo.toml index 541dc0265..409918fc4 100644 --- a/util/network-devp2p/Cargo.toml +++ b/util/network-devp2p/Cargo.toml @@ -1,6 +1,6 @@ [package] description = "DevP2P implementation of the ethcore network library" -homepage = "http://parity.io" +repository = "https://github.com/OpenEthereum/open-ethereum" license = "GPL-3.0" name = "ethcore-network-devp2p" version = "1.12.0" diff --git a/util/network-devp2p/src/discovery.rs b/util/network-devp2p/src/discovery.rs index 49b5b6ec9..8bf78bf47 100644 --- a/util/network-devp2p/src/discovery.rs +++ b/util/network-devp2p/src/discovery.rs @@ -584,7 +584,7 @@ impl<'a> Discovery<'a> { None } else { if request.deprecated_echo_hash == echo_hash { - trace!(target: "discovery", "Got Pong from an old parity-ethereum version."); + trace!(target: "discovery", "Got Pong from an old open-ethereum version."); } Some((request.node.clone(), request.reason.clone())) } diff --git a/util/network/Cargo.toml b/util/network/Cargo.toml index 81995fd90..125601b07 100644 --- a/util/network/Cargo.toml +++ b/util/network/Cargo.toml @@ -1,6 +1,6 @@ [package] description = "Ethcore network library" -homepage = "http://parity.io" +repository = "https://github.com/OpenEthereum/open-ethereum" license = "GPL-3.0" name = "ethcore-network" version = "1.12.0" diff --git a/util/network/src/client_version.rs b/util/network/src/client_version.rs index 515925d04..8088e0e6b 100644 --- a/util/network/src/client_version.rs +++ b/util/network/src/client_version.rs @@ -22,8 +22,8 @@ use semver::Version; use std::fmt; /// Parity client string prefix -const LEGACY_CLIENT_ID_PREFIX: &str = "Parity"; -const PARITY_CLIENT_ID_PREFIX: &str = "Parity-Ethereum"; +const LEGACY_CLIENT_ID_PREFIX: &str = "Parity-Ethereum"; +const CURRENT_CLIENT_ID_PREFIX: &str = "Open-Ethereum"; lazy_static! { /// Parity versions starting from this will accept block bodies requests @@ -153,7 +153,7 @@ impl ClientCapabilities for ClientVersion { } fn is_parity(client_id: &str) -> bool { - client_id.starts_with(LEGACY_CLIENT_ID_PREFIX) || client_id.starts_with(PARITY_CLIENT_ID_PREFIX) + client_id.starts_with(LEGACY_CLIENT_ID_PREFIX) || client_id.starts_with(CURRENT_CLIENT_ID_PREFIX) } /// Parse known parity formats. Recognizes either a short format with four fields @@ -260,7 +260,7 @@ pub mod tests { fn make_default_version_string() -> String { format!( "{}/v{}/{}/{}", - PARITY_CLIENT_ID_PREFIX, + CURRENT_CLIENT_ID_PREFIX, PARITY_CLIENT_SEMVER, PARITY_CLIENT_OS, PARITY_CLIENT_COMPILER @@ -270,7 +270,7 @@ pub mod tests { fn make_default_long_version_string() -> String { format!( "{}/{}/v{}/{}/{}", - PARITY_CLIENT_ID_PREFIX, + CURRENT_CLIENT_ID_PREFIX, PARITY_CLIENT_IDENTITY, PARITY_CLIENT_SEMVER, PARITY_CLIENT_OS, @@ -281,7 +281,7 @@ pub mod tests { fn make_multitoken_identity_long_version_string() -> String { format!( "{}/{}/v{}/{}/{}", - PARITY_CLIENT_ID_PREFIX, + CURRENT_CLIENT_ID_PREFIX, PARITY_CLIENT_MULTITOKEN_IDENTITY, PARITY_CLIENT_SEMVER, PARITY_CLIENT_OS, @@ -292,7 +292,7 @@ pub mod tests { fn make_old_semver_version_string() -> String { format!( "{}/v{}/{}/{}", - PARITY_CLIENT_ID_PREFIX, + CURRENT_CLIENT_ID_PREFIX, PARITY_CLIENT_OLD_SEMVER, PARITY_CLIENT_OS, PARITY_CLIENT_COMPILER @@ -318,7 +318,7 @@ pub mod tests { let client_version_string = make_default_version_string(); if let ClientVersion::ParityClient(client_version) = ClientVersion::from(client_version_string.as_str()) { - assert_eq!(client_version.name(), PARITY_CLIENT_ID_PREFIX); + assert_eq!(client_version.name(), CURRENT_CLIENT_ID_PREFIX); assert_eq!(*client_version.semver(), Version::parse(PARITY_CLIENT_SEMVER).unwrap()); assert_eq!(client_version.os(), PARITY_CLIENT_OS); assert_eq!(client_version.compiler(), PARITY_CLIENT_COMPILER); @@ -332,7 +332,7 @@ pub mod tests { let client_version_string = make_default_long_version_string(); if let ClientVersion::ParityClient(client_version) = ClientVersion::from(client_version_string.as_str()) { - assert_eq!(client_version.name(), PARITY_CLIENT_ID_PREFIX); + assert_eq!(client_version.name(), CURRENT_CLIENT_ID_PREFIX); assert_eq!(client_version.identity().unwrap(), PARITY_CLIENT_IDENTITY); assert_eq!(*client_version.semver(), Version::parse(PARITY_CLIENT_SEMVER).unwrap()); assert_eq!(client_version.os(), PARITY_CLIENT_OS); @@ -347,7 +347,7 @@ pub mod tests { let client_version_string = make_multitoken_identity_long_version_string(); if let ClientVersion::ParityClient(client_version) = ClientVersion::from(client_version_string.as_str()) { - assert_eq!(client_version.name(), PARITY_CLIENT_ID_PREFIX); + assert_eq!(client_version.name(), CURRENT_CLIENT_ID_PREFIX); assert_eq!(client_version.identity().unwrap(), PARITY_CLIENT_MULTITOKEN_IDENTITY); assert_eq!(*client_version.semver(), Version::parse(PARITY_CLIENT_SEMVER).unwrap()); assert_eq!(client_version.os(), PARITY_CLIENT_OS); @@ -362,7 +362,7 @@ pub mod tests { let client_version_string: String = make_default_version_string(); if let ClientVersion::ParityClient(client_version) = ClientVersion::from(client_version_string.as_str()) { - assert_eq!(client_version.name(), PARITY_CLIENT_ID_PREFIX); + assert_eq!(client_version.name(), CURRENT_CLIENT_ID_PREFIX); assert_eq!(*client_version.semver(), Version::parse(PARITY_CLIENT_SEMVER).unwrap()); assert_eq!(client_version.os(), PARITY_CLIENT_OS); assert_eq!(client_version.compiler(), PARITY_CLIENT_COMPILER); @@ -376,7 +376,7 @@ pub mod tests { // This is invalid because version has no leading 'v' let client_version_string = format!( "{}/{}/{}/{}", - PARITY_CLIENT_ID_PREFIX, + CURRENT_CLIENT_ID_PREFIX, PARITY_CLIENT_SEMVER, PARITY_CLIENT_OS, PARITY_CLIENT_COMPILER); @@ -392,7 +392,7 @@ pub mod tests { pub fn client_version_when_parity_format_without_identity_and_missing_compiler_field_then_equals_parity_unknown_client_version_string() { let client_version_string = format!( "{}/v{}/{}", - PARITY_CLIENT_ID_PREFIX, + CURRENT_CLIENT_ID_PREFIX, PARITY_CLIENT_SEMVER, PARITY_CLIENT_OS, ); @@ -408,7 +408,7 @@ pub mod tests { pub fn client_version_when_parity_format_with_identity_and_missing_compiler_field_then_equals_parity_unknown_client_version_string() { let client_version_string = format!( "{}/{}/v{}/{}", - PARITY_CLIENT_ID_PREFIX, + CURRENT_CLIENT_ID_PREFIX, PARITY_CLIENT_IDENTITY, PARITY_CLIENT_SEMVER, PARITY_CLIENT_OS, @@ -489,12 +489,12 @@ pub mod tests { fn client_version_accepts_service_transaction_for_different_versions() { assert!(!ClientVersion::from("Geth").accepts_service_transaction()); assert!(ClientVersion::from("Parity-Ethereum/v2.6.0/linux/rustc").accepts_service_transaction()); - assert!(ClientVersion::from("Parity-Ethereum/ABCDEFGH/v2.7.3/linux/rustc").accepts_service_transaction()); + assert!(ClientVersion::from("Open-Ethereum/ABCDEFGH/v2.7.3/linux/rustc").accepts_service_transaction()); } #[test] fn is_parity_when_parity_then_true() { - let client_id = format!("{}/", PARITY_CLIENT_ID_PREFIX); + let client_id = format!("{}/", CURRENT_CLIENT_ID_PREFIX); assert!(is_parity(&client_id)); } diff --git a/util/panic-hook/Cargo.toml b/util/panic-hook/Cargo.toml index 83b5920d2..c9aa7321f 100644 --- a/util/panic-hook/Cargo.toml +++ b/util/panic-hook/Cargo.toml @@ -1,6 +1,6 @@ [package] description = "Parity custom panic hook" -homepage = "http://parity.io" +repository = "https://github.com/OpenEthereum/open-ethereum" license = "GPL-3.0" name = "panic_hook" version = "0.1.0" diff --git a/util/version/Cargo.toml b/util/version/Cargo.toml index cad11a3d2..925ba1d7f 100644 --- a/util/version/Cargo.toml +++ b/util/version/Cargo.toml @@ -2,7 +2,7 @@ # Make sure to update the service if it's moved or the structure is changed. [package] name = "parity-version" -# NOTE: this value is used for Parity Ethereum version string (via env CARGO_PKG_VERSION) +# NOTE: this value is used for Open Ethereum version string (via env CARGO_PKG_VERSION) version = "2.8.0" authors = ["Parity Technologies "] build = "build.rs" diff --git a/util/version/src/lib.rs b/util/version/src/lib.rs index d9fb8e201..fd2261bf2 100644 --- a/util/version/src/lib.rs +++ b/util/version/src/lib.rs @@ -45,7 +45,7 @@ pub fn platform() -> String { pub fn version() -> String { let commit_date = format!("{}", env!("VERGEN_COMMIT_DATE")).replace("-", ""); format!( - "Parity-Ethereum/v{}-{}-{}-{}/{}/rustc{}", + "Open-Ethereum/v{}-{}-{}-{}/{}/rustc{}", env!("CARGO_PKG_VERSION"), THIS_TRACK, env!("VERGEN_SHA_SHORT"), @@ -63,7 +63,7 @@ pub fn version_data() -> Bytes { (env!("CARGO_PKG_VERSION_MINOR").parse::().expect("Environment variables are known to be valid; qed") << 8) + env!("CARGO_PKG_VERSION_PATCH").parse::().expect("Environment variables are known to be valid; qed"); s.append(&v); - s.append(&"Parity-Ethereum"); + s.append(&"Open-Ethereum"); s.append(&generated::rustc_version()); s.append(&&Target::os()[0..2]); s.out()