Skip to content
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.

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

Backport #5887 to v1.14 crates release #6672

Open
wants to merge 3 commits into
base: release-crates-io-v1.14.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions polkadot/runtime/parachains/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ scale-info = { features = ["derive"], workspace = true }
serde = { features = ["alloc", "derive"], workspace = true }
derive_more = { workspace = true, default-features = true }
bitflags = { workspace = true }
sp-api.workspace = true
sp-inherents.workspace = true
sp-std.workspace = true
sp-io.workspace = true

sp-api = { workspace = true }
sp-inherents = { workspace = true }
sp-io = { workspace = true }
sp-runtime = { features = ["serde"], workspace = true }
sp-session.workspace = true
sp-staking = { features = ["serde"], workspace = true }
Expand Down
10 changes: 7 additions & 3 deletions polkadot/runtime/parachains/src/configuration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ use polkadot_parachain_primitives::primitives::{
use polkadot_primitives::{
ApprovalVotingParams, AsyncBackingParams, Balance, ExecutorParamError, ExecutorParams,
NodeFeatures, SessionIndex, LEGACY_MIN_BACKING_VOTES, MAX_CODE_SIZE, MAX_HEAD_DATA_SIZE,
MAX_POV_SIZE, ON_DEMAND_MAX_QUEUE_MAX_SIZE,
ON_DEMAND_MAX_QUEUE_MAX_SIZE,
};
use sp_runtime::{traits::Zero, Perbill, Percent};
use sp_std::prelude::*;
Expand All @@ -46,6 +46,10 @@ use polkadot_primitives::vstaging::SchedulerParams;

const LOG_TARGET: &str = "runtime::configuration";

// This value is derived from network layer limits. See `sc_network::MAX_RESPONSE_SIZE` and
// `polkadot_node_network_protocol::POV_RESPONSE_SIZE`.
const POV_SIZE_HARD_LIMIT: u32 = 16 * 1024 * 1024;

/// All configuration of the runtime with respect to paras.
#[derive(
Clone,
Expand Down Expand Up @@ -310,7 +314,7 @@ pub enum InconsistentError<BlockNumber> {
MaxCodeSizeExceedHardLimit { max_code_size: u32 },
/// `max_head_data_size` exceeds the hard limit of `MAX_HEAD_DATA_SIZE`.
MaxHeadDataSizeExceedHardLimit { max_head_data_size: u32 },
/// `max_pov_size` exceeds the hard limit of `MAX_POV_SIZE`.
/// `max_pov_size` exceeds the hard limit of `POV_SIZE_HARD_LIMIT`.
MaxPovSizeExceedHardLimit { max_pov_size: u32 },
/// `minimum_validation_upgrade_delay` is less than `paras_availability_period`.
MinimumValidationUpgradeDelayLessThanChainAvailabilityPeriod {
Expand Down Expand Up @@ -377,7 +381,7 @@ where
})
}

if self.max_pov_size > MAX_POV_SIZE {
if self.max_pov_size > POV_SIZE_HARD_LIMIT {
return Err(MaxPovSizeExceedHardLimit { max_pov_size: self.max_pov_size })
}

Expand Down
2 changes: 1 addition & 1 deletion polkadot/runtime/parachains/src/configuration/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ fn invariants() {
);

assert_err!(
Configuration::set_max_pov_size(RuntimeOrigin::root(), MAX_POV_SIZE + 1),
Configuration::set_max_pov_size(RuntimeOrigin::root(), POV_SIZE_HARD_LIMIT + 1),
Error::<Test>::InvalidNewValue
);

Expand Down
17 changes: 17 additions & 0 deletions prdoc/pr_6672.prdoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Schema: Polkadot SDK PRDoc Schema (prdoc) v1.0.0
# See doc at https://raw.githubusercontent.com/paritytech/polkadot-sdk/master/prdoc/schema_user.json

title: "Set reasonable hard limit for PoV size config value"

doc:
- audience:
- Runtime Dev
- Runtime User
description: |
Sets the hard limit of the `max_pov_size` host configuration parameter to correspond to the
actual network-related limit rather than to a random constant.

crates:
- name: polkadot-runtime-parachains
bump: patch

Loading