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

Stable 2.4.8 backports #10779

Merged
merged 16 commits into from
Jun 25, 2019
Merged

Stable 2.4.8 backports #10779

merged 16 commits into from
Jun 25, 2019

Conversation

s3krit
Copy link
Contributor

@s3krit s3krit commented Jun 25, 2019

soc1c and others added 16 commits June 24, 2019 13:00
* delete BlockDetails from COL_EXTRA

* better proofs

* added tests

* PR suggestions
* adds error message for --no-ancient-blocks, closes #10261

* Apply suggestions from code review

Co-Authored-By: seunlanlege <seunlanlege@gmail.com>
This commit does the following:
- Prevent overflow in `verify_timestamp()` by not adding `now` to found faulty timestamp
- Use explicit `CheckedSystemTime::checked_add` to prevent potential consensus issues because SystemTime is platform
depedent
- remove `#[cfg(not(time_checked_add))]` conditional compilation
… in PING packet (#10705)

* get node IP address and udp port from Socket, if not included in PING packet

* prevent bootnodes from being added to host nodes

* code corrections

* code corrections

* code corrections

* code corrections

* docs

* code corrections

* code corrections

* Apply suggestions from code review

Co-Authored-By: David <dvdplm@gmail.com>
* Add a way to signal shutdown to snapshotting threads

* Pass Progress to fat_rlps() so we can abort from there too.

* Checking for abort in a single spot

* Remove nightly-only weak/strong counts

* fix warning

* Fix tests

* Add dummy impl to abort snapshots

* Add another dummy impl for TestSnapshotService

* Remove debugging code

* Return error instead of the odd Ok(())
Switch to AtomicU64
@ordian ordian added this to the Patch milestone Jun 25, 2019
@ordian ordian added the A8-backport 🕸 Pull request is already reviewed well in another branch. label Jun 25, 2019
@s3krit s3krit merged commit 25435c6 into stable Jun 25, 2019
@ordian ordian deleted the stable-2.4.8-backports branch June 25, 2019 13:39
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A8-backport 🕸 Pull request is already reviewed well in another branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants