Proposer/BlockBuilder: Accept proof recorder & extensions by bkchr · Pull Request #9947 · paritytech/polkadot-sdk

bkchr · 2025-10-06T15:20:12Z

This pull request fundamentally changes how Proposer and BlockBuilder are handling the proof recorder and extensions. Before this pull request the proof recorder was initialized by the BlockBuilder and the proposer statically enabled proof recording or disabled it. With this pull request the proof recorder is passed from the the caller down to the block builder. This also moves the responsibility for extracting the final storage proof to the caller and is not part of the block builder logic anymore. The extensions are now also configurable by the caller and are not longer "guessed" by the block builder.

This pull request also remvoes the cumulus-client-proposer crate as it is not really required anymore.

This pull request fundamentally changes how `Proposer` and `BlockBuilder` are handling the proof recorder and extensions. Before this pull request the proof recorder was initialized by the `BlockBuilder` and the proposer statically enabled proof recording or disabled it. With this pull request the proof recorder is passed from the the caller down to the block builder. This also moves the responsibility for extracting the final storage proof to the caller and is not part of the block builder logic anymore. The extensions are now also configurable by the caller and are not longer "guessed" by the block builder. This pull request also remvoes the `cumulus-client-proposer` crate as it is not really required anymore.

…nsion

bkchr · 2025-10-07T20:11:45Z

/cmd fmt

skunert · 2025-11-10T10:36:00Z

cumulus/client/consensus/aura/src/collator.rs

+
+		let storage_proof_recorder = params.storage_proof_recorder.unwrap_or_default();
+
+		if !params.extra_extensions.is_registered(ProofSizeExt::type_id()) {


Nit: Situation here is not so nice. If this check is triggered it means that the proof recorder provided via the args needs to be registered here also in the ProofSizeExt. Otherwise there might be bugs.

But I'm doing this? The recorder passed via the params is registered here.

I think that if other ProofSizeExt is already registered, it may not use storage_proof_recorder passed in params? Maybe we should overwrite extension here?

I am not sure if I read the code correctly - but I see "implicit" assumption that storage_proof_recorder is exactly the same instance that shall be registered in extensions. From what I see it is not enforced - potentially causing some troubles in future.

The code overall looks fine, so this potential discrepancy is only the minor that could be improved. Maybe we don't need to pass extra_extension, and we could create the one down in the block-builder/src/lib.rs? Not sure if there are other use cases for extra_extensions.

I added this as some kind of backwards compatibility here, but you are right. I will return an error if the extension exists, but the storage_proof_recorder is None.

skunert · 2025-11-10T11:10:21Z

For other reviewers who might wonder what the context of this change is:

Before this PR, the block-builder and basic-authorship where conttrolling the proof recording. Users of these components where just telling it to record a proof, and they would handle it. However, this only works well for single blocks.

Since we will be interested in bundling multiple blocks into a single PoV, the storage proof needs to be recorded "incrementally". With the changes introduced here, higher level components can instantiate the proof recorder and define ignored nodes based on previous blocks for the same PoV. The block-builder itself does not need to know anything about the bundling itself.

…nsion

substrate/bin/node/bench/src/construct.rs

Co-authored-by: Iulian Barbu <14218860+iulianbarbu@users.noreply.github.com>

…nsion

paritytech-workflow-stopper · 2025-11-19T15:44:22Z

All GitHub workflows were cancelled due to failure one of the required jobs.
Failed workflow url: https://github.com/paritytech/polkadot-sdk/actions/runs/19506817141
Failed job name: cargo-clippy

lexnv · 2025-11-20T10:13:43Z

cumulus/client/consensus/aura/src/collators/slot_based/block_builder_task.rs

+					],
+					parachain_inherent_data,
+					extra_inherent_data: other_inherent_data,
+					proposal_duration: authoring_duration,


nit: Should we utilize the adjusted_authoring_duration instead here?

lexnv

LGTM!

michalkucharczyk · 2025-11-20T10:51:47Z

substrate/primitives/consensus/common/src/lib.rs

-	/// If the proof recording was requested, but `None` is given, this will return
-	/// `Err(NoProofRecorded)`.
-	fn into_proof(storage_proof: Option<StorageProof>) -> Result<Self::Proof, NoProofRecorded>;
+	/// When `Some`, a storage proof will be recorded and included in the proposal.


DQ: How exactly will it be included? Proposal does not have dedicated field for recorder proof.

Yeah I will change the wording here.

michalkucharczyk · 2025-11-20T11:28:03Z

substrate/client/consensus/manual-seal/src/consensus/aura.rs

Could P be removed?

michalkucharczyk · 2025-11-20T11:46:47Z

substrate/client/consensus/manual-seal/src/consensus/babe.rs

 	C::Api: BabeApi<B>,
 	P: Send + Sync,
 {
-	type Proof = P;


same here: P is no longer needed.

substrate/client/consensus/slots/src/slots.rs

michalkucharczyk · 2025-11-20T13:03:01Z

substrate/utils/frame/benchmarking-cli/src/extrinsic/bench.rs


-		let BuiltBlock { block, proof, .. } = builder.build()?;
+		let BuiltBlock { block, .. } = builder.build()?;
+


Suggested change

substrate/bin/node/bench/src/construct.rs

michalkucharczyk · 2025-11-20T13:06:06Z

substrate/bin/node/cli/src/service.rs

+							max_duration: std::time::Duration::from_secs(1),
+							block_size_limit: None,
+							storage_proof_recorder: None,
+							extra_extensions: Default::default(),


michalkucharczyk · 2025-11-20T13:28:11Z

substrate/client/block-builder/src/lib.rs

 			call_api_at: self.call_api_at,
 			proof_recorder: None,
 			inherent_digests: Default::default(),
 			parent_block: self.parent_block,
 			parent_number,
+			extra_extensions: Extensions::new(),


nit: ..Default::default() could be used

michalkucharczyk · 2025-11-20T13:28:20Z

substrate/client/block-builder/src/lib.rs

 			inherent_digests: Default::default(),
 			parent_block: self.parent_block,
 			parent_number,
+			extra_extensions: Extensions::new(),


and here...

cumulus/client/consensus/aura/src/collator.rs

Co-authored-by: Michal Kucharczyk <1728078+michalkucharczyk@users.noreply.github.com>

…nsion

bkchr · 2025-11-29T22:57:22Z

/cmd prdoc --audience node_dev --bum major

…e_dev --bum major'

…nsion

This pull request fundamentally changes how `Proposer` and `BlockBuilder` are handling the proof recorder and extensions. Before this pull request the proof recorder was initialized by the `BlockBuilder` and the proposer statically enabled proof recording or disabled it. With this pull request the proof recorder is passed from the the caller down to the block builder. This also moves the responsibility for extracting the final storage proof to the caller and is not part of the block builder logic anymore. The extensions are now also configurable by the caller and are not longer "guessed" by the block builder. This pull request also remvoes the `cumulus-client-proposer` crate as it is not really required anymore. --------- Co-authored-by: cmd[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Iulian Barbu <14218860+iulianbarbu@users.noreply.github.com> Co-authored-by: Michal Kucharczyk <1728078+michalkucharczyk@users.noreply.github.com>

bkchr requested review from a team and skunert October 6, 2025 15:20

bkchr added the T0-node This PR/Issue is related to the topic “node”. label Oct 6, 2025

bkchr added 9 commits October 6, 2025 17:21

Merge remote-tracking branch 'origin/master' into bkchr-proposer-exte…

ef47c6a

…nsion

FMT

160ab63

Fix warning

6726094

Merge remote-tracking branch 'origin/master' into bkchr-proposer-exte…

f06461e

…nsion

Fixes

5b5fb22

Fix docs

aab68c8

Fix omni bencher

d185a2a

Fixes

697a66d

Fix tests

1487482

github-actions bot and others added 2 commits October 7, 2025 20:14

Update from github-actions[bot] running command 'fmt'

9774850

Fixes

7135830

skunert approved these changes Nov 10, 2025

View reviewed changes

skunert requested a review from a team November 10, 2025 11:06

Merge remote-tracking branch 'origin/master' into bkchr-proposer-exte…

4914069

…nsion

iulianbarbu reviewed Nov 17, 2025

View reviewed changes

substrate/bin/node/bench/src/construct.rs Outdated Show resolved Hide resolved

bkchr and others added 2 commits November 17, 2025 20:34

Apply suggestion from @iulianbarbu

c103c40

Co-authored-by: Iulian Barbu <14218860+iulianbarbu@users.noreply.github.com>

Merge remote-tracking branch 'origin/master' into bkchr-proposer-exte…

5229e1d

…nsion

Use correct authoring time

2c55068

lexnv reviewed Nov 20, 2025

View reviewed changes

lexnv approved these changes Nov 20, 2025

View reviewed changes

michalkucharczyk reviewed Nov 20, 2025

View reviewed changes

substrate/client/consensus/slots/src/slots.rs Show resolved Hide resolved

michalkucharczyk reviewed Nov 20, 2025

View reviewed changes

cumulus/client/consensus/aura/src/collator.rs Outdated Show resolved Hide resolved

michalkucharczyk approved these changes Nov 20, 2025

View reviewed changes

bkchr and others added 3 commits November 24, 2025 13:19

Apply suggestions from code review

a3c171b

Co-authored-by: Michal Kucharczyk <1728078+michalkucharczyk@users.noreply.github.com>

Review feedback

130276b

Merge remote-tracking branch 'origin/master' into bkchr-proposer-exte…

9696b21

…nsion

bkchr enabled auto-merge November 24, 2025 12:36

github-actions bot and others added 3 commits November 29, 2025 22:59

Update from github-actions[bot] running command 'prdoc --audience nod…

c47c5c0

…e_dev --bum major'

Review feedback

9607080

Merge remote-tracking branch 'origin/master' into bkchr-proposer-exte…

af372f2

…nsion

bkchr added this pull request to the merge queue Nov 30, 2025

github-merge-queue bot removed this pull request from the merge queue due to failed status checks Nov 30, 2025

bkchr added this pull request to the merge queue Nov 30, 2025

Merged via the queue into master with commit cb4262e Nov 30, 2025
249 of 254 checks passed

bkchr deleted the bkchr-proposer-extension branch November 30, 2025 10:01

pgherveou added this to [preview] release tracker Mar 31, 2026

github-project-automation bot moved this to Todo in [preview] release tracker Mar 31, 2026

github-project-automation bot moved this from Todo to Done in [preview] release tracker Mar 31, 2026

gilescope mentioned this pull request Apr 1, 2026

chore: Updated SDK to polkadot-stable2603 midnightntwrk/partner-chains#25

Open

8 tasks


		let storage_proof_recorder = params.storage_proof_recorder.unwrap_or_default();

		if !params.extra_extensions.is_registered(ProofSizeExt::type_id()) {


		let BuiltBlock { block, proof, .. } = builder.build()?;
		let BuiltBlock { block, .. } = builder.build()?;

Conversation

bkchr commented Oct 6, 2025

Uh oh!

bkchr commented Oct 7, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

michalkucharczyk Nov 20, 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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

skunert commented Nov 10, 2025

Uh oh!

Uh oh!

paritytech-workflow-stopper bot commented Nov 19, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

lexnv left a comment

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!

Uh oh!

Choose a reason for hiding this comment

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!

Uh oh!

bkchr commented Nov 29, 2025

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

michalkucharczyk Nov 20, 2025 •

edited

Loading