pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-30 08:11:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Companion for substrate#10878 (#993)

Browse Source 
* companion for slot duration changes

* fix aura inherent data provider

* update lockfile for {"polkadot"}

Co-authored-by: parity-processbot <>
This commit is contained in:
André Silva
2022-02-22 22:27:29 +00:00
committed by GitHub
parent c8a935d38f
commit 719127cac3
4 changed files with 351 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cumulus/Cargo.lock
Generated
+281 -257
View File
File diff suppressed because it is too large Load Diff
cumulus/client/consensus/aura/src/lib.rs
+4 -8
View File
@@ -36,10 +36,8 @@ use sc_telemetry::TelemetryHandle;
use sp_api::ProvideRuntimeApi; use sp_api::ProvideRuntimeApi;
use sp_application_crypto::AppPublic; use sp_application_crypto::AppPublic;
use sp_blockchain::HeaderBackend; use sp_blockchain::HeaderBackend;
use sp_consensus::{ use sp_consensus::{EnableProofRecording, Environment, ProofRecording, Proposer, SyncOracle};
EnableProofRecording, Environment, ProofRecording, Proposer, SlotData, SyncOracle, use sp_consensus_aura::{AuraApi, SlotDuration};
};
use sp_consensus_aura::AuraApi;
use sp_core::crypto::Pair; use sp_core::crypto::Pair;
use sp_inherents::{CreateInherentDataProviders, InherentData, InherentDataProvider}; use sp_inherents::{CreateInherentDataProviders, InherentData, InherentDataProvider};
use sp_keystore::SyncCryptoStorePtr; use sp_keystore::SyncCryptoStorePtr;
@@ -49,9 +47,7 @@ use std::{convert::TryFrom, hash::Hash, sync::Arc};
mod import_queue; mod import_queue;
pub use import_queue::{build_verifier, import_queue, BuildVerifierParams, ImportQueueParams}; pub use import_queue::{build_verifier, import_queue, BuildVerifierParams, ImportQueueParams};
pub use sc_consensus_aura::{ pub use sc_consensus_aura::{slot_duration, AuraVerifier, BuildAuraWorkerParams, SlotProportion};
slot_duration, AuraVerifier, BuildAuraWorkerParams, SlotDuration, SlotProportion,
};
pub use sc_consensus_slots::InherentDataProviderExt; pub use sc_consensus_slots::InherentDataProviderExt;
const LOG_TARGET: &str = "aura::cumulus"; const LOG_TARGET: &str = "aura::cumulus";
@@ -201,7 +197,7 @@ where
inherent_data_providers.slot(), inherent_data_providers.slot(),
inherent_data_providers.timestamp(), inherent_data_providers.timestamp(),
inherent_data, inherent_data,
self.slot_duration.slot_duration(), self.slot_duration.as_duration(),
parent.clone(), parent.clone(),
// Set the block limit to 50% of the maximum PoV size. // Set the block limit to 50% of the maximum PoV size.
// //
cumulus/parachain-template/node/src/service.rs
+4 -5
View File
@@ -26,7 +26,6 @@ use sc_network::NetworkService;
use sc_service::{Configuration, PartialComponents, Role, TFullBackend, TFullClient, TaskManager}; use sc_service::{Configuration, PartialComponents, Role, TFullBackend, TFullClient, TaskManager};
use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle}; use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle};
use sp_api::ConstructRuntimeApi; use sp_api::ConstructRuntimeApi;
use sp_consensus::SlotData;
use sp_keystore::SyncCryptoStorePtr; use sp_keystore::SyncCryptoStorePtr;
use sp_runtime::traits::BlakeTwo256; use sp_runtime::traits::BlakeTwo256;
use substrate_prometheus_endpoint::Registry; use substrate_prometheus_endpoint::Registry;
@@ -383,9 +382,9 @@ pub fn parachain_build_import_queue(
let time = sp_timestamp::InherentDataProvider::from_system_time(); let time = sp_timestamp::InherentDataProvider::from_system_time();
let slot = let slot =
sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
*time, *time,
slot_duration.slot_duration(), slot_duration,
); );
Ok((time, slot)) Ok((time, slot))
@@ -448,9 +447,9 @@ pub async fn start_parachain_node(
let time = sp_timestamp::InherentDataProvider::from_system_time(); let time = sp_timestamp::InherentDataProvider::from_system_time();
let slot = let slot =
sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
*time, *time,
slot_duration.slot_duration(), slot_duration,
); );
let parachain_inherent = parachain_inherent.ok_or_else(|| { let parachain_inherent = parachain_inherent.ok_or_else(|| {
cumulus/polkadot-parachains/src/service.rs
+62 -55
View File
@@ -46,7 +46,7 @@ use sc_network::NetworkService;
use sc_service::{Configuration, PartialComponents, Role, TFullBackend, TFullClient, TaskManager}; use sc_service::{Configuration, PartialComponents, Role, TFullBackend, TFullClient, TaskManager};
use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle}; use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle};
use sp_api::{ApiExt, ConstructRuntimeApi}; use sp_api::{ApiExt, ConstructRuntimeApi};
use sp_consensus::{CacheKeyId, SlotData}; use sp_consensus::CacheKeyId;
use sp_consensus_aura::AuraApi; use sp_consensus_aura::AuraApi;
use sp_core::crypto::Pair; use sp_core::crypto::Pair;
use sp_keystore::SyncCryptoStorePtr; use sp_keystore::SyncCryptoStorePtr;
@@ -683,15 +683,15 @@ pub fn rococo_parachain_build_import_queue(
block_import: client.clone(), block_import: client.clone(),
client: client.clone(), client: client.clone(),
create_inherent_data_providers: move |_, _| async move { create_inherent_data_providers: move |_, _| async move {
let time = sp_timestamp::InherentDataProvider::from_system_time(); let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
let slot = let slot =
sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
*time, *timestamp,
slot_duration.slot_duration(), slot_duration,
); );
Ok((time, slot)) Ok((timestamp, slot))
}, },
registry: config.prometheus_registry().clone(), registry: config.prometheus_registry().clone(),
can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()), can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()),
@@ -753,29 +753,32 @@ pub async fn start_rococo_parachain_node(
>(BuildAuraConsensusParams { >(BuildAuraConsensusParams {
proposer_factory, proposer_factory,
create_inherent_data_providers: move |_, (relay_parent, validation_data)| { create_inherent_data_providers: move |_, (relay_parent, validation_data)| {
let relay_chain_interface = relay_chain_interface.clone(); let relay_chain_interface = relay_chain_interface.clone();
async move { async move {
let parachain_inherent = let parachain_inherent =
cumulus_primitives_parachain_inherent::ParachainInherentData::create_at( cumulus_primitives_parachain_inherent::ParachainInherentData::create_at(
relay_parent, relay_parent,
&relay_chain_interface, &relay_chain_interface,
&validation_data, &validation_data,
id, id,
).await; ).await;
let time = sp_timestamp::InherentDataProvider::from_system_time();
let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
let slot = let slot =
sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
*time, *timestamp,
slot_duration.slot_duration(), slot_duration,
); );
let parachain_inherent = parachain_inherent.ok_or_else(|| { let parachain_inherent = parachain_inherent.ok_or_else(|| {
Box::<dyn std::error::Error + Send + Sync>::from( Box::<dyn std::error::Error + Send + Sync>::from(
"Failed to create parachain inherent", "Failed to create parachain inherent",
) )
})?; })?;
Ok((time, slot, parachain_inherent))
Ok((timestamp, slot, parachain_inherent))
} }
}, },
block_import: client.clone(), block_import: client.clone(),
@@ -1064,15 +1067,15 @@ where
cumulus_client_consensus_aura::BuildVerifierParams { cumulus_client_consensus_aura::BuildVerifierParams {
client: client2.clone(), client: client2.clone(),
create_inherent_data_providers: move |_, _| async move { create_inherent_data_providers: move |_, _| async move {
let time = sp_timestamp::InherentDataProvider::from_system_time(); let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
let slot = let slot =
sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
*time, *timestamp,
slot_duration.slot_duration(), slot_duration,
); );
Ok((time, slot)) Ok((timestamp, slot))
}, },
can_author_with: sp_consensus::CanAuthorWithNativeVersion::new( can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(
client2.executor().clone(), client2.executor().clone(),
@@ -1177,20 +1180,21 @@ where
let relay_chain_for_aura = relay_chain_for_aura.clone(); let relay_chain_for_aura = relay_chain_for_aura.clone();
async move { async move {
let parachain_inherent = let parachain_inherent =
cumulus_primitives_parachain_inherent::ParachainInherentData::create_at( cumulus_primitives_parachain_inherent::ParachainInherentData::create_at(
relay_parent, relay_parent,
&relay_chain_for_aura, &relay_chain_for_aura,
&validation_data, &validation_data,
id, id,
).await; ).await;
let time =
let timestamp =
sp_timestamp::InherentDataProvider::from_system_time(); sp_timestamp::InherentDataProvider::from_system_time();
let slot = let slot =
sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
*time, *timestamp,
slot_duration.slot_duration(), slot_duration,
); );
let parachain_inherent = let parachain_inherent =
parachain_inherent.ok_or_else(|| { parachain_inherent.ok_or_else(|| {
@@ -1198,7 +1202,8 @@ where
"Failed to create parachain inherent", "Failed to create parachain inherent",
) )
})?; })?;
Ok((time, slot, parachain_inherent))
Ok((timestamp, slot, parachain_inherent))
} }
}, },
block_import: client2.clone(), block_import: client2.clone(),
@@ -1494,15 +1499,15 @@ pub fn canvas_kusama_build_import_queue(
block_import: client.clone(), block_import: client.clone(),
client: client.clone(), client: client.clone(),
create_inherent_data_providers: move |_, _| async move { create_inherent_data_providers: move |_, _| async move {
let time = sp_timestamp::InherentDataProvider::from_system_time(); let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
let slot = let slot =
sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
*time, *timestamp,
slot_duration.slot_duration(), slot_duration,
); );
Ok((time, slot)) Ok((timestamp, slot))
}, },
registry: config.prometheus_registry(), registry: config.prometheus_registry(),
can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()), can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()),
@@ -1565,26 +1570,28 @@ pub async fn start_canvas_kusama_node(
let relay_chain_interface = relay_chain_interface.clone(); let relay_chain_interface = relay_chain_interface.clone();
async move { async move {
let parachain_inherent = let parachain_inherent =
cumulus_primitives_parachain_inherent::ParachainInherentData::create_at( cumulus_primitives_parachain_inherent::ParachainInherentData::create_at(
relay_parent, relay_parent,
&relay_chain_interface, &relay_chain_interface,
&validation_data, &validation_data,
id, id,
).await; ).await;
let time = sp_timestamp::InherentDataProvider::from_system_time();
let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
let slot = let slot =
sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
*time, *timestamp,
slot_duration.slot_duration(), slot_duration,
); );
let parachain_inherent = parachain_inherent.ok_or_else(|| { let parachain_inherent = parachain_inherent.ok_or_else(|| {
Box::<dyn std::error::Error + Send + Sync>::from( Box::<dyn std::error::Error + Send + Sync>::from(
"Failed to create parachain inherent", "Failed to create parachain inherent",
) )
})?; })?;
Ok((time, slot, parachain_inherent))
Ok((timestamp, slot, parachain_inherent))
} }
}, },
block_import: client.clone(), block_import: client.clone(),