Remove CandidateDescriptor V1

Author: s0me0ne-unkn0wn

polkadot/node/collation-generation/src/lib.rs

@@ -44,19 +44,15 @@ use polkadot_node_subsystem::{
 	SubsystemContext, SubsystemError, SubsystemResult, SubsystemSender,
 };
 use polkadot_node_subsystem_util::{
-	request_claim_queue, request_node_features, request_persisted_validation_data,
-	request_session_index_for_child, request_validation_code_hash, request_validators,
-	runtime::ClaimQueueSnapshot,
+	request_claim_queue, request_persisted_validation_data, request_session_index_for_child,
+	request_validation_code_hash, request_validators, runtime::ClaimQueueSnapshot,
 };
 use polkadot_primitives::{
-	collator_signature_payload, node_features::FeatureIndex, transpose_claim_queue,
-	CandidateCommitments, CandidateDescriptor, CandidateDescriptorV2,
-	CandidateReceiptV2 as CandidateReceipt, CollatorPair, CommittedCandidateReceiptV2, CoreIndex,
-	Hash, Id as ParaId, OccupiedCoreAssumption, PersistedValidationData, SessionIndex,
-	TransposedClaimQueue, ValidationCodeHash,
+	transpose_claim_queue, CandidateCommitments, CandidateDescriptorV2,
+	CommittedCandidateReceiptV2, CoreIndex, Hash, Id as ParaId, OccupiedCoreAssumption,
+	PersistedValidationData, SessionIndex, TransposedClaimQueue, ValidationCodeHash,
 };
 use schnellru::{ByLength, LruMap};
-use sp_core::crypto::Pair;
 use std::{collections::HashSet, sync::Arc};
 
 mod error;
@@ -229,11 +225,9 @@ impl CollationGenerationSubsystem {
 
 		construct_and_distribute_receipt(
 			collation,
-			config.key.clone(),
 			ctx.sender(),
 			result_sender,
 			&mut self.metrics,
-			session_info.v2_receipts,
 			&transpose_claim_queue(claim_queue),
 		)
 		.await?;
@@ -441,11 +435,9 @@ impl CollationGenerationSubsystem {
 							core_index: descriptor_core_index,
 							session_index,
 						},
-						task_config.key.clone(),
 						&mut task_sender,
 						result_sender,
 						&metrics,
-						session_info.v2_receipts,
 						&transposed_claim_queue,
 					)
 					.await
@@ -484,7 +476,6 @@ impl<Context> CollationGenerationSubsystem {
 
 #[derive(Clone)]
 struct PerSessionInfo {
-	v2_receipts: bool,
 	n_validators: usize,
 }
 
@@ -508,16 +499,7 @@ impl SessionInfoCache {
 		let n_validators =
 			request_validators(relay_parent, &mut sender.clone()).await.await??.len();
 
-		let node_features =
-			request_node_features(relay_parent, session_index, sender).await.await??;
-
-		let info = PerSessionInfo {
-			v2_receipts: node_features
-				.get(FeatureIndex::CandidateReceiptV2 as usize)
-				.map(|b| *b)
-				.unwrap_or(false),
-			n_validators,
-		};
+		let info = PerSessionInfo { n_validators };
 		self.0.insert(session_index, info);
 		Ok(self.0.get(&session_index).expect("Just inserted").clone())
 	}
@@ -538,11 +520,9 @@ struct PreparedCollation {
 /// which is distributed to validators.
 async fn construct_and_distribute_receipt(
 	collation: PreparedCollation,
-	key: CollatorPair,
 	sender: &mut impl overseer::CollationGenerationSenderTrait,
 	result_sender: Option<oneshot::Sender<CollationSecondedSignal>>,
 	metrics: &Metrics,
-	v2_receipts: bool,
 	transposed_claim_queue: &TransposedClaimQueue,
 ) -> Result<()> {
 	let PreparedCollation {
@@ -579,14 +559,6 @@ async fn construct_and_distribute_receipt(
 
 	let pov_hash = pov.hash();
 
-	let signature_payload = collator_signature_payload(
-		&relay_parent,
-		&para_id,
-		&persisted_validation_data_hash,
-		&pov_hash,
-		&validation_code_hash,
-	);
-
 	let erasure_root = erasure_root(n_validators, validation_data, pov.clone())?;
 
 	let commitments = CandidateCommitments {
@@ -598,7 +570,7 @@ async fn construct_and_distribute_receipt(
 		hrmp_watermark: collation.hrmp_watermark,
 	};
 
-	let receipt = if v2_receipts {
+	let receipt = {
 		let ccr = CommittedCandidateReceiptV2 {
 			descriptor: CandidateDescriptorV2::new(
 				para_id,
@@ -618,31 +590,6 @@ async fn construct_and_distribute_receipt(
 			.map_err(Error::CandidateReceiptCheck)?;
 
 		ccr.to_plain()
-	} else {
-		if !commitments.ump_signals().map_err(Error::CandidateReceiptCheck)?.is_empty() {
-			gum::warn!(
-				target: LOG_TARGET,
-				?pov_hash,
-				?relay_parent,
-				para_id = %para_id,
-				"Candidate commitments contain UMP signal without v2 receipts being enabled.",
-			);
-		}
-		CandidateReceipt {
-			commitments_hash: commitments.hash(),
-			descriptor: CandidateDescriptor {
-				signature: key.sign(&signature_payload),
-				para_id,
-				relay_parent,
-				collator: key.public(),
-				persisted_validation_data_hash,
-				pov_hash,
-				erasure_root,
-				para_head: commitments.head_data.hash(),
-				validation_code_hash,
-			}
-			.into(),
-		}
 	};
 
 	gum::debug!(

polkadot/node/core/candidate-validation/src/lib.rs

@@ -1315,11 +1315,6 @@ fn perform_basic_checks(
 		return Err(InvalidCandidate::CodeHashMismatch)
 	}
 
-	// No-op for `v2` receipts.
-	if let Err(()) = candidate.check_collator_signature() {
-		return Err(InvalidCandidate::BadSignature)
-	}
-
 	Ok(())
 }
 

polkadot/primitives/src/lib.rs

@@ -38,17 +38,16 @@ extern crate alloc;
 // Current primitives not requiring versioning are exported here.
 // Primitives requiring versioning must not be exported and must be referred by an exact version.
 pub use v9::{
-	async_backing, byzantine_threshold, check_candidate_backing, collator_signature_payload,
-	effective_minimum_backing_votes, executor_params, metric_definitions, node_features,
-	skip_ump_signals, slashing, supermajority_threshold, transpose_claim_queue, well_known_keys,
-	AbridgedHostConfiguration, AbridgedHrmpChannel, AccountId, AccountIndex, AccountPublic,
-	ApprovalVote, ApprovalVoteMultipleCandidates, ApprovalVotingParams, ApprovedPeerId,
-	AssignmentId, AsyncBackingParams, AuthorityDiscoveryId, AvailabilityBitfield, BackedCandidate,
-	Balance, BlakeTwo256, Block, BlockId, BlockNumber, CandidateCommitments, CandidateDescriptor,
-	CandidateDescriptorV2, CandidateDescriptorVersion, CandidateEvent, CandidateHash,
-	CandidateIndex, CandidateReceipt, CandidateReceiptV2, CheckedDisputeStatementSet,
-	CheckedMultiDisputeStatementSet, ChunkIndex, ClaimQueueOffset, CollatorId, CollatorSignature,
-	CommittedCandidateReceipt, CommittedCandidateReceiptError, CommittedCandidateReceiptV2,
+	async_backing, byzantine_threshold, check_candidate_backing, effective_minimum_backing_votes,
+	executor_params, metric_definitions, node_features, skip_ump_signals, slashing,
+	supermajority_threshold, transpose_claim_queue, well_known_keys, AbridgedHostConfiguration,
+	AbridgedHrmpChannel, AccountId, AccountIndex, AccountPublic, ApprovalVote,
+	ApprovalVoteMultipleCandidates, ApprovalVotingParams, ApprovedPeerId, AssignmentId,
+	AsyncBackingParams, AuthorityDiscoveryId, AvailabilityBitfield, BackedCandidate, Balance,
+	BlakeTwo256, Block, BlockId, BlockNumber, CandidateCommitments, CandidateDescriptorV2,
+	CandidateDescriptorVersion, CandidateEvent, CandidateHash, CandidateIndex, CandidateReceiptV2,
+	CheckedDisputeStatementSet, CheckedMultiDisputeStatementSet, ChunkIndex, ClaimQueueOffset,
+	CollatorId, CollatorSignature, CommittedCandidateReceiptError, CommittedCandidateReceiptV2,
 	CompactStatement, ConsensusLog, CoreIndex, CoreSelector, CoreState, DisputeOffenceKind,
 	DisputeState, DisputeStatement, DisputeStatementSet, DownwardMessage, EncodeAs, ExecutorParam,
 	ExecutorParamError, ExecutorParams, ExecutorParamsHash, ExecutorParamsPrepHash,