Change Fixed to WeightInfoBounds for Polkadot

runtime/kusama/src/lib.rs

@@ -2045,13 +2045,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 {

runtime/kusama/src/weights/xcm/mod.rs

@@ -166,7 +166,7 @@ impl<RuntimeCall> XcmWeightInfo<RuntimeCall> for KusamaXcmWeight<RuntimeCall> {
 		_reserve: &MultiLocation,
 		_xcm: &Xcm<()>,
 	) -> Weight {
-		assets.weigh_multi_assets(XcmGeneric::<Runtime>::initiate_reserve_withdraw())
+		assets.weigh_multi_assets(XcmBalancesWeight::<Runtime>::initiate_reserve_withdraw())
 	}
 	fn initiate_teleport(
 		assets: &MultiAssetFilter,

runtime/kusama/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs

@@ -17,23 +17,24 @@
 //! Autogenerated weights for `pallet_xcm_benchmarks::fungible`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-03-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-04-14, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
 
 // Executed Command:
-// target/production/polkadot
+// ./target/production/polkadot
 // benchmark
-// --chain=kusama-dev
+// pallet
 // --steps=50
 // --repeat=20
-// --pallet=pallet_xcm_benchmarks::fungible
 // --extrinsic=*
 // --execution=wasm
 // --wasm-execution=compiled
 // --heap-pages=4096
+// --pallet=pallet_xcm_benchmarks::fungible
+// --chain=kusama-dev
 // --header=./file_header.txt
 // --template=./xcm/pallet-xcm-benchmarks/template.hbs
-// --output=./runtime/kusama/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
+// --output=./runtime/kusama/src/weights/xcm/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -46,67 +47,142 @@ use sp_std::marker::PhantomData;
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo<T> {
 	// Storage: System Account (r:1 w:1)
-	pub(crate) fn withdraw_asset() -> Weight {
-		Weight::from_parts(20_385_000 as u64, 0)
-			.saturating_add(T::DbWeight::get().reads(1 as u64))
-			.saturating_add(T::DbWeight::get().writes(1 as u64))
+	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	pub fn withdraw_asset() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `101`
+		//  Estimated: `3593`
+		// Minimum execution time: 21_938_000 picoseconds.
+		Weight::from_parts(22_222_000, 3593)
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
 	}
 	// Storage: System Account (r:2 w:2)
-	pub(crate) fn transfer_asset() -> Weight {
-		Weight::from_parts(32_756_000 as u64, 0)
-			.saturating_add(T::DbWeight::get().reads(2 as u64))
-			.saturating_add(T::DbWeight::get().writes(2 as u64))
+	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	pub fn transfer_asset() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `101`
+		//  Estimated: `6196`
+		// Minimum execution time: 45_662_000 picoseconds.
+		Weight::from_parts(46_305_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	// Storage: System Account (r:2 w:2)
+	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
 	// 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)
-	// Storage: Configuration ActiveConfig (r:1 w:0)
-	// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
+	// Proof Skipped: XcmPallet SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
 	// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	pub(crate) fn transfer_reserve_asset() -> Weight {
-		Weight::from_parts(50_645_000 as u64, 0)
-			.saturating_add(T::DbWeight::get().reads(8 as u64))
-			.saturating_add(T::DbWeight::get().writes(5 as u64))
+	// 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)
+	pub fn transfer_reserve_asset() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `312`
+		//  Estimated: `21121`
+		// Minimum execution time: 67_634_000 picoseconds.
+		Weight::from_parts(68_477_000, 21121)
+			.saturating_add(T::DbWeight::get().reads(7))
+			.saturating_add(T::DbWeight::get().writes(5))
 	}
 	// Storage: Benchmark Override (r:0 w:0)
-	pub(crate) fn reserve_asset_deposited() -> Weight {
-		Weight::from_parts(2_000_000_000_000 as u64, 0)
+	// Proof Skipped: Benchmark Override (max_values: None, max_size: None, mode: Measured)
+	pub fn reserve_asset_deposited() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 2_000_000_000_000 picoseconds.
+		Weight::from_parts(2_000_000_000_000, 0)
+	}
+	// 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)
+	pub fn initiate_reserve_withdraw() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `211`
+		//  Estimated: `14420`
+		// Minimum execution time: 27_863_000 picoseconds.
+		Weight::from_parts(28_394_000, 14420)
+			.saturating_add(T::DbWeight::get().reads(5))
+			.saturating_add(T::DbWeight::get().writes(3))
 	}
 	// Storage: System Account (r:1 w:1)
-	pub(crate) fn receive_teleported_asset() -> Weight {
-		Weight::from_parts(19_595_000 as u64, 0)
-			.saturating_add(T::DbWeight::get().reads(1 as u64))
-			.saturating_add(T::DbWeight::get().writes(1 as u64))
+	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	// Storage: Balances InactiveIssuance (r:1 w:1)
+	// Proof: Balances InactiveIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+	pub fn receive_teleported_asset() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `103`
+		//  Estimated: `5094`
+		// Minimum execution time: 22_235_000 picoseconds.
+		Weight::from_parts(22_622_000, 5094)
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	// Storage: System Account (r:1 w:1)
-	pub(crate) fn deposit_asset() -> Weight {
-		Weight::from_parts(21_763_000 as u64, 0)
-			.saturating_add(T::DbWeight::get().reads(1 as u64))
-			.saturating_add(T::DbWeight::get().writes(1 as u64))
+	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	pub fn deposit_asset() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `3593`
+		// Minimum execution time: 25_006_000 picoseconds.
+		Weight::from_parts(25_595_000, 3593)
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
 	}
 	// Storage: System Account (r:1 w:1)
+	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
 	// 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)
-	// Storage: Configuration ActiveConfig (r:1 w:0)
-	// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
+	// Proof Skipped: XcmPallet SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
 	// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	pub(crate) fn deposit_reserve_asset() -> Weight {
-		Weight::from_parts(40_930_000 as u64, 0)
-			.saturating_add(T::DbWeight::get().reads(7 as u64))
-			.saturating_add(T::DbWeight::get().writes(4 as u64))
+	// 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)
+	pub fn deposit_reserve_asset() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `211`
+		//  Estimated: `18013`
+		// Minimum execution time: 48_982_000 picoseconds.
+		Weight::from_parts(49_465_000, 18013)
+			.saturating_add(T::DbWeight::get().reads(6))
+			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	// Storage: System Account (r:1 w:1)
+	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	// Storage: Balances InactiveIssuance (r:1 w:1)
+	// Proof: Balances InactiveIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
 	// 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)
-	// Storage: Configuration ActiveConfig (r:1 w:0)
-	// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
+	// Proof Skipped: XcmPallet SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
 	// Storage: Dmp DownwardMessageQueues (r:1 w:1)
-	pub(crate) fn initiate_teleport() -> Weight {
-		Weight::from_parts(40_788_000 as u64, 0)
-			.saturating_add(T::DbWeight::get().reads(7 as u64))
-			.saturating_add(T::DbWeight::get().writes(4 as u64))
+	// 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)
+	pub fn initiate_teleport() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `211`
+		//  Estimated: `19514`
+		// Minimum execution time: 51_103_000 picoseconds.
+		Weight::from_parts(51_607_000, 19514)
+			.saturating_add(T::DbWeight::get().reads(7))
+			.saturating_add(T::DbWeight::get().writes(5))
 	}
 }