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

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

Merged
merged 3 commits into from Nov 9, 2016

Conversation

@sdaftuar
Copy link
Member

@sdaftuar sdaftuar commented Oct 31, 2016

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
Copy link
Member Author

@sdaftuar sdaftuar commented Nov 1, 2016

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

@sdaftuar sdaftuar force-pushed the sdaftuar:fix-invalid-cb-ban-0.13 branch Nov 1, 2016
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.
@sdaftuar sdaftuar force-pushed the sdaftuar:fix-invalid-cb-ban-0.13 branch to e8ef50b Nov 1, 2016
Copy link
Contributor

@TheBlueMatt TheBlueMatt left a comment

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

@@ -4717,7 +4719,6 @@ std::string GetWarnings(const std::string& strFor)


//////////////////////////////////////////////////////////////////////////////
//

This comment has been minimized.

@TheBlueMatt

TheBlueMatt Nov 2, 2016
Contributor

Wut?

This comment has been minimized.

@sdaftuar

sdaftuar Nov 3, 2016
Author Member

Oops, fixed.

@laanwj laanwj merged commit e8ef50b into bitcoin:0.13 Nov 9, 2016
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 Nov 9, 2016
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)
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

4 participants