Merge remote-tracking branch 'origin/master' into gav-xcm-v3

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

@@ -66,19 +66,15 @@ where
 	let block = B::new(header, extrinsics);
 	assert!(parent_head.hash() == *block.header().parent_hash(), "Invalid parent hash",);
 
-	// Uncompress
+	// Create the db
-	let mut db = MemoryDB::default();
+	let (db, root) = match storage_proof.to_memory_db(Some(parent_head.state_root())) {
-	let root = match sp_trie::decode_compact::<sp_trie::LayoutV1<HashFor<B>>, _, _>(
+		Ok((db, root)) => (db, root),
-		&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 backend = sp_state_machine::TrieBackend::new(db, root);
+	let backend = sp_state_machine::TrieBackend::new(db, *parent_head.state_root());
 
 	let _guard = (
 		// Replace storage calls with our own implementations

parachain-template/runtime/Cargo.toml

@@ -140,6 +140,7 @@ runtime-benchmarks = [
 	"pallet-template/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
+	"polkadot-runtime/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",

polkadot-parachains/canvas-kusama/Cargo.toml

@@ -156,6 +156,7 @@ runtime-benchmarks = [
 	"pallet-timestamp/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
+	"polkadot-runtime/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",

polkadot-parachains/statemine/Cargo.toml

@@ -96,6 +96,7 @@ runtime-benchmarks = [
 	"pallet-uniques/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
+	"polkadot-runtime/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",

polkadot-parachains/statemint/Cargo.toml

@@ -95,6 +95,7 @@ runtime-benchmarks = [
 	"pallet-uniques/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
+	"polkadot-runtime/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",

polkadot-parachains/westmint/Cargo.toml

@@ -94,6 +94,7 @@ runtime-benchmarks = [
 	"pallet-uniques/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
+	"polkadot-runtime/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",