Skip to content

merge upstream updates downstream #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
5chdn merged 13 commits into from
Nov 28, 2018
Merged

merge upstream updates downstream #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4ee49f0
Do not use the home directory as the working dir in docker (#9834)
fubhy Nov 22, 2018
1fdfa1e
chore(eip712): remove unused `failure-derive` (#9958)
niklasad1 Nov 23, 2018
f20f4c7
Fix a deadlock (#9952)
ngotchac Nov 25, 2018
c880716
Remove secret_store runtimes. (#9888)
c0gent Nov 25, 2018
34d22a3
Disable EIP-98 transition by default (#9955)
sorpaas Nov 25, 2018
832c4a7
Add a optional json dump state to evm-bin (#9706)
cheme Nov 25, 2018
0d59319
Fix light client informant while syncing (#9932)
ngotchac Nov 26, 2018
18a2e62
Make CALLCODE to trace value to be the code address (#9881)
sorpaas Nov 26, 2018
f2281dc
Add Error message when sync is still in progress. (#9475)
seunlanlege Nov 26, 2018
70ba050
Add changelogs for 2.0.9, 2.1.4, 2.1.6, and 2.2.1 (#9963)
5chdn Nov 26, 2018
c584221
ci: rearrange pipeline by logic (#9970)
5chdn Nov 27, 2018
c446687
fix docker build (#9971)
gabreal Nov 27, 2018
14c9cbd
Deny unknown fields for chainspec (#9972)
sorpaas Nov 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,13 @@ test-linux:
tags:
- rust-stable

test-audit:
stage: test
script:
- scripts/gitlab/cargo-audit.sh
tags:
- rust-stable

build-linux:
stage: build
only: *releaseable_branches
Expand Down Expand Up @@ -104,25 +111,18 @@ publish-awss3:
tags:
- shell

docs-jsonrpc:
stage: optional
publish-docs:
stage: publish
only:
- tags
except:
- nightly
cache: {}
script:
- scripts/gitlab/docs-jsonrpc.sh
- scripts/gitlab/publish-docs.sh
tags:
- shell

cargo-audit:
stage: optional
script:
- scripts/gitlab/cargo-audit.sh
tags:
- rust-stable

build-android:
stage: optional
image: parity/rust-android:gitlab-ci
Expand All @@ -132,6 +132,7 @@ build-android:
- scripts/gitlab/build-unix.sh
tags:
- rust-arm
allow_failure: true

test-beta:
stage: optional
Expand All @@ -141,6 +142,7 @@ test-beta:
- scripts/gitlab/test-all.sh beta
tags:
- rust-beta
allow_failure: true

test-nightly:
stage: optional
Expand Down
995 changes: 143 additions & 852 deletions CHANGELOG.md
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 3 additions & 11 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion chainspec/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@ authors = ["Marek Kotewicz <marek@parity.io>"]
[dependencies]
ethjson = { path = "../json" }
serde_json = "1.0"
serde_ignored = "0.0.4"
17 changes: 1 addition & 16 deletions chainspec/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,8 @@
// along with Parity. If not, see <http://www.gnu.org/licenses/>.

extern crate serde_json;
extern crate serde_ignored;
extern crate ethjson;

use std::collections::BTreeSet;
use std::{fs, env, process};
use ethjson::spec::Spec;

Expand All @@ -41,24 +39,11 @@ fn main() {
Err(_) => quit(&format!("{} could not be opened", path)),
};

let mut unused = BTreeSet::new();
let mut deserializer = serde_json::Deserializer::from_reader(file);

let spec: Result<Spec, _> = serde_ignored::deserialize(&mut deserializer, |field| {
unused.insert(field.to_string());
});
let spec: Result<Spec, _> = serde_json::from_reader(file);

if let Err(err) = spec {
quit(&format!("{} {}", path, err.to_string()));
}

if !unused.is_empty() {
let err = unused.into_iter()
.map(|field| format!("{} unexpected field `{}`", path, field))
.collect::<Vec<_>>()
.join("\n");
quit(&err);
}

println!("{} is valid", path);
}
23 changes: 23 additions & 0 deletions docs/CHANGELOG-2.0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
Note: Parity 2.0 reached End-of-Life on 2018-11-15 (EOL).

## Parity-Ethereum [v2.0.9](https://github.com/paritytech/parity-ethereum/releases/tag/v2.0.9) (2018-10-29)

Parity-Ethereum 2.0.9-stable is a bug-fix release to improve performance and stability.

The full list of included changes:

- Backports: parity stable 2.0.9 ([#9786](https://github.com/paritytech/parity-ethereum/pull/9786))
- Version: bump parity stable to 2.0.9
- Ethcore: bump ropsten forkblock checkpoint ([#9775](https://github.com/paritytech/parity-ethereum/pull/9775))
- Ethcore: handle vm exception when estimating gas ([#9615](https://github.com/paritytech/parity-ethereum/pull/9615))
- Update jsonrpc-core to a1b2bb742ce16d1168669ffb13ffe856e8131228 ([#9780](https://github.com/paritytech/parity-ethereum/pull/9780))
- Removed "rustup" & added new runner tag ([#9731](https://github.com/paritytech/parity-ethereum/pull/9731))
- Removed "rustup" & added new runner tag
- Exchanged tag "rust-windows" with "windows"
- Revert windows tag change
- Allow zero chain id in EIP155 signing process ([#9792](https://github.com/paritytech/parity-ethereum/pull/9792))
- Allow zero chain id in EIP155 signing process
- Rename test
- Fix test failure
- Insert dev account before unlocking ([#9813](https://github.com/paritytech/parity-ethereum/pull/9813))

## Parity-Ethereum [v2.0.8](https://github.com/paritytech/parity-ethereum/releases/tag/v2.0.8) (2018-10-16)

Parity-Ethereum 2.0.8-stable is a release that fixes a consensus issue with the recent Constantinople release. Upgrading is mandatory whatever network you are connected to that plans enabling EIP-1283, e.g., Ropsten, Kovan, Ethereum.
Expand Down
Loading