Revert "Code, PoV compression and remove CompressedPoV struct (#2852)"

This reverts commit 18b1f8b.

node/collation-generation/Cargo.toml

@@ -13,9 +13,7 @@ polkadot-node-subsystem = { path = "../subsystem" }
 polkadot-node-subsystem-util = { path = "../subsystem-util" }
 polkadot-primitives = { path = "../../primitives" }
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" }
-sp-maybe-compressed-blob  = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" }
 thiserror = "1.0.23"
-parity-scale-codec = { version = "2.0.0", default-features = false, features = ["bit-vec", "derive"] }
 
 [dev-dependencies]
 polkadot-node-subsystem-test-helpers = { path = "../subsystem-test-helpers" }

node/collation-generation/src/lib.rs

@@ -26,9 +26,7 @@ use futures::{
 	sink::SinkExt,
 	stream::StreamExt,
 };
-use polkadot_node_primitives::{
-	CollationGenerationConfig, AvailableData, PoV,
-};
+use polkadot_node_primitives::{CollationGenerationConfig, AvailableData, PoV};
 use polkadot_node_subsystem::{
 	messages::{AllMessages, CollationGenerationMessage, CollatorProtocolMessage},
 	FromOverseer, SpawnedSubsystem, Subsystem, SubsystemContext, SubsystemResult,
@@ -43,7 +41,6 @@ use polkadot_primitives::v1::{
 	CandidateDescriptor, CandidateReceipt, CoreState, Hash, OccupiedCoreAssumption,
 	PersistedValidationData,
 };
-use parity_scale_codec::Encode;
 use sp_core::crypto::Pair;
 use std::sync::Arc;
 
@@ -316,32 +313,7 @@ async fn handle_new_activations<Context: SubsystemContext>(
 					}
 				};
 
-				// Apply compression to the block data.
-				let pov = {
-					let pov = polkadot_node_primitives::maybe_compress_pov(collation.proof_of_validity);
-					let encoded_size = pov.encoded_size();
-
-					// As long as `POV_BOMB_LIMIT` is at least `max_pov_size`, this ensures
-					// that honest collators never produce a PoV which is uncompressed.
-					//
-					// As such, honest collators never produce an uncompressed PoV which starts with
-					// a compression magic number, which would lead validators to reject the collation.
-					if encoded_size > validation_data.max_pov_size as usize {
-						tracing::debug!(
-							target: LOG_TARGET,
-							para_id = %scheduled_core.para_id,
-							size = encoded_size,
-							max_size = validation_data.max_pov_size,
-							"PoV exceeded maximum size"
-						);
-
-						return
-					}
-
-					pov
-				};
-
-				let pov_hash = pov.hash();
+				let pov_hash = collation.proof_of_validity.hash();
 
 				let signature_payload = collator_signature_payload(
 					&relay_parent,
@@ -354,7 +326,7 @@ async fn handle_new_activations<Context: SubsystemContext>(
 				let erasure_root = match erasure_root(
 					n_validators,
 					validation_data,
-					pov.clone(),
+					collation.proof_of_validity.clone(),
 				) {
 					Ok(erasure_root) => erasure_root,
 					Err(err) => {
@@ -403,7 +375,7 @@ async fn handle_new_activations<Context: SubsystemContext>(
 				metrics.on_collation_generated();
 
 				if let Err(err) = task_sender.send(AllMessages::CollatorProtocol(
-					CollatorProtocolMessage::DistributeCollation(ccr, pov, result_sender)
+					CollatorProtocolMessage::DistributeCollation(ccr, collation.proof_of_validity, result_sender)
 				)).await {
 					tracing::warn!(
 						target: LOG_TARGET,
@@ -520,15 +492,16 @@ mod tests {
 			task::{Context as FuturesContext, Poll},
 			Future,
 		};
-		use polkadot_node_primitives::{Collation, CollationResult, BlockData, PoV, POV_BOMB_LIMIT};
+		use polkadot_node_primitives::{Collation, CollationResult, BlockData, PoV};
 		use polkadot_node_subsystem::messages::{
 			AllMessages, RuntimeApiMessage, RuntimeApiRequest,
 		};
 		use polkadot_node_subsystem_test_helpers::{
 			subsystem_test_harness, TestSubsystemContextHandle,
 		};
 		use polkadot_primitives::v1::{
-			CollatorPair, Id as ParaId, PersistedValidationData, ScheduledCore, ValidationCode,
+			BlockNumber, CollatorPair, Id as ParaId,
+			PersistedValidationData, ScheduledCore, ValidationCode,
 		};
 		use std::pin::Pin;
 
@@ -546,24 +519,6 @@ mod tests {
 			}
 		}
 
-		fn test_collation_compressed() -> Collation {
-			let mut collation = test_collation();
-			let compressed = PoV {
-				block_data: BlockData(sp_maybe_compressed_blob::compress(
-					&collation.proof_of_validity.block_data.0,
-					POV_BOMB_LIMIT,
-				).unwrap())
-			};
-			collation.proof_of_validity = compressed;
-			collation
-		}
-
-		fn test_validation_data() -> PersistedValidationData {
-			let mut persisted_validation_data: PersistedValidationData = Default::default();
-			persisted_validation_data.max_pov_size = 1024;
-			persisted_validation_data
-		}
-
 		// Box<dyn Future<Output = Collation> + Unpin + Send
 		struct TestCollator;
 
@@ -760,7 +715,7 @@ mod tests {
 								tx,
 							),
 						))) => {
-							tx.send(Ok(Some(test_validation_data()))).unwrap();
+							tx.send(Ok(Some(Default::default()))).unwrap();
 						}
 						Some(AllMessages::RuntimeApi(RuntimeApiMessage::Request(
 							_hash,
@@ -811,8 +766,9 @@ mod tests {
 			// we expect a single message to be sent, containing a candidate receipt.
 			// we don't care too much about the commitments_hash right now, but let's ensure that we've calculated the
 			// correct descriptor
-			let expect_pov_hash = test_collation_compressed().proof_of_validity.hash();
-			let expect_validation_data_hash = test_validation_data().hash();
+			let expect_pov_hash = test_collation().proof_of_validity.hash();
+			let expect_validation_data_hash
+				= PersistedValidationData::<Hash, BlockNumber>::default().hash();
 			let expect_relay_parent = Hash::repeat_byte(4);
 			let expect_validation_code_hash = ValidationCode(vec![1, 2, 3]).hash();
 			let expect_payload = collator_signature_payload(

node/core/candidate-validation/Cargo.toml

@@ -8,8 +8,7 @@ edition = "2018"
 futures = "0.3.12"
 tracing = "0.1.25"
 
-sp-core = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-maybe-compressed-blob = { package = "sp-maybe-compressed-blob", git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "rococo-v1" }
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["bit-vec", "derive"] }
 
 polkadot-primitives = { path = "../../../primitives" }