Dynamic fees for bridges-v1

Cargo.toml

@@ -16,6 +16,7 @@ members = [
 	"modules/parachains",
 	"modules/relayers",
 	"modules/shift-session-manager",
+	"modules/xcm-bridge-hub-router",
 	"primitives/beefy",
 	"primitives/chain-bridge-hub-cumulus",
 	"primitives/chain-bridge-hub-kusama",
@@ -37,6 +38,7 @@ members = [
 	"primitives/relayers",
 	"primitives/runtime",
 	"primitives/test-utils",
+	"primitives/xcm-bridge-hub-router",
 	"relays/bin-substrate",
 	"relays/client-bridge-hub-kusama",
 	"relays/client-bridge-hub-polkadot",

bin/millau/runtime/src/lib.rs

@@ -464,6 +464,7 @@ impl pallet_bridge_messages::Config<WithRialtoMessagesInstance> for Runtime {
 		WithRialtoMessagesInstance,
 		frame_support::traits::ConstU64<100_000>,
 	>;
+	type OnMessagesDelivered = ();
 
 	type SourceHeaderChain = crate::rialto_messages::RialtoAsSourceHeaderChain;
 	type MessageDispatch = crate::rialto_messages::FromRialtoMessageDispatch;
@@ -495,6 +496,7 @@ impl pallet_bridge_messages::Config<WithRialtoParachainMessagesInstance> for Run
 		WithRialtoParachainMessagesInstance,
 		frame_support::traits::ConstU64<100_000>,
 	>;
+	type OnMessagesDelivered = ();
 
 	type SourceHeaderChain = crate::rialto_parachain_messages::RialtoParachainAsSourceHeaderChain;
 	type MessageDispatch = crate::rialto_parachain_messages::FromRialtoParachainMessageDispatch;

bin/millau/runtime/src/rialto_messages.rs

@@ -25,7 +25,7 @@ use bridge_runtime_common::{
 	},
 	messages_xcm_extension::{XcmBlobHauler, XcmBlobHaulerAdapter},
 };
-use frame_support::{parameter_types, weights::Weight, RuntimeDebug};
+use frame_support::{parameter_types, traits::ConstBool, weights::Weight, RuntimeDebug};
 use pallet_bridge_relayers::WeightInfoExt as _;
 use xcm::latest::prelude::*;
 use xcm_builder::HaulBlobExporter;
@@ -67,6 +67,7 @@ pub type FromRialtoMessageDispatch =
 	bridge_runtime_common::messages_xcm_extension::XcmBlobMessageDispatch<
 		crate::xcm_config::OnMillauBlobDispatcher,
 		(),
+		ConstBool<true>,
 	>;
 
 /// Maximal outbound payload size of Millau -> Rialto messages.
@@ -131,6 +132,10 @@ impl XcmBlobHauler for ToRialtoXcmBlobHauler {
 			.into()
 	}
 
+	fn sending_chain_location() -> MultiLocation {
+		Here.into()
+	}
+
 	fn xcm_lane() -> LaneId {
 		XCM_LANE
 	}

bin/millau/runtime/src/rialto_parachain_messages.rs

@@ -27,7 +27,7 @@ use bridge_runtime_common::{
 	},
 	messages_xcm_extension::{XcmBlobHauler, XcmBlobHaulerAdapter},
 };
-use frame_support::{parameter_types, weights::Weight, RuntimeDebug};
+use frame_support::{parameter_types, traits::ConstBool, weights::Weight, RuntimeDebug};
 use pallet_bridge_relayers::WeightInfoExt as _;
 use xcm::latest::prelude::*;
 use xcm_builder::HaulBlobExporter;
@@ -62,6 +62,7 @@ pub type FromRialtoParachainMessageDispatch =
 	bridge_runtime_common::messages_xcm_extension::XcmBlobMessageDispatch<
 		crate::xcm_config::OnMillauBlobDispatcher,
 		(),
+		ConstBool<true>,
 	>;
 
 /// Maximal outbound payload size of Millau -> RialtoParachain messages.
@@ -132,6 +133,10 @@ impl XcmBlobHauler for ToRialtoParachainXcmBlobHauler {
 			.into()
 	}
 
+	fn sending_chain_location() -> MultiLocation {
+		Here.into()
+	}
+
 	fn xcm_lane() -> LaneId {
 		XCM_LANE
 	}

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

@@ -584,6 +584,7 @@ impl pallet_bridge_messages::Config<WithMillauMessagesInstance> for Runtime {
 		WithMillauMessagesInstance,
 		frame_support::traits::ConstU128<100_000>,
 	>;
+	type OnMessagesDelivered = ();
 
 	type SourceHeaderChain = crate::millau_messages::MillauAsSourceHeaderChain;
 	type MessageDispatch = crate::millau_messages::FromMillauMessageDispatch;

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

@@ -28,7 +28,7 @@ use bridge_runtime_common::{
 	},
 	messages_xcm_extension::{XcmBlobHauler, XcmBlobHaulerAdapter},
 };
-use frame_support::{parameter_types, weights::Weight, RuntimeDebug};
+use frame_support::{parameter_types, traits::ConstBool, weights::Weight, RuntimeDebug};
 use xcm::latest::prelude::*;
 use xcm_builder::HaulBlobExporter;
 
@@ -62,6 +62,7 @@ pub type FromMillauMessageDispatch =
 	bridge_runtime_common::messages_xcm_extension::XcmBlobMessageDispatch<
 		crate::OnRialtoParachainBlobDispatcher,
 		(),
+		ConstBool<true>,
 	>;
 
 /// Messages proof for Millau -> RialtoParachain messages.
@@ -130,6 +131,10 @@ impl XcmBlobHauler for ToMillauXcmBlobHauler {
 		pallet_xcm::Origin::from(MultiLocation::new(1, crate::UniversalLocation::get())).into()
 	}
 
+	fn sending_chain_location() -> MultiLocation {
+		Here.into()
+	}
+
 	fn xcm_lane() -> LaneId {
 		XCM_LANE
 	}

bin/rialto/runtime/src/lib.rs

@@ -442,6 +442,7 @@ impl pallet_bridge_messages::Config<WithMillauMessagesInstance> for Runtime {
 		WithMillauMessagesInstance,
 		frame_support::traits::ConstU128<100_000>,
 	>;
+	type OnMessagesDelivered = ();
 
 	type SourceHeaderChain = crate::millau_messages::MillauAsSourceHeaderChain;
 	type MessageDispatch = crate::millau_messages::FromMillauMessageDispatch;

bin/rialto/runtime/src/millau_messages.rs

@@ -25,7 +25,7 @@ use bridge_runtime_common::{
 	},
 	messages_xcm_extension::{XcmBlobHauler, XcmBlobHaulerAdapter},
 };
-use frame_support::{parameter_types, weights::Weight, RuntimeDebug};
+use frame_support::{parameter_types, traits::ConstBool, weights::Weight, RuntimeDebug};
 use xcm::latest::prelude::*;
 use xcm_builder::HaulBlobExporter;
 
@@ -59,6 +59,7 @@ pub type FromMillauMessageDispatch =
 	bridge_runtime_common::messages_xcm_extension::XcmBlobMessageDispatch<
 		crate::xcm_config::OnRialtoBlobDispatcher,
 		(),
+		ConstBool<true>,
 	>;
 
 /// Messages proof for Millau -> Rialto messages.
@@ -130,6 +131,10 @@ impl XcmBlobHauler for ToMillauXcmBlobHauler {
 			.into()
 	}
 
+	fn sending_chain_location() -> MultiLocation {
+		Here.into()
+	}
+
 	fn xcm_lane() -> LaneId {
 		XCM_LANE
 	}

bin/runtime-common/src/messages_call_ext.rs

@@ -17,7 +17,7 @@
 use crate::messages::{
 	source::FromBridgedChainMessagesDeliveryProof, target::FromBridgedChainMessagesProof,
 };
-use bp_messages::{InboundLaneData, LaneId, MessageNonce};
+use bp_messages::{target_chain::MessageDispatch, InboundLaneData, LaneId, MessageNonce};
 use frame_support::{
 	dispatch::CallableCallFor,
 	traits::{Get, IsSubType},
@@ -77,7 +77,15 @@ impl ReceiveMessagesProofInfo {
 	///
 	/// - or there are no bundled messages, but the inbound lane is blocked by too many unconfirmed
 	///   messages and/or unrewarded relayers.
-	fn is_obsolete(&self) -> bool {
+	fn is_obsolete(&self, is_dispatcher_active: bool) -> bool {
+		// TODO: maybe rename method to `is_accepted`, because it isn't about **obsolete** messages
+		// anymore
+
+		// if dispatcher is inactive, we don't accept any delivery transactions
+		if !is_dispatcher_active {
+			return true
+		}
+
 		// transactions with zero bundled nonces are not allowed, unless they're message
 		// delivery transactions, which brings reward confirmations required to unblock
 		// the lane
@@ -275,7 +283,9 @@ impl<
 
 	fn check_obsolete_call(&self) -> TransactionValidity {
 		match self.call_info() {
-			Some(CallInfo::ReceiveMessagesProof(proof_info)) if proof_info.is_obsolete() => {
+			Some(CallInfo::ReceiveMessagesProof(proof_info))
+				if proof_info.is_obsolete(T::MessageDispatch::is_active()) =>
+			{
 				log::trace!(
 					target: pallet_bridge_messages::LOG_TARGET,
 					"Rejecting obsolete messages delivery transaction: {:?}",