Added fallback_max_weight to Transact for sending messages to V4 chains

bridges/snowbridge/primitives/router/src/inbound/mod.rs

@@ -279,6 +279,7 @@ where
 			// Call create_asset on foreign assets pallet.
 			Transact {
 				origin_kind: OriginKind::Xcm,
+				fallback_max_weight: None,
 				call: (
 					create_call_index,
 					asset_id,

cumulus/parachains/integration-tests/emulated/common/src/xcm_helpers.rs

@@ -31,7 +31,7 @@ pub fn xcm_transact_paid_execution(
 	VersionedXcm::from(Xcm(vec![
 		WithdrawAsset(fees.clone().into()),
 		BuyExecution { fees, weight_limit },
-		Transact { origin_kind, call },
+		Transact { origin_kind, call, fallback_max_weight: None },
 		RefundSurplus,
 		DepositAsset {
 			assets: All.into(),
@@ -53,7 +53,7 @@ pub fn xcm_transact_unpaid_execution(
 
 	VersionedXcm::from(Xcm(vec![
 		UnpaidExecution { weight_limit, check_origin },
-		Transact { origin_kind, call },
+		Transact { origin_kind, call, fallback_max_weight: None },
 	]))
 }
 

cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/transact.rs

@@ -43,7 +43,7 @@ fn transfer_and_transact_in_same_xcm(
 
 	// xcm to be executed at dest
 	let xcm_on_dest = Xcm(vec![
-		Transact { origin_kind: OriginKind::Xcm, call },
+		Transact { origin_kind: OriginKind::Xcm, call, fallback_max_weight: None },
 		ExpectTransactStatus(MaybeErrorCode::Success),
 		// since this is the last hop, we don't need to further use any assets previously
 		// reserved for fees (there are no further hops to cover transport fees for); we

cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/xcm/mod.rs

@@ -84,7 +84,7 @@ impl<Call> XcmWeightInfo<Call> for AssetHubRococoXcmWeight<Call> {
 	fn transfer_reserve_asset(assets: &Assets, _dest: &Location, _xcm: &Xcm<()>) -> Weight {
 		assets.weigh_assets(XcmFungibleWeight::<Runtime>::transfer_reserve_asset())
 	}
-	fn transact(_origin_type: &OriginKind, _call: &DoubleEncoded<Call>) -> Weight {
+	fn transact(_origin_type: &OriginKind, _fallback_max_weight: &Option<Weight>, _call: &DoubleEncoded<Call>) -> Weight {
 		XcmGeneric::<Runtime>::transact()
 	}
 	fn hrmp_new_channel_open_request(

cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/xcm/mod.rs

@@ -83,7 +83,7 @@ impl<Call> XcmWeightInfo<Call> for AssetHubWestendXcmWeight<Call> {
 	fn transfer_reserve_asset(assets: &Assets, _dest: &Location, _xcm: &Xcm<()>) -> Weight {
 		assets.weigh_assets(XcmFungibleWeight::<Runtime>::transfer_reserve_asset())
 	}
-	fn transact(_origin_type: &OriginKind, _call: &DoubleEncoded<Call>) -> Weight {
+	fn transact(_origin_type: &OriginKind, _fallback_max_weight: &Option<Weight>, _call: &DoubleEncoded<Call>) -> Weight {
 		XcmGeneric::<Runtime>::transact()
 	}
 	fn hrmp_new_channel_open_request(

cumulus/parachains/runtimes/assets/test-utils/src/test_cases.rs

@@ -1202,14 +1202,16 @@ pub fn create_and_manage_foreign_assets_for_local_consensus_parachain_assets_wor
 			let xcm = Xcm(vec![
 				WithdrawAsset(buy_execution_fee.clone().into()),
 				BuyExecution { fees: buy_execution_fee.clone(), weight_limit: Unlimited },
-				Transact { origin_kind: OriginKind::Xcm, call: foreign_asset_create.into() },
+				Transact { origin_kind: OriginKind::Xcm, call: foreign_asset_create.into(), fallback_max_weight: None },
 				Transact {
 					origin_kind: OriginKind::SovereignAccount,
 					call: foreign_asset_set_metadata.into(),
+					fallback_max_weight: None,
 				},
 				Transact {
 					origin_kind: OriginKind::SovereignAccount,
 					call: foreign_asset_set_team.into(),
+					fallback_max_weight: None,
 				},
 				ExpectTransactStatus(MaybeErrorCode::Success),
 			]);
@@ -1315,7 +1317,7 @@ pub fn create_and_manage_foreign_assets_for_local_consensus_parachain_assets_wor
 			let xcm = Xcm(vec![
 				WithdrawAsset(buy_execution_fee.clone().into()),
 				BuyExecution { fees: buy_execution_fee.clone(), weight_limit: Unlimited },
-				Transact { origin_kind: OriginKind::Xcm, call: foreign_asset_create.into() },
+				Transact { origin_kind: OriginKind::Xcm, call: foreign_asset_create.into(), fallback_max_weight: None },
 				ExpectTransactStatus(MaybeErrorCode::from(DispatchError::BadOrigin.encode())),
 			]);
 

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/xcm/mod.rs

@@ -84,7 +84,7 @@ impl<Call> XcmWeightInfo<Call> for BridgeHubRococoXcmWeight<Call> {
 	fn transfer_reserve_asset(assets: &Assets, _dest: &Location, _xcm: &Xcm<()>) -> Weight {
 		assets.weigh_assets(XcmFungibleWeight::<Runtime>::transfer_reserve_asset())
 	}
-	fn transact(_origin_type: &OriginKind, _call: &DoubleEncoded<Call>) -> Weight {
+	fn transact(_origin_type: &OriginKind, _fallback_max_weight: &Option<Weight>, _call: &DoubleEncoded<Call>) -> Weight {
 		XcmGeneric::<Runtime>::transact()
 	}
 	fn hrmp_new_channel_open_request(

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/weights/xcm/mod.rs

@@ -85,7 +85,7 @@ impl<Call> XcmWeightInfo<Call> for BridgeHubWestendXcmWeight<Call> {
 	fn transfer_reserve_asset(assets: &Assets, _dest: &Location, _xcm: &Xcm<()>) -> Weight {
 		assets.weigh_assets(XcmFungibleWeight::<Runtime>::transfer_reserve_asset())
 	}
-	fn transact(_origin_type: &OriginKind, _call: &DoubleEncoded<Call>) -> Weight {
+	fn transact(_origin_type: &OriginKind, _fallback_max_weight: &Option<Weight>, _call: &DoubleEncoded<Call>) -> Weight {
 		XcmGeneric::<Runtime>::transact()
 	}
 	fn hrmp_new_channel_open_request(

cumulus/parachains/runtimes/coretime/coretime-rococo/src/coretime.rs

@@ -135,6 +135,7 @@ impl CoretimeInterface for CoretimeAllocator {
 			Instruction::Transact {
 				origin_kind: OriginKind::Native,
 				call: request_core_count_call.encode().into(),
+				fallback_max_weight: Some(Weight::from_parts(1_000_000_000, 200_000)),
 			},
 		]);
 
@@ -164,6 +165,7 @@ impl CoretimeInterface for CoretimeAllocator {
 			Instruction::Transact {
 				origin_kind: OriginKind::Native,
 				call: request_revenue_info_at_call.encode().into(),
+				fallback_max_weight: Some(Weight::from_parts(1_000_000_000, 200_000)),
 			},
 		]);
 
@@ -192,6 +194,7 @@ impl CoretimeInterface for CoretimeAllocator {
 			Instruction::Transact {
 				origin_kind: OriginKind::Native,
 				call: credit_account_call.encode().into(),
+				fallback_max_weight: Some(Weight::from_parts(1_000_000_000, 200_000)),
 			},
 		]);
 
@@ -256,6 +259,7 @@ impl CoretimeInterface for CoretimeAllocator {
 			Instruction::Transact {
 				origin_kind: OriginKind::Native,
 				call: assign_core_call.encode().into(),
+				fallback_max_weight: Some(Weight::from_parts(1_000_000_000, 200_000)),
 			},
 		]);
 

cumulus/parachains/runtimes/coretime/coretime-rococo/src/weights/xcm/mod.rs

@@ -84,7 +84,7 @@ impl<Call> XcmWeightInfo<Call> for CoretimeRococoXcmWeight<Call> {
 	fn transfer_reserve_asset(assets: &Assets, _dest: &Location, _xcm: &Xcm<()>) -> Weight {
 		assets.weigh_assets(XcmFungibleWeight::<Runtime>::transfer_reserve_asset())
 	}
-	fn transact(_origin_type: &OriginKind, _call: &DoubleEncoded<Call>) -> Weight {
+	fn transact(_origin_type: &OriginKind, _fallback_max_weight: &Option<Weight>, _call: &DoubleEncoded<Call>) -> Weight {
 		XcmGeneric::<Runtime>::transact()
 	}
 	fn hrmp_new_channel_open_request(

cumulus/parachains/runtimes/coretime/coretime-westend/src/coretime.rs

@@ -127,6 +127,12 @@ impl CoretimeInterface for CoretimeAllocator {
 		use crate::coretime::CoretimeProviderCalls::RequestCoreCount;
 		let request_core_count_call = RelayRuntimePallets::Coretime(RequestCoreCount(count));
 
+		// Weight for `request_core_count` from westend benchmarks:
+		// `ref_time` = 7889000 + (3 * 25000000) + (1 * 100000000) = 182889000
+		// `proof_size` = 1636
+		// Add 5% to each component and round to 2 significant figures.
+		let call_weight = Weight::from_parts(190_000_000, 1700);
+
 		let message = Xcm(vec![
 			Instruction::UnpaidExecution {
 				weight_limit: WeightLimit::Unlimited,
@@ -135,6 +141,7 @@ impl CoretimeInterface for CoretimeAllocator {
 			Instruction::Transact {
 				origin_kind: OriginKind::Native,
 				call: request_core_count_call.encode().into(),
+				fallback_max_weight: Some(call_weight),
 			},
 		]);
 
@@ -164,6 +171,7 @@ impl CoretimeInterface for CoretimeAllocator {
 			Instruction::Transact {
 				origin_kind: OriginKind::Native,
 				call: request_revenue_info_at_call.encode().into(),
+				fallback_max_weight: Some(Weight::from_parts(1_000_000_000, 200_000)),
 			},
 		]);
 
@@ -192,6 +200,7 @@ impl CoretimeInterface for CoretimeAllocator {
 			Instruction::Transact {
 				origin_kind: OriginKind::Native,
 				call: credit_account_call.encode().into(),
+				fallback_max_weight: Some(Weight::from_parts(1_000_000_000, 200_000)),
 			},
 		]);
 
@@ -216,6 +225,12 @@ impl CoretimeInterface for CoretimeAllocator {
 	) {
 		use crate::coretime::CoretimeProviderCalls::AssignCore;
 
+		// Weight for `assign_core` from westend benchmarks:
+		// `ref_time` = 10177115 + (1 * 25000000) + (2 * 100000000) + (57600 * 13932) = 937660315
+		// `proof_size` = 3612
+		// Add 5% to each component and round to 2 significant figures.
+		let call_weight = Weight::from_parts(980_000_000, 3800);
+
 		// The relay chain currently only allows `assign_core` to be called with a complete mask
 		// and only ever with increasing `begin`. The assignments must be truncated to avoid
 		// dropping that core's assignment completely.
@@ -256,6 +271,7 @@ impl CoretimeInterface for CoretimeAllocator {
 			Instruction::Transact {
 				origin_kind: OriginKind::Native,
 				call: assign_core_call.encode().into(),
+				fallback_max_weight: Some(call_weight),
 			},
 		]);
 

cumulus/parachains/runtimes/coretime/coretime-westend/src/weights/xcm/mod.rs

@@ -83,7 +83,7 @@ impl<Call> XcmWeightInfo<Call> for CoretimeWestendXcmWeight<Call> {
 	fn transfer_reserve_asset(assets: &Assets, _dest: &Location, _xcm: &Xcm<()>) -> Weight {
 		assets.weigh_assets(XcmFungibleWeight::<Runtime>::transfer_reserve_asset())
 	}
-	fn transact(_origin_type: &OriginKind, _call: &DoubleEncoded<Call>) -> Weight {
+	fn transact(_origin_type: &OriginKind, _fallback_max_weight: &Option<Weight>, _call: &DoubleEncoded<Call>) -> Weight {
 		XcmGeneric::<Runtime>::transact()
 	}
 	fn hrmp_new_channel_open_request(

cumulus/parachains/runtimes/people/people-rococo/src/weights/xcm/mod.rs

@@ -83,7 +83,7 @@ impl<Call> XcmWeightInfo<Call> for PeopleRococoXcmWeight<Call> {
 	fn transfer_reserve_asset(assets: &Assets, _dest: &Location, _xcm: &Xcm<()>) -> Weight {
 		assets.weigh_assets(XcmFungibleWeight::<Runtime>::transfer_reserve_asset())
 	}
-	fn transact(_origin_type: &OriginKind, _call: &DoubleEncoded<Call>) -> Weight {
+	fn transact(_origin_type: &OriginKind, _fallback_max_weight: &Option<Weight>, _call: &DoubleEncoded<Call>) -> Weight {
 		XcmGeneric::<Runtime>::transact()
 	}
 	fn hrmp_new_channel_open_request(

cumulus/parachains/runtimes/people/people-westend/src/weights/xcm/mod.rs

@@ -83,7 +83,7 @@ impl<Call> XcmWeightInfo<Call> for PeopleWestendXcmWeight<Call> {
 	fn transfer_reserve_asset(assets: &Assets, _dest: &Location, _xcm: &Xcm<()>) -> Weight {
 		assets.weigh_assets(XcmFungibleWeight::<Runtime>::transfer_reserve_asset())
 	}
-	fn transact(_origin_type: &OriginKind, _call: &DoubleEncoded<Call>) -> Weight {
+	fn transact(_origin_type: &OriginKind, _fallback_max_weight: &Option<Weight>, _call: &DoubleEncoded<Call>) -> Weight {
 		XcmGeneric::<Runtime>::transact()
 	}
 	fn hrmp_new_channel_open_request(

cumulus/parachains/runtimes/test-utils/src/lib.rs

@@ -445,7 +445,7 @@ impl<
 		// prepare xcm as governance will do
 		let xcm = Xcm(vec![
 			UnpaidExecution { weight_limit: Unlimited, check_origin: None },
-			Transact { origin_kind: OriginKind::Superuser, call: call.into() },
+			Transact { origin_kind: OriginKind::Superuser, call: call.into(), fallback_max_weight: None },
 			ExpectTransactStatus(MaybeErrorCode::Success),
 		]);
 
@@ -476,7 +476,7 @@ impl<
 
 		// prepare `Transact` xcm
 		instructions.extend(vec![
-			Transact { origin_kind, call: call.encode().into() },
+			Transact { origin_kind, call: call.encode().into(), fallback_max_weight: None },
 			ExpectTransactStatus(MaybeErrorCode::Success),
 		]);
 		let xcm = Xcm(instructions);

polkadot/runtime/parachains/src/coretime/mod.rs

@@ -333,6 +333,7 @@ impl<T: Config> OnNewSession<BlockNumberFor<T>> for Pallet<T> {
 fn mk_coretime_call<T: Config>(call: crate::coretime::CoretimeCalls) -> Instruction<()> {
 	Instruction::Transact {
 		origin_kind: OriginKind::Superuser,
+		fallback_max_weight: None,
 		call: BrokerRuntimePallets::Broker(call).encode().into(),
 	}
 }

polkadot/runtime/rococo/src/weights/xcm/mod.rs

@@ -111,7 +111,7 @@ impl<RuntimeCall> XcmWeightInfo<RuntimeCall> for RococoXcmWeight<RuntimeCall> {
 	fn transfer_reserve_asset(assets: &Assets, _dest: &Location, _xcm: &Xcm<()>) -> Weight {
 		assets.weigh_assets(XcmBalancesWeight::<Runtime>::transfer_reserve_asset())
 	}
-	fn transact(_origin_kind: &OriginKind, _call: &DoubleEncoded<RuntimeCall>) -> Weight {
+	fn transact(_origin_kind: &OriginKind, _fallback_max_weight: &Option<Weight>, _call: &DoubleEncoded<RuntimeCall>) -> Weight {
 		XcmGeneric::<Runtime>::transact()
 	}
 	fn hrmp_new_channel_open_request(

polkadot/runtime/westend/src/impls.rs

@@ -157,7 +157,7 @@ where
 					.into(),
 			},
 			// Poke the deposit to reserve the appropriate amount on the parachain.
-			Transact { origin_kind: OriginKind::Superuser, call: poke.encode().into() },
+			Transact { origin_kind: OriginKind::Superuser, call: poke.encode().into(), fallback_max_weight: None },
 		]);
 
 		// send

polkadot/runtime/westend/src/weights/xcm/mod.rs

@@ -114,7 +114,7 @@ impl<RuntimeCall> XcmWeightInfo<RuntimeCall> for WestendXcmWeight<RuntimeCall> {
 	fn transfer_reserve_asset(assets: &Assets, _dest: &Location, _xcm: &Xcm<()>) -> Weight {
 		assets.weigh_assets(XcmBalancesWeight::<Runtime>::transfer_reserve_asset())
 	}
-	fn transact(_origin_kind: &OriginKind, _call: &DoubleEncoded<RuntimeCall>) -> Weight {
+	fn transact(_origin_kind: &OriginKind, _fallback_max_weight: &Option<Weight>, _call: &DoubleEncoded<RuntimeCall>) -> Weight {
 		XcmGeneric::<Runtime>::transact()
 	}
 	fn hrmp_new_channel_open_request(

polkadot/xcm/src/v4/mod.rs

@@ -36,7 +36,6 @@ use codec::{
 };
 use core::{fmt::Debug, result};
 use derivative::Derivative;
-use frame_support::dispatch::GetDispatchInfo;
 use scale_info::TypeInfo;
 
 mod asset;
@@ -1270,15 +1269,15 @@ impl<Call> TryFrom<OldXcm<Call>> for Xcm<Call> {
 }
 
 // Convert from a v5 XCM to a v4 XCM.
-impl<Call: Decode + GetDispatchInfo> TryFrom<NewXcm<Call>> for Xcm<Call> {
+impl<Call> TryFrom<NewXcm<Call>> for Xcm<Call> {
 	type Error = ();
 	fn try_from(new_xcm: NewXcm<Call>) -> result::Result<Self, Self::Error> {
 		Ok(Xcm(new_xcm.0.into_iter().map(TryInto::try_into).collect::<result::Result<_, _>>()?))
 	}
 }
 
 // Convert from a v5 instruction to a v4 instruction.
-impl<Call: Decode + GetDispatchInfo> TryFrom<NewInstruction<Call>> for Instruction<Call> {
+impl<Call> TryFrom<NewInstruction<Call>> for Instruction<Call> {
 	type Error = ();
 	fn try_from(new_instruction: NewInstruction<Call>) -> result::Result<Self, Self::Error> {
 		use NewInstruction::*;
@@ -1314,8 +1313,8 @@ impl<Call: Decode + GetDispatchInfo> TryFrom<NewInstruction<Call>> for Instructi
 			HrmpChannelAccepted { recipient } => Self::HrmpChannelAccepted { recipient },
 			HrmpChannelClosing { initiator, sender, recipient } =>
 				Self::HrmpChannelClosing { initiator, sender, recipient },
-			Transact { origin_kind, mut call } => {
-				let require_weight_at_most = call.take_decoded()?.get_dispatch_info().call_weight;
+			Transact { origin_kind, call, fallback_max_weight } => {
+				let require_weight_at_most = fallback_max_weight.unwrap_or(Weight::MAX);
 				Self::Transact { origin_kind, require_weight_at_most, call: call.into() }
 			},
 			ReportError(response_info) => Self::ReportError(QueryResponseInfo {

polkadot/xcm/src/v5/mod.rs

@@ -493,13 +493,17 @@ pub enum Instruction<Call> {
 	///
 	/// - `origin_kind`: The means of expressing the message origin as a dispatch origin.
 	/// - `call`: The encoded transaction to be applied.
+	/// - `fallback_max_weight`: Used for compatibility with previous versions.
+	///   Corresponds to the `require_weight_at_most` parameter in previous versions.
+	///   If you don't care about compatibility you can just put `None`.
+	///   WARNING: If you do, your XCM won't work with older versions.
 	///
 	/// Safety: No concerns.
 	///
 	/// Kind: *Command*.
 	///
 	/// Errors:
-	Transact { origin_kind: OriginKind, call: DoubleEncoded<Call> },
+	Transact { origin_kind: OriginKind, fallback_max_weight: Option<Weight>, call: DoubleEncoded<Call> },
 
 	/// A message to notify about a new incoming HRMP channel. This message is meant to be sent by
 	/// the relay-chain to a para.
@@ -1159,7 +1163,7 @@ impl<Call> Instruction<Call> {
 			HrmpChannelAccepted { recipient } => HrmpChannelAccepted { recipient },
 			HrmpChannelClosing { initiator, sender, recipient } =>
 				HrmpChannelClosing { initiator, sender, recipient },
-			Transact { origin_kind, call } => Transact { origin_kind, call: call.into() },
+			Transact { origin_kind, call, fallback_max_weight } => Transact { origin_kind, call: call.into(), fallback_max_weight },
 			ReportError(response_info) => ReportError(response_info),
 			DepositAsset { assets, beneficiary } => DepositAsset { assets, beneficiary },
 			DepositReserveAsset { assets, dest, xcm } => DepositReserveAsset { assets, dest, xcm },
@@ -1227,7 +1231,7 @@ impl<Call, W: XcmWeightInfo<Call>> GetWeight<W> for Instruction<Call> {
 			TransferAsset { assets, beneficiary } => W::transfer_asset(assets, beneficiary),
 			TransferReserveAsset { assets, dest, xcm } =>
 				W::transfer_reserve_asset(&assets, dest, xcm),
-			Transact { origin_kind, call } => W::transact(origin_kind, call),
+			Transact { origin_kind, fallback_max_weight, call } => W::transact(origin_kind, fallback_max_weight, call),
 			HrmpNewChannelOpenRequest { sender, max_message_size, max_capacity } =>
 				W::hrmp_new_channel_open_request(sender, max_message_size, max_capacity),
 			HrmpChannelAccepted { recipient } => W::hrmp_channel_accepted(recipient),
@@ -1344,7 +1348,7 @@ impl<Call> TryFrom<OldInstruction<Call>> for Instruction<Call> {
 			HrmpChannelClosing { initiator, sender, recipient } =>
 				Self::HrmpChannelClosing { initiator, sender, recipient },
 			Transact { origin_kind, require_weight_at_most: _, call } =>
-				Self::Transact { origin_kind, call: call.into() },
+				Self::Transact { origin_kind, call: call.into(), fallback_max_weight: None },
 			ReportError(response_info) => Self::ReportError(QueryResponseInfo {
 				query_id: response_info.query_id,
 				destination: response_info.destination.try_into().map_err(|_| ())?,

polkadot/xcm/src/v5/traits.rs

@@ -428,6 +428,7 @@ pub type SendResult<T> = result::Result<(T, Assets), SendError>;
 /// let message = Xcm(vec![Instruction::Transact {
 ///     origin_kind: OriginKind::Superuser,
 ///     call: call.into(),
+///     fallback_max_weight: None,
 /// }]);
 /// let message_hash = message.using_encoded(sp_io::hashing::blake2_256);
 ///