Restore test case for p2p transaction blinding #19649
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
instagibbs
force-pushed
the
p2p_segwit_reject
branch
from
f2da6bf to
0fea6ed
Compare
Contributor
|
ACK 0fea6ed However, while we're at it, maybe also check that announcing the stuffed tx3 via wtxid does blind the node to the wtxid? I don't think --- a/test/functional/p2p_segwit.py
+++ b/test/functional/p2p_segwit.py
@@ -174,6 +174,9 @@ class TestP2PConn(P2PInterface):
self.last_wtxidrelay.append(message)
def announce_tx_and_wait_for_getdata(self, tx, timeout=60, success=True, use_wtxid=False):
+ if success:
+ # sanity check
+ assert (self.wtxidrelay and use_wtxid) or (not self.wtxidrelay and not use_wtxid)
with mininode_lock:
self.last_message.pop("getdata", None)
if use_wtxid:
@@ -259,6 +262,8 @@ class SegWitTest(BitcoinTestFramework):
self.old_node = self.nodes[0].add_p2p_connection(TestP2PConn(), services=NODE_NETWORK)
# self.std_node is for testing node1 (fRequireStandard=true)
self.std_node = self.nodes[1].add_p2p_connection(TestP2PConn(), services=NODE_NETWORK | NODE_WITNESS)
+ # self.std_wtx_node is for testing node1 with wtxid relay
+ self.std_wtx_node = self.nodes[1].add_p2p_connection(TestP2PConn(wtxidrelay=True), services=NODE_NETWORK | NODE_WITNESS)
assert self.test_node.nServices & NODE_WITNESS != 0
@@ -1320,10 +1325,13 @@ class SegWitTest(BitcoinTestFramework):
tx3.rehash()
# Node will not be blinded to the transaction, requesting it any number of times
- # since it is being announced via txid relay.
+ # if it is being announced via txid relay.
+ # Node will be blinded to the transaction via wtxid, however.
self.std_node.announce_tx_and_wait_for_getdata(tx3)
+ self.std_wtx_node.announce_tx_and_wait_for_getdata(tx3, use_wtxid=True)
test_transaction_acceptance(self.nodes[1], self.std_node, tx3, True, False, 'tx-size')
self.std_node.announce_tx_and_wait_for_getdata(tx3)
+ self.std_wtx_node.announce_tx_and_wait_for_getdata(tx3, use_wtxid=True, success=False)
# Remove witness stuffing, instead add extra witness push on stack
tx3.vout[0] = CTxOut(tx2.vout[0].nValue - 1000, CScript([OP_TRUE, OP_DROP] * 15 + [OP_TRUE])) |
h/t Anthony Towns
Member
Author
|
@ajtowns looks good, may as well get this in now, confirmed it's not already(intentionally) tested for |
Member
Author
|
@sdaftuar you may be interested |
Member
|
Concept ACK, thanks for paying attention here. |
Contributor
|
tACK 566aada |
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
Aug 9, 2020
566aada Test that wtxid relay peers add wtxid to reject filter (Gregory Sanders) 0fea6ed Restore test case for p2p transaction blinding (Gregory Sanders) Pull request description: Introduced in ca10a03 then erroneously removed in 8d8099e. The restored line is how we are checking that the node will still re-request a specific txid given a witness-related failure. ACKs for top commit: fjahr: tACK 566aada Tree-SHA512: be2b75b5eddb88019b79cc798f9922ca7347ccbb2210b8d4eae93fdde62e2cbb614b5247cb2fbd7ee3577dbe053875a9b62c5747aace8617f12790b8fccdeab4
jnewbery
reviewed
Apr 29, 2021
| self.std_wtx_node.announce_tx_and_wait_for_getdata(tx3, use_wtxid=True) | ||
| test_transaction_acceptance(self.nodes[1], self.std_node, tx3, True, False, 'tx-size') | ||
| self.std_node.announce_tx_and_wait_for_getdata(tx3) | ||
| self.std_wtx_node.announce_tx_and_wait_for_getdata(tx3, use_wtxid=True, success=False) |
Contributor
There was a problem hiding this comment.
This results in a sleep(60) since the timeout defaults to 60. We don't need to wait that long to verify that the inv doesn't result in a getdata.
Fixed in #21804
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Introduced in ca10a03 then erroneously removed in 8d8099e. The restored line is how we are
checking that the node will still re-request a specific txid given a witness-related failure.