[substrate-apply] Move grandpa crates to consensus folder #13458

Cargo.toml

@@ -97,9 +97,9 @@ sc-consensus = { git = "https://github.com/humanode-network/substrate", branch =
 sc-consensus-babe = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.40", default-features = false }
 sc-consensus-babe-rpc = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.40", default-features = false }
 sc-consensus-epochs = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.40", default-features = false }
+sc-consensus-grandpa = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.40", default-features = false }
+sc-consensus-grandpa-rpc = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.40", default-features = false }
 sc-executor = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.40", default-features = false }
-sc-finality-grandpa = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.40", default-features = false }
-sc-finality-grandpa-rpc = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.40", default-features = false }
 sc-network = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.40", default-features = false }
 sc-rpc = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.40", default-features = false }
 sc-rpc-api = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.40", default-features = false }
@@ -116,9 +116,9 @@ sp-block-builder = { git = "https://github.com/humanode-network/substrate", bran
 sp-blockchain = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.40", default-features = false }
 sp-consensus = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.40", default-features = false }
 sp-consensus-babe = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.40", default-features = false }
+sp-consensus-grandpa = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.40", default-features = false }
 sp-core = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.40", default-features = false }
 sp-core-hashing-proc-macro = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.40", default-features = false }
-sp-finality-grandpa = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.40", default-features = false }
 sp-inherents = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.40", default-features = false }
 sp-io = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.40", default-features = false }
 sp-keyring = { git = "https://github.com/humanode-network/substrate", branch = "locked/polkadot-v0.9.40", default-features = false }

crates/crypto-utils/Cargo.toml

@@ -8,5 +8,5 @@ publish = false
 frame-support = { workspace = true }
 pallet-im-online = { workspace = true }
 sp-consensus-babe = { workspace = true }
-sp-finality-grandpa = { workspace = true }
+sp-consensus-grandpa = { workspace = true }
 sp-runtime = { workspace = true }

crates/crypto-utils/src/lib.rs

@@ -2,7 +2,7 @@
 
 use pallet_im_online::sr25519::AuthorityId as ImOnlineId;
 use sp_consensus_babe::AuthorityId as BabeId;
-use sp_finality_grandpa::AuthorityId as GrandpaId;
+use sp_consensus_grandpa::AuthorityId as GrandpaId;
 use sp_runtime::{
     app_crypto::{Pair, Public},
     traits::IdentifyAccount,

crates/humanode-peer/Cargo.toml

@@ -53,8 +53,8 @@ sc-cli = { workspace = true }
 sc-client-api = { workspace = true }
 sc-consensus = { workspace = true }
 sc-consensus-babe = { workspace = true }
+sc-consensus-grandpa = { workspace = true }
 sc-executor = { workspace = true }
-sc-finality-grandpa = { workspace = true }
 sc-service = { workspace = true }
 sc-telemetry = { workspace = true }
 sc-transaction-pool = { workspace = true }
@@ -63,8 +63,8 @@ serde_json = { workspace = true }
 sp-api = { workspace = true }
 sp-application-crypto = { workspace = true }
 sp-consensus-babe = { workspace = true }
+sp-consensus-grandpa = { workspace = true }
 sp-core = { workspace = true }
-sp-finality-grandpa = { workspace = true }
 sp-inherents = { workspace = true }
 sp-io = { workspace = true }
 sp-keyring = { workspace = true }

crates/humanode-peer/src/chain_spec.rs

@@ -15,7 +15,7 @@ use sc_chain_spec_derive::{ChainSpecExtension, ChainSpecGroup};
 use sc_service::ChainType;
 use serde::{Deserialize, Serialize};
 use sp_consensus_babe::AuthorityId as BabeId;
-use sp_finality_grandpa::AuthorityId as GrandpaId;
+use sp_consensus_grandpa::AuthorityId as GrandpaId;
 use sp_runtime::{app_crypto::sr25519, traits::Verify};
 
 /// The concrete chain spec type we're using for the humanode network.

crates/humanode-peer/src/cli/run.rs

@@ -100,7 +100,7 @@ pub async fn run() -> sc_cli::Result<()> {
                     } = service::new_partial(&config)?;
                     let aux_revert = Box::new(|client, backend, blocks| {
                         sc_consensus_babe::revert(Arc::clone(&client), backend, blocks)?;
-                        sc_finality_grandpa::revert(client, blocks)?;
+                        sc_consensus_grandpa::revert(client, blocks)?;
                         Ok(())
                     });
                     Ok((cmd.run(client, backend, Some(aux_revert)), task_manager))

crates/humanode-peer/src/service/mod.rs

@@ -16,7 +16,7 @@ use humanode_runtime::{self, opaque::Block, RuntimeApi};
 use sc_client_api::{BlockBackend, BlockchainEvents};
 use sc_consensus_babe::SlotProportion;
 pub use sc_executor::NativeElseWasmExecutor;
-use sc_finality_grandpa::SharedVoterState;
+use sc_consensus_grandpa::SharedVoterState;
 use sc_service::{
     Error as ServiceError, KeystoreContainer, PartialComponents, TaskManager, WarpSyncParams,
 };
@@ -61,7 +61,7 @@ type FullBackend = sc_service::TFullBackend<Block>;
 type FullSelectChain = sc_consensus::LongestChain<FullBackend, Block>;
 /// Full type for `GrandpaBlockImport`.
 type FullGrandpa =
-    sc_finality_grandpa::GrandpaBlockImport<FullBackend, Block, FullClient, FullSelectChain>;
+    sc_consensus_grandpa::GrandpaBlockImport<FullBackend, Block, FullClient, FullSelectChain>;
 /// Full type for `BabeBlockImport`.
 type FullBabe = sc_consensus_babe::BabeBlockImport<Block, FullClient, FullGrandpa>;
 /// Full type for `FrontierBlockImport`.
@@ -98,7 +98,7 @@ pub fn new_partial(
         sc_consensus::DefaultImportQueue<Block, FullClient>,
         sc_transaction_pool::FullPool<Block, FullClient>,
         (
-            sc_finality_grandpa::LinkHalf<Block, FullClient, FullSelectChain>,
+            sc_consensus_grandpa::LinkHalf<Block, FullClient, FullSelectChain>,
             sc_consensus_babe::BabeLink<Block>,
             EffectiveFullBlockImport,
             inherents::Creator<FullClient>,
@@ -157,7 +157,7 @@ pub fn new_partial(
 
     let select_chain = sc_consensus::LongestChain::new(Arc::clone(&backend));
 
-    let (grandpa_block_import, grandpa_link) = sc_finality_grandpa::block_import(
+    let (grandpa_block_import, grandpa_link) = sc_consensus_grandpa::block_import(
         Arc::clone(&client),
         &(Arc::clone(&client) as Arc<_>),
         select_chain.clone(),
@@ -246,7 +246,7 @@ pub async fn new_full(config: Configuration) -> Result<TaskManager, ServiceError
         ..
     } = config;
 
-    let grandpa_protocol_name = sc_finality_grandpa::protocol_standard_name(
+    let grandpa_protocol_name = sc_consensus_grandpa::protocol_standard_name(
         &client
             .block_hash(0)
             .ok()
@@ -258,11 +258,11 @@ pub async fn new_full(config: Configuration) -> Result<TaskManager, ServiceError
     config
         .network
         .extra_sets
-        .push(sc_finality_grandpa::grandpa_peers_set_config(
+        .push(sc_consensus_grandpa::grandpa_peers_set_config(
             grandpa_protocol_name.clone(),
         ));
 
-    let warp_sync = Arc::new(sc_finality_grandpa::warp_proof::NetworkProvider::new(
+    let warp_sync = Arc::new(sc_consensus_grandpa::warp_proof::NetworkProvider::new(
         Arc::clone(&backend),
         grandpa_link.shared_authority_set().clone(),
         Vec::default(),
@@ -348,9 +348,9 @@ pub async fn new_full(config: Configuration) -> Result<TaskManager, ServiceError
 
         let grandpa_justification_stream = grandpa_link.justification_stream();
         let grandpa_shared_authority_set = grandpa_link.shared_authority_set().clone();
-        let grandpa_shared_voter_state = sc_finality_grandpa::SharedVoterState::empty();
-        let grandpa_finality_proof_provider =
-            sc_finality_grandpa::FinalityProofProvider::new_for_service(
+        let grandpa_shared_voter_state = sc_consensus_grandpa::SharedVoterState::empty();
+        let grandpa_consensus_proof_provider =
+            sc_consensus_grandpa::consensusProofProvider::new_for_service(
                 Arc::clone(&backend),
                 Some(grandpa_shared_authority_set.clone()),
             );
@@ -410,7 +410,7 @@ pub async fn new_full(config: Configuration) -> Result<TaskManager, ServiceError
                     grandpa_shared_voter_state: grandpa_shared_voter_state.clone(),
                     grandpa_shared_authority_set: grandpa_shared_authority_set.clone(),
                     grandpa_justification_stream: grandpa_justification_stream.clone(),
-                    grandpa_finality_provider: Arc::clone(&grandpa_finality_proof_provider),
+                    grandpa_consensus_provider: Arc::clone(&grandpa_consensus_proof_provider),
                 },
                 select_chain: select_chain.clone(),
                 evm: humanode_rpc::EvmDeps {
@@ -476,7 +476,7 @@ pub async fn new_full(config: Configuration) -> Result<TaskManager, ServiceError
         babe,
     );
 
-    let grandpa_config = sc_finality_grandpa::Config {
+    let grandpa_config = sc_consensus_grandpa::Config {
         // See substrate#1578: make this available through chainspec.
         // Ref: https://github.com/paritytech/substrate/issues/1578
         gossip_duration: Duration::from_millis(333),
@@ -490,11 +490,11 @@ pub async fn new_full(config: Configuration) -> Result<TaskManager, ServiceError
     };
 
     if enable_grandpa {
-        let grandpa_config = sc_finality_grandpa::GrandpaParams {
+        let grandpa_config = sc_consensus_grandpa::GrandpaParams {
             config: grandpa_config,
             link: grandpa_link,
             network: Arc::clone(&network),
-            voting_rule: sc_finality_grandpa::VotingRulesBuilder::default().build(),
+            voting_rule: sc_consensus_grandpa::VotingRulesBuilder::default().build(),
             prometheus_registry,
             shared_voter_state: SharedVoterState::empty(),
             telemetry: telemetry.as_ref().map(|x| x.handle()),
@@ -503,7 +503,7 @@ pub async fn new_full(config: Configuration) -> Result<TaskManager, ServiceError
         task_manager.spawn_essential_handle().spawn_blocking(
             "grandpa-voter",
             Some("block-finalization"),
-            sc_finality_grandpa::run_grandpa_voter(grandpa_config)?,
+            sc_consensus_grandpa::run_grandpa_voter(grandpa_config)?,
         );
     }
 

crates/humanode-rpc/Cargo.toml

@@ -26,8 +26,8 @@ sc-client-api = { workspace = true }
 sc-consensus-babe = { workspace = true }
 sc-consensus-babe-rpc = { workspace = true }
 sc-consensus-epochs = { workspace = true }
-sc-finality-grandpa = { workspace = true }
-sc-finality-grandpa-rpc = { workspace = true }
+sc-consensus-grandpa = { workspace = true }
+sc-consensus-grandpa-rpc = { workspace = true }
 sc-network = { workspace = true }
 sc-rpc = { workspace = true }
 sc-rpc-api = { workspace = true }

crates/humanode-rpc/src/lib.rs

@@ -24,10 +24,10 @@ use sc_client_api::{
 use sc_consensus_babe::{BabeConfiguration, Epoch};
 use sc_consensus_babe_rpc::{Babe, BabeApiServer};
 use sc_consensus_epochs::SharedEpochChanges;
-use sc_finality_grandpa::{
+use sc_consensus_grandpa::{
     FinalityProofProvider, GrandpaJustificationStream, SharedAuthoritySet, SharedVoterState,
 };
-use sc_finality_grandpa_rpc::{Grandpa, GrandpaApiServer};
+use sc_consensus_grandpa_rpc::{Grandpa, GrandpaApiServer};
 use sc_network::NetworkService;
 pub use sc_rpc_api::DenyUnsafe;
 use sc_rpc_spec_v2::chain_spec::{ChainSpec, ChainSpecApiServer};
@@ -75,8 +75,8 @@ pub struct GrandpaDeps<BE> {
     pub grandpa_shared_authority_set: SharedAuthoritySet<Hash, BlockNumber>,
     /// Receives notifications about justification events from Grandpa.
     pub grandpa_justification_stream: GrandpaJustificationStream<Block>,
-    /// Finality proof provider.
-    pub grandpa_finality_provider: Arc<FinalityProofProvider<BE, Block>>,
+    /// consensus proof provider.
+    pub grandpa_consensus_provider: Arc<consensusProofProvider<BE, Block>>,
 }
 
 /// Extra EVM related dependencies.
@@ -222,7 +222,7 @@ where
         grandpa_shared_voter_state,
         grandpa_shared_authority_set,
         grandpa_justification_stream,
-        grandpa_finality_provider,
+        grandpa_consensus_provider,
     } = grandpa;
 
     let EvmDeps {
@@ -270,7 +270,7 @@ where
             grandpa_shared_authority_set,
             grandpa_shared_voter_state,
             grandpa_justification_stream,
-            grandpa_finality_provider,
+            grandpa_consensus_provider,
         )
         .into_rpc(),
     )?;