From 21527a9fd2aefffaaa7aedd32c9a87a2f17c6275 Mon Sep 17 00:00:00 2001 From: Aliaksandr Tsurko Date: Wed, 13 Nov 2024 00:08:02 +0100 Subject: [PATCH 1/3] Fix compilation --- node/src/service.rs | 168 +++++++++++++++++++++----------------------- 1 file changed, 80 insertions(+), 88 deletions(-) diff --git a/node/src/service.rs b/node/src/service.rs index 8906f9a29..dc5683bb3 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -53,41 +53,41 @@ type GrandpaBlockImport = sc_consensus_grandpa::GrandpaBlockImport, B, C, FullSelectChain>; type GrandpaLinkHalf = sc_consensus_grandpa::LinkHalf>; -pub fn new_partial( +pub fn new_partial( config: &Configuration, eth_config: &EthConfiguration, build_import_queue: BIQ, ) -> Result< PartialComponents< - FullClient, - FullBackend, - FullSelectChain, - BasicQueue, - FullPool>, + Client, + FullBackend, + FullSelectChain, + BasicQueue, + FullPool, ( Option, - BoxBlockImport, - GrandpaLinkHalf>, - FrontierBackend>, - Arc>, + BoxBlockImport, + GrandpaLinkHalf, + FrontierBackend, + Arc>, ), >, ServiceError, > where - B: BlockT, - RA: ConstructRuntimeApi>, - RA: Send + Sync + 'static, - RA::RuntimeApi: RuntimeApiCollection, - HF: HostFunctionsT + 'static, + // B: BlockT, + // RA: ConstructRuntimeApi, + // RA: Send + Sync + 'static, + // RA::RuntimeApi: RuntimeApiCollection, + // HF: HostFunctionsT + 'static, BIQ: FnOnce( - Arc>, + Arc, &Configuration, &EthConfiguration, &TaskManager, Option, - GrandpaBlockImport>, - ) -> Result<(BasicQueue, BoxBlockImport), ServiceError>, + GrandpaBlockImport, + ) -> Result<(BasicQueue, BoxBlockImport), ServiceError>, { let telemetry = config .telemetry_endpoints @@ -100,12 +100,13 @@ where }) .transpose()?; - let executor = sc_service::new_wasm_executor::(&config.executor); - let (client, backend, keystore_container, task_manager) = sc_service::new_full_parts::( - config, - telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()), - executor, - )?; + let executor = sc_service::new_wasm_executor(&config.executor); + let (client, backend, keystore_container, task_manager) = + sc_service::new_full_parts::( + config, + telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()), + executor, + )?; let client = Arc::new(client); let telemetry = telemetry.map(|(worker, telemetry)| { @@ -124,7 +125,7 @@ where telemetry.as_ref().map(|x| x.handle()), )?; - let storage_override = Arc::new(StorageOverrideHandler::::new(client.clone())); + let storage_override = Arc::new(StorageOverrideHandler::<_, _, _>::new(client.clone())); let frontier_backend = match eth_config.frontier_backend_type { BackendType::KeyValue => FrontierBackend::KeyValue(Arc::new(fc_db::kv::Backend::open( Arc::clone(&client), @@ -190,21 +191,21 @@ where } /// Build the import queue for the template runtime (aura + grandpa). -pub fn build_aura_grandpa_import_queue( - client: Arc>, +pub fn build_aura_grandpa_import_queue( + client: Arc, config: &Configuration, eth_config: &EthConfiguration, task_manager: &TaskManager, telemetry: Option, - grandpa_block_import: GrandpaBlockImport>, -) -> Result<(BasicQueue, BoxBlockImport), ServiceError> + grandpa_block_import: GrandpaBlockImport, +) -> Result<(BasicQueue, BoxBlockImport), ServiceError> where - B: BlockT, - NumberFor: BlockNumberOps, - RA: ConstructRuntimeApi>, - RA: Send + Sync + 'static, - RA::RuntimeApi: RuntimeApiCollection, - HF: HostFunctionsT + 'static, + // B: BlockT, + NumberFor: BlockNumberOps, + // RA: ConstructRuntimeApi>, + // RA: Send + Sync + 'static, + // RA::RuntimeApi: RuntimeApiCollection, + // HF: HostFunctionsT + 'static, { let frontier_block_import = FrontierBlockImport::new(grandpa_block_import.clone(), client.clone()); @@ -241,20 +242,20 @@ where } /// Build the import queue for the template runtime (manual seal). -pub fn build_manual_seal_import_queue( - client: Arc>, +pub fn build_manual_seal_import_queue( + client: Arc, config: &Configuration, _eth_config: &EthConfiguration, task_manager: &TaskManager, _telemetry: Option, - _grandpa_block_import: GrandpaBlockImport>, -) -> Result<(BasicQueue, BoxBlockImport), ServiceError> -where - B: BlockT, - RA: ConstructRuntimeApi>, - RA: Send + Sync + 'static, - RA::RuntimeApi: RuntimeApiCollection, - HF: HostFunctionsT + 'static, + _grandpa_block_import: GrandpaBlockImport, +) -> Result<(BasicQueue, BoxBlockImport), ServiceError> +// where + // B: BlockT, + // RA: ConstructRuntimeApi>, + // RA: Send + Sync + 'static, + // RA::RuntimeApi: RuntimeApiCollection, + // HF: HostFunctionsT + 'static, { let frontier_block_import = FrontierBlockImport::new(client.clone(), client); Ok(( @@ -268,25 +269,25 @@ where } /// Builds a new service for a full client. -pub async fn new_full( +pub async fn new_full( mut config: Configuration, eth_config: EthConfiguration, sealing: Option, ) -> Result where - B: BlockT, - NumberFor: BlockNumberOps, - ::Header: Unpin, - RA: ConstructRuntimeApi>, - RA: Send + Sync + 'static, - RA::RuntimeApi: RuntimeApiCollection, - HF: HostFunctionsT + 'static, - NB: sc_network::NetworkBackend::Hash>, + // B: BlockT, + NumberFor: BlockNumberOps, + // ::Header: Unpin, + // RA: ConstructRuntimeApi>, + // RA: Send + Sync + 'static, + // RA::RuntimeApi: RuntimeApiCollection, + // HF: HostFunctionsT + 'static, + NB: sc_network::NetworkBackend::Hash>, { let build_import_queue = if sealing.is_some() { - build_manual_seal_import_queue:: + build_manual_seal_import_queue } else { - build_aura_grandpa_import_queue:: + build_aura_grandpa_import_queue }; let PartialComponents { @@ -332,7 +333,7 @@ where None } else { net_config.add_notification_protocol(grandpa_protocol_config); - let warp_sync: Arc> = + let warp_sync: Arc> = Arc::new(sc_consensus_grandpa::warp_proof::NetworkProvider::new( backend.clone(), grandpa_link.shared_authority_set().clone(), @@ -378,10 +379,11 @@ where let role = config.role; let force_authoring = config.force_authoring; - let backoff_authoring_blocks = Some(BackoffAuthoringOnFinalizedHeadLagging::> { - unfinalized_slack: 6u32.into(), - ..Default::default() - }); + let backoff_authoring_blocks = + Some(BackoffAuthoringOnFinalizedHeadLagging::> { + unfinalized_slack: 6u32.into(), + ..Default::default() + }); let name = config.network.node_name.clone(); let frontier_backend = Arc::new(frontier_backend); let enable_grandpa = !config.disable_grandpa && sealing.is_none(); @@ -395,7 +397,7 @@ where // The MappingSyncWorker sends through the channel on block import and the subscription emits a notification to the subscriber on receiving a message through this channel. // This way we avoid race conditions when using native substrate block import notification stream. let pubsub_notification_sinks: fc_mapping_sync::EthereumBlockNotificationSinks< - fc_mapping_sync::EthereumBlockNotification, + fc_mapping_sync::EthereumBlockNotification, > = Default::default(); let pubsub_notification_sinks = Arc::new(pubsub_notification_sinks); @@ -447,7 +449,7 @@ where client: client.clone(), pool: pool.clone(), graph: pool.pool().clone(), - converter: Some(TransactionConverter::::default()), + converter: Some(TransactionConverter::::default()), is_authority, enable_dev_signer, network: network.clone(), @@ -640,16 +642,10 @@ pub async fn build_full( ) -> Result { match config.network.network_backend { sc_network::config::NetworkBackendType::Libp2p => { - new_full::>( - config, eth_config, sealing, - ) - .await + new_full::>(config, eth_config, sealing).await } sc_network::config::NetworkBackendType::Litep2p => { - new_full::( - config, eth_config, sealing, - ) - .await + new_full::>(config, eth_config, sealing).await } } } @@ -675,35 +671,31 @@ pub fn new_chain_ops( task_manager, other, .. - } = new_partial::( - config, - eth_config, - build_aura_grandpa_import_queue, - )?; + } = new_partial(config, eth_config, build_aura_grandpa_import_queue)?; Ok((client, backend, import_queue, task_manager, other.3)) } #[allow(clippy::too_many_arguments)] -fn run_manual_seal_authorship( +fn run_manual_seal_authorship( eth_config: &EthConfiguration, sealing: Sealing, - client: Arc>, - transaction_pool: Arc>>, - select_chain: FullSelectChain, - block_import: BoxBlockImport, + client: Arc, + transaction_pool: Arc>, + select_chain: FullSelectChain, + block_import: BoxBlockImport, task_manager: &TaskManager, prometheus_registry: Option<&Registry>, telemetry: Option<&Telemetry>, commands_stream: mpsc::Receiver< - sc_consensus_manual_seal::rpc::EngineCommand<::Hash>, + sc_consensus_manual_seal::rpc::EngineCommand<::Hash>, >, ) -> Result<(), ServiceError> -where - B: BlockT, - RA: ConstructRuntimeApi>, - RA: Send + Sync + 'static, - RA::RuntimeApi: RuntimeApiCollection, - HF: HostFunctionsT + 'static, +// where + // B: BlockT, + // RA: ConstructRuntimeApi>, + // RA: Send + Sync + 'static, + // RA::RuntimeApi: RuntimeApiCollection, + // HF: HostFunctionsT + 'static, { let proposer_factory = sc_basic_authorship::ProposerFactory::new( task_manager.spawn_handle(), From 510c4227e918ee4fcc8c436c70191b3c7fe51323 Mon Sep 17 00:00:00 2001 From: Greg Zaitsev Date: Tue, 12 Nov 2024 18:30:03 -0500 Subject: [PATCH 2/3] Cleanup imports --- node/src/service.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/node/src/service.rs b/node/src/service.rs index dc5683bb3..77673bb9c 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -1,7 +1,7 @@ //! Service and ServiceFactory implementation. Specialized wrapper over substrate service. use crate::cli::Sealing; -use crate::client::{FullBackend, FullClient, RuntimeApiCollection}; +use crate::client::{FullBackend, FullClient}; use crate::ethereum::{ db_config_dir, new_frontier_partial, spawn_frontier_tasks, BackendType, EthConfiguration, FrontierBackend, FrontierBlockImport, FrontierPartialComponents, StorageOverride, @@ -12,15 +12,13 @@ use sc_client_api::{Backend as BackendT, BlockBackend}; use sc_consensus::{BasicQueue, BoxBlockImport}; use sc_consensus_grandpa::BlockNumberOps; use sc_consensus_slots::BackoffAuthoringOnFinalizedHeadLagging; -use sc_executor::HostFunctions as HostFunctionsT; use sc_network_sync::strategy::warp::{WarpSyncConfig, WarpSyncProvider}; use sc_service::{error::Error as ServiceError, Configuration, PartialComponents, TaskManager}; use sc_telemetry::{log, Telemetry, TelemetryHandle, TelemetryWorker}; use sc_transaction_pool::FullPool; use sc_transaction_pool_api::OffchainTransactionPoolFactory; -use sp_api::ConstructRuntimeApi; -use sp_consensus_aura::sr25519::{AuthorityId as AuraId, AuthorityPair as AuraPair}; -use sp_core::{H256, U256}; +use sp_consensus_aura::sr25519::AuthorityPair as AuraPair; +use sp_core::U256; use sp_runtime::traits::{Block as BlockT, NumberFor}; use std::{cell::RefCell, path::Path}; use std::{sync::Arc, time::Duration}; @@ -28,7 +26,7 @@ use substrate_prometheus_endpoint::Registry; // Runtime use node_subtensor_runtime::{ - opaque::Block, AccountId, Balance, Nonce, RuntimeApi, TransactionConverter, + opaque::Block, RuntimeApi, TransactionConverter, }; /// The minimum period of blocks on which justifications will be From 8163679c2fa6678b36279eee5e35060ee02b0831 Mon Sep 17 00:00:00 2001 From: Greg Zaitsev Date: Tue, 12 Nov 2024 18:44:34 -0500 Subject: [PATCH 3/3] Fix clippy --- node/src/service.rs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/node/src/service.rs b/node/src/service.rs index 77673bb9c..84a3a1255 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -25,9 +25,7 @@ use std::{sync::Arc, time::Duration}; use substrate_prometheus_endpoint::Registry; // Runtime -use node_subtensor_runtime::{ - opaque::Block, RuntimeApi, TransactionConverter, -}; +use node_subtensor_runtime::{opaque::Block, RuntimeApi, TransactionConverter}; /// The minimum period of blocks on which justifications will be /// imported and generated. @@ -314,9 +312,7 @@ where let metrics = NB::register_notification_metrics(maybe_registry); let grandpa_protocol_name = sc_consensus_grandpa::protocol_standard_name( - &client - .block_hash(0u32.into())? - .expect("Genesis block exists; qed"), + &client.block_hash(0u32)?.expect("Genesis block exists; qed"), &config.chain_spec, ); @@ -379,7 +375,7 @@ where let force_authoring = config.force_authoring; let backoff_authoring_blocks = Some(BackoffAuthoringOnFinalizedHeadLagging::> { - unfinalized_slack: 6u32.into(), + unfinalized_slack: 6u32, ..Default::default() }); let name = config.network.node_name.clone();