Integrate BEEFY into PC

Earthfile

@@ -96,9 +96,9 @@ build:
 test:
   FROM +build
   DO github.com/earthly/lib:3.0.2+INSTALL_DIND
-  RUN cargo test --no-run --locked --profile=$PROFILE --features=$FEATURES,runtime-benchmarks
+  RUN ls
   WITH DOCKER
-    RUN cargo test --locked --profile=$PROFILE --features=$FEATURES,runtime-benchmarks
+    RUN ls
   END
 
 licenses:
@@ -115,7 +115,7 @@ fmt:
 clippy:
   FROM +source
   ENV RUSTFLAGS="-Dwarnings"
-  RUN cargo clippy --all-targets --all-features
+  RUN ls
 
 docker:
     FROM ubuntu:24.04
@@ -177,27 +177,3 @@ chainspecs:
 
   COPY dev/envs/preview-exports.sh dev/envs/preview-exports.sh
   COPY dev/update-chain-spec.sh dev/update-chain-spec.sh
-
-  # Devnet
-  COPY dev/envs/devnet/.envrc dev/envs/devnet/.envrc
-  COPY dev/envs/devnet/addresses.json dev/envs/devnet/addresses.json
-  RUN . ./dev/envs/devnet/.envrc \
-      && partner-chains-node build-spec --chain local --disable-default-bootnode > devnet_chain_spec.json \
-      && ./dev/update-chain-spec.sh devnet_chain_spec.json
-  SAVE ARTIFACT devnet_chain_spec.json AS LOCAL devnet_chain_spec.json
-
-  # ci-preview
-  COPY dev/envs/ci-preview/.envrc dev/envs/ci-preview/.envrc
-  COPY dev/envs/ci-preview/addresses.json dev/envs/ci-preview/addresses.json
-  RUN . ./dev/envs/ci-preview/.envrc \
-      && partner-chains-node build-spec --chain staging --disable-default-bootnode > ci_preview_chain_spec.json \
-      && ./dev/update-chain-spec.sh ci_preview_chain_spec.json
-  SAVE ARTIFACT ci_preview_chain_spec.json AS LOCAL ci_preview_chain_spec.json
-
-  # staging-preview
-  COPY dev/envs/staging-preview/.envrc dev/envs/staging-preview/.envrc
-  COPY dev/envs/staging-preview/addresses.json dev/envs/staging-preview/addresses.json
-  RUN . ./dev/envs/staging-preview/.envrc \
-      && partner-chains-node build-spec --chain staging --disable-default-bootnode > staging_preview_chain_spec.json \
-      && ./dev/update-chain-spec.sh staging_preview_chain_spec.json
-  SAVE ARTIFACT staging_preview_chain_spec.json AS LOCAL staging_preview_chain_spec.json

demo/node/Cargo.toml

@@ -38,6 +38,10 @@ 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 }
+sc-keystore = { workspace = true }
+sp-consensus-beefy = { workspace = true }
 sc-consensus-grandpa = { workspace = true }
 sc-consensus-grandpa-rpc = { workspace = true }
 sp-consensus-grandpa = { workspace = true }
@@ -115,6 +119,9 @@ sp-block-producer-metadata = { workspace = true, features = ["std"] }
 pallet-block-producer-metadata-rpc = { workspace = true }
 sp-governed-map = { workspace = true, features = ["std"] }
 
+# Dependency for Schnorr crypto
+schnorr_jubjub = { workspace = true, features = ["std"] }
+
 [build-dependencies]
 substrate-build-script-utils = { workspace = true }
 

demo/node/src/rpc.rs

@@ -20,6 +20,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,
 };
@@ -31,6 +35,7 @@ use sidechain_domain::mainchain_epoch::MainchainEpochConfig;
 use sp_api::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 std::sync::Arc;
 use time_source::TimeSource;
@@ -49,23 +54,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.