From cab4c7cd05d5d7a7671c6b8f1115109c47aacdb2 Mon Sep 17 00:00:00 2001 From: Roman Useinov Date: Tue, 8 Jun 2021 10:55:55 +0200 Subject: [PATCH] Make sure GRANDPA shares state with RPC. (#987) * Make sure GRANDPA shares state with RPC. * RPC shared state with GRANDPA rialto. * fmt * cargo fix * fix clippy --- bridges/bin/millau/node/src/service.rs | 7 ++++--- bridges/bin/rialto/node/src/service.rs | 8 +++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/bridges/bin/millau/node/src/service.rs b/bridges/bin/millau/node/src/service.rs index afd9f09db0..632eef06ff 100644 --- a/bridges/bin/millau/node/src/service.rs +++ b/bridges/bin/millau/node/src/service.rs @@ -33,7 +33,7 @@ use sc_client_api::{ExecutorProvider, RemoteBackend}; use sc_consensus_aura::{ImportQueueParams, SlotProportion, StartAuraParams}; use sc_executor::native_executor_instance; pub use sc_executor::NativeExecutor; -use sc_finality_grandpa::SharedVoterState; + use sc_keystore::LocalKeystore; use sc_service::{error::Error as ServiceError, Configuration, TaskManager}; use sc_telemetry::{Telemetry, TelemetryWorker}; @@ -206,6 +206,7 @@ pub fn new_full(mut config: Configuration) -> Result let name = config.network.node_name.clone(); let enable_grandpa = !config.disable_grandpa; let prometheus_registry = config.prometheus_registry().cloned(); + let shared_voter_state = sc_finality_grandpa::SharedVoterState::empty(); let rpc_extensions_builder = { use sc_finality_grandpa::FinalityProofProvider as GrandpaFinalityProofProvider; @@ -221,7 +222,7 @@ pub fn new_full(mut config: Configuration) -> Result let justification_stream = grandpa_link.justification_stream(); let shared_authority_set = grandpa_link.shared_authority_set().clone(); - let shared_voter_state = sc_finality_grandpa::SharedVoterState::empty(); + let shared_voter_state = shared_voter_state.clone(); let finality_proof_provider = GrandpaFinalityProofProvider::new_for_service(backend, Some(shared_authority_set.clone())); @@ -339,7 +340,7 @@ pub fn new_full(mut config: Configuration) -> Result network, voting_rule: sc_finality_grandpa::VotingRulesBuilder::default().build(), prometheus_registry, - shared_voter_state: SharedVoterState::empty(), + shared_voter_state, telemetry: telemetry.as_ref().map(|x| x.handle()), }; diff --git a/bridges/bin/rialto/node/src/service.rs b/bridges/bin/rialto/node/src/service.rs index cefda5dd9a..0e90642ecd 100644 --- a/bridges/bin/rialto/node/src/service.rs +++ b/bridges/bin/rialto/node/src/service.rs @@ -35,7 +35,7 @@ use sc_client_api::{ExecutorProvider, RemoteBackend}; use sc_consensus_aura::{ImportQueueParams, SlotProportion, StartAuraParams}; use sc_executor::native_executor_instance; pub use sc_executor::NativeExecutor; -use sc_finality_grandpa::SharedVoterState; + use sc_keystore::LocalKeystore; use sc_service::{error::Error as ServiceError, Configuration, TaskManager}; use sc_telemetry::{Telemetry, TelemetryWorker}; @@ -209,6 +209,8 @@ pub fn new_full(mut config: Configuration) -> Result let enable_grandpa = !config.disable_grandpa; let prometheus_registry = config.prometheus_registry().cloned(); + let shared_voter_state = sc_finality_grandpa::SharedVoterState::empty(); + let rpc_extensions_builder = { use sc_finality_grandpa::FinalityProofProvider as GrandpaFinalityProofProvider; @@ -223,7 +225,7 @@ pub fn new_full(mut config: Configuration) -> Result let justification_stream = grandpa_link.justification_stream(); let shared_authority_set = grandpa_link.shared_authority_set().clone(); - let shared_voter_state = sc_finality_grandpa::SharedVoterState::empty(); + let shared_voter_state = shared_voter_state.clone(); let finality_proof_provider = GrandpaFinalityProofProvider::new_for_service(backend, Some(shared_authority_set.clone())); @@ -342,7 +344,7 @@ pub fn new_full(mut config: Configuration) -> Result network, voting_rule: sc_finality_grandpa::VotingRulesBuilder::default().build(), prometheus_registry, - shared_voter_state: SharedVoterState::empty(), + shared_voter_state, telemetry: telemetry.as_ref().map(|x| x.handle()), };