Bridges - revert-back and improve congestion

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

@@ -14,20 +14,7 @@ exclude-from-umbrella = true
 workspace = true
 
 [dependencies]
-codec = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-
-# Substrate Dependencies
-frame-support = { workspace = true }
-
-# Bridge Dependencies
-bp-xcm-bridge-hub-router = { workspace = true }
 
 [features]
 default = ["std"]
-std = [
-	"bp-xcm-bridge-hub-router/std",
-	"codec/std",
-	"frame-support/std",
-	"scale-info/std",
-]
+std = []

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

@@ -18,31 +18,5 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use codec::{Decode, Encode};
-use scale_info::TypeInfo;
-
-pub use bp_xcm_bridge_hub_router::XcmBridgeHubRouterCall;
-
-/// `AssetHubRococo` Runtime `Call` enum.
-///
-/// The enum represents a subset of possible `Call`s we can send to `AssetHubRococo` chain.
-/// Ideally this code would be auto-generated from metadata, because we want to
-/// avoid depending directly on the ENTIRE runtime just to get the encoding of `Dispatchable`s.
-///
-/// All entries here (like pretty much in the entire file) must be kept in sync with
-/// `AssetHubRococo` `construct_runtime`, so that we maintain SCALE-compatibility.
-#[allow(clippy::large_enum_variant)]
-#[derive(Encode, Decode, Debug, PartialEq, Eq, Clone, TypeInfo)]
-pub enum Call {
-	/// `ToWestendXcmRouter` bridge pallet.
-	#[codec(index = 45)]
-	ToWestendXcmRouter(XcmBridgeHubRouterCall),
-}
-
-frame_support::parameter_types! {
-	/// Some sane weight to execute `xcm::Transact(pallet-xcm-bridge-hub-router::Call::report_bridge_status)`.
-	pub const XcmBridgeHubRouterTransactCallMaxWeight: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(200_000_000, 6144);
-}
-
 /// Identifier of AssetHubRococo in the Rococo relay chain.
 pub const ASSET_HUB_ROCOCO_PARACHAIN_ID: u32 = 1000;

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

@@ -14,20 +14,7 @@ exclude-from-umbrella = true
 workspace = true
 
 [dependencies]
-codec = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-
-# Substrate Dependencies
-frame-support = { workspace = true }
-
-# Bridge Dependencies
-bp-xcm-bridge-hub-router = { workspace = true }
 
 [features]
 default = ["std"]
-std = [
-	"bp-xcm-bridge-hub-router/std",
-	"codec/std",
-	"frame-support/std",
-	"scale-info/std",
-]
+std = []

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

@@ -18,31 +18,5 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use codec::{Decode, Encode};
-use scale_info::TypeInfo;
-
-pub use bp_xcm_bridge_hub_router::XcmBridgeHubRouterCall;
-
-/// `AssetHubWestend` Runtime `Call` enum.
-///
-/// The enum represents a subset of possible `Call`s we can send to `AssetHubWestend` chain.
-/// Ideally this code would be auto-generated from metadata, because we want to
-/// avoid depending directly on the ENTIRE runtime just to get the encoding of `Dispatchable`s.
-///
-/// All entries here (like pretty much in the entire file) must be kept in sync with
-/// `AssetHubWestend` `construct_runtime`, so that we maintain SCALE-compatibility.
-#[allow(clippy::large_enum_variant)]
-#[derive(Encode, Decode, Debug, PartialEq, Eq, Clone, TypeInfo)]
-pub enum Call {
-	/// `ToRococoXcmRouter` bridge pallet.
-	#[codec(index = 34)]
-	ToRococoXcmRouter(XcmBridgeHubRouterCall),
-}
-
-frame_support::parameter_types! {
-	/// Some sane weight to execute `xcm::Transact(pallet-xcm-bridge-hub-router::Call::report_bridge_status)`.
-	pub const XcmBridgeHubRouterTransactCallMaxWeight: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(200_000_000, 6144);
-}
-
 /// Identifier of AssetHubWestend in the Westend relay chain.
 pub const ASSET_HUB_WESTEND_PARACHAIN_ID: u32 = 1000;

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

@@ -105,7 +105,7 @@ frame_support::parameter_types! {
 	/// The XCM fee that is paid for executing XCM program (with `ExportMessage` instruction) at the Rococo
 	/// BridgeHub.
 	/// (initially was calculated by test `BridgeHubRococo::can_calculate_weight_for_paid_export_message_with_reserve_transfer` + `33%`)
-	pub const BridgeHubRococoBaseXcmFeeInRocs: u128 = 57_145_832;
+	pub const BridgeHubRococoBaseXcmFeeInRocs: u128 = 57_325_000;
 
 	/// Transaction fee that is paid at the Rococo BridgeHub for delivering single inbound message.
 	/// (initially was calculated by test `BridgeHubRococo::can_calculate_fee_for_standalone_message_delivery_transaction` + `33%`)

bridges/chains/chain-bridge-hub-westend/src/lib.rs

@@ -94,7 +94,7 @@ frame_support::parameter_types! {
 	/// The XCM fee that is paid for executing XCM program (with `ExportMessage` instruction) at the Westend
 	/// BridgeHub.
 	/// (initially was calculated by test `BridgeHubWestend::can_calculate_weight_for_paid_export_message_with_reserve_transfer` + `33%`)
-	pub const BridgeHubWestendBaseXcmFeeInWnds: u128 = 18_191_740_000;
+	pub const BridgeHubWestendBaseXcmFeeInWnds: u128 = 18_248_930_000;
 
 	/// Transaction fee that is paid at the Westend BridgeHub for delivering single inbound message.
 	/// (initially was calculated by test `BridgeHubWestend::can_calculate_fee_for_standalone_message_delivery_transaction` + `33%`)

bridges/modules/relayers/src/extension/mod.rs

@@ -454,7 +454,6 @@ mod tests {
 	use bp_runtime::{BasicOperatingMode, HeaderId, Parachain};
 	use bp_test_utils::{make_default_justification, test_keyring, TEST_GRANDPA_SET_ID};
 	use frame_support::{
-		__private::sp_tracing,
 		assert_storage_noop, parameter_types,
 		traits::{fungible::Mutate, ReservableCurrency},
 		weights::Weight,
@@ -1124,7 +1123,6 @@ mod tests {
 		Option<PreDispatchData<ThisChainAccountId, BridgedChainBlockNumber, TestLaneIdType>>,
 		TransactionValidityError,
 	> {
-		sp_tracing::try_init_simple();
 		let extension: TestExtension = BridgeRelayersTransactionExtension(PhantomData);
 		extension
 			.validate_and_prepare(

bridges/modules/xcm-bridge-hub-router/Cargo.toml

@@ -17,6 +17,7 @@ scale-info = { features = ["bit-vec", "derive", "serde"], workspace = true }
 
 # Bridge dependencies
 bp-xcm-bridge-hub-router = { workspace = true }
+bp-xcm-bridge-hub = { workspace = true }
 
 # Substrate Dependencies
 frame-benchmarking = { optional = true, workspace = true }
@@ -38,6 +39,7 @@ sp-std = { workspace = true, default-features = true }
 default = ["std"]
 std = [
 	"bp-xcm-bridge-hub-router/std",
+	"bp-xcm-bridge-hub/std",
 	"codec/std",
 	"frame-benchmarking/std",
 	"frame-support/std",

bridges/modules/xcm-bridge-hub-router/src/benchmarking.rs

@@ -18,43 +18,95 @@
 
 #![cfg(feature = "runtime-benchmarks")]
 
-use crate::{DeliveryFeeFactor, MINIMAL_DELIVERY_FEE_FACTOR};
-use frame_benchmarking::{benchmarks_instance_pallet, BenchmarkError};
-use frame_support::traits::{Get, Hooks};
-use sp_runtime::traits::Zero;
+use crate::{BridgeState, Bridges, Call, ResolveBridgeId, MINIMAL_DELIVERY_FEE_FACTOR};
+use frame_benchmarking::v2::*;
+use frame_support::traits::{EnsureOriginWithArg, Hooks};
+use sp_runtime::{traits::Zero, Saturating};
 use xcm::prelude::*;
 
 /// Pallet we're benchmarking here.
 pub struct Pallet<T: Config<I>, I: 'static = ()>(crate::Pallet<T, I>);
 
 /// Trait that must be implemented by runtime to be able to benchmark pallet properly.
 pub trait Config<I: 'static>: crate::Config<I> {
-	/// Fill up queue so it becomes congested.
-	fn make_congested();
-
 	/// Returns destination which is valid for this router instance.
-	/// (Needs to pass `T::Bridges`)
-	/// Make sure that `SendXcm` will pass.
-	fn ensure_bridged_target_destination() -> Result<Location, BenchmarkError> {
-		Ok(Location::new(
-			Self::UniversalLocation::get().len() as u8,
-			[GlobalConsensus(Self::BridgedNetworkId::get().unwrap())],
-		))
-	}
+	fn ensure_bridged_target_destination() -> Result<Location, BenchmarkError>;
+	/// Returns valid origin for `report_bridge_status` (if `T::BridgeHubOrigin` is supported).
+	fn report_bridge_status_origin() -> Option<Self::RuntimeOrigin>;
 }
 
-benchmarks_instance_pallet! {
-	on_initialize_when_non_congested {
-		DeliveryFeeFactor::<T, I>::put(MINIMAL_DELIVERY_FEE_FACTOR + MINIMAL_DELIVERY_FEE_FACTOR);
-	}: {
-		crate::Pallet::<T, I>::on_initialize(Zero::zero())
+#[instance_benchmarks]
+mod benchmarks {
+	use super::*;
+
+	#[benchmark]
+	fn on_idle_when_bridge_state_removed() -> Result<(), BenchmarkError> {
+		let bridge_id =
+			T::BridgeIdResolver::resolve_for_dest(&T::ensure_bridged_target_destination()?)
+				.ok_or(BenchmarkError::Weightless)?;
+
+		// uncongested and less than a minimal factor is removed
+		Bridges::<T, I>::insert(
+			&bridge_id,
+			BridgeState { delivery_fee_factor: 0.into(), is_congested: false },
+		);
+		assert!(Bridges::<T, I>::get(&bridge_id).is_some());
+
+		#[block]
+		{
+			let _ = crate::Pallet::<T, I>::on_idle(Zero::zero(), Weight::MAX);
+		}
+
+		assert!(Bridges::<T, I>::get(bridge_id).is_none());
+
+		Ok(())
 	}
 
-	on_initialize_when_congested {
-		DeliveryFeeFactor::<T, I>::put(MINIMAL_DELIVERY_FEE_FACTOR + MINIMAL_DELIVERY_FEE_FACTOR);
-		let _ = T::ensure_bridged_target_destination()?;
-		T::make_congested();
-	}: {
-		crate::Pallet::<T, I>::on_initialize(Zero::zero())
+	#[benchmark]
+	fn on_indle_when_bridge_state_updated() -> Result<(), BenchmarkError> {
+		let bridge_id =
+			T::BridgeIdResolver::resolve_for_dest(&T::ensure_bridged_target_destination()?)
+				.ok_or(BenchmarkError::Weightless)?;
+
+		// uncongested and higher than a minimal factor is decreased
+		let old_delivery_fee_factor = MINIMAL_DELIVERY_FEE_FACTOR.saturating_mul(1000.into());
+		Bridges::<T, I>::insert(
+			&bridge_id,
+			BridgeState { delivery_fee_factor: old_delivery_fee_factor, is_congested: false },
+		);
+		assert!(Bridges::<T, I>::get(&bridge_id).is_some());
+
+		#[block]
+		{
+			let _ = crate::Pallet::<T, I>::on_idle(Zero::zero(), Weight::MAX);
+		}
+
+		assert!(
+			Bridges::<T, I>::get(bridge_id).unwrap().delivery_fee_factor < old_delivery_fee_factor
+		);
+		Ok(())
 	}
+
+	#[benchmark]
+	fn report_bridge_status() -> Result<(), BenchmarkError> {
+		let bridge_id =
+			T::BridgeIdResolver::resolve_for_dest(&T::ensure_bridged_target_destination()?)
+				.ok_or(BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)))?;
+		let origin = T::report_bridge_status_origin()
+			.ok_or(BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)))?;
+		let _ = T::BridgeHubOrigin::try_origin(origin.clone(), &bridge_id)
+			.map_err(|_| BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)))?;
+		let is_congested = true;
+
+		#[extrinsic_call]
+		report_bridge_status(origin as T::RuntimeOrigin, bridge_id.clone(), is_congested);
+
+		assert_eq!(
+			Bridges::<T, I>::get(&bridge_id),
+			Some(BridgeState { delivery_fee_factor: MINIMAL_DELIVERY_FEE_FACTOR, is_congested })
+		);
+		Ok(())
+	}
+
+	impl_benchmark_test_suite!(Pallet, crate::mock::new_test_ext(), crate::mock::TestRuntime);
 }