Bridges - Add improved congestion control mechanism

Cargo.toml

@@ -27,8 +27,10 @@ members = [
 	"bridges/modules/messages",
 	"bridges/modules/parachains",
 	"bridges/modules/relayers",
+	"bridges/modules/xcm-bridge",
 	"bridges/modules/xcm-bridge-hub",
 	"bridges/modules/xcm-bridge-hub-router",
+	"bridges/modules/xcm-bridge-router",
 	"bridges/primitives/beefy",
 	"bridges/primitives/header-chain",
 	"bridges/primitives/messages",
@@ -37,8 +39,10 @@ members = [
 	"bridges/primitives/relayers",
 	"bridges/primitives/runtime",
 	"bridges/primitives/test-utils",
+	"bridges/primitives/xcm-bridge",
 	"bridges/primitives/xcm-bridge-hub",
 	"bridges/primitives/xcm-bridge-hub-router",
+	"bridges/primitives/xcm-bridge-router",
 	"bridges/relays/client-substrate",
 	"bridges/relays/equivocation",
 	"bridges/relays/finality",
@@ -664,8 +668,10 @@ bp-rococo = { path = "bridges/chains/chain-rococo", default-features = false }
 bp-runtime = { path = "bridges/primitives/runtime", default-features = false }
 bp-test-utils = { path = "bridges/primitives/test-utils", default-features = false }
 bp-westend = { path = "bridges/chains/chain-westend", default-features = false }
+bp-xcm-bridge = { path = "bridges/primitives/xcm-bridge", default-features = false }
 bp-xcm-bridge-hub = { path = "bridges/primitives/xcm-bridge-hub", default-features = false }
 bp-xcm-bridge-hub-router = { path = "bridges/primitives/xcm-bridge-hub-router", default-features = false }
+bp-xcm-bridge-router = { path = "bridges/primitives/xcm-bridge-router", default-features = false }
 bridge-hub-common = { path = "cumulus/parachains/runtimes/bridge-hubs/common", default-features = false }
 bridge-hub-rococo-emulated-chain = { path = "cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo" }
 bridge-hub-rococo-runtime = { path = "cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo", default-features = false }
@@ -1020,8 +1026,10 @@ pallet-vesting = { path = "substrate/frame/vesting", default-features = false }
 pallet-whitelist = { path = "substrate/frame/whitelist", default-features = false }
 pallet-xcm = { path = "polkadot/xcm/pallet-xcm", default-features = false }
 pallet-xcm-benchmarks = { path = "polkadot/xcm/pallet-xcm-benchmarks", default-features = false }
+pallet-xcm-bridge = { path = "bridges/modules/xcm-bridge", default-features = false }
 pallet-xcm-bridge-hub = { path = "bridges/modules/xcm-bridge-hub", default-features = false }
 pallet-xcm-bridge-hub-router = { path = "bridges/modules/xcm-bridge-hub-router", default-features = false }
+pallet-xcm-bridge-router = { path = "bridges/modules/xcm-bridge-router", default-features = false }
 parachain-info = { path = "cumulus/parachains/pallets/parachain-info", default-features = false, package = "staging-parachain-info" }
 parachain-template-runtime = { path = "templates/parachain/runtime" }
 parachains-common = { path = "cumulus/parachains/common", default-features = false }

bridges/chains/chain-asset-hub-rococo/Cargo.toml

@@ -22,15 +22,15 @@ frame-support = { workspace = true }
 sp-core = { workspace = true }
 
 # Bridge Dependencies
-bp-xcm-bridge-hub-router = { workspace = true }
+bp-xcm-bridge-router = { workspace = true }
 
 # Polkadot dependencies
 xcm = { workspace = true }
 
 [features]
 default = ["std"]
 std = [
-	"bp-xcm-bridge-hub-router/std",
+	"bp-xcm-bridge-router/std",
 	"codec/std",
 	"frame-support/std",
 	"scale-info/std",

bridges/chains/chain-asset-hub-rococo/src/lib.rs

@@ -23,7 +23,7 @@ extern crate alloc;
 use codec::{Decode, Encode};
 use scale_info::TypeInfo;
 
-pub use bp_xcm_bridge_hub_router::XcmBridgeHubRouterCall;
+pub use bp_xcm_bridge_router::XcmBridgeHubCall;
 use xcm::latest::prelude::*;
 
 /// `AssetHubRococo` Runtime `Call` enum.
@@ -39,7 +39,7 @@ use xcm::latest::prelude::*;
 pub enum Call {
 	/// `ToWestendXcmRouter` bridge pallet.
 	#[codec(index = 45)]
-	ToWestendXcmRouter(XcmBridgeHubRouterCall),
+	ToWestendXcmRouter(XcmBridgeHubCall<sp_core::H256>),
 }
 
 frame_support::parameter_types! {
@@ -58,7 +58,7 @@ pub fn build_congestion_message<RuntimeCall>(
 		Transact {
 			origin_kind: OriginKind::Xcm,
 			fallback_max_weight: Some(XcmBridgeHubRouterTransactCallMaxWeight::get()),
-			call: Call::ToWestendXcmRouter(XcmBridgeHubRouterCall::report_bridge_status {
+			call: Call::ToWestendXcmRouter(XcmBridgeHubCall::update_bridge_status {
 				bridge_id,
 				is_congested,
 			})

bridges/chains/chain-asset-hub-westend/Cargo.toml

@@ -22,15 +22,15 @@ frame-support = { workspace = true }
 sp-core = { workspace = true }
 
 # Bridge Dependencies
-bp-xcm-bridge-hub-router = { workspace = true }
+bp-xcm-bridge-router = { workspace = true }
 
 # Polkadot dependencies
 xcm = { workspace = true }
 
 [features]
 default = ["std"]
 std = [
-	"bp-xcm-bridge-hub-router/std",
+	"bp-xcm-bridge-router/std",
 	"codec/std",
 	"frame-support/std",
 	"scale-info/std",