Finish off support for Bitcoin Core v31.0 by satsfy · Pull Request #615 · rust-bitcoin/corepc

satsfy · 2026-05-29T22:48:48Z

Closes #599

Completes v31 support across the client, types, and integration tests. Makes v31 the default version.

set v31 as the latest version and re-export the v31 types.
enabled the v31 integration tests.
Dropped the incorrect "fields changed" doc notes on several v31 types.

Fixed:

getpeerinfo (network): added inv_to_send and last_inv_sequence, and made startingheight optional now that it is only returned under -deprecatedrpc=startingheight.
logging (control): added the new kernel and privatebroadcast categories.
getwalletinfo (wallet): no longer returns paytxfee.
getdeploymentinfo (blockchain): added the script_flags field.
gettxspendingprevout (blockchain): fixed the result type to carry the new spendingtx and blockhash fields, plus added support for the new mempool_only and return_spending_tx arguments.
getblock (blockchain): added the coinbase_tx object returned at verbosity 1, 2 and 3.

Added:

cluster mempool (blockchain): new getmempoolcluster and getmempoolfeeratediagram RPCs, the chunk_weight and chunk_fee fields on getmempoolentry, getrawmempool, getmempoolancestors and getmempooldescendants, and the cluster_limit and optimal fields on getmempoolinfo.
private broadcast (raw transactions): new getprivatebroadcastinfo and abortprivatebroadcast RPCs.

LLM usage: Claude helped on generating tests for new RPCs, verifying things over and over again, attempting to call every RPC, spotting additional unfixed things, and reviewing every change the PR.

When appropriate, comments have been checked to match v31 documentation exactly.

Converted to enum the type of fields "connection_type" and "transport_protocol_type" to match Bitcoin Core docs.

New fields kernel and privatebroadcast.

RPC getwalletinfo no longer returns paytxfee

Add getmempoolcluster and getmempoolfeeratediagram RPCs. Update getmempoolentry, getrawmempool, getmempoolancestors, getmempooldescendants and getmempoolinfo with new field chunk_weight, chunk_fee and cluster_limit fields. Back-fill optional fields as None for earlier versions.

RPC getdeploymentinfo gets script_flags field. This commit adds an Enum with the possible flags.

RPC gettxspendingprevout adds spending_tx and block_hash fields when return_spending_tx is set.

RPC getblock gets new field coinbase_tx. Commit backfills None for earlier versions.

Deny unknown fields. Use i64 for peer timestamps because time can be emmited as a negative.

getblockfrompeer, disconnectnode, getnetworkinfo, getblocktemplate and waitfornewblock each carried a a note that said the fields since v30, but their modelled return types match v30.

Despite getmempoolfeeratediagram being a new RPC, it is hidden. It is not included in the rustdoc method table. Remove SetTxFee import because the RPC has been deleted but the re-export had been kept.

satsfy · 2026-06-01T17:43:39Z

Latest force push uses enums for getpeerinfo types, maintaining full v31 docs in corepc (before, it simply discarded relevant messages from Bitcoin Core documentation).

EDIT: below i retriggered CI

Drop the v30_and_below gates from tests covering RPCs unchanged in v31.

tcharding · 2026-06-01T23:35:56Z

-    /// Minimum fee rate in BTC/kB for a transaction to be accepted.
+    /// Minimum fee rate in BTC/kvB for a transaction to be accepted.


This change shouldn't be in here because we should not be mentioning the rate in model because the FeeRate abstracts this. Can you either just remove this change or throw an additional patch at the front that removes these sorts of docs everywhere in model.

Related: #60

tcharding · 2026-06-01T23:38:19Z

+            limit_cluster_count: None,
+            limit_cluster_size: None,
+            optimal: None,


While not technically wrong, I'm a bit anal about code cleanlyness. Can these go down in the correct order pls?

Same for all the places you add foo: None pls.

tcharding · 2026-06-01T23:41:49Z

+        match self {
+            Self::Base(e) => write!(f, "conversion of the `base` field failed: {}", e),


In this (and rust-bitcoin) repos we use the style of matching on *self and then pattern matching on (ref e). The reason is its just a bit more explicit to what the compiler would otherwise do for us. It was a style choice made a long time ago, to favour explicit over implicit.

tcharding · 2026-06-01T23:43:15Z

+            Self::Numeric(e) => write!(f, "numeric: {}", e),
+            Self::Wtxid(e) => write!(f, "conversion of the `wtxid` field failed: {}", e),
+            Self::Fees(e) => write!(f, "conversion of the `fees` field failed: {}", e),
+            Self::Depends(e) => write!(f, "conversion of the `depends` field failed: {}", e),
+            Self::SpentBy(e) => write!(f, "conversion of the `spentby` field failed: {}", e),


These should be using write_err like we do elsewhere.

tcharding · 2026-06-01T23:46:53Z

+
+/// Error when converting a `MempoolEntry` type into the model type.
+#[derive(Debug)]
+pub enum MempoolEntryError {


All these error types go in a separate file called error.rs.

tcharding · 2026-06-01T23:50:48Z

-    /// Transactions in this chunk in mining order (txids).
+    /// Transactions in this chunk in mining order.


Why this change?

In Bitcoin Core, it looks like this

RPCResult{RPCResult::Type::ARR, "txs", "transactions in this chunk in mining order", {RPCResult{RPCResult::Type::STR_HEX, "txid", "transaction

And in the docs

"txs" : [ (json array) transactions in this chunk in mining order "hex", (string) transaction id ... ]

There is no (txids). Whenever this kind of conflict happens (knowing that our existing docs have errors sometimes) I took no chances and copied exactly what core said to prevent drift. I thought this would be the way to go because we will have codegen types which effortlessly copy precisely the same docs as core.

Yep nice, spot on. Thanks

tcharding · 2026-06-01T23:52:13Z

Looks pretty good man. To create all the new types you just copied the one from the latest version and added the fields, right? I.e for MempoolEntry you copied the one from v24, right?

tcharding · 2026-06-01T23:52:28Z

Reviewed: 1d584d8

satsfy · 2026-06-02T02:32:03Z

Looks pretty good man. To create all the new types you just copied the one from the latest version and added the fields, right? I.e for MempoolEntry you copied the one from v24, right?

Yes. Everything that didn't need to change hasn't changed. Diffs only in new/modified fields or the corresponding docs. All "institutional memory" is kept.

satsfy requested review from RCasatta, jamillambert and tcharding as code owners May 29, 2026 22:48

github-actions Bot added C-bitcoind C-client C-integration-test C-types labels May 29, 2026

satsfy added 11 commits June 1, 2026 14:35

types: fix v31 network getpeerinfo

bb56e59

Converted to enum the type of fields "connection_type" and "transport_protocol_type" to match Bitcoin Core docs.

types: fix v31 control logging

0ff2ab5

New fields kernel and privatebroadcast.

types: fix v31 wallet getwalletinfo

96b0b5f

RPC getwalletinfo no longer returns paytxfee

types: fix v31 blockchain getdeploymentinfo

3d1e8cc

RPC getdeploymentinfo gets script_flags field. This commit adds an Enum with the possible flags.

types: fix v31 blockchain gettxspendingprevout

60168fa

RPC gettxspendingprevout adds spending_tx and block_hash fields when return_spending_tx is set.

types: fix v31 blockchain getblock

57eac42

RPC getblock gets new field coinbase_tx. Commit backfills None for earlier versions.

types: add v31 raw transactions private broadcast

838075e

Deny unknown fields. Use i64 for peer timestamps because time can be emmited as a negative.

types: add v31 optional arg of gettxspendingprevout

be536b0

types: remove false fields changed doc notes

0a54067

getblockfrompeer, disconnectnode, getnetworkinfo, getblocktemplate and waitfornewblock each carried a a note that said the fields since v30, but their modelled return types match v30.

types: set 31 as latest and re-export v31 types

d2a9ab5

Despite getmempoolfeeratediagram being a new RPC, it is hidden. It is not included in the rustdoc method table. Remove SetTxFee import because the RPC has been deleted but the re-export had been kept.

satsfy force-pushed the v31 branch from e831afd to 812edfd Compare June 1, 2026 17:41

test: enable v31 integration tests

1d584d8

Drop the v30_and_below gates from tests covering RPCs unchanged in v31.

satsfy force-pushed the v31 branch from 812edfd to 1d584d8 Compare June 1, 2026 19:40

tcharding reviewed Jun 1, 2026

View reviewed changes

		/// Minimum fee rate in BTC/kB for a transaction to be accepted.
		/// Minimum fee rate in BTC/kvB for a transaction to be accepted.

		match self {
		Self::Base(e) => write!(f, "conversion of the `base` field failed: {}", e),

		/// Transactions in this chunk in mining order (txids).
		/// Transactions in this chunk in mining order.

Conversation

satsfy commented May 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

satsfy commented Jun 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

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!

tcharding commented Jun 1, 2026

Uh oh!

tcharding commented Jun 1, 2026

Uh oh!

satsfy commented Jun 2, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

satsfy commented May 29, 2026 •

edited

Loading

satsfy commented Jun 1, 2026 •

edited

Loading