From ab25fdb2ec31012ab744a9df07b47090b77ad2a0 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Tue, 21 Feb 2023 16:12:27 +0300 Subject: [PATCH 1/2] wrap confirmation and finality transactions into batch_all in RialtoParachain<>Millau --- .../millau_messages_to_rialto_parachain.rs | 7 ++++--- relays/messages/src/message_race_loop.rs | 17 +++++++++-------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/relays/bin-substrate/src/chains/millau_messages_to_rialto_parachain.rs b/relays/bin-substrate/src/chains/millau_messages_to_rialto_parachain.rs index 5dbe1d69d13..8fedd22a40a 100644 --- a/relays/bin-substrate/src/chains/millau_messages_to_rialto_parachain.rs +++ b/relays/bin-substrate/src/chains/millau_messages_to_rialto_parachain.rs @@ -18,8 +18,9 @@ use relay_millau_client::Millau; use relay_rialto_parachain_client::RialtoParachain; -use substrate_relay_helper::messages_lane::{ - DirectReceiveMessagesDeliveryProofCallBuilder, SubstrateMessageLane, +use substrate_relay_helper::{ + messages_lane::{DirectReceiveMessagesDeliveryProofCallBuilder, SubstrateMessageLane}, + UtilityPalletBatchCallBuilder, }; substrate_relay_helper::generate_receive_message_proof_call_builder!( @@ -45,6 +46,6 @@ impl SubstrateMessageLane for MillauMessagesToRialtoParachain { millau_runtime::WithRialtoParachainMessagesInstance, >; - type SourceBatchCallBuilder = (); + type SourceBatchCallBuilder = UtilityPalletBatchCallBuilder; type TargetBatchCallBuilder = (); } diff --git a/relays/messages/src/message_race_loop.rs b/relays/messages/src/message_race_loop.rs index 2988ab231d9..074c8b31b7a 100644 --- a/relays/messages/src/message_race_loop.rs +++ b/relays/messages/src/message_race_loop.rs @@ -573,17 +573,18 @@ pub async fn run, TC: TargetClient

>( if let Some((at_block, nonces_range, proof)) = race_state.nonces_to_submit.as_ref() { log::debug!( target: "bridge", - "Going to submit proof of messages in range {:?} to {} node", + "Going to submit proof of messages in range {:?} to {} node{}", nonces_range, P::target_name(), + if let Some(ref target_batch_transaction) = target_batch_transaction { + format!( + ". This transaction is batched with sending the proof for header {:?}.", + target_batch_transaction.required_header_id(), + ) + } else { + Default::default() + }, ); - if let Some(ref target_batch_transaction) = target_batch_transaction { - log::debug!( - target: "bridge", - "This transaction is batched with sending the proof for header {:?}.", - target_batch_transaction.required_header_id(), - ); - } target_submit_proof.set( race_target From d8dc59aba4b7bd66345c060088f44c5a3a74e539 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Wed, 22 Feb 2023 09:48:17 +0300 Subject: [PATCH 2/2] review comments --- relays/messages/src/message_race_loop.rs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/relays/messages/src/message_race_loop.rs b/relays/messages/src/message_race_loop.rs index 074c8b31b7a..3d995a0a362 100644 --- a/relays/messages/src/message_race_loop.rs +++ b/relays/messages/src/message_race_loop.rs @@ -576,14 +576,10 @@ pub async fn run, TC: TargetClient

>( "Going to submit proof of messages in range {:?} to {} node{}", nonces_range, P::target_name(), - if let Some(ref target_batch_transaction) = target_batch_transaction { - format!( - ". This transaction is batched with sending the proof for header {:?}.", - target_batch_transaction.required_header_id(), - ) - } else { - Default::default() - }, + target_batch_transaction.as_ref().map(|tx| format!( + ". This transaction is batched with sending the proof for header {:?}.", + tx.required_header_id()) + ).unwrap_or_default(), ); target_submit_proof.set(