Skip to content
This repository was archived by the owner on Nov 6, 2020. It is now read-only.

Commit df88d32

Browse files
committed
Merge branch 'master' into dp/chore/fetch-dependencies-from-crates
* master: evmbin: escape newlines in json errors (#9458) use kvdb-* and parity-snappy crates from crates.io (#9441) Add EIP-1014 transition config flag (#9268) add tags for runner selection of build-linux jobs (#9451) Remove unused BlockStatus::Pending (#9447) ci: only include local paths in coverage script (except target) (#9437) Add POA Networks: Core and Sokol (#9413) docker: install missing dependencies in arm target dockerfiles (#9436) Random small cleanups (#9423)
2 parents 1c53be0 + 1f24262 commit df88d32

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+583
-271
lines changed

.github/CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@ Do **not** open an issue on Github if you think your discovered bug could be a *
1212

1313
Otherwise, just create a [new issue](https://github.com/paritytech/parity-ethereum/issues/new) in our repository and state:
1414

15-
- What's your Parity version?
15+
- What's your Parity Ethereum version?
1616
- What's your operating system and version?
17-
- How did you install parity?
17+
- How did you install Parity Ethereum?
1818
- Is your node fully synchronized?
1919
- Did you try turning it off and on again?
2020

2121
Also, try to include **steps to reproduce** the issue and expand on the **actual versus expected behavior**.
2222

2323
## Contribute!
2424

25-
If you would like to contribute to Parity, please **fork it**, fix bugs or implement features, and [propose a pull request](https://github.com/paritytech/parity-ethereum/compare).
25+
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/paritytech/parity-ethereum/compare).
2626

2727
Please, refer to the [Coding Guide](https://wiki.parity.io/Coding-guide) in our wiki for more details about hacking on Parity.
2828

2929
## License.
3030

31-
By contributing to Parity, you agree that your contributions will be licensed under the [GPLv3 License](../LICENSE).
31+
By contributing to Parity Ethereum, you agree that your contributions will be licensed under the [GPLv3 License](../LICENSE).
3232

3333
Each contributor has to sign our Contributor License Agreement. The purpose of the CLA is to ensure that the guardian of a project's outputs has the necessary ownership or grants of rights over all contributions to allow them to distribute under the chosen license. You can read and sign our full Contributor License Agreement at [cla.parity.io](https://cla.parity.io) before submitting a pull request.

.github/ISSUE_TEMPLATE.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
_Before filing a new issue, please **provide the following information**._
22

3-
> I'm running:
4-
>
5-
> - **Which Parity version?**: 0.0.0
6-
> - **Which operating system?**: Windows / MacOS / Linux
7-
> - **How installed?**: via installer / homebrew / binaries / from source
8-
> - **Are you fully synchronized?**: no / yes
9-
> - **Which network are you connected to?**: ethereum / ropsten / kovan / ...
10-
> - **Did you try to restart the node?**: no / yes
3+
- **Parity Ethereum version**: 0.0.0
4+
- **Operating system**: Windows / MacOS / Linux
5+
- **Installation**: homebrew / one-line installer / built from source
6+
- **Fully synchronized**: no / yes
7+
- **Network**: ethereum / ropsten / kovan / ...
8+
- **Restarted**: no / yes
119

1210
_Your issue description goes here below. Try to include **actual** vs. **expected behavior** and **steps to reproduce** the issue._
1311

.gitlab-ci.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,24 +111,32 @@ build-linux-ubuntu-i386:
111111
image: parity/rust-i686:gitlab-ci
112112
variables:
113113
CARGO_TARGET: i686-unknown-linux-gnu
114+
tags:
115+
- rust-i686
114116

115117
build-linux-ubuntu-arm64:
116118
<<: *build
117119
image: parity/rust-arm64:gitlab-ci
118120
variables:
119121
CARGO_TARGET: aarch64-unknown-linux-gnu
122+
tags:
123+
- rust-arm
120124

121125
build-linux-ubuntu-armhf:
122126
<<: *build
123127
image: parity/rust-armv7:gitlab-ci
124128
variables:
125129
CARGO_TARGET: armv7-unknown-linux-gnueabihf
130+
tags:
131+
- rust-arm
126132

127133
build-linux-android-armhf:
128134
<<: *build
129135
image: parity/rust-android:gitlab-ci
130136
variables:
131137
CARGO_TARGET: armv7-linux-androideabi
138+
tags:
139+
- rust-arm
132140

133141
build-darwin-macos-x86_64:
134142
<<: *build

Cargo.lock

Lines changed: 14 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ panic_hook = { path = "util/panic_hook" }
6363
keccak-hash = "0.1"
6464
migration-rocksdb = { path = "util/migration-rocksdb" }
6565
kvdb = "0.1"
66-
kvdb-rocksdb = "0.1.2"
66+
kvdb-rocksdb = "0.1.3"
6767
journaldb = { path = "util/journaldb" }
6868
mem = { path = "util/mem" }
6969

README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,16 @@ To start Parity Ethereum as a regular user using `systemd` init:
149149
`systemd` user directory (usually `~/.config/systemd/user`).
150150
2. 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.
151151

152+
## Parity Ethereum toolchain
153+
154+
In addition to the Parity Ethereum client, there are additional tools in this repository available:
155+
156+
- [evmbin](https://github.com/paritytech/parity-ethereum/blob/master/evmbin/) - EVM implementation for Parity Ethereum.
157+
- [ethabi](https://github.com/paritytech/ethabi) - Parity Ethereum function calls encoding.
158+
- [ethstore](https://github.com/paritytech/parity-ethereum/blob/master/ethstore/) - Parity Ethereum key management.
159+
- [ethkey](https://github.com/paritytech/parity-ethereum/blob/master/ethkey/) - Parity Ethereum keys generator.
160+
- [whisper](https://github.com/paritytech/parity-ethereum/blob/master/whisper/) - Implementation of Whisper-v2 PoC.
161+
152162
## Join the chat!
153163

154164
Questions? Get in touch with us on Gitter:

chainspec/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "chainspec"
33
version = "0.1.0"
4-
authors = ["debris <marek.kotewicz@gmail.com>"]
4+
authors = ["Marek Kotewicz <marek@parity.io>"]
55

66
[dependencies]
77
ethjson = { path = "../json" }

docker/README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
## Usage - CentOS
66

77
Builds a lightweight non-root Parity docker image:
8-
98
```
109
git clone https://github.com/paritytech/parity-ethereum.git
1110
cd parity-ethereum
@@ -20,7 +19,6 @@ PARITY_RUNNER_IMAGE_TAG=centos-parity-experimental \
2019
./docker/centos/build.sh
2120
```
2221

23-
2422
Default values:
2523
```
2624
# The image name

docker/ubuntu-aarch64/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ RUN apt-get -y update && \
66
apt-get install -y --force-yes --no-install-recommends \
77
curl git make g++ gcc-aarch64-linux-gnu g++-aarch64-linux-gnu \
88
libc6-arm64-cross libc6-dev-arm64-cross wget file ca-certificates \
9-
binutils-aarch64-linux-gnu cmake \
9+
binutils-aarch64-linux-gnu cmake3 libudev-dev \
1010
&& \
1111
apt-get clean
1212

docker/ubuntu-arm/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ RUN apt-get -y update && \
66
apt-get install -y --force-yes --no-install-recommends \
77
curl git make g++ gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf \
88
libc6-dev-armhf-cross wget file ca-certificates \
9-
binutils-arm-linux-gnueabihf cmake \
9+
binutils-arm-linux-gnueabihf cmake3 libudev-dev \
1010
&& \
1111
apt-get clean
1212

0 commit comments

Comments
 (0)