[0.13 backport] Attempt reconstruction from all compact block announcements #9357

Merged
merged 2 commits into from Dec 19, 2016

Projects

None yet

5 participants

@sdaftuar
Contributor

Backport of #9352 to the 0.13 branch.

Because in 0.13 we call MarkBlockAsReceived inside ProcessNewBlock(), this code is slightly different from the version in #9352 -- I put a comment that should explain everything.

@laanwj laanwj added the Backport label Dec 15, 2016
@laanwj laanwj added this to the 0.13.2 milestone Dec 15, 2016
@gmaxwell
Member

utACK. Will test.

@TheBlueMatt
Contributor

utACK 53b656f

@gmaxwell
Member

ACK.

@btcdrak
Member
btcdrak commented Dec 19, 2016

ACK 53b656f

@laanwj laanwj merged commit 53b656f into bitcoin:0.13 Dec 19, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@laanwj laanwj added a commit that referenced this pull request Dec 19, 2016
@laanwj laanwj Merge #9357: [0.13 backport] Attempt reconstruction from all compact …
…block announcements


53b656f [qa] Update compactblocks test for multi-peer reconstruction (Suhas Daftuar)
4ced313 Allow compactblock reconstruction when block is in flight (Suhas Daftuar)
03b6f62
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment