diff --git a/bridges/bin/runtime-common/src/messages_benchmarking.rs b/bridges/bin/runtime-common/src/messages_benchmarking.rs
index d80a88f1068c8975426105f881d963e1c3053ee5..e7e7891461b2160a3d51b7731b300af58b80b2d6 100644
--- a/bridges/bin/runtime-common/src/messages_benchmarking.rs
+++ b/bridges/bin/runtime-common/src/messages_benchmarking.rs
@@ -22,24 +22,22 @@
use crate::{
messages::{
source::FromBridgedChainMessagesDeliveryProof, target::FromBridgedChainMessagesProof,
- AccountIdOf, BridgedChain, HashOf, HasherOf, MessageBridge, ThisChain,
+ AccountIdOf, BridgedChain, HashOf, MessageBridge, ThisChain,
},
messages_generation::{
- encode_all_messages, encode_lane_data, grow_trie_leaf_value, prepare_messages_storage_proof,
+ encode_all_messages, encode_lane_data, prepare_message_delivery_storage_proof,
+ prepare_messages_storage_proof,
},
};
-use bp_messages::{storage_keys, MessagePayload};
+use bp_messages::MessagePayload;
use bp_polkadot_core::parachains::ParaHash;
-use bp_runtime::{
- record_all_trie_keys, Chain, Parachain, RawStorageProof, StorageProofSize, UnderlyingChainOf,
-};
+use bp_runtime::{Chain, Parachain, StorageProofSize, UnderlyingChainOf};
use codec::Encode;
use frame_support::weights::Weight;
use pallet_bridge_messages::benchmarking::{MessageDeliveryProofParams, MessageProofParams};
use sp_runtime::traits::{Header, Zero};
use sp_std::prelude::*;
-use sp_trie::{trie_types::TrieDBMutBuilderV1, LayoutV1, MemoryDB, TrieMut};
use xcm::v3::prelude::*;
/// Prepare inbound bridge message according to given message proof parameters.
@@ -172,7 +170,11 @@ where
{
// prepare storage proof
let lane = params.lane;
- let (state_root, storage_proof) = prepare_message_delivery_proof::<B>(params);
+ let (state_root, storage_proof) = prepare_message_delivery_storage_proof::<B>(
+ params.lane,
+ params.inbound_lane_data,
+ params.size,
+ );
// update runtime storage
let (_, bridged_header_hash) = insert_header_to_grandpa_pallet::<R, FI>(state_root);
@@ -200,7 +202,11 @@ where
{
// prepare storage proof
let lane = params.lane;
- let (state_root, storage_proof) = prepare_message_delivery_proof::<B>(params);
+ let (state_root, storage_proof) = prepare_message_delivery_storage_proof::<B>(
+ params.lane,
+ params.inbound_lane_data,
+ params.size,
+ );
// update runtime storage
let (_, bridged_header_hash) =
@@ -213,36 +219,6 @@ where
}
}
-/// Prepare in-memory message delivery proof, without inserting anything to the runtime storage.
-fn prepare_message_delivery_proof<B>(
- params: MessageDeliveryProofParams<AccountIdOf<ThisChain<B>>>,
-) -> (HashOf<BridgedChain<B>>, RawStorageProof)
-where
- B: MessageBridge,
-{
- // prepare Bridged chain storage with inbound lane state
- let storage_key =
- storage_keys::inbound_lane_data_key(B::BRIDGED_MESSAGES_PALLET_NAME, ¶ms.lane).0;
- let mut root = Default::default();
- let mut mdb = MemoryDB::default();
- {
- let mut trie =
- TrieDBMutBuilderV1::<HasherOf<BridgedChain<B>>>::new(&mut mdb, &mut root).build();
- let inbound_lane_data =
- grow_trie_leaf_value(params.inbound_lane_data.encode(), params.size);
- trie.insert(&storage_key, &inbound_lane_data)
- .map_err(|_| "TrieMut::insert has failed")
- .expect("TrieMut::insert should not fail in benchmarks");
- }
-
- // generate storage proof to be delivered to This chain
- let storage_proof = record_all_trie_keys::<LayoutV1<HasherOf<BridgedChain<B>>>, _>(&mdb, &root)
- .map_err(|_| "record_all_trie_keys has failed")
- .expect("record_all_trie_keys should not fail in benchmarks");
-
- (root, storage_proof)
-}
-
/// Insert header to the bridge GRANDPA pallet.
pub(crate) fn insert_header_to_grandpa_pallet<R, GI>(
state_root: bp_runtime::HashOf<R::BridgedChain>,
diff --git a/bridges/bin/runtime-common/src/messages_generation.rs b/bridges/bin/runtime-common/src/messages_generation.rs
index 3c550a9bd0fd546ba90753b8871e049e65a702e3..c37aaa5d4d5378a1b76507e017c73aec3c7aabbd 100644
--- a/bridges/bin/runtime-common/src/messages_generation.rs
+++ b/bridges/bin/runtime-common/src/messages_generation.rs
@@ -16,10 +16,11 @@
//! Helpers for generating message storage proofs, that are used by tests and by benchmarks.
-use crate::messages::{BridgedChain, HashOf, HasherOf, MessageBridge};
+use crate::messages::{AccountIdOf, BridgedChain, HashOf, HasherOf, MessageBridge, ThisChain};
use bp_messages::{
- storage_keys, LaneId, MessageKey, MessageNonce, MessagePayload, OutboundLaneData,
+ storage_keys, InboundLaneData, LaneId, MessageKey, MessageNonce, MessagePayload,
+ OutboundLaneData,
};
use bp_runtime::{record_all_trie_keys, RawStorageProof, StorageProofSize};
use codec::Encode;
@@ -104,6 +105,38 @@ where
(root, storage_proof)
}
+/// Prepare storage proof of given messages delivery.
+///
+/// Returns state trie root and nodes with prepared messages.
+pub fn prepare_message_delivery_storage_proof<B>(
+ lane: LaneId,
+ inbound_lane_data: InboundLaneData<AccountIdOf<ThisChain<B>>>,
+ size: StorageProofSize,
+) -> (HashOf<BridgedChain<B>>, RawStorageProof)
+where
+ B: MessageBridge,
+{
+ // prepare Bridged chain storage with inbound lane state
+ let storage_key = storage_keys::inbound_lane_data_key(B::BRIDGED_MESSAGES_PALLET_NAME, &lane).0;
+ let mut root = Default::default();
+ let mut mdb = MemoryDB::default();
+ {
+ let mut trie =
+ TrieDBMutBuilderV1::<HasherOf<BridgedChain<B>>>::new(&mut mdb, &mut root).build();
+ let inbound_lane_data = grow_trie_leaf_value(inbound_lane_data.encode(), size);
+ trie.insert(&storage_key, &inbound_lane_data)
+ .map_err(|_| "TrieMut::insert has failed")
+ .expect("TrieMut::insert should not fail in benchmarks");
+ }
+
+ // generate storage proof to be delivered to This chain
+ let storage_proof = record_all_trie_keys::<LayoutV1<HasherOf<BridgedChain<B>>>, _>(&mdb, &root)
+ .map_err(|_| "record_all_trie_keys has failed")
+ .expect("record_all_trie_keys should not fail in benchmarks");
+
+ (root, storage_proof)
+}
+
/// Add extra data to the trie leaf value so that it'll be of given size.
pub fn grow_trie_leaf_value(mut value: Vec<u8>, size: StorageProofSize) -> Vec<u8> {
match size {
diff --git a/bridges/primitives/chain-asset-hub-rococo/src/lib.rs b/bridges/primitives/chain-asset-hub-rococo/src/lib.rs
index 1a08ade2f4f2fbec3e351561293af8cf45f28bdf..6216b24d75c907236d1f274073374d68dec94576 100644
--- a/bridges/primitives/chain-asset-hub-rococo/src/lib.rs
+++ b/bridges/primitives/chain-asset-hub-rococo/src/lib.rs
@@ -45,10 +45,6 @@ pub enum Call {
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);
-
- /// Base delivery fee to `BridgeHubRococo`.
- /// (initially was calculated by test `BridgeHubRococo::can_calculate_weight_for_paid_export_message_with_reserve_transfer` + `33%`)
- pub const BridgeHubRococoBaseFeeInRocs: u128 = 1624803349;
}
/// Identifier of AssetHubRococo in the Rococo relay chain.
diff --git a/bridges/primitives/chain-asset-hub-westend/src/lib.rs b/bridges/primitives/chain-asset-hub-westend/src/lib.rs
index 2d317e4aee468c4784f5fcb6dabb7f9c50fd9921..9de1c88098942cdf7bd0684462a95ac3de412490 100644
--- a/bridges/primitives/chain-asset-hub-westend/src/lib.rs
+++ b/bridges/primitives/chain-asset-hub-westend/src/lib.rs
@@ -42,10 +42,6 @@ pub enum Call {
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);
-
- /// Base delivery fee to `BridgeHubWestend`.
- /// (initially was calculated by test `BridgeHubWestend::can_calculate_weight_for_paid_export_message_with_reserve_transfer` + `33%`)
- pub const BridgeHubWestendBaseFeeInWnds: u128 = 487441010000;
}
/// Identifier of AssetHubWestend in the Westend relay chain.
diff --git a/bridges/primitives/chain-asset-hub-wococo/src/lib.rs b/bridges/primitives/chain-asset-hub-wococo/src/lib.rs
index 809e56934e96e329becf37f06e7e481f55ff908b..c04eb04cce70b105ca06e4ebc1075a9099d73d07 100644
--- a/bridges/primitives/chain-asset-hub-wococo/src/lib.rs
+++ b/bridges/primitives/chain-asset-hub-wococo/src/lib.rs
@@ -42,10 +42,6 @@ pub enum Call {
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);
-
- /// Base delivery fee to `BridgeHubWococo`.
- /// (initially was calculated by test `BridgeHubWococo::can_calculate_weight_for_paid_export_message_with_reserve_transfer` + `33%`)
- pub const BridgeHubWococoBaseFeeInWocs: u128 = 1624803349;
}
/// Identifier of AssetHubWococo in the Wococo relay chain.
diff --git a/bridges/primitives/chain-bridge-hub-rococo/src/lib.rs b/bridges/primitives/chain-bridge-hub-rococo/src/lib.rs
index 039d681951cd15ffc0ea124df7e2dc249a048eab..e72e711de92701a5cf6427d5a36c53142cd64693 100644
--- a/bridges/primitives/chain-bridge-hub-rococo/src/lib.rs
+++ b/bridges/primitives/chain-bridge-hub-rococo/src/lib.rs
@@ -82,3 +82,18 @@ pub const WITH_BRIDGE_ROCOCO_TO_WESTEND_MESSAGES_PALLET_INDEX: u8 = 51;
decl_bridge_finality_runtime_apis!(bridge_hub_rococo);
decl_bridge_messages_runtime_apis!(bridge_hub_rococo);
+
+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 = 1628875538;
+
+ /// Transaction fee that is paid at the Rococo BridgeHub for delivering single inbound message.
+ /// (initially was calculated by test `BridgeHubRococo::can_calculate_fee_for_complex_message_delivery_transaction` + `33%`)
+ pub const BridgeHubRococoBaseDeliveryFeeInRocs: u128 = 6417262881;
+
+ /// Transaction fee that is paid at the Rococo BridgeHub for delivering single outbound message confirmation.
+ /// (initially was calculated by test `BridgeHubRococo::can_calculate_fee_for_complex_message_confirmation_transaction` + `33%`)
+ pub const BridgeHubRococoBaseConfirmationFeeInRocs: u128 = 6159996668;
+}
diff --git a/bridges/primitives/chain-bridge-hub-westend/src/lib.rs b/bridges/primitives/chain-bridge-hub-westend/src/lib.rs
index a52e328b68753bf4383e9c600afe5efc9e8d44a4..0124e05bf8871c35d68a64f00d9b34719b900c66 100644
--- a/bridges/primitives/chain-bridge-hub-westend/src/lib.rs
+++ b/bridges/primitives/chain-bridge-hub-westend/src/lib.rs
@@ -73,3 +73,18 @@ pub const WITH_BRIDGE_WESTEND_TO_ROCOCO_MESSAGES_PALLET_INDEX: u8 = 44;
decl_bridge_finality_runtime_apis!(bridge_hub_westend);
decl_bridge_messages_runtime_apis!(bridge_hub_westend);
+
+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 = 488662666666;
+
+ /// Transaction fee that is paid at the Westend BridgeHub for delivering single inbound message.
+ /// (initially was calculated by test `BridgeHubWestend::can_calculate_fee_for_complex_message_delivery_transaction` + `33%`)
+ pub const BridgeHubWestendBaseDeliveryFeeInWnds: u128 = 1925196628010;
+
+ /// Transaction fee that is paid at the Westend BridgeHub for delivering single outbound message confirmation.
+ /// (initially was calculated by test `BridgeHubWestend::can_calculate_fee_for_complex_message_confirmation_transaction` + `33%`)
+ pub const BridgeHubWestendBaseConfirmationFeeInWnds: u128 = 1848016628010;
+}
diff --git a/bridges/primitives/chain-bridge-hub-wococo/src/lib.rs b/bridges/primitives/chain-bridge-hub-wococo/src/lib.rs
index 750a8f7ecb9dd89fd51e8e216a21f76f77e8b953..c8bd397cec561684350c30e407e55915f294204b 100644
--- a/bridges/primitives/chain-bridge-hub-wococo/src/lib.rs
+++ b/bridges/primitives/chain-bridge-hub-wococo/src/lib.rs
@@ -73,3 +73,18 @@ pub const WITH_BRIDGE_WOCOCO_TO_ROCOCO_MESSAGES_PALLET_INDEX: u8 = 45;
decl_bridge_finality_runtime_apis!(bridge_hub_wococo);
decl_bridge_messages_runtime_apis!(bridge_hub_wococo);
+
+frame_support::parameter_types! {
+ /// The XCM fee that is paid for executing XCM program (with `ExportMessage` instruction) at the Wococo
+ /// BridgeHub.
+ /// (initially was calculated by test `BridgeHubWococo::can_calculate_weight_for_paid_export_message_with_reserve_transfer` + `33%`)
+ pub const BridgeHubWococoBaseXcmFeeInWocs: u128 = 1624803349;
+
+ /// Transaction fee that is paid at the Wococo BridgeHub for delivering single inbound message.
+ /// (initially was calculated by test `BridgeHubWococo::can_calculate_fee_for_complex_message_delivery_transaction` + `33%`)
+ pub const BridgeHubWococoBaseDeliveryFeeInWocs: u128 = 6417262881;
+
+ /// Transaction fee that is paid at the Wococo BridgeHub for delivering single outbound message confirmation.
+ /// (initially was calculated by test `BridgeHubWococo::can_calculate_fee_for_complex_message_confirmation_transaction` + `33%`)
+ pub const BridgeHubWococoBaseConfirmationFeeInWocs: u128 = 6159996668;
+}