Revert "Compact proof. (paritytech#295)"

This reverts commit d935b81.

client/collator/src/lib.rs

@@ -25,7 +25,7 @@ use sp_consensus::BlockStatus;
 use sp_core::traits::SpawnNamed;
 use sp_runtime::{
 	generic::BlockId,
-	traits::{Block as BlockT, HashFor, Header as HeaderT, Zero},
+	traits::{Block as BlockT, Header as HeaderT, Zero},
 };
 
 use cumulus_client_consensus_common::ParachainConsensus;
@@ -225,19 +225,8 @@ where
 
 		let (header, extrinsics) = candidate.block.deconstruct();
 
-		let compact_proof = match candidate
-			.proof
-			.into_compact_proof::<HashFor<Block>>(last_head.state_root().clone())
-		{
-			Ok(proof) => proof,
-			Err(e) => {
-				tracing::error!(target: "cumulus-collator", "Failed to compact proof: {:?}", e);
-				return None;
-			}
-		};
-
 		// Create the parachain block data for the validators.
-		let b = ParachainBlockData::<Block>::new(header, extrinsics, compact_proof);
+		let b = ParachainBlockData::<Block>::new(header, extrinsics, candidate.proof);
 
 		tracing::info!(
 			target: LOG_TARGET,
@@ -454,12 +443,7 @@ mod tests {
 		assert_eq!(1, *block.header().number());
 
 		// Ensure that we did not include `:code` in the proof.
-		let db = block
-			.storage_proof()
-			.to_storage_proof::<BlakeTwo256>(Some(header.state_root()))
-			.unwrap()
-			.0
-			.into_memory_db();
+		let db = block.storage_proof().clone().into_memory_db();
 
 		let backend =
 			sp_state_machine::new_in_mem::<BlakeTwo256>().update_backend(*header.state_root(), db);

client/consensus/aura/src/lib.rs

@@ -142,9 +142,9 @@ where
 			BuildAuraWorkerParams {
 				client: para_client,
 				block_import: ParachainBlockImport::new(block_import),
-				justification_sync_link: (),
 				proposer_factory,
 				sync_oracle,
+				justification_sync_link: (),
 				force_authoring,
 				backoff_authoring_blocks,
 				keystore,

pallets/parachain-system/src/validate_block/implementation.rs

@@ -69,17 +69,11 @@ where
 		"Invalid parent hash",
 	);
 
-	// Uncompress
-	let mut db = MemoryDB::default();
-	let root = match sp_trie::decode_compact::<sp_trie::Layout<HashFor<B>>, _, _>(
-		&mut db,
-		storage_proof.iter_compact_encoded_nodes(),
-		Some(parent_head.state_root()),
-	) {
-		Ok(root) => root,
-		Err(_) => panic!("Compact proof decoding failure."),
-	};
-	sp_std::mem::drop(storage_proof);
+	let db = storage_proof.into_memory_db();
+	let root = parent_head.state_root().clone();
+	if !sp_trie::HashDBT::<HashFor<B>, _>::contains(&db, &root, sp_trie::EMPTY_PREFIX) {
+		panic!("Witness data does not contain given storage root.");
+	}
 
 	let backend = sp_state_machine::TrieBackend::new(db, root);
 

primitives/core/src/lib.rs

@@ -155,15 +155,15 @@ pub struct ParachainBlockData<B: BlockT> {
 	/// The extrinsics of the parachain block.
 	extrinsics: sp_std::vec::Vec<B::Extrinsic>,
 	/// The data that is required to emulate the storage accesses executed by all extrinsics.
-	storage_proof: sp_trie::CompactProof,
+	storage_proof: sp_trie::StorageProof,
 }
 
 impl<B: BlockT> ParachainBlockData<B> {
 	/// Creates a new instance of `Self`.
 	pub fn new(
 		header: <B as BlockT>::Header,
 		extrinsics: sp_std::vec::Vec<<B as BlockT>::Extrinsic>,
-		storage_proof: sp_trie::CompactProof,
+		storage_proof: sp_trie::StorageProof,
 	) -> Self {
 		Self {
 			header,
@@ -192,19 +192,13 @@ impl<B: BlockT> ParachainBlockData<B> {
 		&self.extrinsics
 	}
 
-	/// Returns the [`CompactProof`](sp_trie::CompactProof).
-	pub fn storage_proof(&self) -> &sp_trie::CompactProof {
+	/// Returns the [`StorageProof`](sp_trie::StorageProof).
+	pub fn storage_proof(&self) -> &sp_trie::StorageProof {
 		&self.storage_proof
 	}
 
 	/// Deconstruct into the inner parts.
-	pub fn deconstruct(
-		self,
-	) -> (
-		B::Header,
-		sp_std::vec::Vec<B::Extrinsic>,
-		sp_trie::CompactProof,
-	) {
+	pub fn deconstruct(self) -> (B::Header, sp_std::vec::Vec<B::Extrinsic>, sp_trie::StorageProof) {
 		(self.header, self.extrinsics, self.storage_proof)
 	}
 }

test/client/src/block_builder.rs

@@ -18,7 +18,7 @@ use crate::{Backend, Client};
 use cumulus_primitives_core::{ParachainBlockData, PersistedValidationData};
 use cumulus_primitives_parachain_inherent::{ParachainInherentData, INHERENT_IDENTIFIER};
 use cumulus_test_relay_sproof_builder::RelayStateSproofBuilder;
-use cumulus_test_runtime::{Block, GetLastTimestamp, Hash, Header};
+use cumulus_test_runtime::{Block, GetLastTimestamp, Hash};
 use polkadot_primitives::v1::{BlockNumber as PBlockNumber, Hash as PHash};
 use sc_block_builder::{BlockBuilder, BlockBuilderProvider};
 use sp_api::ProvideRuntimeApi;
@@ -167,14 +167,12 @@ pub trait BuildParachainBlockData {
 }
 
 impl<'a> BuildParachainBlockData for sc_block_builder::BlockBuilder<'a, Block, Client, Backend> {
-	fn build_parachain_block(self, parent_state_root: Hash) -> ParachainBlockData<Block> {
+	fn build_parachain_block(self, _: Hash) -> ParachainBlockData<Block> {
 		let built_block = self.build().expect("Builds the block");
 
 		let storage_proof = built_block
 			.proof
-			.expect("We enabled proof recording before.")
-			.into_compact_proof::<<Header as HeaderT>::Hashing>(parent_state_root)
-			.expect("Creates the compact proof");
+			.expect("We enabled proof recording before.");
 
 		let (header, extrinsics) = built_block.block.deconstruct();
 		ParachainBlockData::new(header, extrinsics, storage_proof)