Unverified Commit aa1a089e authored by Andreas Doerr's avatar Andreas Doerr Committed by GitHub
Browse files

Make KeyStore optional (#2964)

parent 4758b9f6
Pipeline #136456 passed with stages
in 24 minutes and 50 seconds
......@@ -458,7 +458,7 @@ checksum = "6736e2428df2ca2848d846c43e88745121a6654696e349ce0054a420815a7409"
[[package]]
name = "beefy-gadget"
version = "0.1.0"
source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#5726a43094cad395d6e253bbc8b93ff7e54f2453"
source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#460ff08c8371958670d4075e1ba0551fab573757"
dependencies = [
"beefy-primitives",
"futures 0.3.14",
......@@ -486,7 +486,7 @@ dependencies = [
[[package]]
name = "beefy-gadget-rpc"
version = "0.1.0"
source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#5726a43094cad395d6e253bbc8b93ff7e54f2453"
source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#460ff08c8371958670d4075e1ba0551fab573757"
dependencies = [
"beefy-gadget",
"beefy-primitives",
......@@ -507,7 +507,7 @@ dependencies = [
[[package]]
name = "beefy-primitives"
version = "0.1.0"
source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#5726a43094cad395d6e253bbc8b93ff7e54f2453"
source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#460ff08c8371958670d4075e1ba0551fab573757"
dependencies = [
"parity-scale-codec",
"sp-api",
......@@ -4530,7 +4530,7 @@ dependencies = [
[[package]]
name = "pallet-beefy"
version = "0.1.0"
source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#5726a43094cad395d6e253bbc8b93ff7e54f2453"
source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#460ff08c8371958670d4075e1ba0551fab573757"
dependencies = [
"beefy-primitives",
"frame-support",
......
......@@ -928,11 +928,19 @@ pub fn new_full<RuntimeApi, Executor>(
task_manager.spawn_essential_handle().spawn_blocking("babe", babe);
}
// if the node isn't actively participating in consensus then it doesn't
// need a keystore, regardless of which protocol we use below.
let keystore_opt = if role.is_authority() {
Some(keystore_container.sync_keystore())
} else {
None
};
// We currently only run the BEEFY gadget on the Rococo and Wococo testnets.
if chain_spec.is_rococo() || chain_spec.is_wococo() {
let gadget = beefy_gadget::start_beefy_gadget::<_, beefy_primitives::ecdsa::AuthorityPair, _, _, _, _>(
client.clone(),
keystore_container.sync_keystore(),
keystore_opt.clone(),
network.clone(),
beefy_link,
network.clone(),
......@@ -949,14 +957,6 @@ pub fn new_full<RuntimeApi, Executor>(
}
}
// if the node isn't actively participating in consensus then it doesn't
// need a keystore, regardless of which protocol we use below.
let keystore_opt = if role.is_authority() {
Some(keystore_container.sync_keystore())
} else {
None
};
let config = grandpa::Config {
// FIXME substrate#1578 make this available through chainspec
gossip_duration: Duration::from_millis(1000),
......
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