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

Commit 4fd7990

Browse files
dvdplmdvdplm
committed
Merge remote-tracking branch 'origin/master' into refactor/hashdb-generic
* origin/master: ethcore: fix ancient block error msg handling (#8832) CI: Fix docker tags (#8822) parity: fix indentation in sync logging (#8794) Removed obsolete IpcMode enum (#8819) Remove UI related settings from CLI (#8783) Remove windows tray and installer (#8778) docs: add changelogs for 1.10.6 and 1.11.3 (#8810) Fix ancient blocks queue deadlock (#8751) Disallow unsigned transactions in case EIP-86 is disabled (#8802) Fix evmbin compilation (#8795) Have space between feature cfg flag (#8791) rpc: fix address formatting in TransactionRequest Display (#8786) Conditionally compile ethcore public test helpers (#8743) Remove Result wrapper from AccountProvider in RPC impls (#8763) Update `license header` and `scripts` (#8666)
2 parents 12ea521 + c8877d4 commit 4fd7990

File tree

835 files changed

+2340
-3700
lines changed

Some content is hidden

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

835 files changed

+2340
-3700
lines changed

‎.gitlab-ci.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ windows:
173173
- stable
174174
- triggers
175175
script:
176-
- sh scripts/gitlab-build.sh x86_64-pc-windows-msvc x86_64-pc-windows-msvc installer "" "" windows
176+
- sh scripts/gitlab-build.sh x86_64-pc-windows-msvc x86_64-pc-windows-msvc amd64 "" "" windows
177177
tags:
178178
- rust-windows
179179
artifacts:
@@ -201,6 +201,8 @@ docker-build:
201201
stage: build
202202
only:
203203
- tags
204+
- beta
205+
- stable
204206
- triggers
205207
before_script:
206208
- docker info

‎CHANGELOG.md

+103-35
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,71 @@
1+
## Parity [v1.11.3](https://github.com/paritytech/parity/releases/tag/v1.11.3) (2018-06-06)
2+
3+
Parity 1.11.3 is a security-relevant release. Please upgrade your nodes as soon as possible to [v1.10.6](https://github.com/paritytech/parity/releases/tag/v1.10.6) or [v1.11.3](https://github.com/paritytech/parity/releases/tag/v1.11.3).
4+
5+
The full list of included changes:
6+
7+
- Parity-version: bump beta to 1.11.3 ([#8806](https://github.com/paritytech/parity/pull/8806))
8+
- Parity-version: bump beta to 1.11.3
9+
- Disallow unsigned transactions in case EIP-86 is disabled ([#8802](https://github.com/paritytech/parity/pull/8802))
10+
- Fix ancient blocks queue deadlock ([#8751](https://github.com/paritytech/parity/pull/8751))
11+
- Update shell32-sys to fix windows build ([#8792](https://github.com/paritytech/parity/pull/8792))
12+
- Backports ([#8785](https://github.com/paritytech/parity/pull/8785))
13+
- Fix light sync with initial validator-set contract ([#8528](https://github.com/paritytech/parity/pull/8528))
14+
- Fix #8468
15+
- Use U256::max_value() instead
16+
- Also change initial transaction gas
17+
- Resumable warp-sync / Seed downloaded snapshots ([#8544](https://github.com/paritytech/parity/pull/8544))
18+
- Start dividing sync chain : first supplier method
19+
- WIP - updated chain sync supplier
20+
- Finish refactoring the Chain Sync Supplier
21+
- Create Chain Sync Requester
22+
- Add Propagator for Chain Sync
23+
- Add the Chain Sync Handler
24+
- Move tests from mod -> handler
25+
- Move tests to propagator
26+
- Refactor SyncRequester arguments
27+
- Refactoring peer fork header handler
28+
- Fix wrong highest block number in snapshot sync
29+
- Small refactor...
30+
- Resume warp-sync downloaded chunks
31+
- Refactoring the previous chunks import
32+
- Address PR grumbles
33+
- Fix not seeding current snapshot
34+
- Update SnapshotService readiness check
35+
- Early abort importing previous chunks
36+
- Update Gitlab CI config
37+
- SyncState back to Waiting when Manifest peers disconnect
38+
- Revert GitLab CI changes
39+
- Refactor resuming snapshots
40+
- Revert "Refactor resuming snapshots"
41+
- Update informant log
42+
- Refactor resuming snapshots
43+
- Update informant message : show chunks done
44+
- Don't open Browser post-install on Mac ([#8641](https://github.com/paritytech/parity/pull/8641))
45+
- Fix not downloading old blocks ([#8642](https://github.com/paritytech/parity/pull/8642))
46+
- Fix PoW blockchains sealing notifications in chain_new_blocks ([#8656](https://github.com/paritytech/parity/pull/8656))
47+
- Shutdown the Snapshot Service early ([#8658](https://github.com/paritytech/parity/pull/8658))
48+
- Shutdown the Snapshot Service when shutting down the runner
49+
- Rename `service` to `client_service`
50+
- Fix tests
51+
- Fix cli signer ([#8682](https://github.com/paritytech/parity/pull/8682))
52+
- Update ethereum-types so `{:#x}` applies 0x prefix
53+
- Set the request index to that of the current request ([#8683](https://github.com/paritytech/parity/pull/8683))
54+
- Set the request index to that of the current request
55+
- Network-devp2p: handle UselessPeer disconnect ([#8686](https://github.com/paritytech/parity/pull/8686))
56+
- Fix local transactions policy. ([#8691](https://github.com/paritytech/parity/pull/8691))
57+
- CI: Fixes for Android Pipeline ([#8745](https://github.com/paritytech/parity/pull/8745))
58+
- Ci: Remove check for shared libraries in gitlab script
59+
- Ci: allow android arm build to fail
60+
- Custom Error Messages on ENFILE and EMFILE IO Errors ([#8744](https://github.com/paritytech/parity/pull/8744))
61+
- Custom Error Messages on ENFILE and EMFILE IO Errors
62+
- Use assert-matches for more readable tests
63+
- Fix Wording and consistency
64+
- Ethcore-sync: fix connection to peers behind chain fork block ([#8710](https://github.com/paritytech/parity/pull/8710))
65+
- Parity-version: bump beta to 1.11.2 ([#8750](https://github.com/paritytech/parity/pull/8750))
66+
- Parity-version: bump beta to 1.11.2
67+
- Parity-version: unset critical flag
68+
169
## Parity [v1.11.1](https://github.com/paritytech/parity/releases/tag/v1.11.1) (2018-05-15)
270

371
This is the Parity 1.11.1-beta release! Hurray!
@@ -156,47 +224,47 @@ The full list of included changes:
156224

157225
- Backports ([#8558](https://github.com/paritytech/parity/pull/8558))
158226
- Fetching logs by hash in blockchain database ([#8463](https://github.com/paritytech/parity/pull/8463))
159-
- Fetch logs by hash in blockchain database
160-
- Fix tests
161-
- Add unit test for branch block logs fetching
162-
- Add docs that blocks must already be sorted
163-
- Handle branch block cases properly
164-
- typo: empty -> is_empty
165-
- Remove return_empty_if_none by using a closure
166-
- Use BTreeSet to avoid sorting again
167-
- Move is_canon to BlockChain
168-
- typo: pass value by reference
169-
- Use loop and wrap inside blocks to simplify the code
170-
- typo: missed a comment
227+
- Fetch logs by hash in blockchain database
228+
- Fix tests
229+
- Add unit test for branch block logs fetching
230+
- Add docs that blocks must already be sorted
231+
- Handle branch block cases properly
232+
- typo: empty -> is_empty
233+
- Remove return_empty_if_none by using a closure
234+
- Use BTreeSet to avoid sorting again
235+
- Move is_canon to BlockChain
236+
- typo: pass value by reference
237+
- Use loop and wrap inside blocks to simplify the code
238+
- typo: missed a comment
171239
- Pass on storage keys tracing to handle the case when it is not modified ([#8491](https://github.com/paritytech/parity/pull/8491))
172-
- Pass on storage keys even if it is not modified
173-
- typo: account and storage query
174-
- Fix tests
175-
- Use state query directly because of suicided accounts
176-
- Fix a RefCell borrow issue
177-
- Add tests for unmodified storage trace
178-
- Address grumbles
179-
- typo: remove unwanted empty line
180-
- ensure_cached compiles with the original signature
240+
- Pass on storage keys even if it is not modified
241+
- typo: account and storage query
242+
- Fix tests
243+
- Use state query directly because of suicided accounts
244+
- Fix a RefCell borrow issue
245+
- Add tests for unmodified storage trace
246+
- Address grumbles
247+
- typo: remove unwanted empty line
248+
- ensure_cached compiles with the original signature
181249
- Update wasmi and pwasm-utils ([#8493](https://github.com/paritytech/parity/pull/8493))
182-
- Update wasmi to 0.2
183-
- Update pwasm-utils to 0.1.5
250+
- Update wasmi to 0.2
251+
- Update pwasm-utils to 0.1.5
184252
- Show imported messages for light client ([#8517](https://github.com/paritytech/parity/pull/8517))
185253
- Enable WebAssembly and Byzantium for Ellaism ([#8520](https://github.com/paritytech/parity/pull/8520))
186-
- Enable WebAssembly and Byzantium for Ellaism
187-
- Fix indentation
188-
- Remove empty lines
254+
- Enable WebAssembly and Byzantium for Ellaism
255+
- Fix indentation
256+
- Remove empty lines
189257
- Don't panic in import_block if invalid rlp ([#8522](https://github.com/paritytech/parity/pull/8522))
190-
- Don't panic in import_block if invalid rlp
191-
- Remove redundant type annotation
192-
- Replace RLP header view usage with safe decoding
258+
- Don't panic in import_block if invalid rlp
259+
- Remove redundant type annotation
260+
- Replace RLP header view usage with safe decoding
193261
- Node table sorting according to last contact data ([#8541](https://github.com/paritytech/parity/pull/8541))
194-
- network-devp2p: sort nodes in node table using last contact data
195-
- network-devp2p: rename node contact types in node table json output
196-
- network-devp2p: fix node table tests
197-
- network-devp2p: note node failure when failed to establish connection
198-
- network-devp2p: handle UselessPeer error
199-
- network-devp2p: note failure when marking node as useless
262+
- network-devp2p: sort nodes in node table using last contact data
263+
- network-devp2p: rename node contact types in node table json output
264+
- network-devp2p: fix node table tests
265+
- network-devp2p: note node failure when failed to establish connection
266+
- network-devp2p: handle UselessPeer error
267+
- network-devp2p: note failure when marking node as useless
200268
- Betalize 1.11 :) ([#8475](https://github.com/paritytech/parity/pull/8475))
201269
- Betalize 1.11 :)
202270
- Update Gitlab scripts

‎Cargo.lock

+4-60
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+1-10
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,7 @@ winapi = { version = "0.3.4", features = ["winsock2", "winuser", "shellapi"] }
8888
daemonize = { git = "https://github.com/paritytech/daemonize" }
8989

9090
[features]
91-
default = ["ui-precompiled"]
92-
ui = [
93-
"ui-enabled",
94-
"parity-dapps/ui",
95-
]
96-
ui-precompiled = [
97-
"ui-enabled",
98-
"parity-dapps/ui-precompiled",
99-
]
100-
ui-enabled = ["dapps"]
91+
default = ["dapps"]
10192
dapps = ["parity-dapps"]
10293
json-tests = ["ethcore/json-tests"]
10394
test-heavy = ["ethcore/test-heavy"]

‎chainspec/src/main.rs

+16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
// Copyright 2015-2018 Parity Technologies (UK) Ltd.
2+
// This file is part of Parity.
3+
4+
// Parity is free software: you can redistribute it and/or modify
5+
// it under the terms of the GNU General Public License as published by
6+
// the Free Software Foundation, either version 3 of the License, or
7+
// (at your option) any later version.
8+
9+
// Parity is distributed in the hope that it will be useful,
10+
// but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
// GNU General Public License for more details.
13+
14+
// You should have received a copy of the GNU General Public License
15+
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
16+
117
extern crate serde_json;
218
extern crate serde_ignored;
319
extern crate ethjson;

‎dapps/Cargo.toml

-6
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,10 @@ fetch = { path = "../util/fetch" }
3434
node-health = { path = "./node-health" }
3535
parity-hash-fetch = { path = "../hash-fetch" }
3636
parity-reactor = { path = "../util/reactor" }
37-
parity-ui = { path = "./ui" }
38-
parity-ui-deprecation = { path = "./ui-deprecation" }
3937
keccak-hash = { path = "../util/hash" }
4038
parity-version = { path = "../util/version" }
4139
registrar = { path = "../registrar" }
4240

4341
[dev-dependencies]
4442
env_logger = "0.4"
4543
ethcore-devtools = { path = "../devtools" }
46-
47-
[features]
48-
ui = ["parity-ui/no-precompiled-js"]
49-
ui-precompiled = ["parity-ui/use-precompiled-js"]

‎dapps/js-glue/build.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2015-2017 Parity Technologies (UK) Ltd.
1+
// Copyright 2015-2018 Parity Technologies (UK) Ltd.
22
// This file is part of Parity.
33

44
// Parity is free software: you can redistribute it and/or modify
@@ -14,7 +14,6 @@
1414
// You should have received a copy of the GNU General Public License
1515
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
1616

17-
1817
#[cfg(feature = "with-syntex")]
1918
mod inner {
2019
extern crate syntex;

‎dapps/js-glue/src/build.rs

+15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
// Copyright 2015-2018 Parity Technologies (UK) Ltd.
2+
// This file is part of Parity.
3+
4+
// Parity is free software: you can redistribute it and/or modify
5+
// it under the terms of the GNU General Public License as published by
6+
// the Free Software Foundation, either version 3 of the License, or
7+
// (at your option) any later version.
8+
9+
// Parity is distributed in the hope that it will be useful,
10+
// but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
// GNU General Public License for more details.
13+
14+
// You should have received a copy of the GNU General Public License
15+
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
116

217
#[cfg(feature = "with-syntex")]
318
pub mod inner {

‎dapps/js-glue/src/codegen.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2015-2017 Parity Technologies (UK) Ltd.
1+
// Copyright 2015-2018 Parity Technologies (UK) Ltd.
22
// This file is part of Parity.
33

44
// Parity is free software: you can redistribute it and/or modify

‎dapps/js-glue/src/js.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2015-2017 Parity Technologies (UK) Ltd.
1+
// Copyright 2015-2018 Parity Technologies (UK) Ltd.
22
// This file is part of Parity.
33

44
// Parity is free software: you can redistribute it and/or modify
@@ -14,8 +14,8 @@
1414
// You should have received a copy of the GNU General Public License
1515
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
1616

17-
#![cfg_attr(feature="use-precompiled-js", allow(dead_code))]
18-
#![cfg_attr(feature="use-precompiled-js", allow(unused_imports))]
17+
#![cfg_attr(feature = "use-precompiled-js", allow(dead_code))]
18+
#![cfg_attr(feature = "use-precompiled-js", allow(unused_imports))]
1919

2020
use std::fmt;
2121
use std::process::Command;

0 commit comments

Comments
 (0)