Benchmark for message delivery confirmation transaction (paritytech#570)

* receive_delivery_proof benchmarks * fix compilation * Update modules/message-lane/src/benchmarking.rs Co-authored-by: Hernando Castano <[email protected]> * Update modules/message-lane/src/benchmarking.rs Co-authored-by: Hernando Castano <[email protected]> * Update modules/message-lane/src/benchmarking.rs Co-authored-by: Hernando Castano <[email protected]> * Update modules/message-lane/src/benchmarking.rs Co-authored-by: Hernando Castano <[email protected]> * Update modules/message-lane/src/benchmarking.rs Co-authored-by: Hernando Castano <[email protected]> Co-authored-by: Hernando Castano <[email protected]>
serban300 · Apr 10, 2024 · 75a2d58 · 75a2d58
1 parent 7c11074
commit 75a2d58
Show file tree

Hide file tree

Showing 6 changed files with 308 additions and 15 deletions.
diff --git a/bridges/bin/rialto/runtime/src/lib.rs b/bridges/bin/rialto/runtime/src/lib.rs
@@ -802,6 +802,7 @@ impl_runtime_apis! {
 			use pallet_message_lane::benchmarking::{
 				Module as MessageLaneBench,
 				Config as MessageLaneConfig,
+				MessageDeliveryProofParams as MessageLaneMessageDeliveryProofParams,
 				MessageParams as MessageLaneMessageParams,
 				MessageProofParams as MessageLaneMessageProofParams,
 			};
@@ -811,6 +812,10 @@ impl_runtime_apis! {
 					Default::default()
 				}
 
+				fn account_balance(account: &Self::AccountId) -> Self::OutboundMessageFee {
+					pallet_balances::Module::<Runtime>::free_balance(account)
+				}
+
 				fn endow_account(account: &Self::AccountId) {
 					pallet_balances::Module::<Runtime>::make_free_balance_be(
 						account,
@@ -913,6 +918,34 @@ impl_runtime_apis! {
 						}.encode(),
 					)
 				}
+
+				fn prepare_message_delivery_proof(
+					params: MessageLaneMessageDeliveryProofParams<Self::AccountId>,
+				) -> millau_messages::FromMillauMessagesDeliveryProof {
+					use crate::millau_messages::{Millau, WithMillauMessageBridge};
+					use bridge_runtime_common::{
+						messages::ChainWithMessageLanes,
+						messages_benchmarking::prepare_message_delivery_proof,
+					};
+					use sp_runtime::traits::Header;
+
+					prepare_message_delivery_proof::<WithMillauMessageBridge, bp_millau::Hasher, Runtime, _, _>(
+						params,
+						|lane_id| pallet_message_lane::storage_keys::inbound_lane_data_key::<
+							Runtime,
+							<Millau as ChainWithMessageLanes>::MessageLaneInstance,
+						>(
+							&lane_id,
+						).0,
+						|state_root| bp_millau::Header::new(
+							0,
+							Default::default(),
+							state_root,
+							Default::default(),
+							Default::default(),
+						),
+					)
+				}
 			}
 
 			add_benchmark!(params, batches, pallet_bridge_eth_poa, BridgeKovan);

diff --git a/bridges/bin/rialto/runtime/src/millau_messages.rs b/bridges/bin/rialto/runtime/src/millau_messages.rs
@@ -74,7 +74,8 @@ pub type FromMillauMessageDispatch = messages::target::FromBridgedChainMessageDi
 pub type FromMillauMessagesProof = messages::target::FromBridgedChainMessagesProof<WithMillauMessageBridge>;
 
 /// Messages delivery proof for Rialto -> Millau messages.
-type ToMillauMessagesDeliveryProof = messages::source::FromBridgedChainMessagesDeliveryProof<WithMillauMessageBridge>;
+pub type FromMillauMessagesDeliveryProof =
+	messages::source::FromBridgedChainMessagesDeliveryProof<WithMillauMessageBridge>;
 
 /// Millau <-> Rialto message bridge.
 #[derive(RuntimeDebug, Clone, Copy)]
@@ -168,7 +169,7 @@ impl TargetHeaderChain<ToMillauMessagePayload, bp_millau::AccountId> for Millau
 	// - hash of the header this proof has been created with;
 	// - the storage proof of one or several keys;
 	// - id of the lane we prove state of.
-	type MessagesDeliveryProof = ToMillauMessagesDeliveryProof;
+	type MessagesDeliveryProof = FromMillauMessagesDeliveryProof;
 
 	fn verify_message(payload: &ToMillauMessagePayload) -> Result<(), Self::Error> {
 		messages::source::verify_chain_message::<WithMillauMessageBridge>(payload)

diff --git a/bridges/bin/runtime-common/src/messages.rs b/bridges/bin/runtime-common/src/messages.rs
@@ -90,7 +90,7 @@ pub trait ChainWithMessageLanes {
 	/// Hash used in the chain.
 	type Hash: Decode;
 	/// Accound id on the chain.
-	type AccountId: Decode;
+	type AccountId: Encode + Decode;
 	/// Public key of the chain account that may be used to verify signatures.
 	type Signer: Decode;
 	/// Signature type used on the chain.

diff --git a/bridges/bin/runtime-common/src/messages_benchmarking.rs b/bridges/bin/runtime-common/src/messages_benchmarking.rs
@@ -19,13 +19,16 @@
 
 #![cfg(feature = "runtime-benchmarks")]
 
-use crate::messages::{target::FromBridgedChainMessagesProof, BalanceOf, BridgedChain, HashOf, MessageBridge};
+use crate::messages::{
+	source::FromBridgedChainMessagesDeliveryProof, target::FromBridgedChainMessagesProof, AccountIdOf, BalanceOf,
+	BridgedChain, HashOf, MessageBridge, ThisChain,
+};
 
 use bp_message_lane::{LaneId, MessageData, MessageKey, MessagePayload};
 use codec::Encode;
 use ed25519_dalek::{PublicKey, SecretKey, Signer, KEYPAIR_LENGTH, SECRET_KEY_LENGTH};
 use frame_support::weights::Weight;
-use pallet_message_lane::benchmarking::MessageProofParams;
+use pallet_message_lane::benchmarking::{MessageDeliveryProofParams, MessageProofParams};
 use sp_core::Hasher;
 use sp_runtime::traits::Header;
 use sp_std::prelude::*;
@@ -142,3 +145,47 @@ where
 			.expect("too many messages requested by benchmark"),
 	)
 }
+
+/// Prepare proof of messages delivery for the `receive_messages_delivery_proof` call.
+pub fn prepare_message_delivery_proof<B, H, R, ML, MH>(
+	params: MessageDeliveryProofParams<AccountIdOf<ThisChain<B>>>,
+	make_bridged_inbound_lane_data_key: ML,
+	make_bridged_header: MH,
+) -> FromBridgedChainMessagesDeliveryProof<B>
+where
+	B: MessageBridge,
+	H: Hasher,
+	R: pallet_substrate_bridge::Config,
+	<R::BridgedChain as bp_runtime::Chain>::Hash: Into<HashOf<BridgedChain<B>>>,
+	ML: Fn(LaneId) -> Vec<u8>,
+	MH: Fn(H::Out) -> <R::BridgedChain as bp_runtime::Chain>::Header,
+{
+	// prepare Bridged chain storage with inbound lane state
+	let storage_key = make_bridged_inbound_lane_data_key(params.lane);
+	let mut root = Default::default();
+	let mut mdb = MemoryDB::default();
+	{
+		let mut trie = TrieDBMut::<H>::new(&mut mdb, &mut root);
+		trie.insert(&storage_key, &params.inbound_lane_data.encode())
+			.map_err(|_| "TrieMut::insert has failed")
+			.expect("TrieMut::insert should not fail in benchmarks");
+	}
+
+	// generate storage proof to be delivered to This chain
+	let mut proof_recorder = Recorder::<H::Out>::new();
+	read_trie_value_with::<Layout<H>, _, _>(&mdb, &root, &storage_key, &mut proof_recorder)
+		.map_err(|_| "read_trie_value_with has failed")
+		.expect("read_trie_value_with should not fail in benchmarks");
+	let storage_proof = proof_recorder.drain().into_iter().map(|n| n.data.to_vec()).collect();
+
+	// prepare Bridged chain header and insert it into the Substrate pallet
+	let bridged_header = make_bridged_header(root);
+	let bridged_header_hash = bridged_header.hash();
+	pallet_substrate_bridge::initialize_for_benchmarks::<R>(bridged_header);
+
+	(
+		bridged_header_hash.into(),
+		StorageProof::new(storage_proof),
+		params.lane,
+	)
+}