backport: merge bitcoin#19776, #20599, #22147, #22340, #20799, #25147, #20764, bitcoin-core/gui#206 (BIP152 backports) #6048

kwvg · 2024-06-09T11:40:48Z

Additional Information

Version 2 of BIP152 high-bandwidth mode/compact blocks implements SegWit support.

As Dash does not implement SegWit, there has never been a need to implement v2 (and therefore, have all the code necessary to support both v1 and v2, that gets removed as part of making support v2 only).
- Despite that, the changes surrounding removing support for both versions (that in our case, do not apply as we never have supported v2) refactor the code in other ways and influence their behaviour. In the interest of upstream alignment, those changes have been backported.

bitcoin#19776 doesn't seem to work on its own without successive backports, specifically bitcoin#20799, despite the latter being a later backport.

19776-only p2p_compactblocks.py run (9f2c868947cc254d021e1a9bd00eb7bc80061e81)

dash@825a14c32b73:/src/dash$ ./test/functional/p2p_compactblocks.py
2024-06-09T12:29:09.777000Z TestFramework (INFO): Initializing test directory /tmp/dash_func_test_kb2nr5oe
2024-06-09T12:29:16.341000Z TestFramework (INFO): Testing SENDCMPCT p2p message...
2024-06-09T12:29:31.432000Z TestFramework (INFO): Testing compactblock construction...
2024-06-09T12:29:40.068000Z TestFramework (INFO): Testing compactblock requests...
2024-06-09T12:29:44.597000Z TestFramework (INFO): Testing getblocktxn handler...
2024-06-09T12:29:59.808000Z TestFramework (INFO): Testing compactblock requests/announcements not at chain tip...
2024-06-09T12:30:03.855000Z TestFramework (INFO): Testing handling of incorrect blocktxn responses...
2024-06-09T12:30:05.868000Z TestFramework (INFO): Testing reconstructing compact blocks from all peers...
2024-06-09T12:30:09.389000Z TestFramework (INFO): Testing end-to-end block relay...
2024-06-09T12:30:10.404000Z TestFramework (INFO): Testing handling of invalid compact blocks...
2024-06-09T12:30:12.418000Z TestFramework (INFO): Testing invalid index in cmpctblock message...
2024-06-09T12:30:14.384000Z TestFramework (INFO): Testing high-bandwidth mode states via getpeerinfo...
2024-06-09T12:30:16.893000Z TestFramework (ERROR): Assertion failed
Traceback (most recent call last):
  File "/src/dash/test/functional/test_framework/test_framework.py", line 158, in main
    self.run_test()
  File "./test/functional/p2p_compactblocks.py", line 849, in run_test
    self.test_highbandwidth_mode_states_via_getpeerinfo()
  File "./test/functional/p2p_compactblocks.py", line 791, in test_highbandwidth_mode_states_via_getpeerinfo
    hb_test_node.send_and_ping(msg_block(block))
  File "/src/dash/test/functional/test_framework/p2p.py", line 579, in send_and_ping
    self.sync_with_ping(timeout=timeout)
  File "/src/dash/test/functional/test_framework/p2p.py", line 596, in sync_with_ping
    self.wait_until(test_function, timeout=timeout)
  File "/src/dash/test/functional/test_framework/p2p.py", line 487, in wait_until
    wait_until_helper(test_function, timeout=timeout, lock=p2p_lock, timeout_factor=self.timeout_factor)
  File "/src/dash/test/functional/test_framework/util.py", line 249, in wait_until_helper
    if predicate():
  File "/src/dash/test/functional/test_framework/p2p.py", line 484, in test_function
    assert self.is_connected
AssertionError
2024-06-09T12:30:17.396000Z TestFramework (INFO): Stopping nodes
2024-06-09T12:30:18.400000Z TestFramework (WARNING): Not cleaning up dir /tmp/dash_func_test_kb2nr5oe
2024-06-09T12:30:18.401000Z TestFramework (ERROR): Test failed. Test logging available at /tmp/dash_func_test_kb2nr5oe/test_framework.log
2024-06-09T12:30:18.401000Z TestFramework (ERROR):
2024-06-09T12:30:18.401000Z TestFramework (ERROR): Hint: Call /src/dash/test/functional/combine_logs.py '/tmp/dash_func_test_kb2nr5oe' to consolidate all logs
2024-06-09T12:30:18.401000Z TestFramework (ERROR):
2024-06-09T12:30:18.401000Z TestFramework (ERROR): If this failure happened unexpectedly or intermittently, please file a bug and provide a link or upload of the combined log.
2024-06-09T12:30:18.402000Z TestFramework (ERROR): https://github.com/dashpay/dash/issues
2024-06-09T12:30:18.402000Z TestFramework (ERROR):

20799-incl p2p_compactblocks.py run (aa116c4f0b4753b615f9483aa03adec5ee4fd655)

dash@825a14c32b73:/src/dash$ ./test/functional/p2p_compactblocks.py
2024-06-09T12:34:27.169000Z TestFramework (INFO): Initializing test directory /tmp/dash_func_test_7d65lmhz
2024-06-09T12:34:32.695000Z TestFramework (INFO): Testing SENDCMPCT p2p message...
2024-06-09T12:34:51.288000Z TestFramework (INFO): Testing compactblock construction...
2024-06-09T12:34:55.325000Z TestFramework (INFO): Testing compactblock requests...
2024-06-09T12:34:59.861000Z TestFramework (INFO): Testing getblocktxn handler...
2024-06-09T12:35:07.460000Z TestFramework (INFO): Testing compactblock requests/announcements not at chain tip...
2024-06-09T12:35:09.503000Z TestFramework (INFO): Testing handling of incorrect blocktxn responses...
2024-06-09T12:35:11.519000Z TestFramework (INFO): Testing reconstructing compact blocks from all peers...
2024-06-09T12:35:15.039000Z TestFramework (INFO): Testing end-to-end block relay...
2024-06-09T12:35:16.055000Z TestFramework (INFO): Testing handling of invalid compact blocks...
2024-06-09T12:35:17.062000Z TestFramework (INFO): Testing invalid index in cmpctblock message...
2024-06-09T12:35:19.139000Z TestFramework (INFO): Testing high-bandwidth mode states via getpeerinfo...
2024-06-09T12:35:22.159000Z TestFramework (INFO): Stopping nodes
2024-06-09T12:35:23.163000Z TestFramework (INFO): Cleaning up /tmp/dash_func_test_7d65lmhz on exit
2024-06-09T12:35:23.163000Z TestFramework (INFO): Tests successful

The backport of bitcoin-core/gui#206 is a continuation of 3e8ba24 from dash#5964
The backport of bitcoin#20764 is a continuation of bd934c7 from dash#6034

Breaking changes

The getpeerinfo RPC returns two new boolean fields, bip152_hb_to and bip152_hb_from, that respectively indicate whether we selected a peer to be in compact blocks high-bandwidth mode or whether a peer selected us as a compact blocks high-bandwidth peer.

High-bandwidth peers send new block announcements via a cmpctblock message rather than the usual inv/headers announcements. See BIP 152 for more details.
Blocks-only mode will use legacy relaying instead of BIP152 high-bandwidth mode

Checklist:

I have performed a self-review of my own code
I have commented my code, particularly in hard-to-understand areas (note: N/A)
I have added or updated relevant unit/integration/functional/e2e tests
I have made corresponding changes to the documentation
I have assigned this pull request to a milestone (for repository code-owners and collaborators only)

UdjinM6

LGTM, light ACK

github-actions · 2024-06-10T16:26:29Z

This pull request has conflicts, please rebase.

UdjinM6

utACK 1cbf3b9

PastaPastaPasta

utACK 1cbf3b9

…re verack

…-only mode

…r v1 compact blocks)

continuation of bd934c7 from dash#6034 includes: - 9d6aeca

…th_{to, from} in peer details continuation of 3e8ba24 from dash#5964 includes: - 142807a

knst

utACK 1cbf3b9

Though, these changes - are not breaking changes, should it be excluded from PR description? They require release notes indeed (already done).

The getpeerinfo RPC returns two new boolean fields, bip152_hb_to and bip152_hb_from, that respectively indicate whether we selected a peer to be in compact blocks high-bandwidth mode or whether a peer selected us as a compact blocks high-bandwidth peer.

knst · 2024-06-11T07:30:44Z

test/functional/p2p_compactblocks.py

        test_node.send_and_ping(msg_sendheaders())
        check_announcement_of_new_block(node, test_node, lambda p: "cmpctblock" in p.last_message)

        # Try one more time, after sending a version-1, announce=false message.


nit-20799: missing changes
version=1

kwvg added this to the 21 milestone Jun 9, 2024

kwvg marked this pull request as ready for review June 9, 2024 16:59

kwvg requested review from PastaPastaPasta, UdjinM6 and knst June 9, 2024 16:59

UdjinM6 reviewed Jun 10, 2024

View reviewed changes

github-actions bot added the needs rebase label Jun 10, 2024

kwvg force-pushed the bip152_bps branch from cf05808 to 1cbf3b9 Compare June 10, 2024 16:33

github-actions bot removed the needs rebase label Jun 10, 2024

kwvg requested a review from UdjinM6 June 10, 2024 16:35

UdjinM6 approved these changes Jun 10, 2024

View reviewed changes

PastaPastaPasta approved these changes Jun 10, 2024

View reviewed changes

UdjinM6 added the RPC Some notable changes to RPC params/behaviour/descriptions label Jun 10, 2024

kwvg added 8 commits June 10, 2024 17:31

merge bitcoin#19776: expose high bandwidth mode state via getpeerinfo

799214b

merge bitcoin#20599: Tolerate sendheaders and sendcmpct messages befo…

2ce4818

…re verack

merge bitcoin#22147: p2p: Protect last outbound HB compact block peer

73b8f84

merge bitcoin#22340: Use legacy relaying to download blocks in blocks…

f4ce573

…-only mode

merge bitcoin#20799: Only support version 2 compact blocks

6274a57

merge bitcoin#25147: follow ups to bitcoin#20799 (removing support fo…

06a6f84

…r v1 compact blocks)

merge bitcoin#20764: cli -netinfo peer connections dashboard updates

2390621

continuation of bd934c7 from dash#6034 includes: - 9d6aeca

merge bitcoin-core/gui#206: Display fRelayTxes and bip152_highbandwid…

1cbf3b9

…th_{to, from} in peer details continuation of 3e8ba24 from dash#5964 includes: - 142807a

knst approved these changes Jun 11, 2024

View reviewed changes

PastaPastaPasta merged commit 2f93ee4 into dashpay:develop Jun 11, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

backport: merge bitcoin#19776, #20599, #22147, #22340, #20799, #25147, #20764, bitcoin-core/gui#206 (BIP152 backports) #6048

backport: merge bitcoin#19776, #20599, #22147, #22340, #20799, #25147, #20764, bitcoin-core/gui#206 (BIP152 backports) #6048

Uh oh!

kwvg commented Jun 9, 2024 •

edited

Loading

Uh oh!

UdjinM6 left a comment

Uh oh!

github-actions bot commented Jun 10, 2024

Uh oh!

UdjinM6 left a comment •

edited

Loading

Uh oh!

PastaPastaPasta left a comment

Uh oh!

knst left a comment •

edited

Loading

Uh oh!

knst Jun 11, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

backport: merge bitcoin#19776, #20599, #22147, #22340, #20799, #25147, #20764, bitcoin-core/gui#206 (BIP152 backports) #6048

backport: merge bitcoin#19776, #20599, #22147, #22340, #20799, #25147, #20764, bitcoin-core/gui#206 (BIP152 backports) #6048

Uh oh!

Conversation

kwvg commented Jun 9, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Additional Information

Breaking changes

Checklist:

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Jun 10, 2024

Uh oh!

UdjinM6 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

PastaPastaPasta left a comment

Choose a reason for hiding this comment

Uh oh!

knst left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

knst Jun 11, 2024

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

kwvg commented Jun 9, 2024 •

edited

Loading

UdjinM6 left a comment •

edited

Loading

knst left a comment •

edited

Loading