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

Commit 88b0225

Browse files
committed
Merge branch 'master' into dp/chore/remove-accounts-bloom
* master: (25 commits) Update .gitmodules (#11628) ethcore/res: activate ecip-1088 phoenix on classic (#11598) Upgrade parity-common deps to latest (#11620) Fix Goerli syncing (#11604) deps: switch to upstream ctrlc (#11617) Deduplicating crate dependencies (part 3 of n) (#11614) Deduplicating crate dependencies (part 2 of n, `slab`) (#11613) Actually save ENR on creation and modification (#11602) Activate POSDAO on xDai chain and update bootnodes (#11610) Activate on-chain randomness in POA Core (#11609) Deduplicating crate dependencies (part 1 of n) (#11606) Update enodes for POA Sokol (#11611) Remove .git folder from dogerignore file so vergen library can get build date and commit hash in the binary generatio vergen library can get build date and commit hash in the binary generation (#11608) Reduced gas cost for static calls made to precompiles EIP2046/1352 (#11583) [easy] `ethcore-bloom-journal` was renamed to `accounts-bloom` (#11605) Use serde_json to export hardcoded sync (#11601) Node Discovery v4 ENR Extension (EIP-868) (#11540) Fix compile warnings (#11595) Update version to 3.0.0-alpha.1 (#11592) ethcore/res: bump canon fork hash for mordor and kotti testnets (#11584) ...
2 parents 1b87034 + 90c0be0 commit 88b0225

File tree

258 files changed

+8165
-7872
lines changed

Some content is hidden

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

258 files changed

+8165
-7872
lines changed

.cargo/config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ rustflags = ["-Ctarget-feature=+aes,+sse2,+ssse3"]
1818

1919
[target.x86_64-pc-windows-msvc]
2020
# Enables the aes-ni instructions for RustCrypto dependency.
21-
# Link the C runtime statically ; https://github.com/OpenEthereum/open-ethereum/issues/6643
21+
# Link the C runtime statically ; https://github.com/openethereum/openethereum/issues/6643
2222
rustflags = ["-Ctarget-feature=+aes,+sse2,+ssse3", "-Ctarget-feature=+crt-static"]
2323

2424
[target.x86_64-apple-darwin]

.dockerignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ target
1616
# idea ide
1717
.idea
1818

19-
# git stuff
20-
.git
19+
# git folder is not ignored so vergen library can get the commit hash and date for the build
20+
#.git
2121

2222
ethcore/res/ethereum/tests

.github/CODE_OF_CONDUCT.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
## 1. Purpose
44

5-
A primary goal of Parity is to be inclusive to the largest number of contributors, with the most varied and diverse backgrounds possible. As such, we are committed to providing a friendly, safe and welcoming environment for all, regardless of gender, sexual orientation, ability, ethnicity, socioeconomic status, and religion (or lack thereof).
5+
A primary goal of OpenEthereum project is to be inclusive to the largest number of contributors, with the most varied and diverse backgrounds possible. As such, we are committed to providing a friendly, safe and welcoming environment for all, regardless of gender, sexual orientation, ability, ethnicity, socioeconomic status, and religion (or lack thereof).
66

77
This code of conduct outlines our expectations for all those who participate in our community, as well as the consequences for unacceptable behavior.
88

9-
We invite all those who participate in Parity to help us create safe and positive experiences for everyone.
9+
We invite all those who participate in OpenEthereum to help us create safe and positive experiences for everyone.
1010

1111
## 2. Open Source Citizenship
1212

.github/CONTRIBUTING.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@ See also frequently asked questions [tagged with `parity`](https://ethereum.stac
1010

1111
Do **not** open an issue on Github if you think your discovered bug could be a **security-relevant vulnerability**. Please, read our [security policy](../SECURITY.md) instead.
1212

13-
Otherwise, just create a [new issue](https://github.com/OpenEthereum/open-ethereum/issues/new) in our repository and state:
13+
Otherwise, just create a [new issue](https://github.com/openethereum/openethereum/issues/new) in our repository and state:
1414

15-
- What's your Open Ethereum version?
15+
- What's your OpenEthereum version?
1616
- What's your operating system and version?
17-
- How did you install Open Ethereum?
17+
- How did you install OpenEthereum?
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 Open Ethereum, please **fork it**, fix bugs or implement features, and [propose a pull request](https://github.com/OpenEthereum/open-ethereum/compare).
25+
If you would like to contribute to OpenEthereum, please **fork it**, fix bugs or implement features, and [propose a pull request](https://github.com/openethereum/openethereum/compare).
2626

2727
### Labels & Milestones
2828

29-
We use [labels](https://github.com/OpenEthereum/open-ethereum/labels) to manage PRs and issues and communicate the state of a PR. Please familiarize yourself with them. Furthermore we are organizing issues in [milestones](https://github.com/OpenEthereum/open-ethereum/milestones). Best way to get started is to a pick a ticket from the current milestone tagged [`easy`](https://github.com/OpenEthereum/open-ethereum/labels/Q2-easy%20%F0%9F%92%83) and get going, or [`mentor`](https://github.com/OpenEthereum/open-ethereum/labels/Q1-mentor%20%F0%9F%95%BA) and get in contact with the mentor offering their support on that larger task.
29+
We use [labels](https://github.com/openethereum/openethereum/labels) to manage PRs and issues and communicate the state of a PR. Please familiarize yourself with them. Furthermore we are organizing issues in [milestones](https://github.com/openethereum/openethereum/milestones). Best way to get started is to a pick a ticket from the current milestone tagged [`easy`](https://github.com/openethereum/openethereum/labels/Q2-easy%20%F0%9F%92%83) and get going, or [`mentor`](https://github.com/openethereum/openethereum/labels/Q1-mentor%20%F0%9F%95%BA) and get in contact with the mentor offering their support on that larger task.
3030

3131
### Rules
3232

@@ -39,18 +39,18 @@ There are a few basic ground-rules for contributors (including the maintainer(s)
3939

4040
### Recommendations
4141

42-
* **Non-master branch names** *should* be prefixed with a short name moniker, followed by the associated Github Issue ID (if any), and a brief description of the task using the format `<GITHUB_USERNAME>-<ISSUE_ID>-<BRIEF_DESCRIPTION>` (e.g. `gavin-123-readme`). The name moniker helps people to inquiry about their unfinished work, and the GitHub Issue ID helps your future self and other developers (particularly those who are onboarding) find out about and understand the original scope of the task, and where it fits into Open Ethereum [Projects](https://github.com/OpenEthereum/open-ethereum/projects).
42+
* **Non-master branch names** *should* be prefixed with a short name moniker, followed by the associated Github Issue ID (if any), and a brief description of the task using the format `<GITHUB_USERNAME>-<ISSUE_ID>-<BRIEF_DESCRIPTION>` (e.g. `gavin-123-readme`). The name moniker helps people to inquiry about their unfinished work, and the GitHub Issue ID helps your future self and other developers (particularly those who are onboarding) find out about and understand the original scope of the task, and where it fits into OpenEthereum [Projects](https://github.com/openethereum/openethereum/projects).
4343
* **Remove stale branches periodically**
4444

4545
### Preparing Pull Requests
4646

47-
* If your PR does not alter any logic (e.g. comments, dependencies, docs), then it may be tagged [`insubstantial`](https://github.com/OpenEthereum/open-ethereum/pulls?q=is%3Aopen+is%3Apr+label%3A%22A2-insubstantial+%F0%9F%91%B6%22).
47+
* If your PR does not alter any logic (e.g. comments, dependencies, docs), then it may be tagged [`insubstantial`](https://github.com/openethereum/openethereum/pulls?q=is%3Aopen+is%3Apr+label%3A%22A2-insubstantial+%F0%9F%91%B6%22).
4848

49-
* Once a PR is ready for review please add the [`pleasereview`](https://github.com/OpenEthereum/open-ethereum/pulls?utf8=%E2%9C%93&q=is%3Aopen+is%3Apr+label%3A%22A0-pleasereview+%F0%9F%A4%93%22+) label.
49+
* Once a PR is ready for review please add the [`pleasereview`](https://github.com/openethereum/openethereum/pulls?utf8=%E2%9C%93&q=is%3Aopen+is%3Apr+label%3A%22A0-pleasereview+%F0%9F%A4%93%22+) label.
5050

5151
### Reviewing Pull Requests*:
5252

53-
* At least two reviewers are required to review PRs (even for PRs tagged [`insubstantial`](https://github.com/OpenEthereum/open-ethereum/pulls?q=is%3Aopen+is%3Apr+label%3A%22A2-insubstantial+%F0%9F%91%B6%22)).
53+
* At least two reviewers are required to review PRs (even for PRs tagged [`insubstantial`](https://github.com/openethereum/openethereum/pulls?q=is%3Aopen+is%3Apr+label%3A%22A2-insubstantial+%F0%9F%91%B6%22)).
5454

5555
When doing a review, make sure to look for any:
5656

@@ -63,4 +63,4 @@ When doing a review, make sure to look for any:
6363

6464
## License.
6565

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

.github/ISSUE_TEMPLATE.md

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

33
_If you think that your issue is an exploitable security vulnerability, please mail your bugreport to [email protected] instead; your submission might be eligible for our Bug Bounty._
4-
_You can find mode info on the reporting process in [SECURITY.md](https://github.com/OpenEthereum/open-ethereum/blob/master/SECURITY.md)_
4+
_You can find mode info on the reporting process in [SECURITY.md](https://github.com/openethereum/openethereum/blob/master/SECURITY.md)_
55

66

7-
- **Open Ethereum version**: 0.0.0
7+
- **OpenEthereum version**: 0.0.0
88
- **Operating system**: Windows / MacOS / Linux
99
- **Installation**: homebrew / one-line installer / built from source
1010
- **Fully synchronized**: no / yes
1111
- **Network**: ethereum / ropsten / goerli / ...
1212
- **Restarted**: no / yes
1313

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

.github/workflows/build-test.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,18 @@ jobs:
2020
runs-on: ${{ matrix.platform }}
2121
steps:
2222
- name: Checkout sources
23-
uses: actions/checkout@v2
23+
uses: actions/checkout@master
2424
with:
25-
fetch-depth: 50
26-
- name: Checkout submodules
27-
shell: bash
28-
run: git submodule update --init --recursive
25+
submodules: true
26+
# https://github.com/actions/cache/issues/133
27+
- name: Fixup the owner of ~/.cargo/
28+
if: matrix.platform == 'ubuntu-16.04'
29+
run: sudo chown -R $(whoami):$(id -ng) ~/.cargo/
2930
- name: Install toolchain
3031
uses: actions-rs/toolchain@v1
3132
with:
3233
toolchain: ${{ matrix.toolchain }}
34+
profile: minimal
3335
override: true
3436
- name: Cache cargo registry
3537
uses: actions/[email protected]

.github/workflows/build.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches:
66
- stable
77
tags:
8-
- v2*
8+
- v*
99

1010
jobs:
1111
build:
@@ -21,9 +21,11 @@ jobs:
2121
runs-on: ${{ matrix.platform }}
2222
steps:
2323
- name: Checkout sources
24-
uses: actions/checkout@v2
25-
with:
26-
fetch-depth: 50
24+
uses: actions/checkout@master
25+
# https://github.com/actions/cache/issues/133
26+
- name: Fixup the owner of ~/.cargo/
27+
if: matrix.platform == 'ubuntu-16.04'
28+
run: sudo chown -R $(whoami):$(id -ng) ~/.cargo/
2729
- name: Install toolchain
2830
uses: actions-rs/toolchain@v1
2931
with:

.github/workflows/check.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ jobs:
1212
runs-on: ubuntu-16.04
1313
steps:
1414
- name: Checkout sources
15-
uses: actions/checkout@v2
15+
uses: actions/checkout@master
1616
with:
17-
fetch-depth: 50
18-
- name: Checkout submodules
19-
shell: bash
20-
run: git submodule update --init --recursive
17+
submodules: true
18+
# https://github.com/actions/cache/issues/133
19+
- name: Fixup the owner of ~/.cargo/
20+
run: sudo chown -R $(whoami):$(id -ng) ~/.cargo/
2121
- name: Install stable toolchain
2222
uses: actions-rs/toolchain@v1
2323
with:

.github/workflows/deploy-docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches:
66
- stable
77
tags:
8-
- v2*
8+
- v*
99

1010
jobs:
1111
deploy-docker:

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ parity-clib-examples/cpp/build/
4242

4343
.vscode
4444
rls/
45-
/parity.*
45+
/openethereum.*

0 commit comments

Comments
 (0)