Merge branch 'master' into voting_hook

Author: ndkazu

cumulus/bin/pov-validator/src/main.rs

@@ -20,7 +20,7 @@ use clap::Parser;
 use codec::{Decode, Encode};
 use polkadot_node_primitives::{BlockData, PoV, POV_BOMB_LIMIT};
 use polkadot_parachain_primitives::primitives::ValidationParams;
-use polkadot_primitives::{BlockNumber as RBlockNumber, Hash as RHash, HeadData};
+use polkadot_primitives::PersistedValidationData;
 use sc_executor::WasmExecutor;
 use sp_core::traits::{CallContext, CodeExecutor, RuntimeCode, WrappedRuntimeCode};
 use std::{fs, path::PathBuf, time::Instant};
@@ -104,17 +104,10 @@ fn main() -> anyhow::Result<()> {
 		tracing::error!(%error, "Failed to decode `PoV`");
 		anyhow::anyhow!("Failed to decode `PoV`")
 	})?;
-	let head_data = HeadData::decode(pov_file_ptr).map_err(|error| {
-		tracing::error!(%error, "Failed to `HeadData`");
-		anyhow::anyhow!("Failed to decode `HeadData`")
-	})?;
-	let relay_parent_storage_root = RHash::decode(pov_file_ptr).map_err(|error| {
-		tracing::error!(%error, "Failed to relay storage root");
-		anyhow::anyhow!("Failed to decode relay storage root")
-	})?;
-	let relay_parent_number = RBlockNumber::decode(pov_file_ptr).map_err(|error| {
-		tracing::error!(%error, "Failed to relay block number");
-		anyhow::anyhow!("Failed to decode relay block number")
+
+	let pvd = PersistedValidationData::decode(pov_file_ptr).map_err(|error| {
+		tracing::error!(%error, "Failed to `PersistedValidationData`");
+		anyhow::anyhow!("Failed to decode `PersistedValidationData`")
 	})?;
 
 	let pov = sp_maybe_compressed_blob::decompress(&pov.block_data.0, POV_BOMB_LIMIT).map_err(
@@ -125,9 +118,9 @@ fn main() -> anyhow::Result<()> {
 	)?;
 
 	let validation_params = ValidationParams {
-		relay_parent_number,
-		relay_parent_storage_root,
-		parent_head: head_data,
+		relay_parent_number: pvd.relay_parent_number,
+		relay_parent_storage_root: pvd.relay_parent_storage_root,
+		parent_head: pvd.parent_head,
 		block_data: BlockData(pov.into()),
 	};
 

cumulus/client/consensus/aura/src/collators/lookahead.rs

@@ -409,6 +409,7 @@ where
 								parent_header.clone(),
 								*relay_parent_header.state_root(),
 								*relay_parent_header.number(),
+								validation_data.max_pov_size,
 							);
 						}
 

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

@@ -375,6 +375,7 @@ where
 				parachain_candidate: candidate,
 				validation_code_hash,
 				core_index: *core_index,
+				max_pov_size: validation_data.max_pov_size,
 			}) {
 				tracing::error!(target: crate::LOG_TARGET, ?err, "Unable to send block to collation task.");
 				return

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

@@ -126,6 +126,7 @@ async fn handle_collation_message<Block: BlockT, RClient: RelayChainInterface +
 		validation_code_hash,
 		relay_parent,
 		core_index,
+		max_pov_size,
 	} = message;
 
 	let hash = parachain_candidate.block.header().hash();
@@ -160,6 +161,7 @@ async fn handle_collation_message<Block: BlockT, RClient: RelayChainInterface +
 					parent_header.clone(),
 					relay_parent_header.state_root,
 					relay_parent_header.number,
+					max_pov_size,
 				);
 			} else {
 				tracing::error!(target: LOG_TARGET, "Failed to get relay parent header from hash: {relay_parent:?}");

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

@@ -255,6 +255,8 @@ struct CollatorMessage<Block: BlockT> {
 	pub validation_code_hash: ValidationCodeHash,
 	/// Core index that this block should be submitted on
 	pub core_index: CoreIndex,
+	/// Maximum pov size. Currently needed only for exporting PoV.
+	pub max_pov_size: u32,
 }
 
 /// Fetch the `CoreSelector` and `ClaimQueueOffset` for `parent_hash`.

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

@@ -273,6 +273,7 @@ pub(crate) fn export_pov_to_path<Block: BlockT>(
 	parent_header: Block::Header,
 	relay_parent_storage_root: RHash,
 	relay_parent_number: RBlockNumber,
+	max_pov_size: u32,
 ) {
 	if let Err(error) = fs::create_dir_all(&path) {
 		tracing::error!(target: LOG_TARGET, %error, path = %path.display(), "Failed to create PoV export directory");
@@ -288,7 +289,11 @@ pub(crate) fn export_pov_to_path<Block: BlockT>(
 	};
 
 	pov.encode_to(&mut file);
-	HeadData(parent_header.encode()).encode_to(&mut file);
-	relay_parent_storage_root.encode_to(&mut file);
-	relay_parent_number.encode_to(&mut file);
+	PersistedValidationData {
+		parent_head: HeadData(parent_header.encode()),
+		relay_parent_number,
+		relay_parent_storage_root,
+		max_pov_size,
+	}
+	.encode_to(&mut file);
 }

prdoc/pr_7924.prdoc

@@ -0,0 +1,8 @@
+title: 'sp-api: Support `mut` in `impl_runtime_apis!`'
+doc:
+- audience: Runtime Dev
+  description: |-
+    This brings support for declaring variables in parameters as `mut` inside of `impl_runtime_apis!`.
+crates:
+- name: sp-api-proc-macro
+  bump: patch

prdoc/pr_7928.prdoc

@@ -0,0 +1,9 @@
+title: Fix pallet-revive-fixtures build.rs
+doc:
+- audience: Runtime Dev
+  description: |-
+    Fix pallet-revive-uapi resolution when building pallet-revive-fixtures
+    contracts
+crates:
+- name: pallet-revive-fixtures
+  bump: patch

substrate/frame/revive/fixtures/build.rs

@@ -85,19 +85,30 @@ fn create_cargo_toml<'a>(
 	let mut cargo_toml: toml::Value = toml::from_str(include_str!("./build/_Cargo.toml"))?;
 	let uapi_dep = cargo_toml["dependencies"]["uapi"].as_table_mut().unwrap();
 
-	let metadata = MetadataCommand::new()
-		.manifest_path(fixtures_dir.join("Cargo.toml"))
-		.exec()
-		.expect("Failed to fetch cargo metadata");
+	let manifest_path = fixtures_dir.join("Cargo.toml");
+	let metadata = MetadataCommand::new().manifest_path(&manifest_path).exec().unwrap();
+	let dependency_graph = metadata.resolve.unwrap();
 
-	let mut uapi_pkgs: Vec<_> = metadata
+	// Resolve the pallet-revive-fixtures package id
+	let fixtures_pkg_id = metadata
 		.packages
 		.iter()
-		.filter(|pkg| pkg.name == "pallet-revive-uapi")
-		.collect();
+		.find(|pkg| pkg.manifest_path.as_std_path() == manifest_path)
+		.map(|pkg| pkg.id.clone())
+		.unwrap();
+	let fixtures_pkg_node =
+		dependency_graph.nodes.iter().find(|node| node.id == fixtures_pkg_id).unwrap();
+
+	// Get the pallet-revive-uapi package id
+	let uapi_pkg_id = fixtures_pkg_node
+		.deps
+		.iter()
+		.find(|dep| dep.name == "pallet_revive_uapi")
+		.map(|dep| dep.pkg.clone())
+		.expect("pallet-revive-uapi is a build dependency of pallet-revive-fixtures; qed");
 
-	uapi_pkgs.sort_by(|a, b| b.version.cmp(&a.version));
-	let uapi_pkg = uapi_pkgs.first().unwrap();
+	// Get pallet-revive-uapi package
+	let uapi_pkg = metadata.packages.iter().find(|pkg| pkg.id == uapi_pkg_id).unwrap();
 
 	if uapi_pkg.source.is_none() {
 		uapi_dep.insert(

substrate/frame/transaction-payment/src/lib.rs

@@ -140,7 +140,7 @@ type BalanceOf<T> = <<T as Config>::OnChargeTransaction as OnChargeTransaction<T
 /// Meaning that fees can change by around ~23% per day, given extreme congestion.
 ///
 /// More info can be found at:
-/// <https://research.web3.foundation/en/latest/polkadot/overview/2-token-economics.html>
+/// <https://research.web3.foundation/Polkadot/overview/token-economics>
 pub struct TargetedFeeAdjustment<T, S, V, M, X>(core::marker::PhantomData<(T, S, V, M, X)>);
 
 /// Something that can convert the current multiplier to the next one.

substrate/primitives/api/proc-macro/src/utils.rs

@@ -74,10 +74,8 @@ pub fn replace_wild_card_parameter_names(input: &mut Signature) {
 	let mut generated_pattern_counter = 0;
 	input.inputs.iter_mut().for_each(|arg| {
 		if let FnArg::Typed(arg) = arg {
-			arg.pat = Box::new(generate_unique_pattern(
-				(*arg.pat).clone(),
-				&mut generated_pattern_counter,
-			));
+			arg.pat =
+				Box::new(sanitize_pattern((*arg.pat).clone(), &mut generated_pattern_counter));
 		}
 	});
 }
@@ -101,8 +99,11 @@ pub fn fold_fn_decl_for_client_side(
 	};
 }
 
-/// Generate an unique pattern based on the given counter, if the given pattern is a `_`.
-pub fn generate_unique_pattern(pat: Pat, counter: &mut u32) -> Pat {
+/// Sanitize the given pattern.
+///
+/// - `_` patterns are changed to a variable based on `counter`.
+/// - `mut something` removes the `mut`.
+pub fn sanitize_pattern(pat: Pat, counter: &mut u32) -> Pat {
 	match pat {
 		Pat::Wild(_) => {
 			let generated_name =
@@ -111,6 +112,10 @@ pub fn generate_unique_pattern(pat: Pat, counter: &mut u32) -> Pat {
 
 			parse_quote!( #generated_name )
 		},
+		Pat::Ident(mut pat) => {
+			pat.mutability = None;
+			pat.into()
+		},
 		_ => pat,
 	}
 }
@@ -138,8 +143,7 @@ pub fn extract_parameter_names_types_and_borrows(
 					t => (t.clone(), None),
 				};
 
-				let name =
-					generate_unique_pattern((*arg.pat).clone(), &mut generated_pattern_counter);
+				let name = sanitize_pattern((*arg.pat).clone(), &mut generated_pattern_counter);
 				result.push((name, ty, borrow));
 			},
 			FnArg::Receiver(_) if matches!(allow_self, AllowSelfRefInParameters::No) =>

substrate/primitives/api/test/tests/decl_and_impl.rs

@@ -81,7 +81,8 @@ impl_runtime_apis! {
 			unimplemented!()
 		}
 
-		fn something_with_block(_: Block) -> Block {
+		// Ensure that we accept `mut`
+		fn something_with_block(mut _block: Block) -> Block {
 			unimplemented!()
 		}