Add hidden RPC `getrawaddrman` #439

deadmanoz · 2025-12-30T03:57:00Z

Add support for the hidden getrawaddrman RPC that returns raw address manager table entries (added v26). This RPC is marked as experimental and hidden from the API docs by default.

The mapped_as and source_mapped_as fields are Option<u32> following the established pattern for version-specific fields (no into.rs required because these are additions rather than removals or changed types). These fields were added in Bitcoin Core v28 and will deserialise as None for earlier versions or when -asmap is not configured.

Note: will have conflicts with #435 and #433, happy to rebase after either merges

deadmanoz · 2025-12-30T04:01:29Z

Ok so I learned that only the public RPCs should be added to the rustdoc table in the vX/mod.rs!

Add support for the hidden getrawaddrman RPC (v26) that returns raw address manager table entries. This RPC is marked as experimental and hidden from the API docs by default. The mapped_as and source_mapped_as fields are Optional<u32> following the established codebase pattern for version-specific fields. These fields were added in Bitcoin Core v28 and will deserialize as None for earlier versions or when -asmap is not configured. Includes integration test.

0xB10C · 2025-12-30T09:03:13Z

types/src/v26/hidden.rs

+/// The key in the parent map is formatted as "bucket/position" indicating the
+/// location in the relevant address manager table.


This key is a bit weird (not in your implementation, but in the Bitcoin Core implement). IIRC, it was done this way, as the key should be seen as Bitcoin Core implementation specific. However, RPC users might want to consume and act on it. I guess probably best to write a parser for it in downstream apps and not here.

Yeah, so I'm not changing anything, the key is just a String like "255/50" as you get from the RPC directly.

0xB10C · 2025-12-30T09:12:37Z

integration_test/tests/hidden.rs

+    node.client.add_peer_address(peer_address, peer_port).expect("addpeeraddress");
+
+    let json: GetRawAddrman = node.client.get_raw_addrman().expect("getrawaddrman");
+
+    let entry = json
+        .new
+        .values()
+        .find(|e| e.address == peer_address && e.port == peer_port)
+        .expect("added peer should appear in the 'new' table");


addpeeraddress supports an additional argument for adding things to the tried table. However that wasn't implemented in #334.

I think for this test it's fine to just test the new table.

0xB10C · 2025-12-30T09:15:40Z

integration_test/tests/hidden.rs

+        .find(|e| e.address == peer_address && e.port == peer_port)
+        .expect("added peer should appear in the 'new' table");
+
+    assert_eq!(entry.network, "ipv4");


Suggested change

assert_eq!(entry.network, "ipv4");

assert_eq!(entry.network, "ipv4");

assert!(entry.services > 0);

assert!(entry.time > 0);

I don't recall what source is set to when using addpeeraddress, but maybe that can be checked as well.

0xB10C · 2025-12-30T09:17:03Z

integration_test/tests/hidden.rs

+    assert_eq!(entry.network, "ipv4");
+
+    // mapped_as field added in v28, only present with -asmap config.
+    assert!(entry.mapped_as.is_none(), "mapped_as requires -asmap config");


Suggested change

assert!(entry.mapped_as.is_none(), "mapped_as requires -asmap config");

assert!(entry.mapped_as.is_none(), "mapped_as requires -asmap config");

assert!(entry.source_mapped_as.is_none(), "mapped_as requires -asmap config");

This might break once/if asmap get's included and enabled by default. But that's probably a few versions out.

0xB10C · 2025-12-30T09:19:52Z

Looks good to me!

https://github.com/0xB10C/addrman-observer still uses a custom rust-bitcoincore-rpc getrawaddrman implementation. Would be nice to replace that with this PR! I might do this to test this PR.

deadmanoz · 2025-12-30T09:20:57Z

Looks good to me!

https://github.com/0xB10C/addrman-observer still uses a custom rust-bitcoincore-rpc getrawaddrman implementation. Would be nice to replace that with this PR! I might do this to test this PR.

I was going to propagate the change once all good here, but go for it!

tcharding · 2025-12-31T00:07:37Z

types/src/v26/hidden.rs

+/// Field order matches Bitcoin Core's RPC response definition.
+#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
+#[cfg_attr(feature = "serde-deny-unknown-fields", serde(deny_unknown_fields))]
+pub struct RawAddrmanEntry {


Suggested change

pub struct RawAddrmanEntry {

pub struct RawAddrManEntry {

And same everywhere else that rawaddrman is converted to a Rust type.

tcharding · 2025-12-31T00:11:04Z

types/src/v26/hidden.rs

+    /// Mapped AS (Autonomous System) number at the end of the BGP route to the peer.
+    /// Only present if the -asmap config option is set.
+    /// Added in Bitcoin Core v28.
+    pub mapped_as: Option<u32>,


Thanks for working on this and props for getting as far as you did in this convoluted repo. The version specific types are designed to be exactly correct for the version i.e., v26::RawAddrManEntry should be exactly the shape returned by Core v26. This means no optional fields. Rather anytime a new field is added a new version of the struct is added, so we should have a v28::RawAddrMan (and v28::RawAddrManEntry).

(If there was an associated struct in model, where there is not in this case, it would use optional fields because the model types are version in-specific.)

FTR looks like you have the client stuff correct, because the v28 changes do not effect the client so the v26 client macro works just fine. I mentioned that this repo was convoluted, right?

tcharding · 2025-12-31T00:14:19Z

Everything else looks good. Reviewed: bafede8

github-actions bot added C-client C-integration-test C-types labels Dec 30, 2025

deadmanoz mentioned this pull request Dec 30, 2025

Implement hidden (test-only) RPC calls #333

Open

12 tasks

deadmanoz mentioned this pull request Dec 30, 2025

rpc-extractor: add more RPCs (uptime, getmemoryinfo, ...) peer-observer/peer-observer#199

Open

11 tasks

deadmanoz force-pushed the implement-getrawaddrman branch from bd26946 to bafede8 Compare December 30, 2025 04:14

0xB10C reviewed Dec 30, 2025

View reviewed changes

tcharding reviewed Dec 31, 2025

View reviewed changes

		/// The key in the parent map is formatted as "bucket/position" indicating the
		/// location in the relevant address manager table.

	assert!(entry.mapped_as.is_none(), "mapped_as requires -asmap config");
	assert!(entry.mapped_as.is_none(), "mapped_as requires -asmap config");
	assert!(entry.source_mapped_as.is_none(), "mapped_as requires -asmap config");

Add hidden RPC getrawaddrman #439

Are you sure you want to change the base?

Add hidden RPC getrawaddrman #439

Uh oh!

Conversation

deadmanoz commented Dec 30, 2025

Uh oh!

deadmanoz commented Dec 30, 2025

Uh oh!

0xB10C Dec 30, 2025

Choose a reason for hiding this comment

Uh oh!

deadmanoz Dec 30, 2025

Choose a reason for hiding this comment

Uh oh!

0xB10C Dec 30, 2025

Choose a reason for hiding this comment

Uh oh!

0xB10C Dec 30, 2025

Choose a reason for hiding this comment

Uh oh!

0xB10C Dec 30, 2025

Choose a reason for hiding this comment

Uh oh!

0xB10C commented Dec 30, 2025

Uh oh!

deadmanoz commented Dec 30, 2025

Uh oh!

tcharding Dec 31, 2025

Choose a reason for hiding this comment

Uh oh!

tcharding Dec 31, 2025

Choose a reason for hiding this comment

Uh oh!

tcharding Dec 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tcharding commented Dec 31, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Add hidden RPC `getrawaddrman` #439

Add hidden RPC `getrawaddrman` #439

tcharding Dec 31, 2025 •

edited

Loading