Change Fixed to WeightInfoBounds for Polkadot

node/collation-generation/src/lib.rs

@@ -25,7 +25,7 @@
 //!   * Determine if the para is scheduled on any core by fetching the `availability_cores` Runtime API.
 //!   * Use the Runtime API subsystem to fetch the full validation data.
 //!   * Invoke the `collator`, and use its outputs to produce a [`CandidateReceipt`], signed with the configuration's `key`.
-//!   * Dispatch a [`CollatorProtocolMessage::DistributeCollation`](receipt, pov)`.
+//!   * Dispatch a [`CollatorProtocolMessage::DistributeCollation`]`(receipt, pov)`.
 
 #![deny(missing_docs)]
 

node/core/dispute-coordinator/src/initialized.rs

@@ -92,7 +92,7 @@ pub struct InitialData {
 pub(crate) struct Initialized {
 	keystore: Arc<LocalKeystore>,
 	runtime_info: RuntimeInfo,
-	/// This is the highest `SessionIndex` seen via `ActiveLeavesUpdate`. It doen't matter if it was
+	/// This is the highest `SessionIndex` seen via `ActiveLeavesUpdate`. It doesn't matter if it was
 	/// cached successfully or not. It is used to detect ancient disputes.
 	highest_session_seen: SessionIndex,
 	/// Will be set to `true` if an error occured during the last caching attempt

node/core/dispute-coordinator/src/metrics.rs

@@ -123,14 +123,14 @@ impl Metrics {
 			.map(|metrics| metrics.participation_pipeline_durations.start_timer())
 	}
 
-	/// Set the priority_queue_size metric
+	/// Set the `priority_queue_size` metric
 	pub fn report_priority_queue_size(&self, size: u64) {
 		if let Some(metrics) = &self.0 {
 			metrics.participation_priority_queue_size.set(size);
 		}
 	}
 
-	/// Set the best_effort_queue_size metric
+	/// Set the `best_effort_queue_size` metric
 	pub fn report_best_effort_queue_size(&self, size: u64) {
 		if let Some(metrics) = &self.0 {
 			metrics.participation_best_effort_queue_size.set(size);

node/core/dispute-coordinator/src/participation/queues/tests.rs

@@ -38,9 +38,9 @@ fn make_dummy_comparator(
 	CandidateComparator::new_dummy(relay_parent, *req.candidate_hash())
 }
 
-/// Make a partial clone of the given ParticipationRequest, just missing
-/// the request_timer field. We prefer this helper to implementing Clone
-/// for ParticipationRequest, since we only clone requests in tests.
+/// Make a partial clone of the given `ParticipationRequest`, just missing
+/// the `request_timer` field. We prefer this helper to implementing Clone
+/// for `ParticipationRequest`, since we only clone requests in tests.
 fn clone_request(request: &ParticipationRequest) -> ParticipationRequest {
 	ParticipationRequest {
 		candidate_receipt: request.candidate_receipt.clone(),

node/core/dispute-coordinator/src/scraping/mod.rs

@@ -57,13 +57,13 @@ const LRU_OBSERVED_BLOCKS_CAPACITY: NonZeroUsize = match NonZeroUsize::new(20) {
 	None => panic!("Observed blocks cache size must be non-zero"),
 };
 
-/// ScrapedUpdates
+/// `ScrapedUpdates`
 ///
-/// Updates to on_chain_votes and included receipts for new active leaf and its unprocessed
+/// Updates to `on_chain_votes` and included receipts for new active leaf and its unprocessed
 /// ancestors.
 ///
-/// on_chain_votes: New votes as seen on chain
-/// included_receipts: Newly included parachain block candidate receipts as seen on chain
+/// `on_chain_votes`: New votes as seen on chain
+/// `included_receipts`: Newly included parachain block candidate receipts as seen on chain
 pub struct ScrapedUpdates {
 	pub on_chain_votes: Vec<ScrapedOnChainVotes>,
 	pub included_receipts: Vec<CandidateReceipt>,

node/core/pvf/common/src/worker/mod.rs

@@ -178,7 +178,7 @@ pub fn stringify_panic_payload(payload: Box<dyn Any + Send + 'static>) -> String
 
 /// In case of node and worker version mismatch (as a result of in-place upgrade), send `SIGTERM`
 /// to the node to tear it down and prevent it from raising disputes on valid candidates. Node
-/// restart should be handled by the node owner. As node exits, unix sockets opened to workers
+/// restart should be handled by the node owner. As node exits, Unix sockets opened to workers
 /// get closed by the OS and other workers receive error on socket read and also exit. Preparation
 /// jobs are written to the temporary files that are renamed to real artifacts on the node side, so
 /// no leftover artifacts are possible.

node/core/pvf/common/src/worker/security.rs

@@ -94,7 +94,7 @@ pub mod landlock {
 		}
 	}
 
-	/// Basaed on the given `status`, returns a single bool indicating whether the given landlock
+	/// Based on the given `status`, returns a single bool indicating whether the given landlock
 	/// ABI is fully enabled on the current Linux environment.
 	pub fn status_is_fully_enabled(
 		status: &Result<RulesetStatus, Box<dyn std::error::Error>>,

node/network/approval-distribution/src/lib.rs

@@ -186,7 +186,7 @@ struct State {
 	/// Config for aggression.
 	aggression_config: AggressionConfig,
 
-	/// HashMap from active leaves to spans
+	/// `HashMap` from active leaves to spans
 	spans: HashMap<Hash, jaeger::PerLeafSpan>,
 
 	/// Current approval checking finality lag.

node/service/src/fake_runtime_api.rs

@@ -14,9 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Provides "fake" runtime api implementations
+//! Provides "fake" runtime API implementations
 //!
-//! These are used to provide a type that implements these runtime apis without requiring to import the native runtimes.
+//! These are used to provide a type that implements these runtime APIs without requiring to import the native runtimes.
 
 use beefy_primitives::crypto::{AuthorityId as BeefyId, Signature as BeefySignature};
 use grandpa_primitives::AuthorityId as GrandpaId;
@@ -40,7 +40,7 @@ use sp_weights::Weight;
 use std::collections::BTreeMap;
 
 sp_api::decl_runtime_apis! {
-	/// This runtime api is only implemented for the test runtime!
+	/// This runtime API is only implemented for the test runtime!
 	pub trait GetLastTimestamp {
 		/// Returns the last timestamp of a runtime.
 		fn get_last_timestamp() -> u64;

node/subsystem-util/src/nesting_sender.rs

@@ -81,7 +81,7 @@
 //! this approach to put back pressure on only a single source (as all are the same). If a module
 //! has a task that requires this, it indeed has to spawn a long running task which can do the
 //! back-pressure on that message source or we make it its own subsystem. This is just one of the
-//! situations that justifies the complexity of asynchronism.
+//! situations that justifies the complexity of asynchrony.
 
 use std::{convert::identity, sync::Arc};
 

node/subsystem-util/src/reputation.rs

@@ -42,7 +42,7 @@ impl Default for ReputationAggregator {
 }
 
 impl ReputationAggregator {
-	/// New ReputationAggregator
+	/// New `ReputationAggregator`
 	///
 	/// # Arguments
 	///

runtime/kusama/src/lib.rs

@@ -2094,6 +2094,7 @@ sp_api::impl_runtime_apis! {
 			Vec<frame_benchmarking::BenchmarkBatch>,
 			sp_runtime::RuntimeString,
 		> {
+			use frame_support::traits::WhitelistedStorageKeys;
 			use frame_benchmarking::{Benchmarking, BenchmarkBatch, TrackedStorageKey, BenchmarkError};
 			// Trying to add benchmarks directly to some pallets caused cyclic dependency issues.
 			// To get around that, we separated the benchmarks into its own crate.
@@ -2136,13 +2137,15 @@ sp_api::impl_runtime_apis! {
 					Statemine::get(),
 					MultiAsset { fun: Fungible(1 * UNITS), id: Concrete(TokenLocation::get()) },
 				));
+				pub const TrustedReserve: Option<(MultiLocation, MultiAsset)> = None;
 			}
 
 			impl pallet_xcm_benchmarks::fungible::Config for Runtime {
 				type TransactAsset = Balances;
 
 				type CheckedAccount = LocalCheckAccount;
 				type TrustedTeleporter = TrustedTeleporter;
+				type TrustedReserve = TrustedReserve;
 
 				fn get_multi_asset() -> MultiAsset {
 					MultiAsset {
@@ -2201,24 +2204,9 @@ sp_api::impl_runtime_apis! {
 				}
 			}
 
-			let whitelist: Vec<TrackedStorageKey> = vec![
-				// Block Number
-				hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec().into(),
-				// Total Issuance
-				hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(),
-				// Execution Phase
-				hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(),
-				// Event Count
-				hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(),
-				// System Events
-				hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),
-				// Treasury Account
-				hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da95ecffd7b6c0f78751baa9d281e0bfa3a6d6f646c70792f74727372790000000000000000000000000000000000000000").to_vec().into(),
-				// Configuration ActiveConfig
-				hex_literal::hex!("06de3d8a54d27e44a9d5ce189618f22db4b49d95320d9021994c850f25b8e385").to_vec().into(),
-				// The transactional storage limit.
-				hex_literal::hex!("3a7472616e73616374696f6e5f6c6576656c3a").to_vec().into(),
-			];
+			let mut whitelist: Vec<TrackedStorageKey> = AllPalletsWithSystem::whitelisted_storage_keys();
+			let treasury_key = frame_system::Account::<Runtime>::hashed_key_for(Treasury::account_id());
+			whitelist.push(treasury_key.to_vec().into());
 
 			let mut batches = Vec::<BenchmarkBatch>::new();
 			let params = (&config, &whitelist);

runtime/kusama/src/tests.rs

@@ -17,13 +17,17 @@
 //! Tests for the Kusama Runtime Configuration
 
 use crate::*;
-use frame_support::{dispatch::GetDispatchInfo, weights::WeightToFee as WeightToFeeT};
+use frame_support::{
+	dispatch::GetDispatchInfo, traits::WhitelistedStorageKeys, weights::WeightToFee as WeightToFeeT,
+};
 use keyring::Sr25519Keyring::Charlie;
 use pallet_transaction_payment::Multiplier;
 use parity_scale_codec::Encode;
 use runtime_common::MinimumMultiplier;
 use separator::Separatable;
+use sp_core::hexdisplay::HexDisplay;
 use sp_runtime::FixedPointNumber;
+use std::collections::HashSet;
 
 #[test]
 fn nis_hold_reason_encoding_is_correct() {
@@ -146,3 +150,28 @@ fn nominator_limit() {
 fn call_size() {
 	RuntimeCall::assert_size_under(230);
 }
+
+#[test]
+fn check_whitelist() {
+	let whitelist: HashSet<String> = AllPalletsWithSystem::whitelisted_storage_keys()
+		.iter()
+		.map(|e| HexDisplay::from(&e.key).to_string())
+		.collect();
+
+	// Block number
+	assert!(whitelist.contains("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac"));
+	// Total issuance
+	assert!(whitelist.contains("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80"));
+	// Execution phase
+	assert!(whitelist.contains("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a"));
+	// Event count
+	assert!(whitelist.contains("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850"));
+	// System events
+	assert!(whitelist.contains("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7"));
+	// Configuration ActiveConfig
+	assert!(whitelist.contains("06de3d8a54d27e44a9d5ce189618f22db4b49d95320d9021994c850f25b8e385"));
+	// XcmPallet VersionDiscoveryQueue
+	assert!(whitelist.contains("1405f2411d0af5a7ff397e7c9dc68d194a222ba0333561192e474c59ed8e30e1"));
+	// XcmPallet SafeXcmVersion
+	assert!(whitelist.contains("1405f2411d0af5a7ff397e7c9dc68d196323ae84c43568be0d1394d5d0d522c4"));
+}

runtime/kusama/src/weights/pallet_xcm.rs

@@ -23,10 +23,9 @@
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot
+// target/production/polkadot
 // benchmark
 // pallet
-// --chain=kusama-dev
 // --steps=50
 // --repeat=20
 // --no-storage-info
@@ -36,6 +35,10 @@
 // --extrinsic=*
 // --execution=wasm
 // --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/var/lib/gitlab-runner/builds/zyw4fam_/0/parity/mirrors/polkadot/.git/.artifacts/bench.json
+// --pallet=pallet_xcm
+// --chain=kusama-dev
 // --header=./file_header.txt
 // --output=./runtime/kusama/src/weights/
 
@@ -56,10 +59,6 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
 	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
 	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet VersionDiscoveryQueue (r:1 w:1)
-	/// Proof Skipped: XcmPallet VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: XcmPallet SafeXcmVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
 	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
 	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
 	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
@@ -109,16 +108,13 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: XcmPallet SafeXcmVersion (r:0 w:1)
-	/// Proof Skipped: XcmPallet SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
 	fn force_default_xcm_version() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
 		// Minimum execution time: 2_939_000 picoseconds.
 		Weight::from_parts(3_022_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
 	}
 	/// Storage: XcmPallet VersionNotifiers (r:1 w:1)
 	/// Proof Skipped: XcmPallet VersionNotifiers (max_values: None, max_size: None, mode: Measured)
@@ -130,10 +126,6 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
 	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
 	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet VersionDiscoveryQueue (r:1 w:1)
-	/// Proof Skipped: XcmPallet VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: XcmPallet SafeXcmVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
 	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
 	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
 	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
@@ -158,10 +150,6 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
 	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
 	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet VersionDiscoveryQueue (r:1 w:1)
-	/// Proof Skipped: XcmPallet VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: XcmPallet SafeXcmVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
 	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
 	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
 	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
@@ -232,10 +220,6 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
 	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
 	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet VersionDiscoveryQueue (r:1 w:1)
-	/// Proof Skipped: XcmPallet VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: XcmPallet SafeXcmVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
 	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
 	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
 	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
@@ -281,10 +265,6 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
 	/// Storage: XcmPallet SupportedVersion (r:1 w:0)
 	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
-	/// Storage: XcmPallet VersionDiscoveryQueue (r:1 w:1)
-	/// Proof Skipped: XcmPallet VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
-	/// Storage: XcmPallet SafeXcmVersion (r:1 w:0)
-	/// Proof Skipped: XcmPallet SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
 	/// Storage: Dmp DownwardMessageQueues (r:1 w:1)
 	/// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
 	/// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)