Wire BEEFY into demo runtime/node

Author: AmbientTea

Cargo.lock

@@ -262,6 +262,11 @@ pallet-scheduler                            =  {  default-features  =  false,
 pallet-preimage                             =  {  default-features  =  false,                            git  =  "https://github.com/input-output-hk/polkadot-sdk.git",  rev  =  "01884a99a9507fa1f6e893e602c85e172825cea5"  }
 pallet-parameters                           =  {  default-features  =  false,                            git  =  "https://github.com/input-output-hk/polkadot-sdk.git",  rev  =  "01884a99a9507fa1f6e893e602c85e172825cea5"  }
 sp-consensus-beefy                          =  {  default-features  =  false,                            git  =  "https://github.com/input-output-hk/polkadot-sdk.git",  rev  =  "01884a99a9507fa1f6e893e602c85e172825cea5"  }
+sc-consensus-beefy                          =  {  default-features  =  false,                            git  =  "https://github.com/input-output-hk/polkadot-sdk.git",  rev  =  "01884a99a9507fa1f6e893e602c85e172825cea5"  }
+sc-consensus-beefy-rpc                      =  {  default-features  =  false,                            git  =  "https://github.com/input-output-hk/polkadot-sdk.git",  rev  =  "01884a99a9507fa1f6e893e602c85e172825cea5"  }
+pallet-beefy                                =  {  default-features  =  false,                            git  =  "https://github.com/input-output-hk/polkadot-sdk.git",  rev  =  "01884a99a9507fa1f6e893e602c85e172825cea5"  }
+pallet-beefy-mmr                            =  {  default-features  =  false,                            git  =  "https://github.com/input-output-hk/polkadot-sdk.git",  rev  =  "01884a99a9507fa1f6e893e602c85e172825cea5"  }
+pallet-mmr                                  =  {  default-features  =  false,                            git  =  "https://github.com/input-output-hk/polkadot-sdk.git",  rev  =  "01884a99a9507fa1f6e893e602c85e172825cea5"  }
 
 raw-scripts = { git = "https://github.com/input-output-hk/partner-chains-smart-contracts.git", rev = "v8.2.0" }
 # local dependencies

Cargo.toml

@@ -38,6 +38,9 @@ sp-consensus-aura = { workspace = true }
 sp-partner-chains-consensus-aura = { workspace = true }
 sp-consensus = { workspace = true }
 sc-consensus = { workspace = true }
+sc-consensus-beefy = { workspace = true }
+sc-consensus-beefy-rpc = { workspace = true }
+sp-consensus-beefy = { workspace = true }
 sc-consensus-grandpa = { workspace = true }
 sc-consensus-grandpa-rpc = { workspace = true }
 sp-consensus-grandpa = { workspace = true }

demo/node/Cargo.toml

@@ -43,6 +43,7 @@ pub fn pc_create_chain_spec(config: &CreateChainSpecConfig<SessionKeys>) -> serd
 		system: partner_chains_demo_runtime::SystemConfig::default(),
 		balances: partner_chains_demo_runtime::BalancesConfig::default(),
 		aura: partner_chains_demo_runtime::AuraConfig::default(),
+		beefy: partner_chains_demo_runtime::BeefyConfig::default(),
 		grandpa: partner_chains_demo_runtime::GrandpaConfig::default(),
 		sudo: partner_chains_demo_runtime::SudoConfig::default(),
 		transaction_payment: Default::default(),

demo/node/src/chain_spec.rs

@@ -17,6 +17,10 @@ use partner_chains_demo_runtime::{
 	opaque::{Block, SessionKeys},
 };
 use partner_chains_demo_runtime::{BlockNumber, BlockProducerMetadataType, CrossChainPublic, Hash};
+use sc_consensus_beefy::communication::notification::{
+	BeefyBestBlockStream, BeefyVersionedFinalityProofStream,
+};
+use sc_consensus_beefy_rpc::Beefy;
 use sc_consensus_grandpa::{
 	FinalityProofProvider, GrandpaJustificationStream, SharedAuthoritySet, SharedVoterState,
 };
@@ -28,6 +32,7 @@ use sidechain_domain::mainchain_epoch::MainchainEpochConfig;
 use sp_api::{CallApiAt, ProvideRuntimeApi};
 use sp_block_builder::BlockBuilder;
 use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
+use sp_consensus_beefy::AuthorityIdBound;
 use sp_session_validator_management_query::SessionValidatorManagementQuery;
 use sp_sidechain::GetEpochDurationApi;
 use std::sync::Arc;
@@ -47,23 +52,35 @@ pub struct GrandpaDeps<B> {
 	pub finality_provider: Arc<FinalityProofProvider<B, Block>>,
 }
 
+/// Dependencies for BEEFY
+pub struct BeefyDeps<AuthorityId: AuthorityIdBound> {
+	/// Receives notifications about finality proof events from BEEFY.
+	pub beefy_finality_proof_stream: BeefyVersionedFinalityProofStream<Block, AuthorityId>,
+	/// Receives notifications about best block events from BEEFY.
+	pub beefy_best_block_stream: BeefyBestBlockStream<Block>,
+	/// Executor to drive the subscription manager in the BEEFY RPC handler.
+	pub subscription_executor: sc_rpc::SubscriptionTaskExecutor,
+}
+
 /// Full client dependencies.
-pub struct FullDeps<C, P, B, T> {
+pub struct FullDeps<C, P, B, T, AuthorityId: AuthorityIdBound> {
 	/// The client instance to use.
 	pub client: Arc<C>,
 	/// Transaction pool instance.
 	pub pool: Arc<P>,
 	/// GRANDPA specific dependencies.
 	pub grandpa: GrandpaDeps<B>,
+	/// BEEFY specific dependencies.
+	pub beefy: BeefyDeps<AuthorityId>,
 	/// Data sources.
 	pub data_sources: DataSources,
 	/// Source of system time
 	pub time_source: Arc<T>,
 }
 
 /// Instantiate all full RPC extensions.
-pub fn create_full<C, P, B, T>(
-	deps: FullDeps<C, P, B, T>,
+pub fn create_full<C, P, B, T, AuthorityId: AuthorityIdBound>(
+	deps: FullDeps<C, P, B, T, AuthorityId>,
 ) -> Result<RpcModule<()>, Box<dyn std::error::Error + Send + Sync>>
 where
 	C: ProvideRuntimeApi<Block>,
@@ -93,10 +110,11 @@ where
 	T: TimeSource + Send + Sync + 'static,
 {
 	use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer};
+	use sc_consensus_beefy_rpc::BeefyApiServer;
 	use substrate_frame_rpc_system::{System, SystemApiServer};
 
 	let mut module = RpcModule::new(());
-	let FullDeps { client, pool, grandpa, data_sources, time_source } = deps;
+	let FullDeps { client, pool, grandpa, beefy, data_sources, time_source } = deps;
 
 	module.merge(System::new(client.clone(), pool.clone()).into_rpc())?;
 	module.merge(TransactionPayment::new(client.clone()).into_rpc())?;
@@ -137,6 +155,15 @@ where
 		.into_rpc(),
 	)?;
 
+	module.merge(
+		Beefy::<Block, AuthorityId>::new(
+			beefy.beefy_finality_proof_stream,
+			beefy.beefy_best_block_stream,
+			beefy.subscription_executor,
+		)?
+		.into_rpc(),
+	)?;
+
 	// Extend this RPC with a custom API by using the following syntax.
 	// `YourRpcStruct` should have a reference to a client, which is needed
 	// to call into the runtime.