Add state to message lanes (#2214)

* add LaneState enum and a field to lanes data * use OptionQuery in InboundLanes and OutboundLanes * ensure that lanes are opened when accessing them * an option to specify opened lanes in genesis config + fixed tests * added PR reference to TODO * fix failing benchmarks * spelling * get_or_init_data -> data
paritytech · May 7, 2024 · 58ba24f · 58ba24f
1 parent 78997ce
commit 58ba24f
Show file tree

Hide file tree

Showing 25 changed files with 546 additions and 270 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/millau/node/Cargo.toml b/bin/millau/node/Cargo.toml
@@ -15,6 +15,7 @@ serde_json = "1.0.96"
 
 # Bridge dependencies
 
+bp-messages = { path = "../../../primitives/messages" }
 millau-runtime = { path = "../runtime" }
 
 # Substrate Dependencies

diff --git a/bin/millau/node/src/chain_spec.rs b/bin/millau/node/src/chain_spec.rs
@@ -222,12 +222,14 @@ fn testnet_genesis(
 		},
 		bridge_rialto_messages: BridgeRialtoMessagesConfig {
 			owner: Some(get_account_id_from_seed::<sr25519::Public>(RIALTO_MESSAGES_PALLET_OWNER)),
+			opened_lanes: vec![bp_messages::LaneId::default()],
 			..Default::default()
 		},
 		bridge_rialto_parachain_messages: BridgeRialtoParachainMessagesConfig {
 			owner: Some(get_account_id_from_seed::<sr25519::Public>(
 				RIALTO_PARACHAIN_MESSAGES_PALLET_OWNER,
 			)),
+			opened_lanes: vec![bp_messages::LaneId::default()],
 			..Default::default()
 		},
 		xcm_pallet: Default::default(),

diff --git a/bin/millau/runtime/src/lib.rs b/bin/millau/runtime/src/lib.rs
@@ -428,8 +428,6 @@ impl pallet_shift_session_manager::Config for Runtime {}
 parameter_types! {
 	pub const MaxMessagesToPruneAtOnce: bp_messages::MessageNonce = 8;
 	pub const RootAccountForPayments: Option<AccountId> = None;
-	pub RialtoActiveOutboundLanes: &'static [bp_messages::LaneId] = &[rialto_messages::XCM_LANE];
-	pub RialtoParachainActiveOutboundLanes: &'static [bp_messages::LaneId] = &[rialto_parachain_messages::XCM_LANE];
 }
 
 /// Instance of the messages pallet used to relay messages to/from Rialto chain.
@@ -443,8 +441,6 @@ impl pallet_bridge_messages::Config<WithRialtoMessagesInstance> for Runtime {
 	type BridgedChain = bp_rialto::Rialto;
 	type BridgedHeaderChain = BridgeRialtoGrandpa;
 
-	type ActiveOutboundLanes = RialtoActiveOutboundLanes;
-
 	type OutboundPayload = bridge_runtime_common::messages_xcm_extension::XcmAsPlainPayload;
 	type InboundPayload = bridge_runtime_common::messages_xcm_extension::XcmAsPlainPayload;
 
@@ -473,8 +469,6 @@ impl pallet_bridge_messages::Config<WithRialtoParachainMessagesInstance> for Run
 		bp_rialto_parachain::RialtoParachain,
 	>;
 
-	type ActiveOutboundLanes = RialtoParachainActiveOutboundLanes;
-
 	type OutboundPayload = bridge_runtime_common::messages_xcm_extension::XcmAsPlainPayload;
 	type InboundPayload = bridge_runtime_common::messages_xcm_extension::XcmAsPlainPayload;
 

diff --git a/bin/millau/runtime/src/xcm_config.rs b/bin/millau/runtime/src/xcm_config.rs
@@ -242,7 +242,7 @@ mod tests {
 	};
 	use bp_messages::{
 		target_chain::{DispatchMessage, DispatchMessageData, MessageDispatch},
-		LaneId, MessageKey,
+		LaneId, MessageKey, OutboundLaneData,
 	};
 	use bridge_runtime_common::messages_xcm_extension::XcmBlobMessageDispatchResult;
 	use codec::Encode;
@@ -268,10 +268,15 @@ mod tests {
 	fn xcm_messages_to_rialto_are_sent_using_bridge_exporter() {
 		new_test_ext().execute_with(|| {
 			// ensure that the there are no messages queued
+			OutboundLanes::<Runtime, WithRialtoMessagesInstance>::insert(
+				crate::rialto_messages::XCM_LANE,
+				OutboundLaneData::opened(),
+			);
 			assert_eq!(
 				OutboundLanes::<Runtime, WithRialtoMessagesInstance>::get(
 					crate::rialto_messages::XCM_LANE
 				)
+				.unwrap()
 				.latest_generated_nonce,
 				0,
 			);
@@ -292,6 +297,7 @@ mod tests {
 				OutboundLanes::<Runtime, WithRialtoMessagesInstance>::get(
 					crate::rialto_messages::XCM_LANE
 				)
+				.unwrap()
 				.latest_generated_nonce,
 				1,
 			);
@@ -302,10 +308,15 @@ mod tests {
 	fn xcm_messages_to_rialto_parachain_are_sent_using_bridge_exporter() {
 		new_test_ext().execute_with(|| {
 			// ensure that the there are no messages queued
+			OutboundLanes::<Runtime, WithRialtoParachainMessagesInstance>::insert(
+				crate::rialto_parachain_messages::XCM_LANE,
+				OutboundLaneData::opened(),
+			);
 			assert_eq!(
 				OutboundLanes::<Runtime, WithRialtoParachainMessagesInstance>::get(
 					crate::rialto_parachain_messages::XCM_LANE
 				)
+				.unwrap()
 				.latest_generated_nonce,
 				0,
 			);
@@ -326,6 +337,7 @@ mod tests {
 				OutboundLanes::<Runtime, WithRialtoParachainMessagesInstance>::get(
 					crate::rialto_parachain_messages::XCM_LANE
 				)
+				.unwrap()
 				.latest_generated_nonce,
 				1,
 			);

diff --git a/bin/rialto-parachain/node/Cargo.toml b/bin/rialto-parachain/node/Cargo.toml
@@ -26,6 +26,8 @@ serde = { version = '1.0', features = ['derive'] }
 jsonrpsee = { version = "0.16.2", features = ["server"] }
 
 # Local Dependencies
+
+bp-messages = { path = "../../../primitives/messages" }
 rialto-parachain-runtime = { path = '../runtime' }
 
 # Substrate Dependencies

diff --git a/bin/rialto-parachain/node/src/chain_spec.rs b/bin/rialto-parachain/node/src/chain_spec.rs
@@ -192,6 +192,7 @@ fn testnet_genesis(
 		aura_ext: Default::default(),
 		bridge_millau_messages: BridgeMillauMessagesConfig {
 			owner: Some(get_account_id_from_seed::<sr25519::Public>(MILLAU_MESSAGES_PALLET_OWNER)),
+			opened_lanes: vec![bp_messages::LaneId::default()],
 			..Default::default()
 		},
 	}

diff --git a/bin/rialto-parachain/runtime/src/lib.rs b/bin/rialto-parachain/runtime/src/lib.rs
@@ -552,7 +552,6 @@ impl pallet_bridge_grandpa::Config for Runtime {
 parameter_types! {
 	pub const MaxMessagesToPruneAtOnce: bp_messages::MessageNonce = 8;
 	pub const RootAccountForPayments: Option<AccountId> = None;
-	pub ActiveOutboundLanes: &'static [bp_messages::LaneId] = &[millau_messages::XCM_LANE];
 }
 
 /// Instance of the messages pallet used to relay messages to/from Millau chain.
@@ -566,8 +565,6 @@ impl pallet_bridge_messages::Config<WithMillauMessagesInstance> for Runtime {
 	type BridgedChain = bp_millau::Millau;
 	type BridgedHeaderChain = BridgeMillauGrandpa;
 
-	type ActiveOutboundLanes = ActiveOutboundLanes;
-
 	type OutboundPayload = bridge_runtime_common::messages_xcm_extension::XcmAsPlainPayload;
 	type InboundPayload = bridge_runtime_common::messages_xcm_extension::XcmAsPlainPayload;
 
@@ -845,7 +842,7 @@ mod tests {
 	use crate::millau_messages::{FromMillauMessageDispatch, XCM_LANE};
 	use bp_messages::{
 		target_chain::{DispatchMessage, DispatchMessageData, MessageDispatch},
-		LaneId, MessageKey,
+		LaneId, MessageKey, OutboundLaneData,
 	};
 	use bp_runtime::Chain;
 	use bridge_runtime_common::{
@@ -883,8 +880,13 @@ mod tests {
 	fn xcm_messages_to_millau_are_sent_using_bridge_exporter() {
 		new_test_ext().execute_with(|| {
 			// ensure that the there are no messages queued
+			OutboundLanes::<Runtime, WithMillauMessagesInstance>::insert(
+				XCM_LANE,
+				OutboundLaneData::opened(),
+			);
 			assert_eq!(
 				OutboundLanes::<Runtime, WithMillauMessagesInstance>::get(XCM_LANE)
+					.unwrap()
 					.latest_generated_nonce,
 				0,
 			);
@@ -903,6 +905,7 @@ mod tests {
 			// ensure that the message has been queued
 			assert_eq!(
 				OutboundLanes::<Runtime, WithMillauMessagesInstance>::get(XCM_LANE)
+					.unwrap()
 					.latest_generated_nonce,
 				1,
 			);

diff --git a/bin/rialto/node/Cargo.toml b/bin/rialto/node/Cargo.toml
@@ -14,6 +14,7 @@ serde_json = "1.0.96"
 
 # Bridge dependencies
 
+bp-messages = { path = "../../../primitives/messages" }
 rialto-runtime = { path = "../runtime" }
 
 # Substrate Dependencies

diff --git a/bin/rialto/node/src/chain_spec.rs b/bin/rialto/node/src/chain_spec.rs
@@ -277,6 +277,7 @@ fn testnet_genesis(
 		paras: Default::default(),
 		bridge_millau_messages: BridgeMillauMessagesConfig {
 			owner: Some(get_account_id_from_seed::<sr25519::Public>(MILLAU_MESSAGES_PALLET_OWNER)),
+			opened_lanes: vec![bp_messages::LaneId::default()],
 			..Default::default()
 		},
 		xcm_pallet: Default::default(),

diff --git a/bin/rialto/runtime/src/lib.rs b/bin/rialto/runtime/src/lib.rs
@@ -408,7 +408,6 @@ impl pallet_shift_session_manager::Config for Runtime {}
 parameter_types! {
 	pub const MaxMessagesToPruneAtOnce: bp_messages::MessageNonce = 8;
 	pub const RootAccountForPayments: Option<AccountId> = None;
-	pub ActiveOutboundLanes: &'static [bp_messages::LaneId] = &[millau_messages::XCM_LANE];
 }
 
 /// Instance of the messages pallet used to relay messages to/from Millau chain.
@@ -422,8 +421,6 @@ impl pallet_bridge_messages::Config<WithMillauMessagesInstance> for Runtime {
 	type BridgedChain = bp_millau::Millau;
 	type BridgedHeaderChain = BridgeMillauGrandpa;
 
-	type ActiveOutboundLanes = ActiveOutboundLanes;
-
 	type OutboundPayload = bridge_runtime_common::messages_xcm_extension::XcmAsPlainPayload;
 	type InboundPayload = bridge_runtime_common::messages_xcm_extension::XcmAsPlainPayload;
 

diff --git a/bin/rialto/runtime/src/xcm_config.rs b/bin/rialto/runtime/src/xcm_config.rs
@@ -197,7 +197,7 @@ mod tests {
 	};
 	use bp_messages::{
 		target_chain::{DispatchMessage, DispatchMessageData, MessageDispatch},
-		LaneId, MessageKey,
+		LaneId, MessageKey, OutboundLaneData,
 	};
 	use bridge_runtime_common::messages_xcm_extension::XcmBlobMessageDispatchResult;
 	use codec::Encode;
@@ -223,8 +223,13 @@ mod tests {
 	fn xcm_messages_to_millau_are_sent_using_bridge_exporter() {
 		new_test_ext().execute_with(|| {
 			// ensure that the there are no messages queued
+			OutboundLanes::<Runtime, WithMillauMessagesInstance>::insert(
+				XCM_LANE,
+				OutboundLaneData::opened(),
+			);
 			assert_eq!(
 				OutboundLanes::<Runtime, WithMillauMessagesInstance>::get(XCM_LANE)
+					.unwrap()
 					.latest_generated_nonce,
 				0,
 			);
@@ -243,6 +248,7 @@ mod tests {
 			// ensure that the message has been queued
 			assert_eq!(
 				OutboundLanes::<Runtime, WithMillauMessagesInstance>::get(XCM_LANE)
+					.unwrap()
 					.latest_generated_nonce,
 				1,
 			);

diff --git a/bin/runtime-common/src/integrity.rs b/bin/runtime-common/src/integrity.rs
@@ -166,12 +166,6 @@ where
 	R: pallet_bridge_messages::Config<MI>,
 	MI: 'static,
 {
-	assert!(
-		!R::ActiveOutboundLanes::get().is_empty(),
-		"ActiveOutboundLanes ({:?}) must not be empty",
-		R::ActiveOutboundLanes::get(),
-	);
-
 	assert!(
 		pallet_bridge_messages::BridgedChainOf::<R, MI>::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX
 			<= pallet_bridge_messages::BridgedChainOf::<R, MI>::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX,