From 4ddccfa5e54ccc31d66a4a96aa65a80fd606abfd Mon Sep 17 00:00:00 2001 From: Marek Kotewicz Date: Thu, 26 Jul 2018 13:36:15 +0200 Subject: [PATCH 1/7] remove ssl from dockerfiles, closes #8880 (#9195) --- docker/android/Dockerfile | 18 ------------------ docker/hub/Dockerfile | 2 -- docker/ubuntu/Dockerfile | 1 - 3 files changed, 21 deletions(-) diff --git a/docker/android/Dockerfile b/docker/android/Dockerfile index 7783781b4ca..1dbf15fac7d 100644 --- a/docker/android/Dockerfile +++ b/docker/android/Dockerfile @@ -23,24 +23,6 @@ RUN /usr/local/android-ndk-r16b/build/tools/make-standalone-toolchain.sh \ --arch=arm --install-dir=/opt/ndk-standalone --stl=libc++ --platform=android-26 ENV PATH $PATH:/opt/ndk-standalone/bin -# Compiling OpenSSL for Android -RUN cd /root && \ - git clone git://git.openssl.org/openssl.git && \ - cd openssl && \ - git checkout OpenSSL_1_1_0-stable -ENV CROSS_SYSROOT /opt/ndk-standalone/sysroot -RUN cd /root/openssl && \ - ./Configure android-armeabi --cross-compile-prefix=arm-linux-androideabi- \ - -static no-stdio no-ui \ - -I/usr/local/android-ndk-r16b/sysroot/usr/include \ - -I/usr/local/android-ndk-r16b/sysroot/usr/include/arm-linux-androideabi \ - -L/usr/local/android-ndk-r16b/sysroot/usr/lib \ - --prefix=/opt/ndk-standalone/sysroot/usr -RUN cd /root/openssl && \ - make build_libs && \ - make install_dev -RUN rm -rf /root/openssl - # Compiling libudev for Android # This is the most hacky part of the process, as we need to apply a patch and pass specific # options that the compiler environment doesn't define. diff --git a/docker/hub/Dockerfile b/docker/hub/Dockerfile index e70434af4b1..ce85763dce9 100644 --- a/docker/hub/Dockerfile +++ b/docker/hub/Dockerfile @@ -23,8 +23,6 @@ RUN apt-get update && \ libc6-dev \ binutils \ file \ - openssl \ - libssl-dev \ libudev-dev \ pkg-config \ dpkg-dev \ diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile index 83bf1567a46..574ff64ebd2 100644 --- a/docker/ubuntu/Dockerfile +++ b/docker/ubuntu/Dockerfile @@ -11,7 +11,6 @@ RUN apt-get update && \ git \ file \ binutils \ - libssl-dev \ pkg-config \ libudev-dev From 1ce8c1cf82fc5d2738ba3f41087a599eb02fe817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Thu, 26 Jul 2018 21:42:09 +0100 Subject: [PATCH 2/7] snap: remove ssl dependencies from snapcraft definition (#9222) --- snap/snapcraft.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index b1017707038..c7da2396002 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -33,8 +33,8 @@ parts: # rust-channel: stable # @TODO enable after https://bugs.launchpad.net/snapcraft/+bug/1778530 rust-revision: 1.26.2 # @TODO remove after https://bugs.launchpad.net/snapcraft/+bug/1778530 build-attributes: [no-system-libraries] - build-packages: [g++, libudev-dev, libssl-dev, make, pkg-config, cmake] - stage-packages: [libc6, libssl1.0.0, libudev1, libstdc++6] + build-packages: [g++, libudev-dev, make, pkg-config, cmake] + stage-packages: [libc6, libudev1, libstdc++6] df: plugin: nil stage-packages: [coreutils] From bf7677ce6913998142eba39ad2f32f0b45a52c4d Mon Sep 17 00:00:00 2001 From: JohnnySheffield Date: Fri, 27 Jul 2018 06:20:27 +0200 Subject: [PATCH 3/7] Removes duplicate libudev-dev from Dockerfile (#9220) --- docker/hub/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker/hub/Dockerfile b/docker/hub/Dockerfile index ce85763dce9..88b11a524c7 100644 --- a/docker/hub/Dockerfile +++ b/docker/hub/Dockerfile @@ -25,8 +25,7 @@ RUN apt-get update && \ file \ libudev-dev \ pkg-config \ - dpkg-dev \ - libudev-dev &&\ + dpkg-dev &&\ # install rustup curl https://sh.rustup.rs -sSf | sh -s -- -y && \ # rustup directory From fb503f523bff75c8711601ee6677aefae7693777 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Fri, 27 Jul 2018 10:13:05 +0100 Subject: [PATCH 4/7] Allow old blocks from peers with lower difficulty (#9226) Previously we only allow downloading of old blocks if the peer difficulty was greater than our syncing difficulty. This change allows downloading of blocks from peers where the difficulty is greater then the last downloaded old block. --- ethcore/sync/src/chain/mod.rs | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/ethcore/sync/src/chain/mod.rs b/ethcore/sync/src/chain/mod.rs index 50f4c9428a1..ef5146f91da 100644 --- a/ethcore/sync/src/chain/mod.rs +++ b/ethcore/sync/src/chain/mod.rs @@ -761,14 +761,24 @@ impl ChainSync { } } - // Only ask for old blocks if the peer has a higher difficulty - if force || higher_difficulty { + // Only ask for old blocks if the peer has a higher difficulty than the last imported old block + let last_imported_old_block_difficulty = self.old_blocks.as_mut().and_then(|d| { + io.chain().block_total_difficulty(BlockId::Number(d.last_imported_block_number())) + }); + + if force || last_imported_old_block_difficulty.map_or(true, |ld| peer_difficulty.map_or(true, |pd| pd > ld)) { if let Some(request) = self.old_blocks.as_mut().and_then(|d| d.request_blocks(io, num_active_peers)) { SyncRequester::request_blocks(self, io, peer_id, request, BlockSet::OldBlocks); return; } } else { - trace!(target: "sync", "peer {} is not suitable for asking old blocks", peer_id); + trace!( + target: "sync", + "peer {:?} is not suitable for requesting old blocks, last_imported_old_block_difficulty={:?}, peer_difficulty={:?}", + peer_id, + last_imported_old_block_difficulty, + peer_difficulty + ); self.deactivate_peer(io, peer_id); } }, From 77a5ce6bf365d410cbf27fc418ebc2bd820bcac2 Mon Sep 17 00:00:00 2001 From: Wei Tang Date: Fri, 27 Jul 2018 18:07:46 +0800 Subject: [PATCH 5/7] Fix potential as_usize overflow when casting from U256 in miner (#9221) --- ethcore/src/miner/miner.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ethcore/src/miner/miner.rs b/ethcore/src/miner/miner.rs index 1939d02b110..233e28139be 100644 --- a/ethcore/src/miner/miner.rs +++ b/ethcore/src/miner/miner.rs @@ -417,7 +417,7 @@ impl Miner { let max_transactions = if min_tx_gas.is_zero() { usize::max_value() } else { - MAX_SKIPPED_TRANSACTIONS.saturating_add((*open_block.block().header().gas_limit() / min_tx_gas).as_u64() as usize) + MAX_SKIPPED_TRANSACTIONS.saturating_add(cmp::min(*open_block.block().header().gas_limit() / min_tx_gas, u64::max_value().into()).as_u64() as usize) }; let pending: Vec> = self.transaction_queue.pending( From 5737c213409c7205a826936b842c3f91194598e3 Mon Sep 17 00:00:00 2001 From: Dong Zhou Date: Fri, 27 Jul 2018 18:56:21 +0800 Subject: [PATCH 6/7] fix typo (#9232) --- util/network-devp2p/src/host.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/network-devp2p/src/host.rs b/util/network-devp2p/src/host.rs index 28d6620bc10..8d8a1459c99 100644 --- a/util/network-devp2p/src/host.rs +++ b/util/network-devp2p/src/host.rs @@ -670,7 +670,7 @@ impl Host { } } - fn connection_closed(&self, token: TimerToken, io: &IoContext) { + fn connection_closed(&self, token: StreamToken, io: &IoContext) { trace!(target: "network", "Connection closed: {}", token); self.kill_connection(token, io, true); } From 7ad556346eed03cfea2999f7f9daf864de6489af Mon Sep 17 00:00:00 2001 From: Afri Schoedon <5chdn@users.noreply.github.com> Date: Fri, 27 Jul 2018 16:00:34 +0200 Subject: [PATCH 7/7] add changelog for 1.11.8 stable and 2.0.1 beta (#9230) * docs: add changelog for 1.11.8 stable * docs: add changelog for 2.0.1 beta --- CHANGELOG.md | 54 +++++++++++++++++++++++++++++++++++++++++- docs/CHANGELOG-1.11.md | 50 +++++++++++++++++++++++++++++++++++--- 2 files changed, 100 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b92c3f0ab86..a86383349dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,55 @@ +## Parity-Ethereum [v2.0.1](https://github.com/paritytech/parity-ethereum/releases/tag/v2.0.1) (2018-07-27) + +Parity-Ethereum 2.0.1-beta is a bug-fix release to improve performance and stability. + +Note, authorities in PoA networks based on the Aura engine, should upgrade their nodes to 1.11.8-stable or 2.0.1-beta as this release includes a critical fix. + +The full list of included changes: + +- Backports to 2.0.1-beta ([#9145](https://github.com/paritytech/parity-ethereum/pull/9145)) + - Parity-version: bump beta to 2.0.1 + - Ci: update version strings for snaps ([#9160](https://github.com/paritytech/parity-ethereum/pull/9160)) + - Be more graceful on Aura difficulty validation ([#9164](https://github.com/paritytech/parity-ethereum/pull/9164)) + - Be more graceful on Aura difficulty validation + - Test: rejects_step_backwards + - Test: proposer_switching + - Test: rejects_future_block + - Test: reports_skipped + - Test: verify_empty_seal_steps + - Remove node-health ([#9119](https://github.com/paritytech/parity-ethereum/pull/9119)) + - Remove node-health + - Remove ntp_servers + - Add --ntp-servers as legacy instead of removing it + - Add --ntp-servers to deprecated args + - Remove unused stuff + - Remove _legacy_ntp_servers + - Parity: fix UserDefaults json parser ([#9189](https://github.com/paritytech/parity-ethereum/pull/9189)) + - Parity: fix UserDefaults json parser + - Parity: use serde_derive for UserDefaults + - Parity: support deserialization of old UserDefault json format + - Parity: make UserDefaults serde backwards compatible + - Parity: tabify indentation in UserDefaults + - Fix bugfix hard fork logic ([#9138](https://github.com/paritytech/parity-ethereum/pull/9138)) + - Fix bugfix hard fork logic + - Remove dustProtectionTransition from bugfix category + - Eip-168 is not enabled by default + - Remove unnecessary 'static + - Disable per-sender limit for local transactions. ([#9148](https://github.com/paritytech/parity-ethereum/pull/9148)) + - Disable per-sender limit for local transactions. + - Add a missing new line. + - Rpc: fix is_major_importing sync state condition ([#9112](https://github.com/paritytech/parity-ethereum/pull/9112)) + - Rpc: fix is_major_importing sync state condition + - Rpc: fix informant printout when waiting for peers + - Fix verification in ethcore-sync collect_blocks ([#9135](https://github.com/paritytech/parity-ethereum/pull/9135)) + - Docker: update hub dockerfile ([#9173](https://github.com/paritytech/parity-ethereum/pull/9173)) + - Update Dockerfile for hub + - Update to Ubuntu Xenial 16.04 + - Fix cmake version + - Docker: fix tab indentation in hub dockerfile + - Rpc: fix broken merge + - Rpc: remove node_health leftover from merge + - Rpc: remove dapps leftover from merge + ## Parity-Ethereum [v2.0.0](https://github.com/paritytech/parity-ethereum/releases/tag/v2.0.0) "Ethereum" (2018-07-18) This is the Parity-Ethereum//v2.0.0-beta release, code-named "Ethereum", **YOLO!** @@ -57,7 +109,7 @@ The full list of included changes: - Update parity-common - Offload cull to IoWorker. ([#9099](https://github.com/paritytech/parity-ethereum/pull/9099)) - Fix work-notify. ([#9104](https://github.com/paritytech/parity-ethereum/pull/9104)) - - Update hidapi, fixes #7542 ([#9108](https://github.com/paritytech/parity-ethereum/pull/9108)) + - Update hidapi, fixes [#7542](https://github.com/paritytech/parity-ethereum/issues/7542) ([#9108](https://github.com/paritytech/parity-ethereum/pull/9108)) - Docker: add cmake dependency ([#9111](https://github.com/paritytech/parity-ethereum/pull/9111)) - Update light client hardcoded headers ([#9098](https://github.com/paritytech/parity-ethereum/pull/9098)) - Insert Kovan hardcoded headers until 7690241 diff --git a/docs/CHANGELOG-1.11.md b/docs/CHANGELOG-1.11.md index ecbcf62e2f4..2d8630c80a5 100644 --- a/docs/CHANGELOG-1.11.md +++ b/docs/CHANGELOG-1.11.md @@ -1,4 +1,48 @@ -## Parity [v1.11.7](https://github.com/paritytech/parity/releases/tag/v1.11.7) "Prosperity" (2018-07-17) +## Parity [v1.11.8](https://github.com/paritytech/parity-ethereum/releases/tag/v1.11.8) (2018-07-27) + +Parity 1.11.8-stable is a bug-fix release to improve performance and stability. + +Note, authorities in PoA networks based on the Aura engine, should upgrade their nodes immediately as this release includes a critical fix. + +The full list of included changes: + +- Backports to 1.11.8-stable ([#9144](https://github.com/paritytech/parity-ethereum/pull/9144)) + - Parity-version: bump stable to 1.11.8 + - Ci: update version strings for snaps ([#9160](https://github.com/paritytech/parity-ethereum/pull/9160)) + - Be more graceful on Aura difficulty validation ([#9164](https://github.com/paritytech/parity-ethereum/pull/9164)) + - Be more graceful on Aura difficulty validation + - Test: rejects_step_backwards + - Test: proposer_switching + - Test: rejects_future_block + - Test: reports_skipped + - Test: verify_empty_seal_steps + - Parity: fix UserDefaults json parser ([#9189](https://github.com/paritytech/parity-ethereum/pull/9189)) + - Parity: fix UserDefaults json parser + - Parity: use serde_derive for UserDefaults + - Parity: support deserialization of old UserDefault json format + - Parity: make UserDefaults serde backwards compatible + - Parity: tabify indentation in UserDefaults + - Fix bugfix hard fork logic ([#9138](https://github.com/paritytech/parity-ethereum/pull/9138)) + - Fix bugfix hard fork logic + - Remove dustProtectionTransition from bugfix category + - EIP-168 is not enabled by default + - Remove unnecessary 'static + - Disable per-sender limit for local transactions. ([#9148](https://github.com/paritytech/parity-ethereum/pull/9148)) + - Disable per-sender limit for local transactions. + - Add a missing new line. + - Rpc: fix is_major_importing sync state condition ([#9112](https://github.com/paritytech/parity-ethereum/pull/9112)) + - Rpc: fix is_major_importing sync state condition + - Rpc: fix informant printout when waiting for peers + - Fix verification in ethcore-sync collect_blocks ([#9135](https://github.com/paritytech/parity-ethereum/pull/9135)) + - Docker: update hub dockerfile ([#9173](https://github.com/paritytech/parity-ethereum/pull/9173)) + - Update Dockerfile for hub + - Update to Ubuntu Xenial 16.04 + - Fix cmake version + - Docker: fix tab indentation in hub dockerfile + - Ethcore: update to parity-wasm 0.31 + - Rpc: fix broken merge + +## Parity [v1.11.7](https://github.com/paritytech/parity-ethereum/releases/tag/v1.11.7) "Prosperity" (2018-07-17) Parity 1.11.7 "Prosperity" is a bug-fix release to improve performance and stability that marks the 1.11 release track as `stable`. Among other fixes, this release significantly addresses peering and synchronization issues. If you experienced such issues before, upgrading is highly recommended. If you rely on old versions of Parity, check out the `old-stable-1.10` branch, cherry-pick fixes, and compile your binaries independently. There will be no official support for any versions prior to 1.11.7, however (EOL). @@ -29,7 +73,7 @@ The full list of included changes: - Fix ethcore-sync tests. - Fix RPC tests. - Make sure to produce full blocks. ([#9115](https://github.com/paritytech/parity/pull/9115)) - - Update hidapi, fixes #7542 ([#9108](https://github.com/paritytech/parity/pull/9108)) + - Update hidapi, fixes [#7542](https://github.com/paritytech/parity-ethereum/issues/7542) ([#9108](https://github.com/paritytech/parity/pull/9108)) - Docker: add cmake dependency ([#9111](https://github.com/paritytech/parity/pull/9111)) - Fix miner tests. - Revert "Make sure to produce full blocks." @@ -249,7 +293,7 @@ The full list of included changes: - Update shell32-sys to fix windows build ([#8792](https://github.com/paritytech/parity/pull/8792)) - Backports ([#8785](https://github.com/paritytech/parity/pull/8785)) - Fix light sync with initial validator-set contract ([#8528](https://github.com/paritytech/parity/pull/8528)) - - Fix #8468 + - Fix [#8468](https://github.com/paritytech/parity-ethereum/issues/8468) - Use U256::max_value() instead - Also change initial transaction gas - Resumable warp-sync / Seed downloaded snapshots ([#8544](https://github.com/paritytech/parity/pull/8544))