Expose GRANDPA round state through RPC

bin/node-template/node/Cargo.toml

@@ -19,6 +19,7 @@ name = "node-template"
 futures = "0.3.4"
 log = "0.4.8"
 structopt = "0.3.8"
+parking_lot = "0.10.0"
 
 sc-cli = { version = "0.8.0-dev", path = "../../../client/cli" }
 sp-core = { version = "2.0.0-dev", path = "../../../primitives/core" }

bin/node-template/node/src/service.rs

@@ -10,7 +10,9 @@ use sp_inherents::InherentDataProviders;
 use sc_executor::native_executor_instance;
 pub use sc_executor::NativeExecutor;
 use sp_consensus_aura::sr25519::{AuthorityPair as AuraPair};
-use sc_finality_grandpa::{self, FinalityProofProvider as GrandpaFinalityProofProvider, StorageAndProofProvider};
+use sc_finality_grandpa::{self, FinalityProofProvider as GrandpaFinalityProofProvider,
+	StorageAndProofProvider, SharedVoterState,
+};
 
 // Our native executor instance.
 native_executor_instance!(
@@ -27,7 +29,7 @@ macro_rules! new_full_start {
 	($config:expr) => {{
 		use std::sync::Arc;
 		use sp_consensus_aura::sr25519::AuthorityPair as AuraPair;
-		
+
 		let mut import_setup = None;
 		let inherent_data_providers = sp_inherents::InherentDataProviders::new();
 
@@ -155,7 +157,8 @@ pub fn new_full(config: Configuration)
 			inherent_data_providers: inherent_data_providers.clone(),
 			telemetry_on_connect: Some(service.telemetry_on_connect_stream()),
 			voting_rule: sc_finality_grandpa::VotingRulesBuilder::default().build(),
-			prometheus_registry: service.prometheus_registry()
+			prometheus_registry: service.prometheus_registry(),
+			shared_voter_state: SharedVoterState::new(None),
 		};
 
 		// the GRANDPA voter task is considered infallible, i.e.

bin/node/cli/Cargo.toml

@@ -43,6 +43,7 @@ log = "0.4.8"
 rand = "0.7.2"
 structopt = { version = "0.3.8", optional = true }
 tracing = "0.1.10"
+parking_lot = "0.10.0"
 
 # primitives
 sp-authority-discovery = { version = "2.0.0-dev",  path = "../../../primitives/authority-discovery" }

bin/node/cli/src/command.rs

@@ -20,6 +20,7 @@ use node_runtime::{Block, RuntimeApi};
 use node_transaction_factory::RuntimeAdapter;
 use sc_cli::{CliConfiguration, ImportParams, Result, SharedParams, SubstrateCli};
 use sc_service::Configuration;
+use grandpa::SharedVoterState;
 
 impl SubstrateCli for Cli {
 	fn impl_name() -> &'static str {

bin/node/cli/src/service.rs

@@ -22,7 +22,10 @@ use std::sync::Arc;
 
 use sc_consensus_babe;
 use sc_client::{self, LongestChain};
-use grandpa::{self, FinalityProofProvider as GrandpaFinalityProofProvider, StorageAndProofProvider};
+use grandpa::{
+	self, FinalityProofProvider as GrandpaFinalityProofProvider, StorageAndProofProvider,
+	SharedVoterState,
+};
 use node_executor;
 use node_primitives::Block;
 use node_runtime::RuntimeApi;
@@ -48,6 +51,7 @@ macro_rules! new_full_start {
 		use std::sync::Arc;
 		type RpcExtension = jsonrpc_core::IoHandler<sc_rpc::Metadata>;
 		let mut import_setup = None;
+		let mut rpc_setup = None;
 		let inherent_data_providers = sp_inherents::InherentDataProviders::new();
 
 		let builder = sc_service::ServiceBuilder::new_full::<
@@ -91,6 +95,10 @@ macro_rules! new_full_start {
 			.with_rpc_extensions(|builder| -> std::result::Result<RpcExtension, _> {
 				let babe_link = import_setup.as_ref().map(|s| &s.2)
 					.expect("BabeLink is present for full services or set up failed; qed.");
+				let grandpa_link = import_setup.as_ref().map(|s| &s.1)
+					.expect("GRANDPA LinkHalf is present for full services or set up failed; qed.");
+				let shared_authority_set = grandpa_link.shared_authority_set();
+				let shared_voter_state = SharedVoterState::new(None);
 				let deps = node_rpc::FullDeps {
 					client: builder.client().clone(),
 					pool: builder.pool(),
@@ -100,12 +108,17 @@ macro_rules! new_full_start {
 						keystore: builder.keystore(),
 						babe_config: sc_consensus_babe::BabeLink::config(babe_link).clone(),
 						shared_epoch_changes: sc_consensus_babe::BabeLink::epoch_changes(babe_link).clone()
-					}
+					},
+					grandpa: node_rpc::GrandpaDeps {
+						shared_voter_state: shared_voter_state.clone(),
+						shared_authority_set: shared_authority_set.clone(),
+					},
 				};
+				rpc_setup = Some((shared_voter_state));
 				Ok(node_rpc::create_full(deps))
 			})?;
 
-		(builder, import_setup, inherent_data_providers)
+		(builder, import_setup, inherent_data_providers, rpc_setup)
 	}}
 }
 
@@ -131,7 +144,8 @@ macro_rules! new_full {
 			$config.disable_grandpa,
 		);
 
-		let (builder, mut import_setup, inherent_data_providers) = new_full_start!($config);
+		let (builder, mut import_setup, inherent_data_providers, mut rpc_setup)
+			= new_full_start!($config);
 
 		let service = builder
 			.with_finality_proof_provider(|client, backend| {
@@ -144,6 +158,9 @@ macro_rules! new_full {
 		let (block_import, grandpa_link, babe_link) = import_setup.take()
 				.expect("Link Half and Block Import are present for Full Services or setup failed before. qed");
 
+		let shared_voter_state = rpc_setup.take()
+				.expect("The SharedVoterSetup is present for Full Services or setup failed before. qed");
+
 		($with_startup_data)(&block_import, &babe_link);
 
 		if let sc_service::config::Role::Authority { .. } = &role {
@@ -243,6 +260,7 @@ macro_rules! new_full {
 				telemetry_on_connect: Some(service.telemetry_on_connect_stream()),
 				voting_rule: grandpa::VotingRulesBuilder::default().build(),
 				prometheus_registry: service.prometheus_registry(),
+				shared_voter_state,
 			};
 
 			// the GRANDPA voter task is considered infallible, i.e.
@@ -408,6 +426,7 @@ mod tests {
 	use crate::service::{new_full, new_light};
 	use sp_runtime::traits::IdentifyAccount;
 	use sp_transaction_pool::{MaintainedTransactionPool, ChainEvent};
+	use grandpa::SharedVoterState;
 
 	type AccountPublic = <Signature as Verify>::Signer;
 

bin/node/rpc/Cargo.toml

@@ -28,3 +28,5 @@ sc-keystore = { version = "2.0.0-dev", path = "../../../client/keystore" }
 sc-consensus-epochs = { version = "0.8.0-dev", path = "../../../client/consensus/epochs" }
 sp-consensus = { version = "0.8.0-dev", path = "../../../primitives/consensus/common" }
 sp-blockchain = { version = "2.0.0-dev", path = "../../../primitives/blockchain" }
+sc-finality-grandpa = { version = "0.8.0-dev", path = "../../../client/finality-grandpa" }
+sc-finality-grandpa-rpc = { version = "0.8.0-dev", path = "../../../client/finality-grandpa/rpc" }

bin/node/rpc/src/lib.rs

@@ -31,7 +31,7 @@
 
 use std::{sync::Arc, fmt};
 
-use node_primitives::{Block, BlockNumber, AccountId, Index, Balance};
+use node_primitives::{Block, BlockNumber, AccountId, Index, Balance, Hash};
 use node_runtime::UncheckedExtrinsic;
 use sp_api::ProvideRuntimeApi;
 use sp_transaction_pool::TransactionPool;
@@ -42,6 +42,8 @@ use sp_consensus_babe::BabeApi;
 use sc_consensus_epochs::SharedEpochChanges;
 use sc_consensus_babe::{Config, Epoch};
 use sc_consensus_babe_rpc::BabeRPCHandler;
+use sc_finality_grandpa::{SharedVoterState, SharedAuthoritySet};
+use sc_finality_grandpa_rpc::GrandpaRpcHandler;
 
 /// Light client extra dependencies.
 pub struct LightDeps<C, F, P> {
@@ -65,6 +67,14 @@ pub struct BabeDeps {
 	pub keystore: KeyStorePtr,
 }
 
+/// Extra dependencies for GRANDPA
+pub struct GrandpaDeps {
+	/// Voting round info.
+	pub shared_voter_state: SharedVoterState,
+	/// Authority set info.
+	pub shared_authority_set: SharedAuthoritySet<Hash, BlockNumber>,
+}
+
 /// Full client dependencies.
 pub struct FullDeps<C, P, SC> {
 	/// The client instance to use.
@@ -75,6 +85,8 @@ pub struct FullDeps<C, P, SC> {
 	pub select_chain: SC,
 	/// BABE specific dependencies.
 	pub babe: BabeDeps,
+	/// GRANDPA specific dependencies.
+	pub grandpa: GrandpaDeps,
 }
 
 /// Instantiate all Full RPC extensions.
@@ -102,13 +114,18 @@ pub fn create_full<C, P, M, SC>(
 		client,
 		pool,
 		select_chain,
-		babe
+		babe,
+		grandpa,
 	} = deps;
 	let BabeDeps {
 		keystore,
 		babe_config,
 		shared_epoch_changes,
 	} = babe;
+	let GrandpaDeps {
+		shared_voter_state,
+		shared_authority_set,
+	} = grandpa;
 
 	io.extend_with(
 		SystemApi::to_delegate(FullSystem::new(client.clone(), pool))
@@ -127,6 +144,11 @@ pub fn create_full<C, P, M, SC>(
 			BabeRPCHandler::new(client, shared_epoch_changes, keystore, babe_config, select_chain)
 		)
 	);
+	io.extend_with(
+		sc_finality_grandpa_rpc::GrandpaApi::to_delegate(
+			GrandpaRpcHandler::new(shared_voter_state, shared_authority_set)
+		)
+	);
 
 	io
 }

client/finality-grandpa/rpc/Cargo.toml

@@ -0,0 +1,22 @@
+[package]
+name = "sc-finality-grandpa-rpc"
+version = "0.8.0-dev"
+authors = ["Parity Technologies <admin@parity.io>"]
+description = "RPC extensions for the GRANDPA finality gadget"
+edition = "2018"
+license = "GPL-3.0"
+
+[dependencies]
+sc-finality-grandpa = { version = "0.8.0-dev", path = "../" }
+finality-grandpa = { version = "0.11.2", features = ["derive-codec"] }
+jsonrpc-core = "14.0.3"
+jsonrpc-core-client = "14.0.3"
+jsonrpc-derive = "14.0.3"
+futures = "0.3.1"
+serde = { version = "1.0.105", features = ["derive"] }
+serde_json = "1.0.50"
+log = "0.4.8"
+derive_more = "0.99.2"
+
+[dev-dependencies]
+substrate-test-runtime-client = { version = "2.0.0-dev", path = "../../../test-utils/runtime/client" }