chore: move genesis block builder to block builder crate.

client/block-builder/Cargo.toml

@@ -17,6 +17,7 @@ codec = { package = "parity-scale-codec", version = "3.2.2", features = [
 	"derive",
 ] }
 sc-client-api = { version = "4.0.0-dev", path = "../api" }
+sc-executor = { version = "0.10.0-dev", path = "../executor" }
 sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
 sp-block-builder = { version = "4.0.0-dev", path = "../../primitives/block-builder" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }

client/block-builder/src/lib.rs

@@ -26,6 +26,11 @@
 
 #![warn(missing_docs)]
 
+mod genesis;
+
+pub use genesis::{construct_genesis_block, BuildGenesisBlock, GenesisBlockBuilder};
+use std::collections::hash_map::DefaultHasher;
+
 use codec::Encode;
 
 use sp_api::{
@@ -40,9 +45,42 @@ use sp_runtime::{
 	Digest,
 };
 
+use sc_client_api::backend;
+use sc_executor::RuntimeVersionOf;
 pub use sp_block_builder::BlockBuilder as BlockBuilderApi;
+use sp_core::storage::{well_known_keys, StateVersion, Storage};
 
-use sc_client_api::backend;
+/// Return the state version given the genesis storage and executor.
+pub fn resolve_state_version_from_wasm<E>(
+	storage: &Storage,
+	executor: &E,
+) -> sp_blockchain::Result<StateVersion>
+where
+	E: RuntimeVersionOf,
+{
+	if let Some(wasm) = storage.top.get(well_known_keys::CODE) {
+		let mut ext = sp_state_machine::BasicExternalities::new_empty(); // just to read runtime version.
+
+		let code_fetcher = sp_core::traits::WrappedRuntimeCode(wasm.as_slice().into());
+		let runtime_code = sp_core::traits::RuntimeCode {
+			code_fetcher: &code_fetcher,
+			heap_pages: None,
+			hash: {
+				use std::hash::{Hash, Hasher};
+				let mut state = DefaultHasher::new();
+				wasm.hash(&mut state);
+				state.finish().to_le_bytes().to_vec()
+			},
+		};
+		let runtime_version = RuntimeVersionOf::runtime_version(executor, &mut ext, &runtime_code)
+			.map_err(|e| sp_blockchain::Error::VersionInvalid(e.to_string()))?;
+		Ok(runtime_version.state_version())
+	} else {
+		Err(sp_blockchain::Error::VersionInvalid(
+			"Runtime missing from initial storage, could not read state version.".to_string(),
+		))
+	}
+}
 
 /// Used as parameter to [`BlockBuilderProvider`] to express if proof recording should be enabled.
 ///

client/service/src/client/client.rs

@@ -18,16 +18,13 @@
 
 //! Substrate Client
 
-use super::{
-	block_rules::{BlockRules, LookupResult as BlockLookupResult},
-	genesis::BuildGenesisBlock,
-};
+use super::block_rules::{BlockRules, LookupResult as BlockLookupResult};
 use futures::{FutureExt, StreamExt};
 use log::{error, info, trace, warn};
 use parking_lot::{Mutex, RwLock};
 use prometheus_endpoint::Registry;
 use rand::Rng;
-use sc_block_builder::{BlockBuilderApi, BlockBuilderProvider, RecordProof};
+use sc_block_builder::{BlockBuilderApi, BlockBuilderProvider, BuildGenesisBlock, RecordProof};
 use sc_client_api::{
 	backend::{
 		self, apply_aux, BlockImportOperation, ClientImportOperation, FinalizeSummary, Finalizer,

client/service/src/client/mod.rs

@@ -47,7 +47,6 @@
 mod block_rules;
 mod call_executor;
 mod client;
-pub mod genesis;
 mod wasm_override;
 mod wasm_substitutes;
 

client/service/src/lib.rs

@@ -57,12 +57,14 @@ pub use self::{
 		new_full_parts, spawn_tasks, BuildNetworkParams, KeystoreContainer, NetworkStarter,
 		SpawnTasksParams, TFullBackend, TFullCallExecutor, TFullClient,
 	},
-	client::{
-		genesis::{BuildGenesisBlock, GenesisBlockBuilder},
-		resolve_state_version_from_wasm, ClientConfig, LocalCallExecutor,
-	},
+	client::{ClientConfig, LocalCallExecutor},
 	error::Error,
 };
+
+pub use sc_block_builder::{
+	resolve_state_version_from_wasm, BuildGenesisBlock, GenesisBlockBuilder,
+};
+
 pub use config::{
 	BasePath, BlocksPruning, Configuration, DatabaseSource, PruningMode, Role, RpcMethods, TaskType,
 };