Support arbitrary additional relay keys in the relay storage proof

client/consensus/nimbus-consensus/src/collators/basic.rs

@@ -65,6 +65,8 @@ pub struct Params<Proposer, BI, ParaClient, RClient, CIDP, CS, ADP = ()> {
 	/// The collator service used for bundling proposals into collations and announcing
 	/// to the network.
 	pub collator_service: CS,
+	/// Additional relay keys to add in the storage proof
+	pub additional_relay_keys: Vec<Vec<u8>>,
 }
 
 /// Run bare Nimbus consensus as a relay-chain-driven collator.
@@ -174,6 +176,7 @@ where
 					&relay_client,
 					*request.relay_parent(),
 					nimbus_id.clone(),
+					params.additional_relay_keys.clone(),
 				)
 				.await
 			);

client/consensus/nimbus-consensus/src/collators/lookahead.rs

@@ -49,6 +49,8 @@ use std::{sync::Arc, time::Duration};
 pub struct Params<BI, CIDP, Client, Backend, RClient, CHP, SO, Proposer, CS, DP = ()> {
 	/// Additional digest provider
 	pub additional_digests_provider: DP,
+	/// Additional relay keys to add in the storage proof
+	pub additional_relay_keys: Vec<Vec<u8>>,
 	/// The amount of time to spend authoring each block.
 	pub authoring_duration: Duration,
 	/// Used to actually import blocks.
@@ -343,6 +345,7 @@ where
 						&params.relay_client,
 						relay_parent,
 						author_id.clone(),
+						params.additional_relay_keys.clone(),
 					)
 					.await
 					{

client/consensus/nimbus-consensus/src/lib.rs

@@ -107,6 +107,7 @@ pub(crate) async fn create_inherent_data<Block, CIDP, RClient>(
 	relay_client: &RClient,
 	relay_parent: PHash,
 	author_id: NimbusId,
+	additional_relay_keys: Vec<Vec<u8>>,
 ) -> Result<(ParachainInherentData, InherentData), Box<dyn Error + Send + Sync + 'static>>
 where
 	Block: BlockT,
@@ -118,6 +119,7 @@ where
 		relay_client,
 		validation_data,
 		para_id,
+		additional_relay_keys,
 	)
 	.await;
 

template/node/src/service.rs

@@ -403,6 +403,7 @@ fn start_consensus(
 		force_authoring,
 		max_pov_percentage,
 		additional_digests_provider: (),
+		additional_relay_keys: vec![],
 		collator_key,
 		//authoring_duration: Duration::from_millis(500),
 	};