-
Notifications
You must be signed in to change notification settings - Fork 119
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* slot skip cause block2 stuck Signed-off-by: zqhxuyuan <zqhxuyuan@gmail.com> * slot skip cause block2 stuck Signed-off-by: zqhxuyuan <zqhxuyuan@gmail.com> * calamari works by only one collator Signed-off-by: zqhxuyuan <zqhxuyuan@gmail.com> * add dolphin localdev Signed-off-by: zqhxuyuan <zqhxuyuan@gmail.com> * add instant finalize Signed-off-by: Charles Ferrell <charlie@manta.network> * format Signed-off-by: zqhxuyuan <zqhxuyuan@gmail.com> * update dev name Signed-off-by: zqhxuyuan <zqhxuyuan@gmail.com> * build dev consensus Signed-off-by: zqhxuyuan <zqhxuyuan@gmail.com> Signed-off-by: zqhxuyuan <zqhxuyuan@gmail.com> Signed-off-by: Charles Ferrell <charlie@manta.network> Co-authored-by: Charles Ferrell <charlie@manta.network> Co-authored-by: Adam Reif <garandor@manta.network>
- Loading branch information
3 people
authored
Jan 6, 2023
1 parent
1391a3f
commit 1bdcec4
Showing
9 changed files
with
452 additions
and
97 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,230 @@ | ||
| // Copyright 2020-2022 Manta Network. | ||
| // This file is part of Manta. | ||
| // | ||
| // Manta is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License as published by | ||
| // the Free Software Foundation, either version 3 of the License, or | ||
| // (at your option) any later version. | ||
| // | ||
| // Manta is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU General Public License | ||
| // along with Manta. If not, see <http://www.gnu.org/licenses/>. | ||
|
|
||
| //! Service builder | ||
| #![allow(clippy::too_many_arguments)] | ||
|
|
||
| use crate::{ | ||
| client::{RuntimeApiCommon, RuntimeApiNimbus}, | ||
| instant_finalize::InstantFinalizeBlockImport, | ||
| service::{Client, StateBackend, TransactionPool}, | ||
| }; | ||
| use std::future::Future; | ||
|
|
||
| pub use manta_primitives::types::{AccountId, Balance, Block, Hash, Header, Index as Nonce}; | ||
| use polkadot_service::CollatorPair; | ||
| use session_key_primitives::AuraId; | ||
| use std::sync::Arc; | ||
|
|
||
| use sc_consensus::LongestChain; | ||
| use sc_network::NetworkService; | ||
| use sc_service::{Configuration, Error, KeystoreContainer, TFullBackend, TaskManager}; | ||
| use sc_telemetry::{TelemetryHandle, TelemetryWorkerHandle}; | ||
| use sp_api::ConstructRuntimeApi; | ||
| use sp_blockchain::HeaderBackend; | ||
| use sp_keystore::SyncCryptoStorePtr; | ||
| use substrate_prometheus_endpoint::Registry; | ||
|
|
||
| use cumulus_client_cli::CollatorOptions; | ||
| use cumulus_client_consensus_common::ParachainConsensus; | ||
| use cumulus_primitives_core::ParaId; | ||
| use cumulus_primitives_parachain_inherent::{ | ||
| MockValidationDataInherentDataProvider, MockXcmConfig, | ||
| }; | ||
| use cumulus_relay_chain_inprocess_interface::build_inprocess_relay_chain; | ||
| use cumulus_relay_chain_interface::{RelayChainInterface, RelayChainResult}; | ||
| use cumulus_relay_chain_rpc_interface::RelayChainRPCInterface; | ||
|
|
||
| use nimbus_consensus::{ | ||
| BuildNimbusConsensusParams, NimbusConsensus, NimbusManualSealConsensusDataProvider, | ||
| }; | ||
|
|
||
| /// build relaychain interface for parachain mode | ||
| pub async fn build_relay_chain_interface( | ||
| polkadot_config: Configuration, | ||
| parachain_config: &Configuration, | ||
| telemetry_worker_handle: Option<TelemetryWorkerHandle>, | ||
| task_manager: &mut TaskManager, | ||
| collator_options: CollatorOptions, | ||
| hwbench: Option<sc_sysinfo::HwBench>, | ||
| ) -> RelayChainResult<( | ||
| Arc<(dyn RelayChainInterface + 'static)>, | ||
| Option<CollatorPair>, | ||
| )> { | ||
| match collator_options.relay_chain_rpc_url { | ||
| Some(relay_chain_url) => Ok(( | ||
| Arc::new(RelayChainRPCInterface::new(relay_chain_url).await?) as Arc<_>, | ||
| None, | ||
| )), | ||
| None => build_inprocess_relay_chain( | ||
| polkadot_config, | ||
| parachain_config, | ||
| telemetry_worker_handle, | ||
| task_manager, | ||
| hwbench, | ||
| ), | ||
| } | ||
| } | ||
|
|
||
| /// build parachain nimbus consensus | ||
| pub fn build_nimbus_consensus<RuntimeApi>( | ||
| id: ParaId, | ||
| client: Arc<Client<RuntimeApi>>, | ||
| prometheus_registry: Option<&Registry>, | ||
| telemetry: Option<TelemetryHandle>, | ||
| task_manager: &TaskManager, | ||
| relay_chain_interface: Arc<dyn RelayChainInterface>, | ||
| transaction_pool: Arc<TransactionPool<RuntimeApi>>, | ||
| _sync_oracle: Arc<NetworkService<Block, Hash>>, | ||
| keystore: SyncCryptoStorePtr, | ||
| force_authoring: bool, | ||
| ) -> Result<Box<dyn ParachainConsensus<Block>>, Error> | ||
| where | ||
| RuntimeApi: ConstructRuntimeApi<Block, Client<RuntimeApi>> + Send + Sync + 'static, | ||
| RuntimeApi::RuntimeApi: RuntimeApiCommon<StateBackend = StateBackend> | ||
| + RuntimeApiNimbus | ||
| + sp_consensus_aura::AuraApi<Block, AuraId>, | ||
| { | ||
| let spawn_handle = task_manager.spawn_handle(); | ||
| let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording( | ||
| spawn_handle, | ||
| client.clone(), | ||
| transaction_pool, | ||
| prometheus_registry, | ||
| telemetry, | ||
| ); | ||
|
|
||
| // NOTE: In nimbus, author_id is unused as it is the RuntimeAPI that identifies the block author | ||
| let provider = move |_, (relay_parent, validation_data, _author_id)| { | ||
| let relay_chain_interface = relay_chain_interface.clone(); | ||
| async move { | ||
| let parachain_inherent = | ||
| cumulus_primitives_parachain_inherent::ParachainInherentData::create_at( | ||
| relay_parent, | ||
| &relay_chain_interface, | ||
| &validation_data, | ||
| id, | ||
| ) | ||
| .await; | ||
|
|
||
| let time = sp_timestamp::InherentDataProvider::from_system_time(); | ||
|
|
||
| let parachain_inherent = parachain_inherent.ok_or_else(|| { | ||
| Box::<dyn std::error::Error + Send + Sync>::from( | ||
| "Failed to create parachain inherent", | ||
| ) | ||
| })?; | ||
|
|
||
| let nimbus_inherent = nimbus_primitives::InherentDataProvider; | ||
| Ok((time, parachain_inherent, nimbus_inherent)) | ||
| } | ||
| }; | ||
|
|
||
| Ok(NimbusConsensus::build(BuildNimbusConsensusParams { | ||
| additional_digests_provider: (), | ||
| para_id: id, | ||
| proposer_factory, | ||
| block_import: client.clone(), | ||
| parachain_client: client, | ||
| keystore, | ||
| skip_prediction: force_authoring, | ||
| create_inherent_data_providers: provider, | ||
| })) | ||
| } | ||
|
|
||
| /// build standalone mode dev consensus using manual instant seal | ||
| pub fn build_dev_nimbus_consensus<RuntimeApi>( | ||
| client: Arc<Client<RuntimeApi>>, | ||
| transaction_pool: Arc<TransactionPool<RuntimeApi>>, | ||
| keystore_container: &KeystoreContainer, | ||
| select_chain: LongestChain<TFullBackend<Block>, Block>, | ||
| task_manager: &TaskManager, | ||
| ) -> Result<impl Future<Output = ()> + Send + 'static, Error> | ||
| where | ||
| RuntimeApi: ConstructRuntimeApi<Block, Client<RuntimeApi>> + Send + Sync + 'static, | ||
| RuntimeApi::RuntimeApi: RuntimeApiCommon<StateBackend = StateBackend> + RuntimeApiNimbus, | ||
| { | ||
| use futures::{Stream, StreamExt}; | ||
| use sc_consensus_manual_seal::{run_manual_seal, EngineCommand, ManualSealParams}; | ||
|
|
||
| let proposer_factory = sc_basic_authorship::ProposerFactory::new( | ||
| task_manager.spawn_handle(), | ||
| client.clone(), | ||
| transaction_pool.clone(), | ||
| None, | ||
| None, | ||
| ); | ||
|
|
||
| let commands_stream: Box<dyn Stream<Item = EngineCommand<Hash>> + Send + Sync + Unpin> = | ||
| Box::new( | ||
| // This bit cribbed from the implementation of instant seal. | ||
| transaction_pool | ||
| .pool() | ||
| .validated_pool() | ||
| .import_notification_stream() | ||
| .map(|_| EngineCommand::SealNewBlock { | ||
| create_empty: false, | ||
| finalize: false, | ||
| parent_hash: None, | ||
| sender: None, | ||
| }), | ||
| ); | ||
|
|
||
| let client_set_aside_for_cidp = client.clone(); | ||
|
|
||
| let consensus = run_manual_seal(ManualSealParams { | ||
| block_import: InstantFinalizeBlockImport::new(client.clone()), | ||
| env: proposer_factory, | ||
| client: client.clone(), | ||
| pool: transaction_pool, | ||
| commands_stream, | ||
| select_chain, | ||
| consensus_data_provider: Some(Box::new(NimbusManualSealConsensusDataProvider { | ||
| keystore: keystore_container.sync_keystore(), | ||
| client, | ||
| additional_digests_provider: (), | ||
| })), | ||
| create_inherent_data_providers: move |block: Hash, ()| { | ||
| let current_para_block = client_set_aside_for_cidp | ||
| .number(block) | ||
| .expect("Header lookup should succeed") | ||
| .expect("Header passed in as parent should be present in backend."); | ||
|
|
||
| let client_for_xcm = client_set_aside_for_cidp.clone(); | ||
| async move { | ||
| let time = sp_timestamp::InherentDataProvider::from_system_time(); | ||
|
|
||
| let mocked_parachain = MockValidationDataInherentDataProvider { | ||
| current_para_block, | ||
| relay_offset: 1000, | ||
| relay_blocks_per_para_block: 2, | ||
| xcm_config: MockXcmConfig::new( | ||
| &*client_for_xcm, | ||
| block, | ||
| Default::default(), | ||
| Default::default(), | ||
| ), | ||
| raw_downward_messages: vec![], | ||
| raw_horizontal_messages: vec![], | ||
| }; | ||
|
|
||
| Ok((time, mocked_parachain)) | ||
| } | ||
| }, | ||
| }); | ||
|
|
||
| Ok(consensus) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.