Skip to content
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.

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

Use best header chain timestamps to detect partitioning #6256

Merged
merged 1 commit into from Jun 12, 2015

Conversation

@gavinandresen
Copy link
Contributor

gavinandresen commented Jun 8, 2015

The partition checking code was using chainActive timestamps
to detect partitioning; with headers-first syncing, it should use
(and with this pull request, does use) pIndexBestHeader timestamps.

Fixes issue #6251

The partition checking code was using chainActive timestamps
to detect partitioning; with headers-first syncing, it should use
(and with this pull request, does use) pIndexBestHeader timestamps.

Fixes issue #6251
@laanwj laanwj added Bug P2P labels Jun 9, 2015
@laanwj
Copy link
Member

laanwj commented Jun 12, 2015

utACK

@laanwj laanwj merged commit 65b9454 into bitcoin:master Jun 12, 2015
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
laanwj added a commit that referenced this pull request Jun 12, 2015
65b9454 Use best header chain timestamps to detect partitioning (Gavin Andresen)
gavinandresen added a commit that referenced this pull request Jun 15, 2015
The partition checking code was using chainActive timestamps
to detect partitioning; with headers-first syncing, it should use
(and with this pull request, does use) pIndexBestHeader timestamps.

Fixes issue #6251

Github-Pull: #6256
Rebased-From: 65b9454
@laanwj
Copy link
Member

laanwj commented Jun 15, 2015

Cherry-picked to 0.11 as fce474c

laanwj added a commit that referenced this pull request Jun 21, 2015
…6251)"

Re-enable partition check, it should be safe again after #6256.

This reverts commit 3eada74.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.