Companion for Weight V2

bridges/bin/runtime-common/src/messages.rs

@@ -367,7 +367,7 @@ pub mod source {
 		payload: &FromThisChainMessagePayload<B>,
 	) -> Result<(), &'static str> {
 		let weight_limits = BridgedChain::<B>::message_weight_limits(&payload.call);
-		if !weight_limits.contains(&payload.weight.into()) {
+		if !weight_limits.contains(&Weight::from_computation(payload.weight).into()) {
 			return Err("Incorrect message weight declared")
 		}
 
@@ -407,7 +407,11 @@ pub mod source {
 		let delivery_transaction = BridgedChain::<B>::estimate_delivery_transaction(
 			&payload.encode(),
 			pay_dispatch_fee_at_target_chain,
-			if pay_dispatch_fee_at_target_chain { 0.into() } else { payload.weight.into() },
+			if pay_dispatch_fee_at_target_chain {
+				Weight::zero().into()
+			} else {
+				Weight::from_computation(payload.weight).into()
+			},
 		);
 		let delivery_transaction_fee = BridgedChain::<B>::transaction_payment(delivery_transaction);
 
@@ -584,7 +588,9 @@ pub mod target {
 		fn dispatch_weight(
 			message: &DispatchMessage<Self::DispatchPayload, BalanceOf<BridgedChain<B>>>,
 		) -> frame_support::weights::Weight {
-			message.data.payload.as_ref().map(|payload| payload.weight).unwrap_or(0)
+			Weight::from_computation(
+				message.data.payload.as_ref().map(|payload| payload.weight).unwrap_or(0),
+			)
 		}
 
 		fn dispatch(

bridges/bin/runtime-common/src/messages_api.rs

@@ -20,6 +20,7 @@ use crate::messages::{source::FromThisChainMessagePayload, MessageBridge};
 
 use bp_messages::{LaneId, MessageDetails, MessageNonce};
 use codec::Decode;
+use frame_support::weights::Weight;
 use sp_std::vec::Vec;
 
 /// Implementation of the `To*OutboundLaneApi::message_details`.
@@ -41,7 +42,7 @@ where
 				FromThisChainMessagePayload::<BridgeConfig>::decode(&mut &message_data.payload[..]).ok()?;
 			Some(MessageDetails {
 				nonce,
-				dispatch_weight: decoded_payload.weight,
+				dispatch_weight: Weight::from_computation(decoded_payload.weight),
 				size: message_data.payload.len() as _,
 				delivery_and_dispatch_fee: message_data.fee,
 				dispatch_fee_payment: decoded_payload.dispatch_fee_payment,

bridges/modules/grandpa/src/lib.rs

@@ -109,9 +109,11 @@ pub mod pallet {
 		fn on_initialize(_n: T::BlockNumber) -> frame_support::weights::Weight {
 			<RequestCount<T, I>>::mutate(|count| *count = count.saturating_sub(1));
 
-			(0_u64)
+			let computation_weight = (0_u64)
 				.saturating_add(T::DbWeight::get().reads(1))
-				.saturating_add(T::DbWeight::get().writes(1))
+				.saturating_add(T::DbWeight::get().writes(1));
+
+			Weight::from_computation(computation_weight)
 		}
 	}
 

bridges/modules/grandpa/src/weights.rs

@@ -42,7 +42,7 @@
 
 use frame_support::{
 	traits::Get,
-	weights::{constants::RocksDbWeight, Weight},
+	weights::{constants::RocksDbWeight, ComputationWeight as Weight},
 };
 use sp_std::marker::PhantomData;
 

bridges/modules/messages/src/lib.rs

@@ -65,7 +65,7 @@ use codec::{Decode, Encode};
 use frame_support::{
 	fail,
 	traits::Get,
-	weights::{Pays, PostDispatchInfo},
+	weights::{Pays, PostDispatchInfo, Weight},
 };
 use frame_system::RawOrigin;
 use num_traits::{SaturatingAdd, Zero};
@@ -349,15 +349,18 @@ pub mod pallet {
 				T::WeightInfo::increase_message_fee(message_size as _),
 			);
 
-			Ok(PostDispatchInfo { actual_weight: Some(actual_weight), pays_fee: Pays::Yes })
+			Ok(PostDispatchInfo {
+				actual_weight: Some(Weight::from_computation(actual_weight)),
+				pays_fee: Pays::Yes,
+			})
 		}
 
 		/// Receive messages proof from bridged chain.
 		///
 		/// The weight of the call assumes that the transaction always brings outbound lane
 		/// state update. Because of that, the submitter (relayer) has no benefit of not including
 		/// this data in the transaction, so reward confirmations lags should be minimal.
-		#[pallet::weight(T::WeightInfo::receive_messages_proof_weight(proof, *messages_count, *dispatch_weight))]
+		#[pallet::weight(T::WeightInfo::receive_messages_proof_weight(proof, *messages_count, dispatch_weight.computation()))]
 		pub fn receive_messages_proof(
 			origin: OriginFor<T>,
 			relayer_id_at_bridged_chain: T::InboundRelayer,
@@ -387,7 +390,7 @@ pub mod pallet {
 			let declared_weight = T::WeightInfo::receive_messages_proof_weight(
 				&proof,
 				messages_count,
-				dispatch_weight,
+				dispatch_weight.computation(),
 			);
 			let mut actual_weight = declared_weight;
 
@@ -433,7 +436,7 @@ pub mod pallet {
 					// on this lane. We can't dispatch lane messages out-of-order, so if declared
 					// weight is not enough, let's move to next lane
 					let dispatch_weight = T::MessageDispatch::dispatch_weight(&message);
-					if dispatch_weight > dispatch_weight_left {
+					if dispatch_weight.is_strictly_greater_than(&dispatch_weight_left) {
 						log::trace!(
 							target: "runtime::bridge-messages",
 							"Cannot dispatch any more messages on lane {:?}. Weight: declared={}, left={}",
@@ -471,18 +474,19 @@ pub mod pallet {
 						ReceivalResult::TooManyUnconfirmedMessages => (dispatch_weight, true),
 					};
 
-					let unspent_weight = sp_std::cmp::min(unspent_weight, dispatch_weight);
+					let unspent_weight = unspent_weight.min(dispatch_weight);
 					dispatch_weight_left -= dispatch_weight - unspent_weight;
-					actual_weight = actual_weight.saturating_sub(unspent_weight).saturating_sub(
-						// delivery call weight formula assumes that the fee is paid at
-						// this (target) chain. If the message is prepaid at the source
-						// chain, let's refund relayer with this extra cost.
-						if refund_pay_dispatch_fee {
-							T::WeightInfo::pay_inbound_dispatch_fee_overhead()
-						} else {
-							0
-						},
-					);
+					actual_weight =
+						actual_weight.saturating_sub(unspent_weight.computation()).saturating_sub(
+							// delivery call weight formula assumes that the fee is paid at
+							// this (target) chain. If the message is prepaid at the source
+							// chain, let's refund relayer with this extra cost.
+							if refund_pay_dispatch_fee {
+								T::WeightInfo::pay_inbound_dispatch_fee_overhead()
+							} else {
+								0
+							},
+						);
 				}
 			}
 
@@ -495,7 +499,10 @@ pub mod pallet {
 				declared_weight,
 			);
 
-			Ok(PostDispatchInfo { actual_weight: Some(actual_weight), pays_fee: Pays::Yes })
+			Ok(PostDispatchInfo {
+				actual_weight: Some(Weight::from_computation(actual_weight)),
+				pays_fee: Pays::Yes,
+			})
 		}
 
 		/// Receive messages delivery proof from bridged chain.
@@ -592,7 +599,9 @@ pub mod pallet {
 					relayers_state.total_messages.saturating_mul(single_message_callback_overhead);
 				let actual_callback_weight =
 					T::OnDeliveryConfirmed::on_messages_delivered(&lane_id, &confirmed_messages);
-				match preliminary_callback_overhead.checked_sub(actual_callback_weight) {
+				match preliminary_callback_overhead
+					.checked_sub(actual_callback_weight.computation())
+				{
 					Some(difference) if difference == 0 => (),
 					Some(difference) => {
 						log::trace!(
@@ -646,7 +655,10 @@ pub mod pallet {
 				lane_id,
 			);
 
-			Ok(PostDispatchInfo { actual_weight: Some(actual_weight), pays_fee: Pays::Yes })
+			Ok(PostDispatchInfo {
+				actual_weight: Some(Weight::from_computation(actual_weight)),
+				pays_fee: Pays::Yes,
+			})
 		}
 	}
 
@@ -877,7 +889,7 @@ fn send_message<T: Config<I>, I: 'static>(
 	let single_message_callback_overhead =
 		T::WeightInfo::single_message_callback_overhead(T::DbWeight::get());
 	let actual_callback_weight = T::OnMessageAccepted::on_messages_accepted(&lane_id, &nonce);
-	match single_message_callback_overhead.checked_sub(actual_callback_weight) {
+	match single_message_callback_overhead.checked_sub(actual_callback_weight.computation()) {
 		Some(difference) if difference == 0 => (),
 		Some(difference) => {
 			log::trace!(
@@ -921,7 +933,7 @@ fn send_message<T: Config<I>, I: 'static>(
 
 	Pallet::<T, I>::deposit_event(Event::MessageAccepted { lane_id, nonce });
 
-	Ok(SendMessageArtifacts { nonce, weight: actual_weight })
+	Ok(SendMessageArtifacts { nonce, weight: Weight::from_computation(actual_weight) })
 }
 
 /// Ensure that the origin is either root, or `PalletOwner`.

bridges/modules/messages/src/weights.rs

@@ -42,7 +42,7 @@
 
 use frame_support::{
 	traits::Get,
-	weights::{constants::RocksDbWeight, Weight},
+	weights::{constants::RocksDbWeight, ComputationWeight as Weight},
 };
 use sp_std::marker::PhantomData;
 

bridges/modules/messages/src/weights_ext.rs

@@ -20,7 +20,7 @@ use crate::weights::WeightInfo;
 
 use bp_messages::{MessageNonce, UnrewardedRelayersState};
 use bp_runtime::{PreComputedSize, Size};
-use frame_support::weights::{RuntimeDbWeight, Weight};
+use frame_support::weights::{ComputationWeight as Weight, RuntimeDbWeight};
 
 /// Size of the message being delivered in benchmarks.
 pub const EXPECTED_DEFAULT_MESSAGE_LENGTH: u32 = 128;

bridges/modules/token-swap/src/weights.rs

@@ -42,7 +42,7 @@
 
 use frame_support::{
 	traits::Get,
-	weights::{constants::RocksDbWeight, Weight},
+	weights::{constants::RocksDbWeight, ComputationWeight as Weight},
 };
 use sp_std::marker::PhantomData;
 

bridges/primitives/chain-rococo/src/lib.rs

@@ -57,7 +57,7 @@ impl WeightToFeePolynomial for WeightToFee {
 	fn polynomial() -> WeightToFeeCoefficients<Balance> {
 		const CENTS: Balance = 1_000_000_000_000 / 100;
 		let p = CENTS;
-		let q = 10 * Balance::from(ExtrinsicBaseWeight::get());
+		let q = 10 * Balance::from(ExtrinsicBaseWeight::get().computation());
 		smallvec::smallvec![WeightToFeeCoefficient {
 			degree: 1,
 			negative: false,
@@ -99,7 +99,7 @@ pub const EXISTENTIAL_DEPOSIT: Balance = 1_000_000_000_000 / 100;
 /// chain. Don't put too much reserve there, because it is used to **decrease**
 /// `DEFAULT_MESSAGE_DELIVERY_TX_WEIGHT` cost. So putting large reserve would make delivery
 /// transactions cheaper.
-pub const PAY_INBOUND_DISPATCH_FEE_WEIGHT: Weight = 600_000_000;
+pub const PAY_INBOUND_DISPATCH_FEE_WEIGHT: Weight = Weight::new().set_computation(600_000_000);
 
 sp_api::decl_runtime_apis! {
 	/// API for querying information about the finalized Rococo headers.

bridges/primitives/messages/src/source_chain.rs

@@ -20,7 +20,9 @@ use crate::{DeliveredMessages, InboundLaneData, LaneId, MessageNonce, OutboundLa
 
 use crate::UnrewardedRelayer;
 use bp_runtime::Size;
-use frame_support::{weights::Weight, Parameter, RuntimeDebug};
+use frame_support::{
+	dispatch::Zero, pallet_prelude::Saturating, weights::Weight, Parameter, RuntimeDebug,
+};
 use sp_std::{
 	collections::{btree_map::BTreeMap, vec_deque::VecDeque},
 	fmt::Debug,
@@ -189,7 +191,7 @@ impl<SenderOrigin, AccountId, Balance, Payload>
 		_message: Payload,
 		_delivery_and_dispatch_fee: Balance,
 	) -> Result<SendMessageArtifacts, Self::Error> {
-		Ok(SendMessageArtifacts { nonce: 0, weight: 0 })
+		Ok(SendMessageArtifacts { nonce: 0, weight: Weight::zero() })
 	}
 }
 
@@ -213,7 +215,7 @@ pub trait OnDeliveryConfirmed {
 #[impl_trait_for_tuples::impl_for_tuples(30)]
 impl OnDeliveryConfirmed for Tuple {
 	fn on_messages_delivered(lane: &LaneId, messages: &DeliveredMessages) -> Weight {
-		let mut total_weight: Weight = 0;
+		let mut total_weight = Weight::zero();
 		for_tuples!(
 			#(
 				total_weight = total_weight.saturating_add(Tuple::on_messages_delivered(lane, messages));
@@ -231,7 +233,7 @@ pub trait OnMessageAccepted {
 
 impl OnMessageAccepted for () {
 	fn on_messages_accepted(_lane: &LaneId, _message: &MessageNonce) -> Weight {
-		0
+		Weight::zero()
 	}
 }
 

bridges/primitives/messages/src/target_chain.rs

@@ -20,7 +20,7 @@ use crate::{LaneId, Message, MessageData, MessageKey, OutboundLaneData};
 
 use bp_runtime::{messages::MessageDispatchResult, Size};
 use codec::{Decode, Encode, Error as CodecError};
-use frame_support::{weights::Weight, Parameter, RuntimeDebug};
+use frame_support::{dispatch::Zero, weights::Weight, Parameter, RuntimeDebug};
 use scale_info::TypeInfo;
 use sp_std::{collections::btree_map::BTreeMap, fmt::Debug, prelude::*};
 
@@ -166,7 +166,7 @@ impl<AccountId, Fee> MessageDispatch<AccountId, Fee> for ForbidInboundMessages {
 	) -> MessageDispatchResult {
 		MessageDispatchResult {
 			dispatch_result: false,
-			unspent_weight: 0,
+			unspent_weight: Weight::zero(),
 			dispatch_fee_paid_during_dispatch: false,
 		}
 	}

bridges/primitives/polkadot-core/src/lib.rs

@@ -76,7 +76,8 @@ const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);
 /// All Polkadot-like chains allow 2 seconds of compute with a 6-second average block time.
 ///
 /// This is a copy-paste from the Polkadot repo's `polkadot-runtime-common` crate.
-pub const MAXIMUM_BLOCK_WEIGHT: Weight = 2 * WEIGHT_PER_SECOND;
+pub const MAXIMUM_BLOCK_WEIGHT: Weight =
+	Weight::new().set_computation(2 * WEIGHT_PER_SECOND).set_bandwidth(u64::MAX); // No limit to bandwidth at the moment.
 
 /// All Polkadot-like chains assume that an on-initialize consumes 1 percent of the weight on
 /// average, hence a single extrinsic will not be allowed to consume more than
@@ -137,15 +138,16 @@ pub const MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX: MessageNonce = 8192;
 /// This value is a result of `pallet_bridge_messages::Pallet::receive_messages_delivery_proof`
 /// weight formula computation for the case when single message is confirmed. The result then must
 /// be rounded up to account possible future runtime upgrades.
-pub const MAX_SINGLE_MESSAGE_DELIVERY_CONFIRMATION_TX_WEIGHT: Weight = 2_000_000_000;
+pub const MAX_SINGLE_MESSAGE_DELIVERY_CONFIRMATION_TX_WEIGHT: Weight =
+	Weight::new().set_computation(2_000_000_000).set_bandwidth(u64::MAX); // No bandwidth limit at the moment
 
 /// Increase of delivery transaction weight on Polkadot-like chain with every additional message
 /// byte.
 ///
 /// This value is a result of
 /// `pallet_bridge_messages::WeightInfoExt::storage_proof_size_overhead(1)` call. The result then
 /// must be rounded up to account possible future runtime upgrades.
-pub const ADDITIONAL_MESSAGE_BYTE_DELIVERY_WEIGHT: Weight = 25_000;
+pub const ADDITIONAL_MESSAGE_BYTE_DELIVERY_WEIGHT: Weight = Weight::new().set_computation(25_000);
 
 /// Maximal number of bytes, included in the signed Polkadot-like transaction apart from the encoded
 /// call itself.
@@ -159,7 +161,7 @@ pub const TX_EXTRA_BYTES: u32 = 256;
 /// for the case when single message of `pallet_bridge_messages::EXPECTED_DEFAULT_MESSAGE_LENGTH`
 /// bytes is delivered. The message must have dispatch weight set to zero. The result then must be
 /// rounded up to account possible future runtime upgrades.
-pub const DEFAULT_MESSAGE_DELIVERY_TX_WEIGHT: Weight = 1_500_000_000;
+pub const DEFAULT_MESSAGE_DELIVERY_TX_WEIGHT: Weight = Weight::new().set_computation(1_500_000_000);
 
 /// Weight of pay-dispatch-fee operation for inbound messages at Polkadot-like chain.
 ///
@@ -168,7 +170,7 @@ pub const DEFAULT_MESSAGE_DELIVERY_TX_WEIGHT: Weight = 1_500_000_000;
 /// chain. Don't put too much reserve there, because it is used to **decrease**
 /// `DEFAULT_MESSAGE_DELIVERY_TX_WEIGHT` cost. So putting large reserve would make delivery
 /// transactions cheaper.
-pub const PAY_INBOUND_DISPATCH_FEE_WEIGHT: Weight = 600_000_000;
+pub const PAY_INBOUND_DISPATCH_FEE_WEIGHT: Weight = Weight::new().set_computation(600_000_000);
 
 /// Re-export `time_units` to make usage easier.
 pub use time_units::*;

parachain/src/primitives.rs

@@ -19,7 +19,7 @@
 
 use sp_std::vec::Vec;
 
-use frame_support::weights::Weight;
+use frame_support::{dispatch::Zero, weights::Weight};
 use parity_scale_codec::{CompactAs, Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_core::{RuntimeDebug, TypeId};
@@ -316,7 +316,7 @@ impl DmpMessageHandler for () {
 		_max_weight: Weight,
 	) -> Weight {
 		iter.for_each(drop);
-		0
+		Weight::zero()
 	}
 }
 
@@ -349,7 +349,7 @@ impl XcmpMessageHandler for () {
 		_max_weight: Weight,
 	) -> Weight {
 		for _ in iter {}
-		0
+		Weight::zero()
 	}
 }
 

runtime/parachains/src/configuration.rs

@@ -285,7 +285,9 @@ impl<BlockNumber: Default + From<u32>> Default for HostConfiguration<BlockNumber
 			hrmp_max_parachain_outbound_channels: Default::default(),
 			hrmp_max_parathread_outbound_channels: Default::default(),
 			hrmp_max_message_num_per_candidate: Default::default(),
-			ump_max_individual_weight: 20 * WEIGHT_PER_MILLIS,
+			ump_max_individual_weight: Weight::new()
+				.set_computation(20 * WEIGHT_PER_MILLIS)
+				.set_bandwidth(5 * 1024 * 1024),
 			pvf_checking_enabled: false,
 			pvf_voting_ttl: 2u32.into(),
 			minimum_validation_upgrade_delay: 2.into(),
@@ -1136,7 +1138,7 @@ pub struct SessionChangeOutcome<BlockNumber> {
 impl<T: Config> Pallet<T> {
 	/// Called by the initializer to initialize the configuration pallet.
 	pub(crate) fn initializer_initialize(_now: T::BlockNumber) -> Weight {
-		0
+		Weight::zero()
 	}
 
 	/// Called by the initializer to finalize the configuration pallet.