Skip to content

Add feature to allow Aura collator to use full PoV size #5393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
s0me0ne-unkn0wn merged 5 commits into from
Aug 27, 2024
Merged

Add feature to allow Aura collator to use full PoV size #5393

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
09a5de8
Add feature to use full PoV
s0me0ne-unkn0wn Aug 17, 2024
5206bd4
Merge branch 'master' into s0me0ne/full-pov-feature
s0me0ne-unkn0wn Aug 27, 2024
206b8aa
Bootstrap prdoc
s0me0ne-unkn0wn Aug 27, 2024
9020814
Add semver info
s0me0ne-unkn0wn Aug 27, 2024
bd2ea64
Update prdoc/pr_5393.prdoc
s0me0ne-unkn0wn Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions cumulus/client/consensus/aura/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,7 @@ polkadot-primitives = { workspace = true, default-features = true }
polkadot-node-primitives = { workspace = true, default-features = true }
polkadot-node-subsystem = { workspace = true, default-features = true }
polkadot-overseer = { workspace = true, default-features = true }

[features]
# Allows collator to use full PoV size for block building
full-pov-size = []
16 changes: 11 additions & 5 deletions cumulus/client/consensus/aura/src/collators/basic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,16 @@ where
.await
);

let allowed_pov_size = if cfg!(feature = "full-pov-size") {
validation_data.max_pov_size
} else {
// Set the block limit to 50% of the maximum PoV size.
//
// TODO: If we got benchmarking that includes the proof size,
// we should be able to use the maximum pov size.
validation_data.max_pov_size / 2
} as usize;

let maybe_collation = try_request!(
collator
.collate(
Expand All @@ -245,11 +255,7 @@ where
None,
(parachain_inherent_data, other_inherent_data),
params.authoring_duration,
// Set the block limit to 50% of the maximum PoV size.
//
// TODO: If we got benchmarking that includes the proof size,
// we should be able to use the maximum pov size.
(validation_data.max_pov_size / 2) as usize,
allowed_pov_size,
)
.await
);
Expand Down
16 changes: 11 additions & 5 deletions cumulus/client/consensus/aura/src/collators/lookahead.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,18 +412,24 @@ where
)
.await;

let allowed_pov_size = if cfg!(feature = "full-pov-size") {
validation_data.max_pov_size
} else {
// Set the block limit to 50% of the maximum PoV size.
//
// TODO: If we got benchmarking that includes the proof size,
// we should be able to use the maximum pov size.
validation_data.max_pov_size / 2
} as usize;

match collator
.collate(
&parent_header,
&slot_claim,
None,
(parachain_inherent_data, other_inherent_data),
params.authoring_duration,
// Set the block limit to 50% of the maximum PoV size.
//
// TODO: If we got benchmarking that includes the proof size,
// we should be able to use the maximum pov size.
(validation_data.max_pov_size / 2) as usize,
allowed_pov_size,
)
.await
{
Expand Down
16 changes: 11 additions & 5 deletions cumulus/client/consensus/aura/src/collators/slot_based/block_builder_task.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,18 +350,24 @@ where
)
.await;

let allowed_pov_size = if cfg!(feature = "full-pov-size") {
validation_data.max_pov_size
} else {
// Set the block limit to 50% of the maximum PoV size.
//
// TODO: If we got benchmarking that includes the proof size,
// we should be able to use the maximum pov size.
validation_data.max_pov_size / 2
} as usize;

let Ok(Some(candidate)) = collator
.build_block_and_import(
&parent_header,
&slot_claim,
None,
(parachain_inherent_data, other_inherent_data),
authoring_duration,
// Set the block limit to 50% of the maximum PoV size.
//
// TODO: If we got benchmarking that includes the proof size,
// we should be able to use the maximum pov size.
(validation_data.max_pov_size / 2) as usize,
allowed_pov_size,
)
.await
else {
Expand Down