Revert "Don't include :code by default in storage proofs (#5060)" (#5136)

This reverts commit 6ee39261c8.

substrate/client/src/call_executor.rs

@@ -25,7 +25,7 @@ use sp_state_machine::{
 };
 use sc_executor::{RuntimeVersion, RuntimeInfo, NativeVersion};
 use sp_externalities::Extensions;
-use sp_core::{NativeOrEncoded, NeverNativeValue, traits::{CodeExecutor, RuntimeCode}};
+use sp_core::{NativeOrEncoded, NeverNativeValue, traits::CodeExecutor};
 use sp_api::{ProofRecorder, InitializeBlock, StorageTransactionCache};
 use sc_client_api::{backend, call_executor::CallExecutor};
 
@@ -90,7 +90,6 @@ where
 			method,
 			call_data,
 			extensions.unwrap_or_default(),
-			&sp_state_machine::backend::get_runtime_code(&state)?,
 		).execute_using_consensus_failure_handler::<_, NeverNativeValue, fn() -> _>(
 			strategy.get_manager(),
 			None,
@@ -141,8 +140,6 @@ where
 
 		// make sure to destroy state before exiting this function
 		let mut state = self.backend.state_at(*at)?;
-		let runtime_code = sp_state_machine::backend::get_runtime_code(&state)?;
-
 		let result = match recorder {
 			Some(recorder) => state.as_trie_backend()
 				.ok_or_else(||
@@ -163,7 +160,6 @@ where
 						method,
 						call_data,
 						extensions.unwrap_or_default(),
-						&runtime_code,
 					)
 					// TODO: https://github.com/paritytech/substrate/issues/4455
 					// .with_storage_transaction_cache(storage_transaction_cache.as_mut().map(|c| &mut **c))
@@ -177,7 +173,6 @@ where
 				method,
 				call_data,
 				extensions.unwrap_or_default(),
-				&runtime_code,
 			)
 			.with_storage_transaction_cache(storage_transaction_cache.as_mut().map(|c| &mut **c))
 			.execute_using_consensus_failure_handler(execution_manager, native_call)
@@ -202,8 +197,7 @@ where
 			changes_trie_state,
 			None,
 		);
-		let wasm_code = RuntimeCode::from_externalities(&ext).map_err(|e| e.to_string().into());
-		let version = wasm_code.and_then(|c| self.executor.runtime_version(&mut ext, &c));
+		let version = self.executor.runtime_version(&mut ext);
 		{
 			let _lock = self.backend.get_import_lock().read();
 			self.backend.destroy_state(state)?;
@@ -224,7 +218,6 @@ where
 			&self.executor,
 			method,
 			call_data,
-			&sp_state_machine::backend::get_runtime_code(trie_state)?,
 		)
 		.map_err(Into::into)
 	}

substrate/client/src/client.rs

@@ -41,7 +41,8 @@ use sp_runtime::{
 use sp_state_machine::{
 	DBValue, Backend as StateBackend, ChangesTrieAnchorBlockId,
 	prove_read, prove_child_read, ChangesTrieRootsStorage, ChangesTrieStorage,
-	ChangesTrieConfigurationRange, key_changes, key_changes_proof,
+	ChangesTrieConfigurationRange, key_changes, key_changes_proof, StorageProof,
+	merge_storage_proofs,
 };
 use sc_executor::{RuntimeVersion, RuntimeInfo};
 use sp_consensus::{
@@ -54,7 +55,6 @@ use sp_blockchain::{self as blockchain,
 	well_known_cache_keys::Id as CacheKeyId,
 	HeaderMetadata, CachedHeaderMetadata,
 };
-use sp_trie::StorageProof;
 
 use sp_api::{
 	CallApiAt, ConstructRuntimeApi, Core as CoreApi, ApiExt, ApiRef, ProvideRuntimeApi,
@@ -482,19 +482,9 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		method: &str,
 		call_data: &[u8]
 	) -> sp_blockchain::Result<(Vec<u8>, StorageProof)> {
-		// Make sure we include the `:code` and `:heap_pages` in the execution proof to be
-		// backwards compatible.
-		//
-		// TODO: Remove when solved: https://github.com/paritytech/substrate/issues/5047
-		let code_proof = self.read_proof(
-			id,
-			&[well_known_keys::CODE.to_vec(), well_known_keys::HEAP_PAGES.to_vec()],
-		)?;
-
 		let state = self.state_at(id)?;
 		let header = self.prepare_environment_block(id)?;
 		prove_execution(state, header, &self.executor, method, call_data)
-			.map(|p| (p.0, StorageProof::merge(vec![p.1, code_proof])))
 	}
 
 	/// Reads given header and generates CHT-based header proof.
@@ -779,7 +769,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 			Ok(())
 		}, ())?;
 
-		Ok(StorageProof::merge(proofs))
+		Ok(merge_storage_proofs(proofs))
 	}
 
 	/// Generates CHT-based proof for roots of changes tries at given blocks (that are part of single CHT).

substrate/client/src/genesis.rs

@@ -89,8 +89,6 @@ mod tests {
 		};
 		let hash = header.hash();
 		let mut overlay = OverlayedChanges::default();
-		let runtime_code = sp_state_machine::backend::get_runtime_code(&backend)
-			.expect("Code is part of the backend");
 
 		StateMachine::new(
 			backend,
@@ -100,7 +98,6 @@ mod tests {
 			"Core_initialize_block",
 			&header.encode(),
 			Default::default(),
-			&runtime_code,
 		).execute(
 			ExecutionStrategy::NativeElseWasm,
 		).unwrap();
@@ -114,7 +111,6 @@ mod tests {
 				"BlockBuilder_apply_extrinsic",
 				&tx.encode(),
 				Default::default(),
-				&runtime_code,
 			).execute(
 				ExecutionStrategy::NativeElseWasm,
 			).unwrap();
@@ -128,7 +124,6 @@ mod tests {
 			"BlockBuilder_finalize_block",
 			&[],
 			Default::default(),
-			&runtime_code,
 		).execute(
 			ExecutionStrategy::NativeElseWasm,
 		).unwrap();
@@ -166,8 +161,6 @@ mod tests {
 
 		let backend = InMemoryBackend::from(storage);
 		let (b1data, _b1hash) = block1(genesis_hash, &backend);
-		let runtime_code = sp_state_machine::backend::get_runtime_code(&backend)
-			.expect("Code is part of the backend");
 
 		let mut overlay = OverlayedChanges::default();
 		let _ = StateMachine::new(
@@ -178,7 +171,6 @@ mod tests {
 			"Core_execute_block",
 			&b1data,
 			Default::default(),
-			&runtime_code,
 		).execute(
 			ExecutionStrategy::NativeElseWasm,
 		).unwrap();
@@ -197,8 +189,6 @@ mod tests {
 
 		let backend = InMemoryBackend::from(storage);
 		let (b1data, _b1hash) = block1(genesis_hash, &backend);
-		let runtime_code = sp_state_machine::backend::get_runtime_code(&backend)
-			.expect("Code is part of the backend");
 
 		let mut overlay = OverlayedChanges::default();
 		let _ = StateMachine::new(
@@ -209,7 +199,6 @@ mod tests {
 			"Core_execute_block",
 			&b1data,
 			Default::default(),
-			&runtime_code,
 		).execute(
 			ExecutionStrategy::AlwaysWasm,
 		).unwrap();
@@ -228,8 +217,6 @@ mod tests {
 
 		let backend = InMemoryBackend::from(storage);
 		let (b1data, _b1hash) = block1(genesis_hash, &backend);
-		let runtime_code = sp_state_machine::backend::get_runtime_code(&backend)
-			.expect("Code is part of the backend");
 
 		let mut overlay = OverlayedChanges::default();
 		let r = StateMachine::new(
@@ -240,7 +227,6 @@ mod tests {
 			"Core_execute_block",
 			&b1data,
 			Default::default(),
-			&runtime_code,
 		).execute(
 			ExecutionStrategy::NativeElseWasm,
 		);

substrate/client/src/light/backend.rs

@@ -172,9 +172,9 @@ impl<S, Block> ClientBackend<Block> for Backend<S, HashFor<Block>>
 				match maybe_val {
 					Some(val) => self.blockchain.storage().insert_aux(
 						&[(&key[..], &val[..])],
-						std::iter::empty(),
+						::std::iter::empty(),
 					)?,
-					None => self.blockchain.storage().insert_aux(std::iter::empty(), &[&key[..]])?,
+					None => self.blockchain.storage().insert_aux(::std::iter::empty(), &[&key[..]])?,
 				}
 			}
 		}

substrate/client/src/light/call_executor.rs

@@ -29,6 +29,7 @@ use sp_externalities::Extensions;
 use sp_state_machine::{
 	self, Backend as StateBackend, OverlayedChanges, ExecutionStrategy, create_proof_check_backend,
 	execution_proof_check_on_trie_backend, ExecutionManager, StorageProof,
+	merge_storage_proofs,
 };
 use hash_db::Hasher;
 
@@ -205,7 +206,7 @@ pub fn prove_execution<Block, S, E>(
 		method,
 		call_data,
 	)?;
-	let total_proof = StorageProof::merge(vec![init_proof, exec_proof]);
+	let total_proof = merge_storage_proofs(vec![init_proof, exec_proof]);
 
 	Ok((result, total_proof))
 }
@@ -258,17 +259,12 @@ fn check_execution_proof_with_make_header<Header, E, H, MakeNextHeader: Fn(&Head
 	let mut changes = OverlayedChanges::default();
 	let trie_backend = create_proof_check_backend(root, remote_proof)?;
 	let next_header = make_next_header(&request.header);
-
-	// TODO: Remove when solved: https://github.com/paritytech/substrate/issues/5047
-	let runtime_code = sp_state_machine::backend::get_runtime_code(&trie_backend)?;
-
 	execution_proof_check_on_trie_backend::<H, Header::Number, _>(
 		&trie_backend,
 		&mut changes,
 		executor,
 		"Core_initialize_block",
 		&next_header.encode(),
-		&runtime_code,
 	)?;
 
 	// execute method
@@ -278,9 +274,7 @@ fn check_execution_proof_with_make_header<Header, E, H, MakeNextHeader: Fn(&Head
 		executor,
 		&request.method,
 		&request.call_data,
-		&runtime_code,
-	)
-	.map_err(Into::into)
+	).map_err(Into::into)
 }
 
 #[cfg(test)]

substrate/client/src/light/fetcher.rs

@@ -30,7 +30,7 @@ use sp_runtime::traits::{
 use sp_state_machine::{
 	ChangesTrieRootsStorage, ChangesTrieAnchorBlockId, ChangesTrieConfigurationRange,
 	InMemoryChangesTrieStorage, TrieBackend, read_proof_check, key_changes_proof_check_with_db,
-	read_child_proof_check,
+	create_proof_check_backend_storage, read_child_proof_check,
 };
 pub use sp_state_machine::StorageProof;
 use sp_blockchain::{Error as ClientError, Result as ClientResult};
@@ -155,7 +155,7 @@ impl<E, H, B: BlockT, S: BlockchainStorage<B>> LightDataChecker<E, H, B, S> {
 			H::Out: Ord + codec::Codec,
 	{
 		// all the checks are sharing the same storage
-		let storage = remote_roots_proof.into_memory_db();
+		let storage = create_proof_check_backend_storage(remote_roots_proof);
 
 		// remote_roots.keys() are sorted => we can use this to group changes tries roots
 		// that are belongs to the same CHT
@@ -187,8 +187,7 @@ impl<E, H, B: BlockT, S: BlockchainStorage<B>> LightDataChecker<E, H, B, S> {
 					local_cht_root,
 					block,
 					remote_changes_trie_root,
-					&proving_backend,
-				)?;
+					&proving_backend)?;
 
 				// and return the storage to use in following checks
 				storage = proving_backend.into_storage();
@@ -271,7 +270,7 @@ impl<E, Block, H, S> FetchChecker<Block> for LightDataChecker<E, H, Block, S>
 		body: Vec<Block::Extrinsic>
 	) -> ClientResult<Vec<Block::Extrinsic>> {
 		// TODO: #2621
-		let extrinsics_root = HashFor::<Block>::ordered_trie_root(
+		let	extrinsics_root = HashFor::<Block>::ordered_trie_root(
 			body.iter().map(Encode::encode).collect(),
 		);
 		if *request.header.extrinsics_root() == extrinsics_root {
@@ -295,7 +294,7 @@ struct RootsStorage<'a, Number: AtLeast32Bit, Hash: 'a> {
 impl<'a, H, Number, Hash> ChangesTrieRootsStorage<H, Number> for RootsStorage<'a, Number, Hash>
 	where
 		H: Hasher,
-		Number: std::fmt::Display + std::hash::Hash + Clone + AtLeast32Bit + Encode + Decode + Send + Sync + 'static,
+		Number: ::std::fmt::Display + ::std::hash::Hash + Clone + AtLeast32Bit + Encode + Decode + Send + Sync + 'static,
 		Hash: 'a + Send + Sync + Clone + AsRef<[u8]>,
 {
 	fn build_anchor(