difftreelog
fix lookahead leftovers
in: master
6 files changed
primitives/common/src/constants.rsdiffbeforeafterboth--- a/primitives/common/src/constants.rs
+++ b/primitives/common/src/constants.rs
@@ -26,7 +26,7 @@
#[cfg(not(feature = "lookahead"))]
pub const MILLISECS_PER_BLOCK: u64 = 12000;
#[cfg(feature = "lookahead")]
-pub const MILLISECS_PER_BLOCK: u64 = 3000;
+pub const MILLISECS_PER_BLOCK: u64 = 6000;
pub const MILLISECS_PER_RELAY_BLOCK: u64 = 6000;
pub const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK;
runtime/common/config/parachain.rsdiffbeforeafterboth--- a/runtime/common/config/parachain.rs
+++ b/runtime/common/config/parachain.rs
@@ -43,6 +43,8 @@
#[cfg(feature = "lookahead")]
type CheckAssociatedRelayNumber =
cumulus_pallet_parachain_system::RelayNumberMonotonicallyIncreases;
+ #[cfg(feature = "lookahead")]
+ type ConsensusHook = ConsensusHook;
}
impl parachain_info::Config for Runtime {}
runtime/common/config/substrate.rsdiffbeforeafterboth--- a/runtime/common/config/substrate.rs
+++ b/runtime/common/config/substrate.rs
@@ -17,7 +17,7 @@
use frame_support::{
dispatch::DispatchClass,
ord_parameter_types, parameter_types,
- traits::{ConstBool, ConstU32, Everything, NeverEnsureOrigin},
+ traits::{ConstBool, ConstU32, ConstU64, Everything, NeverEnsureOrigin},
weights::{
constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight},
ConstantMultiplier,
@@ -134,15 +134,14 @@
type MaxKeyLen = MigrationMaxKeyLen;
}
-parameter_types! {
- pub const MinimumPeriod: u64 = SLOT_DURATION / 2;
-}
-
impl pallet_timestamp::Config for Runtime {
/// A timestamp: milliseconds since the unix epoch.
type Moment = u64;
type OnTimestampSet = ();
- type MinimumPeriod = MinimumPeriod;
+ #[cfg(not(feature = "lookahead"))]
+ type MinimumPeriod = ConstU64<{SLOT_DURATION / 2}>;
+ #[cfg(feature = "lookahead")]
+ type MinimumPeriod = ConstU64<0>;
type WeightInfo = ();
}
@@ -247,6 +246,8 @@
type DisabledValidators = ();
type MaxAuthorities = MaxAuthorities;
type AllowMultipleBlocksPerSlot = ConstBool<true>;
+ #[cfg(feature = "lookahead")]
+ type SlotDuration = ConstU64<SLOT_DURATION>;
}
impl pallet_utility::Config for Runtime {
runtime/common/mod.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617pub mod config;18pub mod construct_runtime;19pub mod dispatch;20pub mod ethereum;21pub mod identity;22pub mod instance;23pub mod maintenance;24pub mod runtime_apis;2526pub mod sponsoring;27#[allow(missing_docs)]28pub mod weights;2930#[cfg(test)]31pub mod tests;3233use frame_support::{34 traits::{Currency, Imbalance, OnUnbalanced},35 weights::Weight,36};37use sp_runtime::{38 generic, impl_opaque_keys,39 traits::{BlakeTwo256, BlockNumberProvider},40};41use sp_std::vec::Vec;42#[cfg(feature = "std")]43use sp_version::NativeVersion;44use up_common::types::{AccountId, BlockNumber};4546use crate::{47 AllPalletsWithSystem, Aura, Balances, InherentDataExt, Runtime, RuntimeCall, Signature,48 Treasury,49};5051#[macro_export]52macro_rules! unsupported {53 () => {54 pallet_common::unsupported!($crate::Runtime)55 };56}5758/// The address format for describing accounts.59pub type Address = sp_runtime::MultiAddress<AccountId, ()>;60/// A Block signed with a Justification61pub type SignedBlock = generic::SignedBlock<Block>;62/// Frontier wrapped extrinsic63pub type UncheckedExtrinsic =64 fp_self_contained::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;65/// Header type.66pub type Header = generic::Header<BlockNumber, BlakeTwo256>;67/// Block type.68pub type Block = generic::Block<Header, UncheckedExtrinsic>;69/// BlockId type as expected by this runtime.70pub type BlockId = generic::BlockId<Block>;7172impl_opaque_keys! {73 pub struct SessionKeys {74 pub aura: Aura,75 }76}7778/// The version information used to identify this runtime when compiled natively.79#[cfg(feature = "std")]80pub fn native_version() -> NativeVersion {81 NativeVersion {82 runtime_version: crate::VERSION,83 can_author_with: Default::default(),84 }85}8687pub type ChargeTransactionPayment = pallet_charge_transaction::ChargeTransactionPayment<Runtime>;8889pub type SignedExtra = (90 frame_system::CheckSpecVersion<Runtime>,91 frame_system::CheckTxVersion<Runtime>,92 frame_system::CheckGenesis<Runtime>,93 frame_system::CheckEra<Runtime>,94 frame_system::CheckNonce<Runtime>,95 frame_system::CheckWeight<Runtime>,96 maintenance::CheckMaintenance,97 identity::DisableIdentityCalls,98 ChargeTransactionPayment,99 //pallet_contract_helpers::ContractHelpersExtension<Runtime>,100 pallet_ethereum::FakeTransactionFinalizer<Runtime>,101);102103/// Executive: handles dispatch to the various modules.104pub type Executive = frame_executive::Executive<105 Runtime,106 Block,107 frame_system::ChainContext<Runtime>,108 Runtime,109 AllPalletsWithSystem,110 AuraToCollatorSelection,111>;112113type NegativeImbalance = <Balances as Currency<AccountId>>::NegativeImbalance;114115pub struct DealWithFees;116impl OnUnbalanced<NegativeImbalance> for DealWithFees {117 fn on_unbalanceds<B>(mut fees_then_tips: impl Iterator<Item = NegativeImbalance>) {118 if let Some(fees) = fees_then_tips.next() {119 // for fees, 100% to treasury120 let mut split = fees.ration(100, 0);121 if let Some(tips) = fees_then_tips.next() {122 // for tips, if any, 100% to treasury123 tips.ration_merge_into(100, 0, &mut split);124 }125 Treasury::on_unbalanced(split.0);126 // Author::on_unbalanced(split.1);127 }128 }129}130131pub struct RelayChainBlockNumberProvider<T>(sp_std::marker::PhantomData<T>);132133impl<T: cumulus_pallet_parachain_system::Config> BlockNumberProvider134 for RelayChainBlockNumberProvider<T>135{136 type BlockNumber = BlockNumber;137138 fn current_block_number() -> Self::BlockNumber {139 cumulus_pallet_parachain_system::Pallet::<T>::validation_data()140 .map(|d| d.relay_parent_number)141 .unwrap_or_default()142 }143 #[cfg(feature = "runtime-benchmarks")]144 fn set_block_number(block: Self::BlockNumber) {145 cumulus_pallet_parachain_system::RelaychainDataProvider::<T>::set_block_number(block)146 }147}148149pub(crate) struct CheckInherents;150151impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {152 fn check_inherents(153 block: &Block,154 relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,155 ) -> sp_inherents::CheckInherentsResult {156 let relay_chain_slot = relay_state_proof157 .read_slot()158 .expect("Could not read the relay chain slot from the proof");159160 let inherent_data =161 cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration(162 relay_chain_slot,163 sp_std::time::Duration::from_secs(6),164 )165 .create_inherent_data()166 .expect("Could not create the timestamp inherent data");167168 inherent_data.check_extrinsics(block)169 }170}171172#[derive(parity_scale_codec::Encode, parity_scale_codec::Decode)]173pub enum XCMPMessage<XAccountId, XBalance> {174 /// Transfer tokens to the given account from the Parachain account.175 TransferToken(XAccountId, XBalance),176}177178pub struct AuraToCollatorSelection;179impl frame_support::traits::OnRuntimeUpgrade for AuraToCollatorSelection {180 fn on_runtime_upgrade() -> Weight {181 #[cfg(feature = "collator-selection")]182 {183 use frame_support::{storage::migration, BoundedVec};184 use pallet_session::SessionManager;185 use sp_runtime::{traits::OpaqueKeys, RuntimeAppPublic};186187 use crate::config::pallets::MaxCollators;188189 let mut weight = <Runtime as frame_system::Config>::DbWeight::get().reads(1);190191 let version = migration::get_storage_value::<()>(192 b"AuraToCollatorSelection",193 b"StorageVersion",194 &[],195 );196197 let should_upgrade = version.is_none();198199 if should_upgrade {200 log::info!(201 target: "runtime::aura_to_collator_selection",202 "Running migration of Aura authorities to Collator Selection invulnerables"203 );204205 let invulnerables = pallet_aura::Pallet::<Runtime>::authorities()206 .iter()207 .cloned()208 .filter_map(|authority_id| {209 weight.saturating_accrue(<Runtime as frame_system::Config>::DbWeight::get().reads_writes(1, 1));210 let vec = authority_id.to_raw_vec();211 let slice = vec.as_slice();212 let array: Option<[u8; 32]> = match slice.try_into() {213 Ok(a) => Some(a),214 Err(_) => {215 log::error!("Failed to convert an Aura authority to a Collator Selection invulnerable: {:?}", authority_id);216 None217 },218 };219 array.map(|a| (AccountId::from(a), authority_id))220 })221 .collect::<Vec<_>>();222223 let bounded_invulnerables = BoundedVec::<_, MaxCollators>::try_from(224 invulnerables225 .iter()226 .cloned()227 .map(|(acc, _)| acc)228 .collect::<Vec<_>>(),229 )230 .expect("Existing collators/invulnerables are more than MaxCollators");231232 <pallet_collator_selection::Invulnerables<Runtime>>::put(bounded_invulnerables);233234 let keys = invulnerables235 .into_iter()236 .map(|(acc, aura)| {237 (238 acc.clone(), // account id239 acc, // validator id240 SessionKeys { aura }, // session keys241 )242 })243 .collect::<Vec<_>>();244245 for (account, val, keys) in keys.iter() {246 for id in <Runtime as pallet_session::Config>::Keys::key_ids() {247 <pallet_session::KeyOwner<Runtime>>::insert((*id, keys.get_raw(*id)), val)248 }249 <pallet_session::NextKeys<Runtime>>::insert(val, keys);250 // todo exercise caution, the following is taken from genesis251 if frame_system::Pallet::<Runtime>::inc_consumers_without_limit(account)252 .is_err()253 {254 log::warn!(255 "We have entered an error with incrementing consumers without limit during the migration"256 );257 // This will leak a provider reference, however it only happens once (at258 // genesis) so it's really not a big deal and we assume that the user wants to259 // do this since it's the only way a non-endowed account can contain a session260 // key.261 frame_system::Pallet::<Runtime>::inc_providers(account);262 }263 }264265 let initial_validators_0 =266 <Runtime as pallet_session::Config>::SessionManager::new_session(0)267 .unwrap_or_else(|| {268 frame_support::print(269 "No initial validator provided by `SessionManager`, use \270 session config keys to generate initial validator set.",271 );272 keys.iter().map(|x| x.1.clone()).collect()273 });274 /*assert!(275 !initial_validators_0.is_empty(),276 "Empty validator set for session 0 in (pseudo) genesis block!"277 );*/278279 let initial_validators_1 =280 <Runtime as pallet_session::Config>::SessionManager::new_session(1)281 .unwrap_or_else(|| initial_validators_0.clone());282 /*assert!(283 !initial_validators_1.is_empty(),284 "Empty validator set for session 1 in (pseudo) genesis block!"285 );*/286287 let queued_keys: Vec<_> = initial_validators_1288 .iter()289 .cloned()290 .map(|v| {291 (292 v.clone(),293 <pallet_session::NextKeys<Runtime>>::get(&v)294 .expect("Validator in session 1 missing keys!"),295 )296 })297 .collect();298299 // Tell everyone about the genesis session keys -- Aura must've already initialized it300 //<Runtime as pallet_session::Config>::SessionHandler::on_genesis_session::<<Runtime as pallet_session::Config>::Keys>(&queued_keys);301302 <pallet_session::Validators<Runtime>>::put(initial_validators_0);303 <pallet_session::QueuedKeys<Runtime>>::put(queued_keys);304305 <Runtime as pallet_session::Config>::SessionManager::start_session(0);306307 log::info!(308 target: "runtime::aura_to_collator_selection",309 "Migration of Aura authorities to Collator Selection invulnerables is complete."310 );311312 migration::put_storage_value::<()>(313 b"AuraToCollatorSelection",314 b"StorageVersion",315 &[],316 (),317 );318319 weight += <Runtime as frame_system::Config>::DbWeight::get().writes(1)320 } else {321 log::info!(322 target: "runtime::aura_to_collator_selection",323 "The storage migration has already been flagged as complete. No migration needs to be done.",324 );325 }326327 weight328 }329330 #[cfg(not(feature = "collator-selection"))]331 {332 Weight::zero()333 }334 }335}1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617pub mod config;18pub mod construct_runtime;19pub mod dispatch;20pub mod ethereum;21pub mod identity;22pub mod instance;23pub mod maintenance;24pub mod runtime_apis;2526pub mod sponsoring;27#[allow(missing_docs)]28pub mod weights;2930#[cfg(test)]31pub mod tests;3233use frame_support::{34 traits::{Currency, Imbalance, OnUnbalanced},35 weights::Weight,36};37use sp_runtime::{38 generic, impl_opaque_keys,39 traits::{BlakeTwo256, BlockNumberProvider},40};41use sp_std::vec::Vec;42#[cfg(feature = "std")]43use sp_version::NativeVersion;44use up_common::types::{AccountId, BlockNumber};4546use crate::{47 AllPalletsWithSystem, Aura, Balances, Runtime, RuntimeCall, Signature,48 Treasury,49};5051#[macro_export]52macro_rules! unsupported {53 () => {54 pallet_common::unsupported!($crate::Runtime)55 };56}5758/// The address format for describing accounts.59pub type Address = sp_runtime::MultiAddress<AccountId, ()>;60/// A Block signed with a Justification61pub type SignedBlock = generic::SignedBlock<Block>;62/// Frontier wrapped extrinsic63pub type UncheckedExtrinsic =64 fp_self_contained::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;65/// Header type.66pub type Header = generic::Header<BlockNumber, BlakeTwo256>;67/// Block type.68pub type Block = generic::Block<Header, UncheckedExtrinsic>;69/// BlockId type as expected by this runtime.70pub type BlockId = generic::BlockId<Block>;7172impl_opaque_keys! {73 pub struct SessionKeys {74 pub aura: Aura,75 }76}7778/// The version information used to identify this runtime when compiled natively.79#[cfg(feature = "std")]80pub fn native_version() -> NativeVersion {81 NativeVersion {82 runtime_version: crate::VERSION,83 can_author_with: Default::default(),84 }85}8687pub type ChargeTransactionPayment = pallet_charge_transaction::ChargeTransactionPayment<Runtime>;8889pub type SignedExtra = (90 frame_system::CheckSpecVersion<Runtime>,91 frame_system::CheckTxVersion<Runtime>,92 frame_system::CheckGenesis<Runtime>,93 frame_system::CheckEra<Runtime>,94 frame_system::CheckNonce<Runtime>,95 frame_system::CheckWeight<Runtime>,96 maintenance::CheckMaintenance,97 identity::DisableIdentityCalls,98 ChargeTransactionPayment,99 //pallet_contract_helpers::ContractHelpersExtension<Runtime>,100 pallet_ethereum::FakeTransactionFinalizer<Runtime>,101);102103/// Executive: handles dispatch to the various modules.104pub type Executive = frame_executive::Executive<105 Runtime,106 Block,107 frame_system::ChainContext<Runtime>,108 Runtime,109 AllPalletsWithSystem,110 AuraToCollatorSelection,111>;112113type NegativeImbalance = <Balances as Currency<AccountId>>::NegativeImbalance;114115pub struct DealWithFees;116impl OnUnbalanced<NegativeImbalance> for DealWithFees {117 fn on_unbalanceds<B>(mut fees_then_tips: impl Iterator<Item = NegativeImbalance>) {118 if let Some(fees) = fees_then_tips.next() {119 // for fees, 100% to treasury120 let mut split = fees.ration(100, 0);121 if let Some(tips) = fees_then_tips.next() {122 // for tips, if any, 100% to treasury123 tips.ration_merge_into(100, 0, &mut split);124 }125 Treasury::on_unbalanced(split.0);126 // Author::on_unbalanced(split.1);127 }128 }129}130131pub struct RelayChainBlockNumberProvider<T>(sp_std::marker::PhantomData<T>);132133impl<T: cumulus_pallet_parachain_system::Config> BlockNumberProvider134 for RelayChainBlockNumberProvider<T>135{136 type BlockNumber = BlockNumber;137138 fn current_block_number() -> Self::BlockNumber {139 cumulus_pallet_parachain_system::Pallet::<T>::validation_data()140 .map(|d| d.relay_parent_number)141 .unwrap_or_default()142 }143 #[cfg(feature = "runtime-benchmarks")]144 fn set_block_number(block: Self::BlockNumber) {145 cumulus_pallet_parachain_system::RelaychainDataProvider::<T>::set_block_number(block)146 }147}148149#[cfg(not(feature = "lookahead"))]150pub(crate) struct CheckInherents;151152#[cfg(not(feature = "lookahead"))]153impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {154 fn check_inherents(155 block: &Block,156 relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,157 ) -> sp_inherents::CheckInherentsResult {158 use crate::InherentDataExt;159160 let relay_chain_slot = relay_state_proof161 .read_slot()162 .expect("Could not read the relay chain slot from the proof");163164 let inherent_data =165 cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration(166 relay_chain_slot,167 sp_std::time::Duration::from_secs(6),168 )169 .create_inherent_data()170 .expect("Could not create the timestamp inherent data");171172 inherent_data.check_extrinsics(block)173 }174}175176#[derive(parity_scale_codec::Encode, parity_scale_codec::Decode)]177pub enum XCMPMessage<XAccountId, XBalance> {178 /// Transfer tokens to the given account from the Parachain account.179 TransferToken(XAccountId, XBalance),180}181182pub struct AuraToCollatorSelection;183impl frame_support::traits::OnRuntimeUpgrade for AuraToCollatorSelection {184 fn on_runtime_upgrade() -> Weight {185 #[cfg(feature = "collator-selection")]186 {187 use frame_support::{storage::migration, BoundedVec};188 use pallet_session::SessionManager;189 use sp_runtime::{traits::OpaqueKeys, RuntimeAppPublic};190191 use crate::config::pallets::MaxCollators;192193 let mut weight = <Runtime as frame_system::Config>::DbWeight::get().reads(1);194195 let version = migration::get_storage_value::<()>(196 b"AuraToCollatorSelection",197 b"StorageVersion",198 &[],199 );200201 let should_upgrade = version.is_none();202203 if should_upgrade {204 log::info!(205 target: "runtime::aura_to_collator_selection",206 "Running migration of Aura authorities to Collator Selection invulnerables"207 );208209 let invulnerables = pallet_aura::Pallet::<Runtime>::authorities()210 .iter()211 .cloned()212 .filter_map(|authority_id| {213 weight.saturating_accrue(<Runtime as frame_system::Config>::DbWeight::get().reads_writes(1, 1));214 let vec = authority_id.to_raw_vec();215 let slice = vec.as_slice();216 let array: Option<[u8; 32]> = match slice.try_into() {217 Ok(a) => Some(a),218 Err(_) => {219 log::error!("Failed to convert an Aura authority to a Collator Selection invulnerable: {:?}", authority_id);220 None221 },222 };223 array.map(|a| (AccountId::from(a), authority_id))224 })225 .collect::<Vec<_>>();226227 let bounded_invulnerables = BoundedVec::<_, MaxCollators>::try_from(228 invulnerables229 .iter()230 .cloned()231 .map(|(acc, _)| acc)232 .collect::<Vec<_>>(),233 )234 .expect("Existing collators/invulnerables are more than MaxCollators");235236 <pallet_collator_selection::Invulnerables<Runtime>>::put(bounded_invulnerables);237238 let keys = invulnerables239 .into_iter()240 .map(|(acc, aura)| {241 (242 acc.clone(), // account id243 acc, // validator id244 SessionKeys { aura }, // session keys245 )246 })247 .collect::<Vec<_>>();248249 for (account, val, keys) in keys.iter() {250 for id in <Runtime as pallet_session::Config>::Keys::key_ids() {251 <pallet_session::KeyOwner<Runtime>>::insert((*id, keys.get_raw(*id)), val)252 }253 <pallet_session::NextKeys<Runtime>>::insert(val, keys);254 // todo exercise caution, the following is taken from genesis255 if frame_system::Pallet::<Runtime>::inc_consumers_without_limit(account)256 .is_err()257 {258 log::warn!(259 "We have entered an error with incrementing consumers without limit during the migration"260 );261 // This will leak a provider reference, however it only happens once (at262 // genesis) so it's really not a big deal and we assume that the user wants to263 // do this since it's the only way a non-endowed account can contain a session264 // key.265 frame_system::Pallet::<Runtime>::inc_providers(account);266 }267 }268269 let initial_validators_0 =270 <Runtime as pallet_session::Config>::SessionManager::new_session(0)271 .unwrap_or_else(|| {272 frame_support::print(273 "No initial validator provided by `SessionManager`, use \274 session config keys to generate initial validator set.",275 );276 keys.iter().map(|x| x.1.clone()).collect()277 });278 /*assert!(279 !initial_validators_0.is_empty(),280 "Empty validator set for session 0 in (pseudo) genesis block!"281 );*/282283 let initial_validators_1 =284 <Runtime as pallet_session::Config>::SessionManager::new_session(1)285 .unwrap_or_else(|| initial_validators_0.clone());286 /*assert!(287 !initial_validators_1.is_empty(),288 "Empty validator set for session 1 in (pseudo) genesis block!"289 );*/290291 let queued_keys: Vec<_> = initial_validators_1292 .iter()293 .cloned()294 .map(|v| {295 (296 v.clone(),297 <pallet_session::NextKeys<Runtime>>::get(&v)298 .expect("Validator in session 1 missing keys!"),299 )300 })301 .collect();302303 // Tell everyone about the genesis session keys -- Aura must've already initialized it304 //<Runtime as pallet_session::Config>::SessionHandler::on_genesis_session::<<Runtime as pallet_session::Config>::Keys>(&queued_keys);305306 <pallet_session::Validators<Runtime>>::put(initial_validators_0);307 <pallet_session::QueuedKeys<Runtime>>::put(queued_keys);308309 <Runtime as pallet_session::Config>::SessionManager::start_session(0);310311 log::info!(312 target: "runtime::aura_to_collator_selection",313 "Migration of Aura authorities to Collator Selection invulnerables is complete."314 );315316 migration::put_storage_value::<()>(317 b"AuraToCollatorSelection",318 b"StorageVersion",319 &[],320 (),321 );322323 weight += <Runtime as frame_system::Config>::DbWeight::get().writes(1)324 } else {325 log::info!(326 target: "runtime::aura_to_collator_selection",327 "The storage migration has already been flagged as complete. No migration needs to be done.",328 );329 }330331 weight332 }333334 #[cfg(not(feature = "collator-selection"))]335 {336 Weight::zero()337 }338 }339}runtime/common/runtime_apis.rsdiffbeforeafterboth--- a/runtime/common/runtime_apis.rs
+++ b/runtime/common/runtime_apis.rs
@@ -485,7 +485,14 @@
impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {
fn slot_duration() -> sp_consensus_aura::SlotDuration {
- sp_consensus_aura::SlotDuration::from_millis(Aura::slot_duration())
+ #[cfg(not(feature = "lookahead"))]
+ {
+ sp_consensus_aura::SlotDuration::from_millis(Aura::slot_duration())
+ }
+ #[cfg(feature = "lookahead")]
+ {
+ sp_consensus_aura::SlotDuration::from_millis(up_common::constants::SLOT_DURATION)
+ }
}
fn authorities() -> Vec<AuraId> {
runtime/opal/src/lib.rsdiffbeforeafterboth--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -67,8 +67,15 @@
impl_common_runtime_apis!();
+// CheckInherents is included in consensus hook
+#[cfg(not(feature = "lookahead"))]
cumulus_pallet_parachain_system::register_validate_block!(
Runtime = Runtime,
BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
CheckInherents = CheckInherents,
);
+#[cfg(feature = "lookahead")]
+cumulus_pallet_parachain_system::register_validate_block!(
+ Runtime = Runtime,
+ BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
+);