Take send cost on BH into account

bridges/snowbridge/pallets/inbound-queue/src/lib.rs

@@ -53,6 +53,7 @@ use sp_runtime::traits::Zero;
 use sp_std::vec;
 use xcm::prelude::{
 	send_xcm, Junction::*, Location, SendError as XcmpSendError, SendXcm, Xcm, XcmContext, XcmHash,
+	*,
 };
 use xcm_executor::traits::TransactAsset;
 
@@ -61,9 +62,8 @@ use snowbridge_core::{
 	sibling_sovereign_account, BasicOperatingMode, Channel, ChannelId, ParaId, PricingParameters,
 	StaticLookup,
 };
-use snowbridge_router_primitives::{
-	inbound,
-	inbound::{ConvertMessage, ConvertMessageError},
+use snowbridge_router_primitives::inbound::{
+	ConvertMessage, ConvertMessageError, VersionedMessage,
 };
 use sp_runtime::{traits::Saturating, SaturatedConversion, TokenError};
 
@@ -141,6 +141,9 @@ pub mod pallet {
 
 		/// To withdraw and deposit an asset.
 		type AssetTransactor: TransactAsset;
+
+		/// The most expensive xcm here only used to estimate send cost
+		type MaxSendCost: Get<BalanceOf<Self>>;
 	}
 
 	#[pallet::hooks]
@@ -278,12 +281,11 @@ pub mod pallet {
 			}
 
 			// Decode message into XCM
-			let (xcm, fee) =
-				match inbound::VersionedMessage::decode_all(&mut envelope.payload.as_ref()) {
-					Ok(message) => T::MessageConverter::convert(envelope.message_id, message)
-						.map_err(|e| Error::<T>::ConvertMessage(e))?,
-					Err(_) => return Err(Error::<T>::InvalidPayload.into()),
-				};
+			let (xcm, fee) = match VersionedMessage::decode_all(&mut envelope.payload.as_ref()) {
+				Ok(message) => T::MessageConverter::convert(envelope.message_id, message)
+					.map_err(|e| Error::<T>::ConvertMessage(e))?,
+				Err(_) => return Err(Error::<T>::InvalidPayload.into()),
+			};
 
 			log::info!(
 				target: LOG_TARGET,
@@ -335,6 +337,7 @@ pub mod pallet {
 			weight_fee
 				.saturating_add(len_fee)
 				.saturating_add(T::PricingParameters::get().rewards.local)
+				.saturating_add(T::MaxSendCost::get())
 		}
 
 		/// Burn the amount of the fee embedded into the XCM for teleports
@@ -365,7 +368,6 @@ pub mod pallet {
 	/// API for accessing the delivery cost of a message
 	impl<T: Config> Get<BalanceOf<T>> for Pallet<T> {
 		fn get() -> BalanceOf<T> {
-			// Cost here based on MaxMessagePayloadSize(the worst case)
 			Self::calculate_delivery_cost(T::MaxMessageSize::get())
 		}
 	}

bridges/snowbridge/pallets/inbound-queue/src/mock.rs

@@ -175,6 +175,8 @@ parameter_types! {
 		rewards: Rewards { local: DOT, remote: meth(1) },
 		multiplier: FixedU128::from_rational(1, 1),
 	};
+	pub DefaultFee: Asset = (Parent, 1_000_000_000).into();
+	pub MaxSendCost: u128 =  1;
 }
 
 pub const DOT: u128 = 10_000_000_000;
@@ -248,6 +250,7 @@ impl inbound_queue::Config for Test {
 	type LengthToFee = IdentityFee<u128>;
 	type MaxMessageSize = ConstU32<1024>;
 	type AssetTransactor = SuccessfulTransactor;
+	type MaxSendCost = MaxSendCost;
 }
 
 pub fn last_events(n: usize) -> Vec<RuntimeEvent> {

bridges/snowbridge/pallets/outbound-queue/src/lib.rs

@@ -410,7 +410,7 @@ pub mod pallet {
 		}
 
 		/// The local component of the message processing fees in native currency
-		pub(crate) fn calculate_local_fee() -> T::Balance {
+		pub fn calculate_local_fee() -> T::Balance {
 			T::WeightToFee::weight_to_fee(
 				&T::WeightInfo::do_process_message().saturating_add(T::WeightInfo::commit_single()),
 			)

bridges/snowbridge/runtime/test-common/Cargo.toml

@@ -42,6 +42,7 @@ snowbridge-core = { path = "../../primitives/core", default-features = false }
 snowbridge-pallet-ethereum-client = { path = "../../pallets/ethereum-client", default-features = false }
 snowbridge-pallet-ethereum-client-fixtures = { path = "../../pallets/ethereum-client/fixtures", default-features = false }
 snowbridge-pallet-outbound-queue = { path = "../../pallets/outbound-queue", default-features = false }
+snowbridge-pallet-inbound-queue = { path = "../../pallets/inbound-queue", default-features = false }
 snowbridge-pallet-system = { path = "../../pallets/system", default-features = false }
 
 [features]
@@ -63,6 +64,7 @@ std = [
 	"snowbridge-core/std",
 	"snowbridge-pallet-ethereum-client-fixtures/std",
 	"snowbridge-pallet-ethereum-client/std",
+	"snowbridge-pallet-inbound-queue/std",
 	"snowbridge-pallet-outbound-queue/std",
 	"snowbridge-pallet-system/std",
 	"sp-core/std",
@@ -86,6 +88,7 @@ runtime-benchmarks = [
 	"snowbridge-core/runtime-benchmarks",
 	"snowbridge-pallet-ethereum-client-fixtures/runtime-benchmarks",
 	"snowbridge-pallet-ethereum-client/runtime-benchmarks",
+	"snowbridge-pallet-inbound-queue/runtime-benchmarks",
 	"snowbridge-pallet-outbound-queue/runtime-benchmarks",
 	"snowbridge-pallet-system/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",

bridges/snowbridge/runtime/test-common/src/lib.rs

@@ -12,7 +12,7 @@ use parachains_runtimes_test_utils::{
 };
 use snowbridge_core::{ChannelId, ParaId};
 use snowbridge_pallet_ethereum_client_fixtures::*;
-use sp_core::{H160, U256};
+use sp_core::{Get, H160, U256};
 use sp_keyring::AccountKeyring::*;
 use sp_runtime::{traits::Header, AccountId32, DigestItem, SaturatedConversion, Saturating};
 use xcm::{
@@ -561,3 +561,46 @@ pub fn ethereum_to_polkadot_message_extrinsics_work<Runtime>(
 			assert_ok!(sync_committee_outcome);
 		});
 }
+
+pub fn fetch_delivery_cost<Runtime, XcmConfig>(collator_session_key: CollatorSessionKeys<Runtime>)
+where
+	Runtime: frame_system::Config
+		+ pallet_balances::Config
+		+ pallet_session::Config
+		+ pallet_xcm::Config
+		+ parachain_info::Config
+		+ pallet_collator_selection::Config
+		+ cumulus_pallet_parachain_system::Config
+		+ snowbridge_pallet_outbound_queue::Config
+		+ snowbridge_pallet_inbound_queue::Config
+		+ pallet_timestamp::Config,
+	XcmConfig: xcm_executor::Config,
+	ValidatorIdOf<Runtime>: From<AccountIdOf<Runtime>>,
+	<Runtime as frame_system::Config>::AccountId: From<sp_runtime::AccountId32> + AsRef<[u8]>,
+{
+	ExtBuilder::<Runtime>::default()
+		.with_collators(collator_session_key.collators())
+		.with_session_keys(collator_session_key.session_keys())
+		.with_para_id(1013.into())
+		.with_tracing()
+		.build()
+		.execute_with(|| {
+			let _ = <pallet_xcm::Pallet<Runtime>>::force_xcm_version(
+				RuntimeHelper::<Runtime>::root_origin(),
+				Box::new(Location { parents: 1, interior: [Parachain(1000)].into() }),
+				XCM_VERSION,
+			);
+			let inbound_delivery_cost =
+				<snowbridge_pallet_inbound_queue::Pallet<Runtime>>::calculate_delivery_cost(
+					<Runtime as snowbridge_pallet_inbound_queue::Config>::MaxMessageSize::get(),
+				);
+			let inbound_send_cost =
+				<Runtime as snowbridge_pallet_inbound_queue::Config>::MaxSendCost::get();
+			let outbound_delivery_cost =
+				<snowbridge_pallet_outbound_queue::Pallet<Runtime>>::calculate_local_fee();
+
+			println!("inbound_delivery_cost:{:?}", inbound_delivery_cost);
+			println!("inbound_send_cost:{:?}", inbound_send_cost);
+			println!("outbound_delivery_cost:{:?}", outbound_delivery_cost);
+		})
+}

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_to_ethereum_config.rs

@@ -63,6 +63,7 @@ parameter_types! {
 		rewards: Rewards { local: 1 * UNITS, remote: meth(1) },
 		multiplier: FixedU128::from_rational(1, 1),
 	};
+	pub MaxSendCost: Balance =  UNITS / 10;
 }
 
 impl snowbridge_pallet_inbound_queue::Config for Runtime {
@@ -90,6 +91,7 @@ impl snowbridge_pallet_inbound_queue::Config for Runtime {
 	type WeightInfo = crate::weights::snowbridge_pallet_inbound_queue::WeightInfo<Runtime>;
 	type PricingParameters = EthereumSystem;
 	type AssetTransactor = <xcm_config::XcmConfig as xcm_executor::Config>::AssetTransactor;
+	type MaxSendCost = MaxSendCost;
 }
 
 impl snowbridge_pallet_outbound_queue::Config for Runtime {

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/tests/snowbridge.rs

@@ -202,3 +202,10 @@ fn construct_and_apply_extrinsic(
 	let r = Executive::apply_extrinsic(xt);
 	r.unwrap()
 }
+
+#[test]
+fn fetch_delivery_cost() {
+	snowbridge_runtime_test_common::fetch_delivery_cost::<Runtime, XcmConfig>(
+		collator_session_keys(),
+	);
+}