Whitelist from benchmarking XCM storage keys read each block

runtime/kusama/src/lib.rs

@@ -2098,6 +2098,12 @@ sp_api::impl_runtime_apis! {
 				hex_literal::hex!("06de3d8a54d27e44a9d5ce189618f22db4b49d95320d9021994c850f25b8e385").to_vec().into(),
 				// The transactional storage limit.
 				hex_literal::hex!("3a7472616e73616374696f6e5f6c6576656c3a").to_vec().into(),
+				// XcmPallet SupportedVersion
+				hex_literal::hex!("1405f2411d0af5a7ff397e7c9dc68d19908b4dae59e7d658f23d261c5e5db22b").to_vec().into(),
+				// XcmPallet VersionDiscoveryQueue
+				hex_literal::hex!("1405f2411d0af5a7ff397e7c9dc68d194a222ba0333561192e474c59ed8e30e1").to_vec().into(),
+				// XcmPallet SafeXcmVersion
+				hex_literal::hex!("1405f2411d0af5a7ff397e7c9dc68d196323ae84c43568be0d1394d5d0d522c4").to_vec().into(),
 			];
 
 			let mut batches = Vec::<BenchmarkBatch>::new();

runtime/polkadot/src/lib.rs

@@ -2128,6 +2128,12 @@ sp_api::impl_runtime_apis! {
 				hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),
 				// Treasury Account
 				hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da95ecffd7b6c0f78751baa9d281e0bfa3a6d6f646c70792f74727372790000000000000000000000000000000000000000").to_vec().into(),
+				// XcmPallet SupportedVersion
+				hex_literal::hex!("1405f2411d0af5a7ff397e7c9dc68d19908b4dae59e7d658f23d261c5e5db22b").to_vec().into(),
+				// XcmPallet VersionDiscoveryQueue
+				hex_literal::hex!("1405f2411d0af5a7ff397e7c9dc68d194a222ba0333561192e474c59ed8e30e1").to_vec().into(),
+				// XcmPallet SafeXcmVersion
+				hex_literal::hex!("1405f2411d0af5a7ff397e7c9dc68d196323ae84c43568be0d1394d5d0d522c4").to_vec().into(),
 			];
 
 			let mut batches = Vec::<BenchmarkBatch>::new();

runtime/polkadot/src/weights/pallet_xcm.rs

@@ -16,22 +16,24 @@
 //! Autogenerated weights for `pallet_xcm`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-02-28, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-03-13, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `bm4`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
+//! HOSTNAME: `bm3`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
 
 // Executed Command:
-// ./target/production/polkadot
+// target/production/polkadot
 // benchmark
 // pallet
-// --chain=polkadot-dev
 // --steps=50
 // --repeat=20
-// --pallet=pallet_xcm
 // --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=polkadot-dev
 // --header=./file_header.txt
 // --output=./runtime/polkadot/src/weights/
 
@@ -49,38 +51,34 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), 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)
 	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
 	fn send() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `470`
-		//  Estimated: `11730`
-		// Minimum execution time: 37_334 nanoseconds.
-		Weight::from_parts(37_920_000, 0)
-			.saturating_add(Weight::from_parts(0, 11730))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(3))
+		//  Measured:  `301`
+		//  Estimated: `13084`
+		// Minimum execution time: 32_080_000 picoseconds.
+		Weight::from_parts(32_873_000, 0)
+			.saturating_add(Weight::from_parts(0, 13084))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	fn teleport_assets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 25_178 nanoseconds.
-		Weight::from_parts(25_519_000, 0)
+		// Minimum execution time: 23_214_000 picoseconds.
+		Weight::from_parts(23_520_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
 	fn reserve_transfer_assets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 23_763 nanoseconds.
-		Weight::from_parts(24_214_000, 0)
+		// Minimum execution time: 21_787_000 picoseconds.
+		Weight::from_parts(22_131_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
 	/// Storage: Benchmark Override (r:0 w:0)
@@ -89,7 +87,7 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 18_446_744_073_709_551 nanoseconds.
+		// Minimum execution time: 18_446_744_073_709_551_000 picoseconds.
 		Weight::from_parts(18_446_744_073_709_551_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
@@ -99,21 +97,18 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_987 nanoseconds.
-		Weight::from_parts(10_249_000, 0)
+		// Minimum execution time: 10_080_000 picoseconds.
+		Weight::from_parts(10_513_000, 0)
 			.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_604 nanoseconds.
-		Weight::from_parts(2_783_000, 0)
+		// Minimum execution time: 3_181_000 picoseconds.
+		Weight::from_parts(3_386_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)
@@ -123,10 +118,6 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), 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)
@@ -135,24 +126,20 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof Skipped: XcmPallet Queries (max_values: None, max_size: None, mode: Measured)
 	fn force_subscribe_version_notify() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `470`
-		//  Estimated: `16110`
-		// Minimum execution time: 41_261 nanoseconds.
-		Weight::from_parts(42_307_000, 0)
-			.saturating_add(Weight::from_parts(0, 16110))
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(6))
+		//  Measured:  `301`
+		//  Estimated: `18937`
+		// Minimum execution time: 36_851_000 picoseconds.
+		Weight::from_parts(59_707_000, 0)
+			.saturating_add(Weight::from_parts(0, 18937))
+			.saturating_add(T::DbWeight::get().reads(6))
+			.saturating_add(T::DbWeight::get().writes(5))
 	}
 	/// Storage: XcmPallet VersionNotifiers (r:1 w:1)
 	/// Proof Skipped: XcmPallet VersionNotifiers (max_values: None, max_size: None, mode: Measured)
 	/// Storage: Configuration ActiveConfig (r:1 w:0)
 	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), 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)
@@ -161,47 +148,47 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof Skipped: XcmPallet Queries (max_values: None, max_size: None, mode: Measured)
 	fn force_unsubscribe_version_notify() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `742`
-		//  Estimated: `17321`
-		// Minimum execution time: 43_993 nanoseconds.
-		Weight::from_parts(44_583_000, 0)
-			.saturating_add(Weight::from_parts(0, 17321))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(5))
+		//  Measured:  `446`
+		//  Estimated: `18021`
+		// Minimum execution time: 38_033_000 picoseconds.
+		Weight::from_parts(38_311_000, 0)
+			.saturating_add(Weight::from_parts(0, 18021))
+			.saturating_add(T::DbWeight::get().reads(5))
+			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	/// Storage: XcmPallet SupportedVersion (r:4 w:2)
 	/// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
 	fn migrate_supported_version() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `229`
-		//  Estimated: `10129`
-		// Minimum execution time: 16_945 nanoseconds.
-		Weight::from_parts(17_320_000, 0)
-			.saturating_add(Weight::from_parts(0, 10129))
+		//  Measured:  `4`
+		//  Estimated: `10894`
+		// Minimum execution time: 13_660_000 picoseconds.
+		Weight::from_parts(14_283_000, 0)
+			.saturating_add(Weight::from_parts(0, 10894))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	/// Storage: XcmPallet VersionNotifiers (r:4 w:2)
 	/// Proof Skipped: XcmPallet VersionNotifiers (max_values: None, max_size: None, mode: Measured)
 	fn migrate_version_notifiers() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `233`
-		//  Estimated: `10133`
-		// Minimum execution time: 16_857 nanoseconds.
-		Weight::from_parts(17_251_000, 0)
-			.saturating_add(Weight::from_parts(0, 10133))
+		//  Measured:  `30`
+		//  Estimated: `10920`
+		// Minimum execution time: 14_883_000 picoseconds.
+		Weight::from_parts(15_164_000, 0)
+			.saturating_add(Weight::from_parts(0, 10920))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	/// Storage: XcmPallet VersionNotifyTargets (r:5 w:0)
 	/// Proof Skipped: XcmPallet VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
 	fn already_notified_target() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `243`
-		//  Estimated: `12618`
-		// Minimum execution time: 19_594 nanoseconds.
-		Weight::from_parts(20_088_000, 0)
-			.saturating_add(Weight::from_parts(0, 12618))
+		//  Measured:  `40`
+		//  Estimated: `13405`
+		// Minimum execution time: 15_867_000 picoseconds.
+		Weight::from_parts(16_313_000, 0)
+			.saturating_add(Weight::from_parts(0, 13405))
 			.saturating_add(T::DbWeight::get().reads(5))
 	}
 	/// Storage: XcmPallet VersionNotifyTargets (r:2 w:1)
@@ -210,44 +197,40 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), 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)
 	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
 	fn notify_current_targets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `540`
-		//  Estimated: `17640`
-		// Minimum execution time: 39_047 nanoseconds.
-		Weight::from_parts(39_491_000, 0)
-			.saturating_add(Weight::from_parts(0, 17640))
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(4))
+		//  Measured:  `337`
+		//  Estimated: `19505`
+		// Minimum execution time: 34_340_000 picoseconds.
+		Weight::from_parts(34_737_000, 0)
+			.saturating_add(Weight::from_parts(0, 19505))
+			.saturating_add(T::DbWeight::get().reads(6))
+			.saturating_add(T::DbWeight::get().writes(3))
 	}
 	/// Storage: XcmPallet VersionNotifyTargets (r:3 w:0)
 	/// Proof Skipped: XcmPallet VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
 	fn notify_target_migration_fail() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `272`
-		//  Estimated: `7697`
-		// Minimum execution time: 8_462 nanoseconds.
-		Weight::from_parts(8_769_000, 0)
-			.saturating_add(Weight::from_parts(0, 7697))
+		//  Measured:  `69`
+		//  Estimated: `8484`
+		// Minimum execution time: 9_453_000 picoseconds.
+		Weight::from_parts(9_734_000, 0)
+			.saturating_add(Weight::from_parts(0, 8484))
 			.saturating_add(T::DbWeight::get().reads(3))
 	}
 	/// Storage: XcmPallet VersionNotifyTargets (r:4 w:2)
 	/// Proof Skipped: XcmPallet VersionNotifyTargets (max_values: None, max_size: None, mode: Measured)
 	fn migrate_version_notify_targets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `240`
-		//  Estimated: `10140`
-		// Minimum execution time: 17_774 nanoseconds.
-		Weight::from_parts(18_055_000, 0)
-			.saturating_add(Weight::from_parts(0, 10140))
+		//  Measured:  `37`
+		//  Estimated: `10927`
+		// Minimum execution time: 15_126_000 picoseconds.
+		Weight::from_parts(15_602_000, 0)
+			.saturating_add(Weight::from_parts(0, 10927))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -257,22 +240,18 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
 	/// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), 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)
 	/// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
 	fn migrate_and_notify_old_targets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `544`
-		//  Estimated: `22618`
-		// Minimum execution time: 44_737 nanoseconds.
-		Weight::from_parts(45_471_000, 0)
-			.saturating_add(Weight::from_parts(0, 22618))
-			.saturating_add(T::DbWeight::get().reads(10))
-			.saturating_add(T::DbWeight::get().writes(5))
+		//  Measured:  `341`
+		//  Estimated: `24475`
+		// Minimum execution time: 41_185_000 picoseconds.
+		Weight::from_parts(42_304_000, 0)
+			.saturating_add(Weight::from_parts(0, 24475))
+			.saturating_add(T::DbWeight::get().reads(8))
+			.saturating_add(T::DbWeight::get().writes(4))
 	}
 }

runtime/rococo/src/lib.rs

@@ -2102,6 +2102,12 @@ sp_api::impl_runtime_apis! {
 				hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),
 				// Treasury Account
 				hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da95ecffd7b6c0f78751baa9d281e0bfa3a6d6f646c70792f74727372790000000000000000000000000000000000000000").to_vec().into(),
+				// XcmPallet SupportedVersion
+				hex_literal::hex!("1405f2411d0af5a7ff397e7c9dc68d19908b4dae59e7d658f23d261c5e5db22b").to_vec().into(),
+				// XcmPallet VersionDiscoveryQueue
+				hex_literal::hex!("1405f2411d0af5a7ff397e7c9dc68d194a222ba0333561192e474c59ed8e30e1").to_vec().into(),
+				// XcmPallet SafeXcmVersion
+				hex_literal::hex!("1405f2411d0af5a7ff397e7c9dc68d196323ae84c43568be0d1394d5d0d522c4").to_vec().into(),
 			];
 
 			let mut batches = Vec::<BenchmarkBatch>::new();

runtime/westend/src/lib.rs

@@ -1844,6 +1844,12 @@ sp_api::impl_runtime_apis! {
 				hex_literal::hex!("06de3d8a54d27e44a9d5ce189618f22db4b49d95320d9021994c850f25b8e385").to_vec().into(),
 				// The transactional storage limit.
 				hex_literal::hex!("3a7472616e73616374696f6e5f6c6576656c3a").to_vec().into(),
+				// XcmPallet SupportedVersion
+				hex_literal::hex!("1405f2411d0af5a7ff397e7c9dc68d19908b4dae59e7d658f23d261c5e5db22b").to_vec().into(),
+				// XcmPallet VersionDiscoveryQueue
+				hex_literal::hex!("1405f2411d0af5a7ff397e7c9dc68d194a222ba0333561192e474c59ed8e30e1").to_vec().into(),
+				// XcmPallet SafeXcmVersion
+				hex_literal::hex!("1405f2411d0af5a7ff397e7c9dc68d196323ae84c43568be0d1394d5d0d522c4").to_vec().into(),
 			];
 
 			let mut batches = Vec::<BenchmarkBatch>::new();