Revert "No disputes and no CandidateReceiptV2 on Kusama (#8483)"

This reverts commit 98a3813.

Author: eskimor

Cargo.lock

@@ -190,11 +190,6 @@ where
 
 	set_default_ss58_version(chain_spec);
 
-	if chain_spec.is_polkadot() {
-		info!("This binary is meant to be used on Kusama only!");
-		return Err(Error::Other("This binary is meant to be used on Kusama only!".into()))
-	}
-
 	if chain_spec.is_kusama() {
 		info!("----------------------------");
 		info!("This chain is not in any way");

polkadot/cli/src/command.rs

@@ -44,11 +44,13 @@ use polkadot_node_subsystem::{
 	SubsystemContext, SubsystemError, SubsystemResult, SubsystemSender,
 };
 use polkadot_node_subsystem_util::{
-	request_claim_queue, request_persisted_validation_data, request_session_index_for_child,
-	request_validation_code_hash, request_validators, runtime::ClaimQueueSnapshot,
+	request_claim_queue, request_node_features, 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,
 	vstaging::{
 		transpose_claim_queue, CandidateDescriptorV2, CandidateReceiptV2 as CandidateReceipt,
 		ClaimQueueOffset, CommittedCandidateReceiptV2, TransposedClaimQueue,
@@ -62,6 +64,9 @@ use std::{collections::HashSet, sync::Arc};
 
 mod error;
 
+#[cfg(test)]
+mod tests;
+
 mod metrics;
 use self::metrics::Metrics;
 
@@ -504,7 +509,16 @@ impl SessionInfoCache {
 		let n_validators =
 			request_validators(relay_parent, &mut sender.clone()).await.await??.len();
 
-		let info = PerSessionInfo { v2_receipts: false, n_validators };
+		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,
+		};
 		self.0.insert(session_index, info);
 		Ok(self.0.get(&session_index).expect("Just inserted").clone())
 	}

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

@@ -120,7 +120,6 @@ pub(crate) struct Initialized {
 	chain_import_backlog: VecDeque<ScrapedOnChainVotes>,
 	metrics: Metrics,
 	approval_voting_parallel_enabled: bool,
-	emergency_no_disputes_mode: bool,
 }
 
 #[overseer::contextbounds(DisputeCoordinator, prefix = self::overseer)]
@@ -159,7 +158,6 @@ impl Initialized {
 			chain_import_backlog: VecDeque::new(),
 			metrics,
 			approval_voting_parallel_enabled,
-			emergency_no_disputes_mode: true,
 		}
 	}
 
@@ -283,11 +281,6 @@ impl Initialized {
 						},
 						FromOrchestra::Signal(OverseerSignal::BlockFinalized(_, n)) => {
 							gum::trace!(target: LOG_TARGET, "OverseerSignal::BlockFinalized");
-
-							if n >= 28_486_744 {
-								self.emergency_no_disputes_mode = false;
-							}
-
 							self.scraper.process_finalized_block(&n);
 							default_confirm
 						},
@@ -956,11 +949,6 @@ impl Initialized {
 		statements: Vec<(SignedDisputeStatement, ValidatorIndex)>,
 		now: Timestamp,
 	) -> FatalResult<ImportStatementsResult> {
-		if self.emergency_no_disputes_mode {
-			gum::debug!(target: LOG_TARGET, "Dispute import skipped due to emergency mode");
-			return Ok(ImportStatementsResult::ValidImport)
-		}
-
 		gum::trace!(target: LOG_TARGET, ?statements, "In handle import statements");
 		if self.session_is_ancient(session) {
 			// It is not valid to participate in an ancient dispute (spam?) or too new.
@@ -1449,11 +1437,6 @@ impl Initialized {
 		valid: bool,
 		now: Timestamp,
 	) -> Result<()> {
-		if self.emergency_no_disputes_mode {
-			gum::debug!(target: LOG_TARGET, "issue_local_statement skipped due to emergency mode");
-			return Ok(());
-		}
-
 		gum::trace!(
 			target: LOG_TARGET,
 			?candidate_hash,

polkadot/node/core/dispute-coordinator/src/initialized.rs

@@ -111,6 +111,9 @@ mod status;
 
 use crate::status::Clock;
 
+#[cfg(test)]
+mod tests;
+
 pub(crate) const LOG_TARGET: &str = "parachain::dispute-coordinator";
 
 /// An implementation of the dispute coordinator subsystem.

polkadot/node/core/dispute-coordinator/src/lib.rs

@@ -14,8 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-#![allow(warnings)]
-
 use std::collections::HashSet;
 #[cfg(test)]
 use std::time::Duration;