Use best header chain timestamps to detect partitioning #6256

Merged
merged 1 commit into from Jun 12, 2015

Conversation

Projects
None yet
2 participants
@gavinandresen
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

Use best header chain timestamps to detect partitioning
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

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Jun 12, 2015

Member

utACK

Member

laanwj commented Jun 12, 2015

utACK

@laanwj laanwj merged commit 65b9454 into bitcoin:master Jun 12, 2015

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

Merge pull request #6256
65b9454 Use best header chain timestamps to detect partitioning (Gavin Andresen)

gavinandresen added a commit that referenced this pull request Jun 15, 2015

Use best header chain timestamps to detect partitioning
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

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Jun 15, 2015

Member

Cherry-picked to 0.11 as fce474c

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

Revert "Disable partition check for now, it triggers too often (issue #…
…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