feat: merge additional_relay_state_keys into relay_proof_request

Author: metricaez

cumulus/client/consensus/aura/src/collator.rs

@@ -33,7 +33,7 @@ use cumulus_client_consensus_common::{
 use cumulus_client_parachain_inherent::{ParachainInherentData, ParachainInherentDataProvider};
 use cumulus_primitives_core::{
 	relay_chain::Hash as PHash, DigestItem, ParachainBlockData, PersistedValidationData,
-	RelayProofRequest,
+	RelayProofRequest, RelayStorageKey,
 };
 use cumulus_relay_chain_interface::RelayChainInterface;
 use sc_client_api::BackendTransaction;
@@ -178,9 +178,17 @@ where
 		parent_hash: Block::Hash,
 		timestamp: impl Into<Option<Timestamp>>,
 		relay_parent_descendants: Option<RelayParentData>,
-		relay_proof_request: RelayProofRequest,
+		mut relay_proof_request: RelayProofRequest,
 		collator_peer_id: PeerId,
 	) -> Result<(ParachainInherentData, InherentData), Box<dyn Error + Send + Sync + 'static>> {
+		// Add additional_relay_state_keys
+		let additional_relay_state_keys: Vec<Vec<u8>> = Vec::new();
+
+		// Merge collator-side keys with runtime-requested keys
+		relay_proof_request
+			.keys
+			.extend(additional_relay_state_keys.into_iter().map(RelayStorageKey::Top));
+
 		let paras_inherent_data = ParachainInherentDataProvider::create_at(
 			relay_parent,
 			&self.relay_client,
@@ -189,7 +197,6 @@ where
 			relay_parent_descendants
 				.map(RelayParentData::into_inherent_descendant_list)
 				.unwrap_or_default(),
-			Vec::new(),
 			relay_proof_request,
 			collator_peer_id,
 		)

cumulus/client/parachain-inherent/src/lib.rs

@@ -148,7 +148,6 @@ async fn collect_relay_storage_proof(
 	relay_parent: PHash,
 	include_authorities: bool,
 	include_next_authorities: bool,
-	additional_relay_state_keys: Vec<Vec<u8>>,
 	relay_proof_request: RelayProofRequest,
 ) -> Option<StorageProof> {
 	// Get static keys that are always needed
@@ -161,13 +160,6 @@ async fn collect_relay_storage_proof(
 	)
 	.await?;
 
-	// Add additional_relay_state_keys
-	let unique_keys: Vec<Vec<u8>> = additional_relay_state_keys
-		.into_iter()
-		.filter(|key| !all_top_keys.contains(key))
-		.collect();
-	all_top_keys.extend(unique_keys);
-
 	// Group requested keys by storage type
 	let RelayProofRequest { keys } = relay_proof_request;
 	let mut child_keys: std::collections::BTreeMap<Vec<u8>, Vec<Vec<u8>>> =
@@ -242,7 +234,6 @@ impl ParachainInherentDataProvider {
 		validation_data: &PersistedValidationData,
 		para_id: ParaId,
 		relay_parent_descendants: Vec<RelayHeader>,
-		additional_relay_state_keys: Vec<Vec<u8>>,
 		relay_proof_request: RelayProofRequest,
 		collator_peer_id: PeerId,
 	) -> Option<ParachainInherentData> {
@@ -268,7 +259,6 @@ impl ParachainInherentDataProvider {
 			relay_parent,
 			!relay_parent_descendants.is_empty(),
 			include_next_authorities,
-			additional_relay_state_keys,
 			relay_proof_request,
 		)
 		.await?;