backport: merge bitcoin#19572, #20953, #20523, #21008, #21310, #22079, #23471, #24218 (zmq backports) #6231
Conversation
| UnregisterValidationInterface(g_zmq_notification_interface); | ||
| delete g_zmq_notification_interface; | ||
| g_zmq_notification_interface = nullptr; | ||
| UnregisterValidationInterface(g_zmq_notification_interface.get()); |
There was a problem hiding this comment.
ecea54c: shouldn't it be named partial merge bitcoin#27125: ...?
There was a problem hiding this comment.
I was planning to make changes of this nature anyway (see a5f9110 for a similar change to pdsNotificationInterface, will be part of a PR dedicated to misc. changes) and the change isn't strictly speaking essential for the functionality of the backports in this PR nor is the change something that doesn't serve value standalone (as opposed to being a part of a larger backport valuable in this immediate PR).
Added attribution in commit comment.
test/functional/interface_zmq.py
Outdated
| label = chr(body[32]) | ||
| mempool_sequence = None if len(body) != 32+1+8 else struct.unpack("<Q", body[32+1:])[0] | ||
| if mempool_sequence is not None: | ||
| assert label == "A" |
There was a problem hiding this comment.
19572: we could probably add some tests for R in interface_zmq_dash.py by "replacing" old txes via islock-ed ones
There was a problem hiding this comment.
I've reintroduced most of the R-specific logic and added a TODO suggesting that such tests may be added in the future. Thoughts?
… mempool tracking
Additional Information
bitcoin#19572 introduces tests in
interface_zmq.pythat validate newly introduced "sequence" reporting of all message types (C,D,RandA). TheRmessage type (removed from mempool) is tested by leveraging the RBF mechanism, which isn't present in Dash.In order to allow the tests to successfully pass, all fee bumping and RBF-specific code had to be removed from the tests. This test also involves creating a new block to test the
Cmessage (connected block) that would return atime-too-newerror and fail unless mocktime has been disabled (which has been done in this test).When backporting bitcoin#18309 (dash#5728), Dash-specific ZMQ notifications did not have those changes applied to them and that particular backport was merged upstream after bitcoin#19572, meaning, for completion, the changes from bitcoin#18309 have been integrated into bitcoin#19572's backport.
As for the Dash-specific notifications, they have been covered to ensure uniformity in a separate commit.
The ZMQ notification interface has been converted to a smart pointer in the interest of safety (this change is eventually done upstream in 8ed4ff8 (bitcoin#27125))
Breaking Changes
None expected.
Checklist: