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

Upstream patch: Fix and improve relay from whitelisted peers #1411

Merged
merged 3 commits into from Sep 21, 2016

Conversation

Projects
None yet
5 participants
@bitcartel
Contributor

bitcartel commented Sep 17, 2016

bitcoin/bitcoin#7106
a9f3d3d

An extra commit modifies the log message string, otherwise there are are a number of commits that need be to backported to add methods e.g. GetDebugMessage. These commits modify the interface in consensus/validation.h so there are conflicts to be resolved. e.g.
9003c7c
a9ac95c
5f12263
fbf44e6

sipa and others added some commits Nov 26, 2015

Fix and improve relay from whitelisted peers
This makes sure that retransmits by a whitelisted peer also actually
result in a retransmit.

Further, this changes the logic to never relay in case we would assign
a DoS score, as we expect to get DoS banned ourselves as a result.
Modify message string so we don't need to backport commits which impl…
…ement FormatStateMessage and GetDebugMessage and involve changes to consensus/validation.h
Show outdated Hide outdated src/main.cpp
@daira

This comment has been minimized.

Show comment
Hide comment
@daira

daira Sep 17, 2016

Contributor

utACK.

Contributor

daira commented Sep 17, 2016

utACK.

@ebfull

This comment has been minimized.

Show comment
Hide comment
@ebfull

ebfull Sep 20, 2016

Contributor

utACK

Contributor

ebfull commented Sep 20, 2016

utACK

@daira

This comment has been minimized.

Show comment
Hide comment
@daira

daira Sep 20, 2016

Contributor

utACK e63d14f. @zkbot r+

Contributor

daira commented Sep 20, 2016

utACK e63d14f. @zkbot r+

@zkbot

This comment has been minimized.

Show comment
Hide comment
@zkbot

zkbot Sep 20, 2016

Contributor

📌 Commit e63d14f has been approved by daira

Contributor

zkbot commented Sep 20, 2016

📌 Commit e63d14f has been approved by daira

@zkbot

This comment has been minimized.

Show comment
Hide comment
@zkbot

zkbot Sep 20, 2016

Contributor

⌛️ Testing commit e63d14f with merge 976479f...

Contributor

zkbot commented Sep 20, 2016

⌛️ Testing commit e63d14f with merge 976479f...

zkbot pushed a commit that referenced this pull request Sep 20, 2016

zkbot
Auto merge of #1411 - bitcartel:master_bitcoin_7106, r=daira
Upstream patch: Fix and improve relay from whitelisted peers

bitcoin/bitcoin#7106
a9f3d3d

An extra commit modifies the log message string, otherwise there are are a number of commits that need be to backported to add methods e.g. GetDebugMessage.  These commits modify the interface in consensus/validation.h so there are conflicts to be resolved. e.g.
9003c7c
a9ac95c
5f12263
fbf44e6
@zkbot

This comment has been minimized.

Show comment
Hide comment
@zkbot

zkbot Sep 21, 2016

Contributor

☀️ Test successful - zcash

Contributor

zkbot commented Sep 21, 2016

☀️ Test successful - zcash

@zkbot zkbot merged commit e63d14f into zcash:master Sep 21, 2016

1 check passed

homu Test successful
Details

@str4d str4d referenced this pull request Feb 13, 2017

Open

Bitcoin Core 0.12.0 #2074

191 of 452 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment