Finishing "Additional priority boost for relayers that have explicitly registered at lane"

bin/millau/runtime/src/lib.rs

@@ -399,6 +399,10 @@ impl pallet_bridge_relayers::Config for Runtime {
 		ConstU64<1_000>,
 		ConstU64<8>,
 	>;
+	type MaxRelayersPerLane = ConstU32<16>;
+	type SlotLength = ConstU64<16>;
+	type PriorityBoostPerMessage = PriorityBoostPerMessage;
+	type PriorityBoostForLaneRelayer = ConstU64<0>;
 	type WeightInfo = ();
 }
 
@@ -660,7 +664,6 @@ pub type BridgeRefundRialtoParachainMessages =
 			bp_relayers::RuntimeWithUtilityPallet<Runtime>,
 			WithRialtoParachainsInstance,
 			WithRialtoParachainMessagesInstance,
-			PriorityBoostPerMessage,
 		>,
 	>;
 

bin/rialto-parachain/runtime/src/lib.rs

@@ -34,7 +34,9 @@ use sp_api::impl_runtime_apis;
 use sp_core::{crypto::KeyTypeId, ConstBool, OpaqueMetadata};
 use sp_runtime::{
 	create_runtime_str, generic, impl_opaque_keys,
-	traits::{AccountIdLookup, Block as BlockT, ConstU128, DispatchInfoOf, SignedExtension},
+	traits::{
+		AccountIdLookup, Block as BlockT, ConstU128, ConstU64, DispatchInfoOf, SignedExtension,
+	},
 	transaction_validity::{TransactionSource, TransactionValidity, TransactionValidityError},
 	ApplyExtrinsicResult,
 };
@@ -539,6 +541,10 @@ impl pallet_bridge_relayers::Config for Runtime {
 	type PaymentProcedure =
 		bp_relayers::PayRewardFromAccount<pallet_balances::Pallet<Runtime>, AccountId>;
 	type StakeAndSlash = ();
+	type MaxRelayersPerLane = ConstU32<16>;
+	type SlotLength = ConstU32<16>;
+	type PriorityBoostPerMessage = ConstU64<0>;
+	type PriorityBoostForLaneRelayer = ConstU64<0>;
 	type WeightInfo = ();
 }
 

bin/rialto/runtime/src/lib.rs

@@ -393,6 +393,10 @@ impl pallet_bridge_relayers::Config for Runtime {
 	type PaymentProcedure =
 		bp_relayers::PayRewardFromAccount<pallet_balances::Pallet<Runtime>, AccountId>;
 	type StakeAndSlash = ();
+	type MaxRelayersPerLane = ConstU32<16>;
+	type SlotLength = ConstU32<16>;
+	type PriorityBoostPerMessage = ConstU64<0>;
+	type PriorityBoostForLaneRelayer = ConstU64<0>;
 	type WeightInfo = ();
 }
 

modules/messages/src/lib.rs

@@ -320,6 +320,7 @@ pub mod pallet {
 
 			// let's now deal with relayer payments
 			T::DeliveryPayments::pay_reward(
+				lane_id,
 				relayer_id_at_this_chain,
 				total_messages,
 				valid_messages,

modules/relayers/src/extension/grandpa_adapter.rs

@@ -33,9 +33,7 @@ use pallet_bridge_messages::{
 	CallSubType as BridgeMessagesCallSubType, Config as BridgeMessagesConfig,
 };
 use sp_runtime::{
-	traits::{Dispatchable, Get},
-	transaction_validity::{TransactionPriority, TransactionValidityError},
-	Saturating,
+	traits::Dispatchable, transaction_validity::TransactionValidityError, Saturating,
 };
 use sp_std::marker::PhantomData;
 
@@ -54,21 +52,17 @@ pub struct WithGrandpaChainExtensionConfig<
 	BridgeGrandpaPalletInstance,
 	// instance of BridgedChainthe `pallet-bridge-messages`, tracked by this extension
 	BridgeMessagesPalletInstance,
-	// message delivery transaction priority boost for every additional message
-	PriorityBoostPerMessage,
 >(
 	PhantomData<(
 		IdProvider,
 		Runtime,
 		BatchCallUnpacker,
 		BridgeGrandpaPalletInstance,
 		BridgeMessagesPalletInstance,
-		PriorityBoostPerMessage,
 	)>,
 );
 
-impl<ID, R, BCU, GI, MI, P> ExtensionConfig
-	for WithGrandpaChainExtensionConfig<ID, R, BCU, GI, MI, P>
+impl<ID, R, BCU, GI, MI> ExtensionConfig for WithGrandpaChainExtensionConfig<ID, R, BCU, GI, MI>
 where
 	ID: StaticStrProvider,
 	R: BridgeRelayersConfig
@@ -77,7 +71,6 @@ where
 	BCU: BatchCallUnpacker<R>,
 	GI: 'static,
 	MI: 'static,
-	P: Get<TransactionPriority>,
 	R::RuntimeCall: Dispatchable<Info = DispatchInfo, PostInfo = PostDispatchInfo>
 		+ BridgeGrandpaCallSubtype<R, GI>
 		+ BridgeMessagesCallSubType<R, MI>,
@@ -86,7 +79,6 @@ where
 	type Runtime = R;
 	type BatchCallUnpacker = BCU;
 	type BridgeMessagesPalletInstance = MI;
-	type PriorityBoostPerMessage = P;
 	type Reward = R::Reward;
 	type RemoteGrandpaChainBlockNumber = pallet_bridge_grandpa::BridgedBlockNumber<R, GI>;
 

modules/relayers/src/extension/mod.rs

@@ -35,7 +35,7 @@ use frame_support::{
 	dispatch::{DispatchInfo, PostDispatchInfo},
 	CloneNoBound, DefaultNoBound, EqNoBound, PartialEqNoBound, RuntimeDebugNoBound,
 };
-use frame_system::Config as SystemConfig;
+use frame_system::{pallet_prelude::BlockNumberFor, Config as SystemConfig};
 use pallet_bridge_messages::{CallHelper as MessagesCallHelper, Config as BridgeMessagesConfig};
 use pallet_transaction_payment::{
 	Config as TransactionPaymentConfig, OnChargeTransaction, Pallet as TransactionPaymentPallet,
@@ -106,6 +106,7 @@ where
 	R::RuntimeCall: Dispatchable<Info = DispatchInfo, PostInfo = PostDispatchInfo>,
 	<R as TransactionPaymentConfig>::OnChargeTransaction:
 		OnChargeTransaction<R, Balance = R::Reward>,
+	usize: TryFrom<BlockNumberFor<R>>,
 {
 	/// Returns number of bundled messages `Some(_)`, if the given call info is a:
 	///
@@ -117,16 +118,15 @@ where
 	/// virtually boosted. The relayer registration (we only boost priority for registered
 	/// relayer transactions) must be checked outside.
 	fn bundled_messages_for_priority_boost(
-		call_info: Option<&ExtensionCallInfo<C::RemoteGrandpaChainBlockNumber>>,
+		call_info: &ExtensionCallInfo<C::RemoteGrandpaChainBlockNumber>,
 	) -> Option<MessageNonce> {
 		// we only boost priority of message delivery transactions
-		let parsed_call = match call_info {
-			Some(parsed_call) if parsed_call.is_receive_messages_proof_call() => parsed_call,
-			_ => return None,
-		};
+		if !call_info.is_receive_messages_proof_call() {
+			return None
+		}
 
 		// compute total number of messages in transaction
-		let bundled_messages = parsed_call.messages_call_info().bundled_messages().saturating_len();
+		let bundled_messages = call_info.messages_call_info().bundled_messages().saturating_len();
 
 		// a quick check to avoid invalid high-priority transactions
 		let max_unconfirmed_messages_in_confirmation_tx = <R as BridgeMessagesConfig<C::BridgeMessagesPalletInstance>>::BridgedChain
@@ -178,8 +178,7 @@ where
 		//
 		// - when relayer is registered after `validate` is called and priority is not boosted:
 		//   relayer should be ready for slashing after registration.
-		let may_slash_relayer =
-			Self::bundled_messages_for_priority_boost(Some(&call_info)).is_some();
+		let may_slash_relayer = Self::bundled_messages_for_priority_boost(&call_info).is_some();
 		let slash_relayer_if_delivery_result = may_slash_relayer
 			.then(|| RelayerAccountAction::Slash(relayer.clone(), reward_account_params))
 			.unwrap_or(RelayerAccountAction::None);
@@ -254,6 +253,8 @@ where
 	R::RuntimeCall: Dispatchable<Info = DispatchInfo, PostInfo = PostDispatchInfo>,
 	<R as TransactionPaymentConfig>::OnChargeTransaction:
 		OnChargeTransaction<R, Balance = R::Reward>,
+	usize: TryFrom<BlockNumberFor<R>>,
+	usize: TryFrom<BlockNumberFor<R>>,
 {
 	const IDENTIFIER: &'static str = C::IdProvider::STR;
 	type AccountId = R::AccountId;
@@ -277,13 +278,15 @@ where
 		// we're not calling `validate` from `pre_dispatch` directly because of performance
 		// reasons, so if you're adding some code that may fail here, please check if it needs
 		// to be added to the `pre_dispatch` as well
-		let parsed_call = C::parse_and_check_for_obsolete_call(call)?;
+		let parsed_call = match C::parse_and_check_for_obsolete_call(call)? {
+			Some(parsed_call) => parsed_call,
+			None => return Ok(Default::default()),
+		};
 
 		// the following code just plays with transaction priority and never returns an error
 
 		// we only boost priority of presumably correct message delivery transactions
-		let bundled_messages = match Self::bundled_messages_for_priority_boost(parsed_call.as_ref())
-		{
+		let bundled_messages = match Self::bundled_messages_for_priority_boost(&parsed_call) {
 			Some(bundled_messages) => bundled_messages,
 			None => return Ok(Default::default()),
 		};
@@ -294,16 +297,19 @@ where
 		}
 
 		// compute priority boost
-		let priority_boost =
-			priority::compute_priority_boost::<C::PriorityBoostPerMessage>(bundled_messages);
+		let priority_boost = priority::compute_priority_boost::<R>(
+			parsed_call.messages_call_info().lane_id(),
+			bundled_messages,
+			who,
+		);
 		let valid_transaction = ValidTransactionBuilder::default().priority(priority_boost);
 
 		log::trace!(
 			target: LOG_TARGET,
 			"{}.{:?}: has boosted priority of message delivery transaction \
 			of relayer {:?}: {} messages -> {} priority",
 			Self::IDENTIFIER,
-			parsed_call.as_ref().map(|p| p.messages_call_info().lane_id()),
+			parsed_call.messages_call_info().lane_id(),
 			who,
 			bundled_messages,
 			priority_boost,
@@ -424,7 +430,7 @@ mod tests {
 	use pallet_bridge_parachains::Call as ParachainsCall;
 	use pallet_utility::Call as UtilityCall;
 	use sp_runtime::{
-		traits::{ConstU64, Header as HeaderT},
+		traits::Header as HeaderT,
 		transaction_validity::{InvalidTransaction, ValidTransaction},
 		DispatchError,
 	};
@@ -452,7 +458,6 @@ mod tests {
 		RuntimeWithUtilityPallet<TestRuntime>,
 		(),
 		(),
-		ConstU64<1>,
 	>;
 	type TestGrandpaExtension =
 		BridgeRelayersSignedExtension<TestRuntime, TestGrandpaExtensionConfig>;
@@ -462,7 +467,6 @@ mod tests {
 		RuntimeWithUtilityPallet<TestRuntime>,
 		(),
 		(),
-		ConstU64<1>,
 	>;
 	type TestExtension = BridgeRelayersSignedExtension<TestRuntime, TestExtensionConfig>;
 

modules/relayers/src/extension/parachain_adapter.rs

@@ -38,10 +38,7 @@ use pallet_bridge_parachains::{
 	CallSubType as BridgeParachainsCallSubtype, Config as BridgeParachainsConfig,
 	SubmitParachainHeadsHelper,
 };
-use sp_runtime::{
-	traits::{Dispatchable, Get},
-	transaction_validity::{TransactionPriority, TransactionValidityError},
-};
+use sp_runtime::{traits::Dispatchable, transaction_validity::TransactionValidityError};
 use sp_std::marker::PhantomData;
 
 /// Adapter to be used in signed extension configuration, when bridging with remote parachains.
@@ -58,20 +55,17 @@ pub struct WithParachainExtensionConfig<
 	BridgeParachainsPalletInstance,
 	// instance of BridgedChainthe `pallet-bridge-messages`, tracked by this extension
 	BridgeMessagesPalletInstance,
-	// message delivery transaction priority boost for every additional message
-	PriorityBoostPerMessage,
 >(
 	PhantomData<(
 		IdProvider,
 		Runtime,
 		BatchCallUnpacker,
 		BridgeParachainsPalletInstance,
 		BridgeMessagesPalletInstance,
-		PriorityBoostPerMessage,
 	)>,
 );
 
-impl<ID, R, BCU, PI, MI, P> ExtensionConfig for WithParachainExtensionConfig<ID, R, BCU, PI, MI, P>
+impl<ID, R, BCU, PI, MI> ExtensionConfig for WithParachainExtensionConfig<ID, R, BCU, PI, MI>
 where
 	ID: StaticStrProvider,
 	R: BridgeRelayersConfig
@@ -81,7 +75,6 @@ where
 	BCU: BatchCallUnpacker<R>,
 	PI: 'static,
 	MI: 'static,
-	P: Get<TransactionPriority>,
 	R::RuntimeCall: Dispatchable<Info = DispatchInfo, PostInfo = PostDispatchInfo>
 		+ BridgeGrandpaCallSubtype<R, R::BridgesGrandpaPalletInstance>
 		+ BridgeParachainsCallSubtype<R, PI>
@@ -92,7 +85,6 @@ where
 	type Runtime = R;
 	type BatchCallUnpacker = BCU;
 	type BridgeMessagesPalletInstance = MI;
-	type PriorityBoostPerMessage = P;
 	type Reward = R::Reward;
 	type RemoteGrandpaChainBlockNumber =
 		pallet_bridge_grandpa::BridgedBlockNumber<R, R::BridgesGrandpaPalletInstance>;