Compact Block Tweaks #8235

Closed
wants to merge 3 commits into
from

Projects

None yet

6 participants

@TheBlueMatt
Contributor

As I'm avoiding code churn in #8068, any further changes which are not required for correct operation will be dumped here.

@TheBlueMatt TheBlueMatt referenced this pull request Jun 21, 2016
Merged

Compact Blocks #8068

@laanwj laanwj added the P2P label Jun 25, 2016
@instagibbs
Contributor

utACK e078663

@sipa
Member
sipa commented Jul 29, 2016

tACK e078663 (tested with the tests from #8418, changing the appropriate 15 and 11 constants in the test to 10 and 6 respectively).

@sipa
Member
sipa commented Aug 3, 2016

Needs rebase after #8418.

@btcdrak
Member
btcdrak commented Aug 5, 2016

Should this be backported to 0.13?

@sipa
Member
sipa commented Aug 25, 2016

@TheBlueMatt Feel like adapting the tests from #8418 to not fail here?

@dcousens dcousens commented on the diff Aug 25, 2016
src/main.cpp
@@ -4620,7 +4624,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
// they wont have a useful mempool to match against a compact block,
// and we dont feel like constructing the object for them, so
// instead we respond with the full, non-compact block.
- if (mi->second->nHeight >= chainActive.Height() - 10) {
+ if (CanDirectFetch(Params().GetConsensus()) && mi->second->nHeight >= chainActive.Height() - 5) {
@dcousens
dcousens Aug 25, 2016 Contributor

Maybe the 5 would make sense as a named constant w/ explanation?

@laanwj
Member
laanwj commented Aug 31, 2016

What is the status of this?

@sipa
Member
sipa commented Aug 31, 2016

@laanwj See #8637.

@TheBlueMatt
Contributor
@laanwj laanwj added a commit that referenced this pull request Oct 18, 2016
@laanwj laanwj Merge #8637: Compact Block Tweaks (rebase of #8235)
3ac6de0 Align constant names for maximum compact block / blocktxn depth (Pieter Wuille)
b2e93a3 Add cmpctblock to debug help list (instagibbs)
fe998e9 More agressively filter compact block requests (Matt Corallo)
02a337d Dont remove a "preferred" cmpctblock peer if they provide a block (Matt Corallo)
0b5a997
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment