[0.13 backport] Fix handling of invalid compact blocks #9048

Merged
merged 3 commits into from Nov 9, 2016

Projects

None yet

4 participants

@sdaftuar
Contributor

Backport of #9026 to 0.13.

@fanquake fanquake added this to the 0.13.2 milestone Nov 1, 2016
@fanquake fanquake added the Backport label Nov 1, 2016
@sdaftuar
Contributor
sdaftuar commented Nov 1, 2016

Updated this to match the latest changes in #9026 (see #9026 (comment)).

sdaftuar added some commits Oct 31, 2016
@sdaftuar sdaftuar Fix compact block handling to not ban if block is invalid 015865e
@sdaftuar sdaftuar Bump the protocol version to distinguish new banning behavior.
This allows future software that would relay compact blocks before
full validation to announce only to peers that will not ban if the
block turns out to be invalid.
e8ef50b
@TheBlueMatt

utACK e8ef50b, minus random line removal. Looks equivalent to #9026.

@@ -4717,7 +4719,6 @@ std::string GetWarnings(const std::string& strFor)
//////////////////////////////////////////////////////////////////////////////
-//
@TheBlueMatt
TheBlueMatt Nov 2, 2016 Contributor

Wut?

@sdaftuar
sdaftuar Nov 3, 2016 Contributor

Oops, fixed.

@laanwj laanwj merged commit e8ef50b into bitcoin:0.13 Nov 9, 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 Nov 9, 2016
@laanwj laanwj Merge #9048: [0.13 backport] Fix handling of invalid compact blocks
e8ef50b Bump the protocol version to distinguish new banning behavior. (Suhas Daftuar)
015865e Fix compact block handling to not ban if block is invalid (Suhas Daftuar)
8290506 [qa] Test that invalid compactblocks don't result in ban (Suhas Daftuar)
9460771
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment