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.rsdiffbeforeafterboth--- a/runtime/common/mod.rs
+++ b/runtime/common/mod.rs
@@ -44,7 +44,7 @@
use up_common::types::{AccountId, BlockNumber};
use crate::{
- AllPalletsWithSystem, Aura, Balances, InherentDataExt, Runtime, RuntimeCall, Signature,
+ AllPalletsWithSystem, Aura, Balances, Runtime, RuntimeCall, Signature,
Treasury,
};
@@ -146,13 +146,17 @@
}
}
+#[cfg(not(feature = "lookahead"))]
pub(crate) struct CheckInherents;
+#[cfg(not(feature = "lookahead"))]
impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {
fn check_inherents(
block: &Block,
relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,
) -> sp_inherents::CheckInherentsResult {
+ use crate::InherentDataExt;
+
let relay_chain_slot = relay_state_proof
.read_slot()
.expect("Could not read the relay chain slot from the proof");
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.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/>.1617//! The Substrate Node Template runtime. This can be compiled with `#[no_std]`, ready for Wasm.1819#![cfg_attr(not(feature = "std"), no_std)]20// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.21#![recursion_limit = "1024"]22#![allow(clippy::from_over_into, clippy::identity_op)]23#![allow(clippy::fn_to_numeric_cast_with_truncation)]24// Make the WASM binary available.25#[cfg(feature = "std")]26include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));2728extern crate alloc;2930use ::staging_xcm::latest::NetworkId;31use frame_support::parameter_types;32use sp_runtime::create_runtime_str;33use sp_version::RuntimeVersion;34use up_common::types::*;3536mod runtime_common;3738pub mod governance_timings;39pub mod xcm_barrier;4041pub use runtime_common::*;4243pub const TOKEN_SYMBOL: &str = "OPL";44pub const DECIMALS: u8 = 18;4546/// This runtime version.47#[sp_version::runtime_version]48pub const VERSION: RuntimeVersion = RuntimeVersion {49 spec_name: create_runtime_str!("opal"),50 impl_name: create_runtime_str!("opal"),51 authoring_version: 1,52 spec_version: 10010064,53 impl_version: 0,54 apis: RUNTIME_API_VERSIONS,55 transaction_version: 3,56 state_version: 1,57};5859parameter_types! {60 pub const Version: RuntimeVersion = VERSION;61 pub const SS58Prefix: u16 = 42;62 pub const ChainId: u64 = 8882;63 pub const RelayNetwork: NetworkId = NetworkId::Kusama;64}6566construct_runtime!();6768impl_common_runtime_apis!();6970// CheckInherents is included in consensus hook71#[cfg(not(feature = "lookahead"))]72cumulus_pallet_parachain_system::register_validate_block!(73 Runtime = Runtime,74 BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,75 CheckInherents = CheckInherents,76);77#[cfg(feature = "lookahead")]78cumulus_pallet_parachain_system::register_validate_block!(79 Runtime = Runtime,80 BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,81);