p2p, rpc: Manual block-relay-only connections with addnode #24170
There are no files selected for viewing
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| RPC | ||
| --- | ||
|
|
||
| - The RPC `addnode` and the `-addnode` bitcoind startup option now | ||
| optionally support adding manual peers that are block-relay-only. | ||
| On these connections, the node doesn't participate in transaction or | ||
| address relay. See bitcoind and RPC help documentation for parameter | ||
| semantics. (#24170) |
This file contains 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
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -93,14 +93,6 @@ static const size_t DEFAULT_MAXSENDBUFFER = 1 * 1000; | |
|
|
||
| typedef int64_t NodeId; | ||
|
|
||
| class CNodeStats; | ||
| class CClientUIInterface; | ||
|
|
||
|
|
@@ -124,6 +116,18 @@ struct CSerializedNetMsg { | |
| std::string m_type; | ||
| }; | ||
|
|
||
| struct AddedNodeParams { | ||
| std::string m_node_address; | ||
| ConnectionType m_conn_type; | ||
| }; | ||
|
|
||
| struct AddedNodeInfo { | ||
| AddedNodeParams m_params; | ||
| CService resolvedAddress; | ||
|
There was a problem hiding this comment. What would be the difference between There was a problem hiding this comment.
|
||
| bool fConnected; | ||
| bool fInbound; | ||
| }; | ||
|
|
||
| /** | ||
| * Look up IP addresses from all interfaces on the machine and add them to the | ||
| * list of local addresses to self-advertise. | ||
|
|
@@ -440,15 +444,16 @@ class CNode | |
| mapSendBytesPerMsgType[msg_type] += sent_bytes; | ||
| } | ||
|
|
||
| bool IsAutomaticOutboundOrBlockRelayConn() const { | ||
| switch (m_conn_type) { | ||
| case ConnectionType::OUTBOUND_FULL_RELAY: | ||
| case ConnectionType::AUTOMATIC_BLOCK_RELAY: | ||
| return true; | ||
| case ConnectionType::INBOUND: | ||
| case ConnectionType::MANUAL: | ||
| case ConnectionType::ADDR_FETCH: | ||
| case ConnectionType::FEELER: | ||
| case ConnectionType::MANUAL_BLOCK_RELAY: | ||
| return false; | ||
|
Comment on lines
+456
to
457
There was a problem hiding this comment. I might be confused, but why don't we wanna consider There was a problem hiding this comment. It's used in |
||
| } // no default case, so the compiler can warn about missing cases | ||
|
|
||
|
|
@@ -463,8 +468,8 @@ class CNode | |
| return m_conn_type == ConnectionType::MANUAL; | ||
| } | ||
|
|
||
| bool IsAutomaticBlockRelayConn() const { | ||
| return m_conn_type == ConnectionType::AUTOMATIC_BLOCK_RELAY; | ||
| } | ||
|
|
||
| bool IsFeelerConn() const { | ||
|
|
@@ -479,14 +484,25 @@ class CNode | |
| return m_conn_type == ConnectionType::INBOUND; | ||
| } | ||
|
|
||
| bool IsManualBlockRelayConn() const | ||
jnewbery marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| { | ||
| return m_conn_type == ConnectionType::MANUAL_BLOCK_RELAY; | ||
| } | ||
|
|
||
| bool IsBlockRelayConn() const | ||
| { | ||
| return IsAutomaticBlockRelayConn() || IsManualBlockRelayConn(); | ||
| } | ||
|
|
||
| bool ExpectServicesFromConn() const { | ||
| switch (m_conn_type) { | ||
| case ConnectionType::INBOUND: | ||
| case ConnectionType::MANUAL: | ||
| case ConnectionType::MANUAL_BLOCK_RELAY: | ||
| case ConnectionType::FEELER: | ||
| return false; | ||
| case ConnectionType::OUTBOUND_FULL_RELAY: | ||
| case ConnectionType::AUTOMATIC_BLOCK_RELAY: | ||
| case ConnectionType::ADDR_FETCH: | ||
| return true; | ||
| } // no default case, so the compiler can warn about missing cases | ||
|
|
@@ -719,7 +735,7 @@ class CConnman | |
| bool bind_on_any; | ||
| bool m_use_addrman_outgoing = true; | ||
| std::vector<std::string> m_specified_outgoing; | ||
| std::vector<AddedNodeParams> m_added_nodes; | ||
| bool m_i2p_accept_incoming; | ||
| }; | ||
|
|
||
|
|
@@ -832,15 +848,15 @@ class CConnman | |
| // Count the number of block-relay-only peers we have over our limit. | ||
| int GetExtraBlockRelayCount() const; | ||
|
|
||
| bool AddNode(const std::string& node, ConnectionType conn_type) EXCLUSIVE_LOCKS_REQUIRED(!m_added_nodes_mutex); | ||
| bool RemoveAddedNode(const std::string& node) EXCLUSIVE_LOCKS_REQUIRED(!m_added_nodes_mutex); | ||
| std::vector<AddedNodeInfo> GetAddedNodeInfo() const EXCLUSIVE_LOCKS_REQUIRED(!m_added_nodes_mutex); | ||
|
|
||
| /** | ||
| * Attempts to open a connection. Currently only used from tests. | ||
| * | ||
| * @param[in] address Address of node to try connecting to | ||
| * @param[in] conn_type ConnectionType::OUTBOUND, ConnectionType::AUTOMATIC_BLOCK_RELAY, | ||
| * ConnectionType::ADDR_FETCH or ConnectionType::FEELER | ||
| * @return bool Returns false if there are no available | ||
| * slots for this connection: | ||
|
|
@@ -1004,9 +1020,9 @@ class CConnman | |
| std::unordered_set<Network> GetReachableEmptyNetworks() const; | ||
|
|
||
| /** | ||
| * Return vector of current AUTOMATIC_BLOCK_RELAY peers. | ||
| */ | ||
| std::vector<CAddress> GetCurrentAutomaticBlockRelayConns() const; | ||
|
|
||
| // Whether the node should be passed out in ForEach* callbacks | ||
| static bool NodeFullyConnected(const CNode* pnode); | ||
|
|
@@ -1038,7 +1054,7 @@ class CConnman | |
| const NetGroupManager& m_netgroupman; | ||
| std::deque<std::string> m_addr_fetches GUARDED_BY(m_addr_fetches_mutex); | ||
| Mutex m_addr_fetches_mutex; | ||
| std::vector<AddedNodeParams> m_added_nodes GUARDED_BY(m_added_nodes_mutex); | ||
| mutable Mutex m_added_nodes_mutex; | ||
| std::vector<CNode*> m_nodes GUARDED_BY(m_nodes_mutex); | ||
| std::list<CNode*> m_nodes_disconnected; | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Prefer
=blocksonlyto be clearer and match the existing-blocksonlyoption.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
-blocksonlymode is different from block relay peers.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How so? Maybe it needs better docs on the difference...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here you go: https://bitcoin.stackexchange.com/questions/112828/what-is-a-block-relay-only-connection-what-is-it-used-for
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That doesn't contrast.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some differences:
fRelay) and will disconnect if that is breached, but it may in special cases send out transactions itself (if submitted via RPC). We'll never send a tx over a block-relay-only connection.