Network RPCs: getaddednodeinfo, addpeeraddress, getnodedaddresses e getaddrmaninfo. by jaoleal · Pull Request #916 · getfloresta/Floresta

jaoleal · 2026-03-27T15:58:23Z

Description and Notes

These already had the needed subsystems and theyre pretty usefull.

How to verify the changes you have done?

Review the tests and propose exercise extensions whether it applies.

Add getaddednodeinfo RPC that returns information about manually added nodes, including whether each is currently connected. Cross-references added_peers with active peer connections. Includes integration test and Python RPC wrapper.

Add addpeeraddress RPC that manually adds a peer address to the address manager. Accepts address, port, and optional tried parameter. Constructs a LocalAddress with WITNESS|NETWORK_LIMITED services and pushes it to AddressMan. Also adds address_count() helper to AddressMan. Includes integration test and Python RPC wrapper.

Add getnodeaddresses RPC that returns known peer addresses from the address manager. Accepts an optional count parameter and optional network filter (ipv4, ipv6, onion, i2p, cjdns). Includes integration test and Python RPC wrapper.

Add getaddrmaninfo RPC that returns address manager statistics broken down by network type (ipv4, ipv6, cjdns). Each network reports total, new (untried), and tried address counts. Adds get_addrman_info() aggregation method to AddressMan. Includes integration test and Python RPC wrapper.

luisschwab · 2026-03-28T04:02:44Z

Can you add a changelog to the PR description?

Micah-Shallom · 2026-04-03T17:19:57Z

+    pub(crate) async fn get_added_node_info(&self) -> Result<Vec<AddedNodeInfo>> {
+        self.node
+            .get_added_node_info()
+            .await
+            .map_err(|e| JsonRpcError::Node(e.to_string()))
+    }


Hi @jaoleal ..looking at the RPC docs for bitocoin core, https://bitcoincore.org/en/doc/30.0.0/rpc/network/getaddednodeinfo/ the rpc endpoint is meant to take the node address and return info for that address else it returns node information for all nodes...

Micah-Shallom · 2026-04-03T17:22:32Z

+        "getaddednodeinfo" => state
+            .get_added_node_info()
+            .await
+            .map(|v| serde_json::to_value(v).unwrap()),


this should take something like let node = get_optional_field(&params, 0, "node", get_string)?;

Micah-Shallom · 2026-04-03T17:32:42Z

+#[derive(Debug, Clone, Serialize)]
+/// Information about a manually added node (via `addnode`).
+pub struct AddedNodeInfo {
+    /// The address of the added node in "ip:port" format.


as @moisesPompilio raised , we need to have the RPCs as close as possible to the core standard which requires only IP without the port

Micah-Shallom · 2026-04-03T17:53:15Z

+pub struct AddedNodeInfo {
+    /// The address of the added node in "ip:port" format.
+    pub addednode: String,
+    /// Whether we are currently connected to this node.
+    pub connected: bool,
 }


we are missing the addresses response which is meant to return {address, connected, port} (only when connected)

moisesPompilio · 2026-04-10T14:31:07Z

+        self.florestad.rpc.addnode(self.bitcoind.p2p_url, "add", v2transport=False)
+        self.wait_for_peers_connections(self.florestad, self.bitcoind)


f953bc0

Suggested change

self.florestad.rpc.addnode(self.bitcoind.p2p_url, "add", v2transport=False)

self.wait_for_peers_connections(self.florestad, self.bitcoind)

self.connect_nodes(self.florestad, self.bitcoind)

moisesPompilio · 2026-04-10T14:36:17Z

+    /// Returns information about all manually added nodes.
+    pub async fn get_added_node_info(
+        &self,
+    ) -> Result<Vec<AddedNodeInfo>, oneshot::error::RecvError> {


f953bc0

I think it's better to import RecvError and use it directly instead of using a fully-qualified path

moisesPompilio · 2026-04-10T15:06:00Z

+        addresses
+            .into_iter()
+            .filter(|(addr, _, _, _)| match &network {
+                None => true,
+                Some(ReachableNetworks::IPv4) => matches!(addr, AddrV2::Ipv4(_)),
+                Some(ReachableNetworks::IPv6) => matches!(addr, AddrV2::Ipv6(_)),
+                Some(ReachableNetworks::TorV3) => matches!(addr, AddrV2::TorV3(_)),
+                Some(ReachableNetworks::I2P) => matches!(addr, AddrV2::I2p(_)),
+                Some(ReachableNetworks::Cjdns) => matches!(addr, AddrV2::Cjdns(_)),
+            })
+            .take(count)
+            .filter_map(|(addr, time, services, port)| {
+                let (address, network) = match &addr {
+                    AddrV2::Ipv4(ip) => (ip.to_string(), "ipv4"),
+                    AddrV2::Ipv6(ip) => (ip.to_string(), "ipv6"),
+                    AddrV2::Cjdns(ip) => (ip.to_string(), "cjdns"),
+                    AddrV2::TorV3(key) => (hex::encode(key), "onion"),
+                    AddrV2::I2p(key) => (hex::encode(key), "i2p"),
+                    _ => return None,
+                };
+
+                Some(NodeAddress {
+                    time,
+                    services: services.to_u64(),
+                    address,
+                    port,
+                    network: network.to_string(),
+                })
+            })
+            .collect()


7c82897

Wouldn't it be better to use a single filter_map instead of a filter followed by a filter_map?

moisesPompilio · 2026-04-10T15:10:17Z

+
+### Ok Response
+
+A JSON array of address objects:


7c82897

lso missing to include the network, because if the user doesn't choose a type, they need to know which network that address is for

https://bitcoincore.org/en/doc/30.0.0/rpc/network/getnodeaddresses/

moisesPompilio · 2026-04-10T15:12:24Z

+
+    def set_test_params(self):
+        self.florestad = self.add_node_default_args(variant=NodeType.FLORESTAD)
+        self.bitcoind = self.add_node_extra_args(


7c82897

use the add_node_default_args instead add_node_extra_args

moisesPompilio · 2026-04-10T15:13:08Z

+        self.connect_nodes(self.florestad, self.bitcoind, "add", v2transport=False)
+        self.wait_for_peers_connections(self.florestad, self.bitcoind)


7c82897

Suggested change

self.connect_nodes(self.florestad, self.bitcoind, "add", v2transport=False)

self.wait_for_peers_connections(self.florestad, self.bitcoind)

self.connect_nodes(self.florestad, self.bitcoind)

moisesPompilio · 2026-04-10T15:16:43Z

+            extra_args=["-v2transport=0"],
+        )
+
+    def run_test(self):


7c82897

Before connecting to the node, can you test what happens if you make this RPC request when the peer has no node addresses?

moisesPompilio · 2026-04-10T15:45:41Z

+    pub fn get_addrman_info(&self) -> ConnectionStats {
+        let mut stats = ConnectionStats::default();
+
+        for addr in self.addresses.values() {
+            let bucket = match &addr.address {
+                AddrV2::Ipv4(_) => &mut stats.ipv4,
+                AddrV2::Ipv6(_) => &mut stats.ipv6,
+                AddrV2::TorV3(_) => &mut stats.onion,
+                AddrV2::I2p(_) => &mut stats.i2p,
+                AddrV2::Cjdns(_) => &mut stats.cjdns,
+                _ => continue,
+            };
+
+            bucket.total += 1;
+            match addr.state {
+                AddressState::Tried(_) | AddressState::Connected => bucket.tried += 1,
+                _ => bucket.new += 1,
+            }
+        }
+
+        stats
+    }


Suggested change

pub fn get_addrman_info(&self) -> ConnectionStats {

let mut stats = ConnectionStats::default();

for addr in self.addresses.values() {

let bucket = match &addr.address {

AddrV2::Ipv4(_) => &mut stats.ipv4,

AddrV2::Ipv6(_) => &mut stats.ipv6,

AddrV2::TorV3(_) => &mut stats.onion,

AddrV2::I2p(_) => &mut stats.i2p,

AddrV2::Cjdns(_) => &mut stats.cjdns,

_ => continue,

};

bucket.total += 1;

match addr.state {

AddressState::Tried(_) | AddressState::Connected => bucket.tried += 1,

_ => bucket.new += 1,

}

}

stats

}

pub fn get_addrman_info(&self) -> AddrManInfo {

let mut stats = AddrManInfo::default();

for addr in self.addresses.values() {

let bucket = match &addr.address {

AddrV2::Ipv4(_) => &mut stats.ipv4,

AddrV2::Ipv6(_) => &mut stats.ipv6,

AddrV2::TorV3(_) => &mut stats.onion,

AddrV2::I2p(_) => &mut stats.i2p,

AddrV2::Cjdns(_) => &mut stats.cjdns,

_ => continue,

};

bucket.total += 1;

stats.all_networks.total += 1;

match addr.state {

AddressState::Tried(_) | AddressState::Connected => {

bucket.tried += 1;

stats.all_networks.tried += 1;

}

_ => {

bucket.new += 1;

stats.all_networks.new += 1;

}

}

}

stats

}

Consider removing ConnectionStats and using AddrManInfo directly here

Davidson-Souza · 2026-04-13T23:01:23Z

Needs rebase.

jaoleal · 2026-04-14T14:33:55Z

#831 (comment)

jaoleal added 4 commits March 26, 2026 15:56

feat(rpc): implement getaddednodeinfo RPC method

f953bc0

Add getaddednodeinfo RPC that returns information about manually added nodes, including whether each is currently connected. Cross-references added_peers with active peer connections. Includes integration test and Python RPC wrapper.

feat(rpc): implement getnodeaddresses RPC method

7c82897

Add getnodeaddresses RPC that returns known peer addresses from the address manager. Accepts an optional count parameter and optional network filter (ipv4, ipv6, onion, i2p, cjdns). Includes integration test and Python RPC wrapper.

jaoleal force-pushed the rpcsaga_fournetworkrpcs branch from ea030cf to 9f84eb4 Compare March 27, 2026 16:34

moisesPompilio self-requested a review March 27, 2026 17:33

jaoleal mentioned this pull request Apr 2, 2026

rpc: implement getaddednodeinfo #915

Closed

3 tasks

moisesPompilio assigned jaoleal Apr 2, 2026

moisesPompilio added the ecosystem support Enable interoperability, compatibility and practical integration with the broader Bitcoin ecosystem label Apr 2, 2026

Micah-Shallom reviewed Apr 3, 2026

View reviewed changes

Davidson-Souza added this to Floresta Apr 6, 2026

github-project-automation bot moved this to Backlog in Floresta Apr 6, 2026

Davidson-Souza moved this from Backlog to Needs review in Floresta Apr 6, 2026

moisesPompilio reviewed Apr 10, 2026

View reviewed changes

jaoleal marked this pull request as draft April 14, 2026 14:33

		self.florestad.rpc.addnode(self.bitcoind.p2p_url, "add", v2transport=False)
		self.wait_for_peers_connections(self.florestad, self.bitcoind)

	self.florestad.rpc.addnode(self.bitcoind.p2p_url, "add", v2transport=False)
	self.wait_for_peers_connections(self.florestad, self.bitcoind)
	self.connect_nodes(self.florestad, self.bitcoind)

Conversation

jaoleal commented Mar 27, 2026

Description and Notes

How to verify the changes you have done?

Uh oh!

luisschwab commented Mar 28, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Davidson-Souza commented Apr 13, 2026

Uh oh!

jaoleal commented Apr 14, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants