Get rid of v2 node feature handling.

v2 is enabled everywhere already.

Author: eskimor

polkadot/node/network/collator-protocol/src/validator_side/mod.rs

@@ -421,7 +421,6 @@ impl RelayParentHoldOffState {
 struct PerRelayParent {
 	assignment: GroupAssignments,
 	collations: Collations,
-	v2_receipts: bool,
 	v3_enabled: bool,
 	current_core: CoreIndex,
 	session_index: SessionIndex,
@@ -588,7 +587,6 @@ async fn construct_per_relay_parent<Sender>(
 	current_assignments: &mut HashMap<ParaId, usize>,
 	keystore: &KeystorePtr,
 	relay_parent: Hash,
-	v2_receipts: bool,
 	v3_enabled: bool,
 	session_index: SessionIndex,
 ) -> Result<Option<PerRelayParent>>
@@ -642,7 +640,6 @@ where
 	Ok(Some(PerRelayParent {
 		assignment,
 		collations,
-		v2_receipts,
 		v3_enabled,
 		session_index,
 		current_core: core_now,
@@ -1524,15 +1521,13 @@ where
 			.await
 			.map_err(Error::CancelledNodeFeatures)??;
 
-		let v2_receipts = node_features::FeatureIndex::CandidateReceiptV2.is_set(&node_features);
 		let v3_enabled = node_features::FeatureIndex::CandidateReceiptV3.is_set(&node_features);
 
 		let Some(per_relay_parent) = construct_per_relay_parent(
 			sender,
 			&mut state.current_assignments,
 			keystore,
 			*leaf,
-			v2_receipts,
 			v3_enabled,
 			session_index,
 		)
@@ -1557,14 +1552,14 @@ where
 			.unwrap_or_default();
 		for block_hash in allowed_ancestry {
 			if let Entry::Vacant(entry) = state.per_relay_parent.entry(*block_hash) {
-				// Safe to use the same v2 receipts config for the allowed relay parents as well
+				// Safe to use the same v3_enabled config for the allowed relay parents as well
 				// as the same session index since they must be in the same session.
 				if let Some(per_relay_parent) = construct_per_relay_parent(
 					sender,
 					&mut state.current_assignments,
 					keystore,
 					*block_hash,
-					v2_receipts,
+					v3_enabled,
 					session_index,
 				)
 				.await?
@@ -2577,7 +2572,7 @@ fn descriptor_version_sanity_check(
 ) -> std::result::Result<(), SecondingError> {
 	match descriptor.version(per_relay_parent.v3_enabled) {
 		CandidateDescriptorVersion::V1 => Ok(()),
-		CandidateDescriptorVersion::V2 if per_relay_parent.v2_receipts => {
+		CandidateDescriptorVersion::V2 | CandidateDescriptorVersion::V3 => {
 			if let Some(core_index) = descriptor.core_index(per_relay_parent.v3_enabled) {
 				if core_index != per_relay_parent.current_core {
 					return Err(SecondingError::InvalidCoreIndex(

polkadot/runtime/parachains/src/paras_inherent/mod.rs

@@ -608,16 +608,13 @@ impl<T: Config> Pallet<T> {
 			}
 
 			let node_features = configuration::ActiveConfig::<T>::get().node_features;
-
-			let allow_v2_receipts = FeatureIndex::CandidateReceiptV2.is_set(&node_features);
 			let v3_enabled = FeatureIndex::CandidateReceiptV3.is_set(&node_features);
 
 			let backed_candidates_with_core = sanitize_backed_candidates::<T>(
 				backed_candidates,
 				&allowed_relay_parents,
 				concluded_invalid_hashes,
 				eligible,
-				allow_v2_receipts,
 				v3_enabled,
 			);
 			let count = count_backed_candidates(&backed_candidates_with_core);
@@ -974,7 +971,6 @@ pub(crate) fn sanitize_bitfields<T: crate::inclusion::Config>(
 fn sanitize_backed_candidate_v2<T: crate::inclusion::Config>(
 	candidate: &BackedCandidate<T::Hash>,
 	allowed_relay_parents: &AllowedRelayParentsTracker<T::Hash, BlockNumberFor<T>>,
-	allow_v2_receipts: bool,
 	v3_enabled: bool,
 ) -> bool {
 	let descriptor_version = candidate.descriptor().version(v3_enabled);
@@ -993,18 +989,6 @@ fn sanitize_backed_candidate_v2<T: crate::inclusion::Config>(
 		_ => {},
 	}
 
-	// It is mandatory to filter these before calling `filter_unchained_candidates` to ensure
-	// any we drop any descendants of the dropped v2 candidates.
-	if descriptor_version == CandidateDescriptorVersion::V2 && !allow_v2_receipts {
-		log::debug!(
-			target: LOG_TARGET,
-			"V2 candidate descriptors not allowed. Dropping candidate {:?} for paraid {:?}.",
-			candidate.candidate().hash(),
-			candidate.descriptor().para_id()
-		);
-		return false
-	}
-
 	// Get the claim queue snapshot at the candidate relay parent.
 	let Some((rp_info, _)) =
 		allowed_relay_parents.acquire_info(candidate.descriptor().relay_parent(), None)
@@ -1083,20 +1067,14 @@ fn sanitize_backed_candidates<T: crate::inclusion::Config>(
 	allowed_relay_parents: &AllowedRelayParentsTracker<T::Hash, BlockNumberFor<T>>,
 	concluded_invalid_with_descendants: BTreeSet<CandidateHash>,
 	scheduled: BTreeMap<ParaId, BTreeSet<CoreIndex>>,
-	allow_v2_receipts: bool,
 	v3_enabled: bool,
 ) -> BTreeMap<ParaId, Vec<(BackedCandidate<T::Hash>, CoreIndex)>> {
 	// Map the candidates to the right paraids, while making sure that the order between candidates
 	// of the same para is preserved.
 	let mut candidates_per_para: BTreeMap<ParaId, Vec<_>> = BTreeMap::new();
 
 	for candidate in backed_candidates {
-		if !sanitize_backed_candidate_v2::<T>(
-			&candidate,
-			allowed_relay_parents,
-			allow_v2_receipts,
-			v3_enabled,
-		) {
+		if !sanitize_backed_candidate_v2::<T>(&candidate, allowed_relay_parents, v3_enabled) {
 			continue
 		}
 

polkadot/runtime/parachains/src/paras_inherent/tests.rs

@@ -1549,7 +1549,6 @@ mod enter {
 		len: usize,
 		start_core_index: usize,
 		code_upgrade_index: Option<usize>,
-		v2_receipts: bool,
 	) -> Vec<BackedCandidate> {
 		if let Some(code_upgrade_index) = code_upgrade_index {
 			assert!(code_upgrade_index < len, "Code upgrade index out of bounds");
@@ -1565,10 +1564,8 @@ mod enter {
 				if Some(idx) == code_upgrade_index {
 					builder.new_validation_code = Some(vec![1, 2, 3, 4].into());
 				}
-				if v2_receipts {
-					builder.core_index = Some(core_index);
-					builder.core_selector = Some(idx as u8);
-				}
+				builder.core_index = Some(core_index);
+				builder.core_selector = Some(idx as u8);
 				let ccr = builder.build();
 
 				BackedCandidate::new(ccr.into(), Default::default(), Default::default(), core_index)