Update to alpha.7

README.md

@@ -22,4 +22,4 @@ The Substrate Recipes are [GPL 3.0 Licensed](LICENSE) It is open source and [ope
 
 ## Using Recipes in External Projects
 
-The pallets and runtimes provided here are tested and ready to be used in other Substrate-based blockchains. The big caveat is that you must use the same upstream Substrate version throughout the project. The recipes currently use Substrate@`v2.0.0-alpha.6`.
+The pallets and runtimes provided here are tested and ready to be used in other Substrate-based blockchains. The big caveat is that you must use the same upstream Substrate version throughout the project. The recipes currently use Substrate@`v2.0.0-alpha.7`.

nodes/babe-grandpa-node/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "babe-grandpa-node"
-version = "2.0.0-alpha.6"
+version = "2.0.0-alpha.7"
 edition = "2018"
 authors = ['Joshy Orndorff', '4meta5', 'Jimmy Chu']
 homepage = 'https://substrate.dev/recipes'
@@ -23,24 +23,24 @@ tokio = "0.1.22"
 exit-future = "0.2.0"
 parking_lot = "0.9.0"
 trie-root = "0.15.2"
-sp-io = '2.0.0-alpha.6'
-sc-cli = '0.8.0-alpha.6'
-sc-client-api = '2.0.0-alpha.6'
-sp-core = '2.0.0-alpha.6'
-sp-runtime = '2.0.0-alpha.6'
-sc-executor = '0.8.0-alpha.6'
-sc-service = '0.8.0-alpha.6'
-sp-inherents = '2.0.0-alpha.6'
-sc-transaction-pool = '2.0.0-alpha.6'
-sp-transaction-pool = '2.0.0-alpha.6'
-sc-network = '0.8.0-alpha.6'
-sc-consensus-babe = '0.8.0-alpha.6'
-sp-consensus-babe = '0.8.0-alpha.6'
-sc-finality-grandpa = '0.8.0-alpha.6'
-sp-finality-grandpa = '2.0.0-alpha.6'
-sc-client = '0.8.0-alpha.6'
-sc-basic-authorship = '0.8.0-alpha.6'
-sp-consensus = '0.8.0-alpha.6'
+sp-io = '2.0.0-alpha.7'
+sc-cli = '0.8.0-alpha.7'
+sc-client-api = '2.0.0-alpha.7'
+sc-consensus = '0.8.0-alpha.7'
+sp-core = '2.0.0-alpha.7'
+sp-runtime = '2.0.0-alpha.7'
+sc-executor = '0.8.0-alpha.7'
+sc-service = '0.8.0-alpha.7'
+sp-inherents = '2.0.0-alpha.7'
+sc-transaction-pool = '2.0.0-alpha.7'
+sp-transaction-pool = '2.0.0-alpha.7'
+sc-network = '0.8.0-alpha.7'
+sc-consensus-babe = '0.8.0-alpha.7'
+sp-consensus-babe = '0.8.0-alpha.7'
+sc-finality-grandpa = '0.8.0-alpha.7'
+sp-finality-grandpa = '2.0.0-alpha.7'
+sc-basic-authorship = '0.8.0-alpha.7'
+sp-consensus = '0.8.0-alpha.7'
 
 # This node only works with runtimes that can provide babe and grandpa authorities.
 # No other runtimes that come with the recipes provide these APIs, but the substrate demonstration
@@ -50,12 +50,12 @@ runtime = { package = "babe-grandpa-runtime", path = "../../runtimes/babe-grandp
 # In theory the main Substrate node's runtime should work, but it is not published on crates.io
 # so a git dependency is necessary which leads to:
 # `perhaps two different versions of crate `sp_runtime` are being used?`
-# runtime = { package = "node-runtime", git = "https://github.com/paritytech/substrate/", tag = "v2.0.0-alpha.6" }
+# runtime = { package = "node-runtime", git = "https://github.com/paritytech/substrate/", tag = "v2.0.0-alpha.7" }
 
 
 [build-dependencies]
 vergen = "3.0.4"
-substrate-build-script-utils = '2.0.0-alpha.6'
+substrate-build-script-utils = '2.0.0-alpha.7'
 
 [features]
 ocw = []

nodes/babe-grandpa-node/src/service.rs

@@ -2,7 +2,7 @@
 
 use std::sync::Arc;
 use std::time::Duration;
-use sc_client::LongestChain;
+use sc_consensus::LongestChain;
 use sc_client_api::ExecutorProvider;
 use runtime::{self, opaque::Block, RuntimeApi};
 use sc_service::{error::{Error as ServiceError}, AbstractService, Configuration, ServiceBuilder};
@@ -36,13 +36,17 @@ macro_rules! new_full_start {
 			runtime::opaque::Block, runtime::RuntimeApi, crate::service::Executor
 		>($config)?
 			.with_select_chain(|_config, backend| {
-				Ok(sc_client::LongestChain::new(backend.clone()))
+				Ok(sc_consensus::LongestChain::new(backend.clone()))
 			})?
-			.with_transaction_pool(|config, client, _fetcher| {
+			.with_transaction_pool(|config, client, _fetcher, prometheus_registry| {
 				let pool_api = sc_transaction_pool::FullChainApi::new(client.clone());
-				Ok(sc_transaction_pool::BasicPool::new(config, std::sync::Arc::new(pool_api)))
+				Ok(sc_transaction_pool::BasicPool::new(
+					config,
+					std::sync::Arc::new(pool_api),
+					prometheus_registry,
+				))
 			})?
-			.with_import_queue(|_config, client, mut select_chain, _transaction_pool| {
+			.with_import_queue(|_config, client, mut select_chain, _transaction_pool, spawn_task_handle| {
 				let select_chain = select_chain.take()
 					.ok_or_else(|| sc_service::Error::SelectChainRequired)?;
 				let (grandpa_block_import, grandpa_link) =
@@ -64,6 +68,7 @@ macro_rules! new_full_start {
 					None,
 					client,
 					inherent_data_providers.clone(),
+					spawn_task_handle,
 				)?;
 
 				import_setup = Some((babe_block_import, grandpa_link, babe_link));
@@ -160,6 +165,7 @@ pub fn new_full(config: Configuration)
 			telemetry_on_connect: Some(service.telemetry_on_connect_stream()),
 			voting_rule: sc_finality_grandpa::VotingRulesBuilder::default().build(),
 			prometheus_registry: service.prometheus_registry(),
+			shared_voter_state: sc_finality_grandpa::SharedVoterState::empty(),
 		};
 
 		// the GRANDPA voter task is considered infallible, i.e.
@@ -189,16 +195,19 @@ pub fn new_light(config: Configuration)
 		.with_select_chain(|_config, backend| {
 			Ok(LongestChain::new(backend.clone()))
 		})?
-		.with_transaction_pool(|config, client, fetcher| {
+		.with_transaction_pool(|config, client, fetcher, prometheus_registry| {
 			let fetcher = fetcher
 				.ok_or_else(|| "Trying to start light transaction pool without active fetcher")?;
 			let pool_api = sc_transaction_pool::LightChainApi::new(client.clone(), fetcher.clone());
 			let pool = sc_transaction_pool::BasicPool::with_revalidation_type(
-				config, Arc::new(pool_api), sc_transaction_pool::RevalidationType::Light,
+				config,
+				Arc::new(pool_api),
+				prometheus_registry,
+				sc_transaction_pool::RevalidationType::Light,
 			);
 			Ok(pool)
 		})?
-		.with_import_queue_and_fprb(|_config, client, backend, fetcher, _select_chain, _tx_pool| {
+		.with_import_queue_and_fprb(|_config, client, backend, fetcher, _select_chain, _tx_pool, spawn_task_handle| {
 			let fetch_checker = fetcher
 				.map(|fetcher| fetcher.checker().clone())
 				.ok_or_else(|| "Trying to start light import queue without active fetch checker")?;
@@ -223,6 +232,7 @@ pub fn new_light(config: Configuration)
 				Some(Box::new(finality_proof_import)),
 				client.clone(),
 				inherent_data_providers.clone(),
+				spawn_task_handle,
 			)?;
 
 			Ok((import_queue, finality_proof_request_builder))

nodes/basic-pow/Cargo.toml

@@ -4,7 +4,7 @@ edition = '2018'
 homepage = 'https://substrate.dev/recipes'
 name = 'basic-pow'
 repository = 'https://github.com/substrate-developer-hub/recipes'
-version = "2.0.0-alpha.6"
+version = "2.0.0-alpha.7"
 description = 'A Substrate node that demonstrates minimal proof of work consensus'
 license = "GPL-3.0-or-later"
 
@@ -19,36 +19,36 @@ structopt = '0.3.8'
 parity-scale-codec = '1.3.0'
 sha3 = "0.8"
 rand = { version = "0.7", features = ["small_rng"] }
-sc-consensus-pow = { version = '0.8.0-alpha.6' }
-sp-consensus-pow = { version = '0.8.0-alpha.6' }
-sc-client-api = { version = '2.0.0-alpha.6' }
-sp-blockchain = { version = '2.0.0-alpha.6' }
-sp-timestamp = '2.0.0-alpha.6'
-sc-basic-authorship = '0.8.0-alpha.6'
-sc-cli = '0.8.0-alpha.6'
-sc-client = '0.8.0-alpha.6'
-sc-executor = '0.8.0-alpha.6'
-sc-network = '0.8.0-alpha.6'
-sc-service = '0.8.0-alpha.6'
-sc-transaction-pool = '2.0.0-alpha.6'
-sp-consensus = '0.8.0-alpha.6'
-sp-core = '2.0.0-alpha.6'
-sp-inherents = '2.0.0-alpha.6'
-sp-runtime = '2.0.0-alpha.6'
-sp-transaction-pool = '2.0.0-alpha.6'
+sc-consensus = '0.8.0-alpha.7'
+sc-consensus-pow = '0.8.0-alpha.7'
+sp-consensus-pow = '0.8.0-alpha.7'
+sc-client-api = '2.0.0-alpha.7'
+sp-blockchain = '2.0.0-alpha.7'
+sp-timestamp = '2.0.0-alpha.7'
+sc-basic-authorship = '0.8.0-alpha.7'
+sc-cli = '0.8.0-alpha.7'
+sc-executor = '0.8.0-alpha.7'
+sc-network = '0.8.0-alpha.7'
+sc-service = '0.8.0-alpha.7'
+sc-transaction-pool = '2.0.0-alpha.7'
+sp-consensus = '0.8.0-alpha.7'
+sp-core = '2.0.0-alpha.7'
+sp-inherents = '2.0.0-alpha.7'
+sp-runtime = '2.0.0-alpha.7'
+sp-transaction-pool = '2.0.0-alpha.7'
 
 # This node is compatible with any of the runtimes below
 # ---
 # Common runtime configured with most Recipes pallets.
-runtime = { package = "super-runtime", path = "../../runtimes/super-runtime" }
+# runtime = { package = "super-runtime", path = "../../runtimes/super-runtime" }
 
 # Runtime with custom weight and fee calculation.
-# runtime = { package = "weight-fee-runtime", path = "../../runtimes/weight-fee-runtime"}
+runtime = { package = "weight-fee-runtime", path = "../../runtimes/weight-fee-runtime"}
 
 # Runtime with custom runtime-api (custom API only used in rpc-node)
 # runtime = { package = "api-runtime", path = "../../runtimes/api-runtime" }
 # ---
 
 [build-dependencies]
 vergen = '3.0.4'
-substrate-build-script-utils = '2.0.0-alpha.6'
+substrate-build-script-utils = '2.0.0-alpha.7'

nodes/basic-pow/src/service.rs

@@ -1,7 +1,7 @@
 //! Service and ServiceFactory implementation. Specialized wrapper over substrate service.
 
 use std::sync::Arc;
-use sc_client::LongestChain;
+use sc_consensus::LongestChain;
 use sc_client_api::ExecutorProvider;
 use runtime::{self, opaque::Block, RuntimeApi};
 use sc_service::{error::{Error as ServiceError}, AbstractService, Configuration, ServiceBuilder};
@@ -42,13 +42,17 @@ macro_rules! new_full_start {
 			runtime::opaque::Block, runtime::RuntimeApi, crate::service::Executor
 		>($config)?
 			.with_select_chain(|_config, backend| {
-				Ok(sc_client::LongestChain::new(backend.clone()))
+				Ok(sc_consensus::LongestChain::new(backend.clone()))
 			})?
-			.with_transaction_pool(|config, client, _fetcher| {
+			.with_transaction_pool(|config, client, _fetcher, prometheus_registry| {
 				let pool_api = sc_transaction_pool::FullChainApi::new(client.clone());
-				Ok(sc_transaction_pool::BasicPool::new(config, std::sync::Arc::new(pool_api)))
+				Ok(sc_transaction_pool::BasicPool::new(
+					config,
+					std::sync::Arc::new(pool_api),
+					prometheus_registry,
+				))
 			})?
-			.with_import_queue(|_config, client, select_chain, _transaction_pool| {
+			.with_import_queue(|_config, client, select_chain, _transaction_pool, spawn_task_handle| {
 
 				let pow_block_import = sc_consensus_pow::PowBlockImport::new(
 					client.clone(),
@@ -61,8 +65,11 @@ macro_rules! new_full_start {
 
 				let import_queue = sc_consensus_pow::import_queue(
 					Box::new(pow_block_import.clone()),
+					None,
+					None,
 					crate::pow::Sha3Algorithm,
 					inherent_data_providers.clone(),
+					spawn_task_handle,
 				)?;
 
 				import_setup = Some(pow_block_import);
@@ -137,17 +144,20 @@ pub fn new_light(config: Configuration)
 		.with_select_chain(|_config, backend| {
 			Ok(LongestChain::new(backend.clone()))
 		})?
-		.with_transaction_pool(|config, client, fetcher| {
+		.with_transaction_pool(|config, client, fetcher, prometheus_registry| {
 			let fetcher = fetcher
 				.ok_or_else(|| "Trying to start light transaction pool without active fetcher")?;
 
 			let pool_api = sc_transaction_pool::LightChainApi::new(client.clone(), fetcher.clone());
 			let pool = sc_transaction_pool::BasicPool::with_revalidation_type(
-				config, Arc::new(pool_api), sc_transaction_pool::RevalidationType::Light,
+				config,
+				Arc::new(pool_api),
+				prometheus_registry,
+				sc_transaction_pool::RevalidationType::Light,
 			);
 			Ok(pool)
 		})?
-		.with_import_queue_and_fprb(|_config, client, _backend, _fetcher, select_chain, _tx_pool| {
+		.with_import_queue_and_fprb(|_config, client, _backend, _fetcher, select_chain, _tx_pool, spawn_task_handle| {
 			let finality_proof_request_builder =
 				Box::new(DummyFinalityProofRequestBuilder::default()) as Box<_>;
 
@@ -162,8 +172,11 @@ pub fn new_light(config: Configuration)
 
 			let import_queue = sc_consensus_pow::import_queue(
 				Box::new(pow_block_import),
+				None,
+				None,
 				Sha3Algorithm,
 				build_inherent_data_providers()?,
+				spawn_task_handle,
 			)?;
 
 			Ok((import_queue, finality_proof_request_builder))

nodes/kitchen-node/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "kitchen-node"
-version = "2.0.0-alpha.6"
+version = "2.0.0-alpha.7"
 edition = "2018"
 authors = ['Joshy Orndorff', '4meta5', 'Jimmy Chu']
 homepage = 'https://substrate.dev/recipes'
@@ -23,22 +23,21 @@ tokio = "0.1.22"
 exit-future = "0.2.0"
 parking_lot = "0.9.0"
 trie-root = "0.15.2"
-sc-basic-authorship = '0.8.0-alpha.6'
-sc-cli = '0.8.0-alpha.6'
-sc-client = '0.8.0-alpha.6'
-sc-client-db = '0.8.0-alpha.6' # This became necessary when converting to instant seal
-sp-consensus = '0.8.0-alpha.6'
-sc-consensus-manual-seal = '0.8.0-alpha.6'
-sc-executor = '0.8.0-alpha.6'
-sc-network = '0.8.0-alpha.6'
-sc-service = '0.8.0-alpha.6'
-sc-transaction-pool = '2.0.0-alpha.6'
-sp-core = '2.0.0-alpha.6'
-sp-inherents = '2.0.0-alpha.6'
-sp-io = '2.0.0-alpha.6'
-sp-runtime = '2.0.0-alpha.6'
-sp-timestamp = '2.0.0-alpha.6'
-sp-transaction-pool = '2.0.0-alpha.6'
+sc-basic-authorship = '0.8.0-alpha.7'
+sc-cli = '0.8.0-alpha.7'
+sc-client-db = '0.8.0-alpha.7' # This became necessary when converting to instant seal
+sp-consensus = '0.8.0-alpha.7'
+sc-consensus-manual-seal = '0.8.0-alpha.7'
+sc-executor = '0.8.0-alpha.7'
+sc-network = '0.8.0-alpha.7'
+sc-service = '0.8.0-alpha.7'
+sc-transaction-pool = '2.0.0-alpha.7'
+sp-core = '2.0.0-alpha.7'
+sp-inherents = '2.0.0-alpha.7'
+sp-io = '2.0.0-alpha.7'
+sp-runtime = '2.0.0-alpha.7'
+sp-timestamp = '2.0.0-alpha.7'
+sp-transaction-pool = '2.0.0-alpha.7'
 
 # This node is compatible with any of the runtimes below
 # ---
@@ -59,7 +58,7 @@ runtime = { package = "super-runtime", path = "../../runtimes/super-runtime" }
 
 [build-dependencies]
 vergen = "3.0.4"
-substrate-build-script-utils = '2.0.0-alpha.6'
+substrate-build-script-utils = '2.0.0-alpha.7'
 
 [features]
 ocw = []

nodes/kitchen-node/src/service.rs

@@ -1,7 +1,7 @@
 //! Service and ServiceFactory implementation. Specialized wrapper over substrate service.
 
 // use std::sync::Arc;
-// use sc_client::LongestChain;
+// use sc_consensus::LongestChain;
 // use sc_client_api::ExecutorProvider;
 use sc_service::{error::{Error as ServiceError}, AbstractService, Configuration};
 use sp_inherents::InherentDataProviders;
@@ -26,7 +26,7 @@ macro_rules! new_full_start {
 			runtime::opaque::Block, runtime::RuntimeApi, crate::service::Executor
 		>($config)?
 			.with_select_chain(|_config, backend| {
-				Ok(sc_client::LongestChain::new(backend.clone()))
+				Ok(sc_consensus::LongestChain::new(backend.clone()))
 			})?
 			.with_transaction_pool(|config, client, _fetcher| {
 				let pool_api = sc_transaction_pool::FullChainApi::new(client.clone());