Compact Block Tweaks (rebase of #8235) #8637

pull sipa wants to merge 4 commits into bitcoin:master from sipa:compactblocktweaks changing 4 files +24 −9

sipa commented at 3:38 PM on August 31, 2016: member

This is a rebase of #8235, with unit tests from #8418 adapted, and some comments addressed.
sipa cross-referenced this on Aug 31, 2016 from issue Compact Block Tweaks by TheBlueMatt
fanquake added the label Tests on Aug 31, 2016
fanquake added the label P2P on Aug 31, 2016
in src/main.h:None in 776f8ee008 outdated
```
  87 | @@ -88,6 +88,9 @@ static const unsigned int BLOCK_STALLING_TIMEOUT = 2;
  88 |  /** Number of headers sent in one getheaders result. We rely on the assumption that if a peer sends
  89 |   *  less than this number, we reached its tip. Changing this value is a protocol upgrade. */
  90 |  static const unsigned int MAX_HEADERS_RESULTS = 2000;
  91 | +/** Maximum age (in blocks) of blocks we're willing to serve as compact blocks to peers
  92 | + *  when requested. For older blocks, a regular BLOCK response will be sent. */
  93 | +static const int MAX_COMPACT_BLOCK_DEPTH = 5;
```
instagibbs commented at 1:40 PM on September 1, 2016:

It's been too long since I've looked at this code, but this sure seems close to MAX_CMPCTBLOCK_DEPTH

sipa commented at 1:49 PM on September 1, 2016:

Where do you see MAX_CMPCTBLOCK_DEPTH?

laanwj commented at 1:51 PM on September 1, 2016:

There's a MAX_CMPCTBLOCK_DEPTH in the p2p-compactblocks.py test, but I'd say it's not a concern here.

instagibbs commented at 1:53 PM on September 1, 2016:

ah right I noticed that then forgot when looking this morning. Forgive me.

sipa commented at 1:56 PM on September 1, 2016:

Oh, right. I'll make the constant names correspond.
sipa force-pushed on Sep 1, 2016
sipa commented at 3:01 PM on September 1, 2016: member

Updated with exactly corresponding constant names between the tests and the implementation.
gmaxwell commented at 9:46 PM on September 9, 2016: contributor

Needs rebase
sipa force-pushed on Sep 19, 2016
sipa commented at 11:39 AM on September 19, 2016: member

Rebased.
gmaxwell commented at 3:49 PM on September 29, 2016: contributor

ACK
TheBlueMatt commented at 9:13 PM on September 30, 2016: contributor

At the risk of holding things up, you might want https://github.com/TheBlueMatt/bitcoin/commit/654f83f66cc31cbde9b3f14b1c30bdfa8821fd31 as well.
TheBlueMatt commented at 3:30 PM on October 3, 2016: contributor

Actually, I'll do that separately (it will conflict with #8393, though that should probably be merged first to make backporting easier), utACK on the contents here.
TheBlueMatt commented at 5:53 PM on October 6, 2016: contributor

Version rebased on #8393 with the cs_main fix on top (I'll pr that separately if you dont want to take it here): https://github.com/TheBlueMatt/bitcoin/commits/cmpctblock
laanwj commented at 8:12 AM on October 11, 2016: member

utACK https://github.com/bitcoin/bitcoin/pull/8637/commits/1bcdb3dd9b9388700c42a099f025371199d3494e
TheBlueMatt commented at 3:27 PM on October 13, 2016: contributor

Needs rebase (see rebased version at https://github.com/TheBlueMatt/bitcoin/commits/cmpctblock).
sipa force-pushed on Oct 17, 2016
sipa force-pushed on Oct 17, 2016
Dont remove a "preferred" cmpctblock peer if they provide a block 02a337defd
More agressively filter compact block requests
Unit test adaptations by Pieter Wuille.
fe998e962d
Add cmpctblock to debug help list b2e93a343e
Align constant names for maximum compact block / blocktxn depth 3ac6de0a04
sipa force-pushed on Oct 17, 2016
instagibbs commented at 2:49 PM on October 17, 2016: member

utACK https://github.com/bitcoin/bitcoin/pull/8637/commits/7e2f31e5ddd294a7783db025f51fd7d9f5d93e4d
TheBlueMatt commented at 5:09 PM on October 18, 2016: contributor

utACK 3ac6de0a045cc9b2047ceb19af970e7ffbf905fa
btcdrak commented at 5:58 PM on October 18, 2016: contributor

utACK 3ac6de0a045cc9b2047ceb19af970e7ffbf905fa
laanwj merged this on Oct 18, 2016
laanwj closed this on Oct 18, 2016
laanwj referenced this in commit 0b5a997acf on Oct 18, 2016
MarcoFalke referenced this in commit 36e3b95103 on Nov 20, 2016
MarcoFalke referenced this in commit 76ba1c9739 on Nov 20, 2016
MarcoFalke referenced this in commit 3d23a0eaa3 on Nov 20, 2016
MarcoFalke referenced this in commit 2cad5db6f7 on Nov 20, 2016
MarcoFalke cross-referenced this on Nov 20, 2016 from issue [qa] 0.13.2 Backports by MarcoFalke
gladcow cross-referenced this on Mar 1, 2018 from issue Backport compact blocks functionality from bitcoin by gladcow
gladcow referenced this in commit 09441b8e25 on Mar 2, 2018
gladcow referenced this in commit 2a13e773ec on Mar 13, 2018
gladcow referenced this in commit 138a84f1f5 on Mar 14, 2018
gladcow referenced this in commit 44216c71e0 on Mar 15, 2018
gladcow referenced this in commit a0af29c65c on Mar 15, 2018
gladcow referenced this in commit 29a34a8d79 on Mar 15, 2018
gladcow referenced this in commit 9072fcbe59 on Mar 24, 2018
gladcow referenced this in commit cd2c4c6a7e on Apr 4, 2018
UdjinM6 referenced this in commit bc45a2f87a on Apr 11, 2018
lateminer referenced this in commit 1b6cba2d1f on Oct 18, 2018
lateminer referenced this in commit 7796e0a7d9 on Oct 24, 2018
andvgal referenced this in commit fd5c50bc2b on Jan 6, 2019
CryptoCentric referenced this in commit dd3fd51204 on Feb 28, 2019
bitcoin locked this on Sep 8, 2021

Contributors

Labels

Linked (view graph)

#8235 Compact Block Tweaks #8393 Support for compact blocks together with segwit #8418 Add tests for compact blocks #9191 [qa] 0.13.2 Backports