Skip to content

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

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 3 commits into from
Nov 9, 2016
Merged

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

merged 3 commits into from
Nov 9, 2016
+81 −22

Conversation

sdaftuar
Copy link
Member

Backport of #9026 to 0.13.

@fanquake fanquake added this to the 0.13.2 milestone Nov 1, 2016
@sdaftuar sdaftuar mentioned this pull request Nov 1, 2016
Merged
@sdaftuar
Copy link
Member Author

sdaftuar commented Nov 1, 2016

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

@sdaftuar sdaftuar force-pushed the fix-invalid-cb-ban-0.13 branch from 028131d to 60af1bc Compare November 1, 2016 17:22
@sdaftuar
Bump the protocol version to distinguish new banning behavior.
e8ef50b 
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 fix-invalid-cb-ban-0.13 branch from 60af1bc to e8ef50b Compare November 1, 2016 19:29
TheBlueMatt
TheBlueMatt reviewed Nov 2, 2016
View reviewed changes
Copy link
Contributor

@TheBlueMatt TheBlueMatt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

src/main.cpp
@@ -4717,7 +4719,6 @@ std::string GetWarnings(const std::string& strFor)


//////////////////////////////////////////////////////////////////////////////
//
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wut?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, fixed.

@TheBlueMatt TheBlueMatt mentioned this pull request Nov 3, 2016
Merged
@laanwj laanwj merged commit e8ef50b into bitcoin:0.13 Nov 9, 2016
laanwj added a commit that referenced this pull request Nov 9, 2016
@laanwj
Merge #9048: [0.13 backport] Fix handling of invalid compact blocks

Verified

This commit was signed with the committer’s verified signature. The key has expired.
laanwj Mara van der Laan
GPG key ID: 74810B012346C9A6
Expired
Verified
Learn about vigilant mode
9460771 
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)
@OlegGirko OlegGirko mentioned this pull request Aug 1, 2017
Merged
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@TheBlueMatt TheBlueMatt

Assignees
No one assigned
Labels
Backport
Projects
None yet
Milestone
0.13.2
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@sdaftuar @TheBlueMatt @laanwj @fanquake