Unverified Commit 2ab282f5 authored by Ashley's avatar Ashley
Browse files

Merge remote-tracking branch 'parity/master' into ashley-compile-to-wasm

parents cceb6b72 5598ed9b
This diff is collapsed.
......@@ -11,8 +11,8 @@ parking_lot = "0.9.0"
log = "0.4.8"
codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = ["derive"] }
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
kvdb = { git = "https://github.com/paritytech/parity-common", rev="03a2ba08f47f4af4219280e660a1ea92cb8896bd" }
kvdb-memorydb = { git = "https://github.com/paritytech/parity-common", rev="03a2ba08f47f4af4219280e660a1ea92cb8896bd" }
kvdb = "0.1.1"
kvdb-memorydb = "0.1.2"
[target.'cfg(not(target_os = "unknown"))'.dependencies]
kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common", rev="03a2ba08f47f4af4219280e660a1ea92cb8896bd" }
kvdb-rocksdb = "0.2"
......@@ -272,6 +272,8 @@ pub fn new_full(config: Configuration<CustomConfiguration, GenesisConfig>)
let client = service.client();
let select_chain = service.select_chain().ok_or(ServiceError::SelectChainRequired)?;
let can_author_with =
consensus_common::CanAuthorWithNativeVersion::new(client.executor().clone());
let babe_config = babe::BabeParams {
keystore: service.keystore(),
......@@ -283,6 +285,7 @@ pub fn new_full(config: Configuration<CustomConfiguration, GenesisConfig>)
inherent_data_providers: inherent_data_providers.clone(),
force_authoring: force_authoring,
babe_link,
can_author_with,
};
let babe = babe::start_babe(babe_config)?;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment