Skip to content

Commit 05d19fb

Browse files
dhruvPieter Wuille
authored and
sipa
committed
test: Functional test for opportunistic encryption
Co-authored-by: Pieter Wuille <bitcoin-dev@wuille.net>
1 parent b815cce commit 05d19fb

File tree

3 files changed

+121
-13
lines changed

3 files changed

+121
-13
lines changed

‎src/net.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1552,6 +1552,10 @@ void V2Transport::MarkBytesSent(size_t bytes_sent) noexcept
15521552
LOCK(m_send_mutex);
15531553
if (m_send_state == SendState::V1) return m_v1_fallback.MarkBytesSent(bytes_sent);
15541554

1555+
if (m_send_state == SendState::AWAITING_KEY && m_send_pos == 0 && bytes_sent > 0) {
1556+
LogPrint(BCLog::NET, "start sending v2 handshake to peer=%d\n", m_nodeid);
1557+
}
1558+
15551559
m_send_pos += bytes_sent;
15561560
Assume(m_send_pos <= m_send_buffer.size());
15571561
if (m_send_pos >= CMessageHeader::HEADER_SIZE) {

‎test/functional/p2p_v2_transport.py

Lines changed: 104 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,116 @@
1212

1313
class V2TransportTest(BitcoinTestFramework):
1414
def set_test_params(self):
15-
self.setup_clean_chain=True
16-
self.num_nodes = 1
17-
self.extra_args = [["-v2transport=0"]]
15+
self.setup_clean_chain = True
16+
self.num_nodes = 5
17+
self.extra_args = [["-v2transport=1"], ["-v2transport=1"], ["-v2transport=0"], ["-v2transport=0"], ["-v2transport=0"]]
1818

1919
def run_test(self):
20-
network_info = self.nodes[0].getnetworkinfo()
20+
sending_handshake = "start sending v2 handshake to peer"
21+
downgrading_to_v1 = "retrying with v1 transport protocol for peer"
22+
self.disconnect_nodes(0, 1)
23+
self.disconnect_nodes(1, 2)
24+
self.disconnect_nodes(2, 3)
25+
self.disconnect_nodes(3, 4)
26+
27+
# verify local services
28+
network_info = self.nodes[2].getnetworkinfo()
2129
assert_equal(int(network_info["localservices"], 16) & NODE_P2P_V2, 0)
2230
assert "P2P_V2" not in network_info["localservicesnames"]
23-
24-
self.restart_node(0, ["-v2transport=1"])
25-
network_info = self.nodes[0].getnetworkinfo()
31+
network_info = self.nodes[1].getnetworkinfo()
2632
assert_equal(int(network_info["localservices"], 16) & NODE_P2P_V2, NODE_P2P_V2)
2733
assert "P2P_V2" in network_info["localservicesnames"]
2834

35+
# V2 nodes can sync with V2 nodes
36+
assert_equal(self.nodes[0].getblockcount(), 0)
37+
assert_equal(self.nodes[1].getblockcount(), 0)
38+
with self.nodes[0].assert_debug_log(expected_msgs=[sending_handshake],
39+
unexpected_msgs=[downgrading_to_v1]):
40+
self.connect_nodes(0, 1, peer_advertises_v2=True)
41+
self.generate(self.nodes[0], 5, sync_fun=lambda: self.sync_all(self.nodes[0:2]))
42+
assert_equal(self.nodes[1].getblockcount(), 5)
43+
# verify there is a v2 connection between node 0 and 1
44+
node_0_info = self.nodes[0].getpeerinfo()
45+
node_1_info = self.nodes[0].getpeerinfo()
46+
assert_equal(len(node_0_info), 1)
47+
assert_equal(len(node_1_info), 1)
48+
assert_equal(node_0_info[0]["transport_protocol_type"], "v2")
49+
assert_equal(node_1_info[0]["transport_protocol_type"], "v2")
50+
assert_equal(len(node_0_info[0]["session_id"]), 64)
51+
assert_equal(len(node_1_info[0]["session_id"]), 64)
52+
assert_equal(node_0_info[0]["session_id"], node_1_info[0]["session_id"])
53+
54+
# V1 nodes can sync with each other
55+
assert_equal(self.nodes[2].getblockcount(), 0)
56+
assert_equal(self.nodes[3].getblockcount(), 0)
57+
with self.nodes[2].assert_debug_log(expected_msgs=[],
58+
unexpected_msgs=[sending_handshake, downgrading_to_v1]):
59+
self.connect_nodes(2, 3, peer_advertises_v2=False)
60+
self.generate(self.nodes[2], 8, sync_fun=lambda: self.sync_all(self.nodes[2:4]))
61+
assert_equal(self.nodes[3].getblockcount(), 8)
62+
assert self.nodes[0].getbestblockhash() != self.nodes[2].getbestblockhash()
63+
# verify there is a v1 connection between node 2 and 3
64+
node_2_info = self.nodes[2].getpeerinfo()
65+
node_3_info = self.nodes[3].getpeerinfo()
66+
assert_equal(len(node_2_info), 1)
67+
assert_equal(len(node_3_info), 1)
68+
assert_equal(node_2_info[0]["transport_protocol_type"], "v1")
69+
assert_equal(node_3_info[0]["transport_protocol_type"], "v1")
70+
assert_equal(len(node_2_info[0]["session_id"]), 0)
71+
assert_equal(len(node_3_info[0]["session_id"]), 0)
72+
73+
# V1 nodes can sync with V2 nodes
74+
self.disconnect_nodes(0, 1)
75+
self.disconnect_nodes(2, 3)
76+
with self.nodes[2].assert_debug_log(expected_msgs=[],
77+
unexpected_msgs=[sending_handshake, downgrading_to_v1]):
78+
self.connect_nodes(2, 1, peer_advertises_v2=False) # cannot enable v2 on v1 node
79+
self.sync_all(self.nodes[1:3])
80+
assert_equal(self.nodes[1].getblockcount(), 8)
81+
assert self.nodes[0].getbestblockhash() != self.nodes[1].getbestblockhash()
82+
# verify there is a v1 connection between node 1 and 2
83+
node_1_info = self.nodes[1].getpeerinfo()
84+
node_2_info = self.nodes[2].getpeerinfo()
85+
assert_equal(len(node_1_info), 1)
86+
assert_equal(len(node_2_info), 1)
87+
assert_equal(node_1_info[0]["transport_protocol_type"], "v1")
88+
assert_equal(node_2_info[0]["transport_protocol_type"], "v1")
89+
assert_equal(len(node_1_info[0]["session_id"]), 0)
90+
assert_equal(len(node_2_info[0]["session_id"]), 0)
91+
92+
# V2 nodes can sync with V1 nodes
93+
self.disconnect_nodes(1, 2)
94+
with self.nodes[0].assert_debug_log(expected_msgs=[],
95+
unexpected_msgs=[sending_handshake, downgrading_to_v1]):
96+
self.connect_nodes(0, 3, peer_advertises_v2=False)
97+
self.sync_all([self.nodes[0], self.nodes[3]])
98+
assert_equal(self.nodes[0].getblockcount(), 8)
99+
# verify there is a v1 connection between node 0 and 3
100+
node_0_info = self.nodes[0].getpeerinfo()
101+
node_3_info = self.nodes[3].getpeerinfo()
102+
assert_equal(len(node_0_info), 1)
103+
assert_equal(len(node_3_info), 1)
104+
assert_equal(node_0_info[0]["transport_protocol_type"], "v1")
105+
assert_equal(node_3_info[0]["transport_protocol_type"], "v1")
106+
assert_equal(len(node_0_info[0]["session_id"]), 0)
107+
assert_equal(len(node_3_info[0]["session_id"]), 0)
108+
109+
# V2 node mines another block and everyone gets it
110+
self.connect_nodes(0, 1, peer_advertises_v2=True)
111+
self.connect_nodes(1, 2, peer_advertises_v2=False)
112+
self.generate(self.nodes[1], 1, sync_fun=lambda: self.sync_all(self.nodes[0:4]))
113+
assert_equal(self.nodes[0].getblockcount(), 9) # sync_all() verifies tip hashes match
114+
115+
# V1 node mines another block and everyone gets it
116+
self.generate(self.nodes[3], 2, sync_fun=lambda: self.sync_all(self.nodes[0:4]))
117+
assert_equal(self.nodes[2].getblockcount(), 11) # sync_all() verifies tip hashes match
118+
119+
assert_equal(self.nodes[4].getblockcount(), 0)
120+
# Peer 4 is v1 p2p, but is falsely advertised as v2.
121+
with self.nodes[1].assert_debug_log(expected_msgs=[sending_handshake, downgrading_to_v1]):
122+
self.connect_nodes(1, 4, peer_advertises_v2=True)
123+
self.sync_all()
124+
assert_equal(self.nodes[4].getblockcount(), 11)
125+
29126
if __name__ == '__main__':
30127
V2TransportTest().main()

‎test/functional/test_framework/test_framework.py

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -581,26 +581,33 @@ def restart_node(self, i, extra_args=None):
581581
def wait_for_node_exit(self, i, timeout):
582582
self.nodes[i].process.wait(timeout)
583583

584-
def connect_nodes(self, a, b):
584+
def connect_nodes(self, a, b, *, peer_advertises_v2=False):
585585
from_connection = self.nodes[a]
586586
to_connection = self.nodes[b]
587587
from_num_peers = 1 + len(from_connection.getpeerinfo())
588588
to_num_peers = 1 + len(to_connection.getpeerinfo())
589589
ip_port = "127.0.0.1:" + str(p2p_port(b))
590-
from_connection.addnode(ip_port, "onetry")
590+
591+
if peer_advertises_v2:
592+
from_connection.addnode(node=ip_port, command="onetry", v2transport=True)
593+
else:
594+
# skip the optional third argument (default false) for
595+
# compatibility with older clients
596+
from_connection.addnode(ip_port, "onetry")
597+
591598
# poll until version handshake complete to avoid race conditions
592599
# with transaction relaying
593600
# See comments in net_processing:
594601
# * Must have a version message before anything else
595602
# * Must have a verack message before anything else
596603
self.wait_until(lambda: sum(peer['version'] != 0 for peer in from_connection.getpeerinfo()) == from_num_peers)
597604
self.wait_until(lambda: sum(peer['version'] != 0 for peer in to_connection.getpeerinfo()) == to_num_peers)
598-
self.wait_until(lambda: sum(peer['bytesrecv_per_msg'].pop('verack', 0) == 24 for peer in from_connection.getpeerinfo()) == from_num_peers)
599-
self.wait_until(lambda: sum(peer['bytesrecv_per_msg'].pop('verack', 0) == 24 for peer in to_connection.getpeerinfo()) == to_num_peers)
605+
self.wait_until(lambda: sum(peer['bytesrecv_per_msg'].pop('verack', 0) >= 21 for peer in from_connection.getpeerinfo()) == from_num_peers)
606+
self.wait_until(lambda: sum(peer['bytesrecv_per_msg'].pop('verack', 0) >= 21 for peer in to_connection.getpeerinfo()) == to_num_peers)
600607
# The message bytes are counted before processing the message, so make
601608
# sure it was fully processed by waiting for a ping.
602-
self.wait_until(lambda: sum(peer["bytesrecv_per_msg"].pop("pong", 0) >= 32 for peer in from_connection.getpeerinfo()) == from_num_peers)
603-
self.wait_until(lambda: sum(peer["bytesrecv_per_msg"].pop("pong", 0) >= 32 for peer in to_connection.getpeerinfo()) == to_num_peers)
609+
self.wait_until(lambda: sum(peer["bytesrecv_per_msg"].pop("pong", 0) >= 29 for peer in from_connection.getpeerinfo()) == from_num_peers)
610+
self.wait_until(lambda: sum(peer["bytesrecv_per_msg"].pop("pong", 0) >= 29 for peer in to_connection.getpeerinfo()) == to_num_peers)
604611

605612
def disconnect_nodes(self, a, b):
606613
def disconnect_nodes_helper(node_a, node_b):

0 commit comments

Comments
 (0)