Unverified Commit 86f670f3 authored by ferrell-code's avatar ferrell-code Committed by GitHub
Browse files

parchain initializer.rs to FrameV2 (#3416)



* migrate to FrameV2

* kusama & westend change pallet name

* keep item private
Co-authored-by: thiolliere's avatarGuillaume Thiolliere <gui.thiolliere@gmail.com>
parent 6cc70a8a
Pipeline #145870 passed with stages
in 37 minutes and 28 seconds
...@@ -321,7 +321,7 @@ impl_opaque_keys! { ...@@ -321,7 +321,7 @@ impl_opaque_keys! {
pub grandpa: Grandpa, pub grandpa: Grandpa,
pub babe: Babe, pub babe: Babe,
pub im_online: ImOnline, pub im_online: ImOnline,
pub para_validator: ParasInitializer, pub para_validator: Initializer,
pub para_assignment: ParasSessionInfo, pub para_assignment: ParasSessionInfo,
pub authority_discovery: AuthorityDiscovery, pub authority_discovery: AuthorityDiscovery,
} }
...@@ -1487,7 +1487,7 @@ construct_runtime! { ...@@ -1487,7 +1487,7 @@ construct_runtime! {
ParasInherent: parachains_paras_inherent::{Pallet, Call, Storage, Inherent} = 54, ParasInherent: parachains_paras_inherent::{Pallet, Call, Storage, Inherent} = 54,
ParasScheduler: parachains_scheduler::{Pallet, Call, Storage} = 55, ParasScheduler: parachains_scheduler::{Pallet, Call, Storage} = 55,
Paras: parachains_paras::{Pallet, Call, Storage, Event, Config} = 56, Paras: parachains_paras::{Pallet, Call, Storage, Event, Config} = 56,
ParasInitializer: parachains_initializer::{Pallet, Call, Storage} = 57, Initializer: parachains_initializer::{Pallet, Call, Storage} = 57,
ParasDmp: parachains_dmp::{Pallet, Call, Storage} = 58, ParasDmp: parachains_dmp::{Pallet, Call, Storage} = 58,
ParasUmp: parachains_ump::{Pallet, Call, Storage, Event} = 59, ParasUmp: parachains_ump::{Pallet, Call, Storage, Event} = 59,
ParasHrmp: parachains_hrmp::{Pallet, Call, Storage, Event} = 60, ParasHrmp: parachains_hrmp::{Pallet, Call, Storage, Event} = 60,
......
...@@ -20,18 +20,16 @@ ...@@ -20,18 +20,16 @@
//! This module can throw fatal errors if session-change notifications are received after initialization. //! This module can throw fatal errors if session-change notifications are received after initialization.
use sp_std::prelude::*; use sp_std::prelude::*;
use frame_support::weights::{Weight, DispatchClass};
use frame_support::traits::EnsureOrigin;
use primitives::v1::{ValidatorId, SessionIndex, ConsensusLog, BlockNumber}; use primitives::v1::{ValidatorId, SessionIndex, ConsensusLog, BlockNumber};
use frame_support::{ use frame_support::traits::{Randomness, OneSessionHandler};
decl_storage, decl_module, decl_error, traits::{OneSessionHandler, Randomness},
};
use parity_scale_codec::{Encode, Decode}; use parity_scale_codec::{Encode, Decode};
use crate::{ use crate::{
configuration::{self, HostConfiguration}, configuration::{self, HostConfiguration},
shared, paras, scheduler, inclusion, session_info, dmp, ump, hrmp, shared, paras, scheduler, inclusion, session_info, dmp, ump, hrmp,
}; };
pub use pallet::*;
/// Information about a session change that has just occurred. /// Information about a session change that has just occurred.
#[derive(Clone)] #[derive(Clone)]
pub struct SessionChangeNotification<BlockNumber> { pub struct SessionChangeNotification<BlockNumber> {
...@@ -69,7 +67,18 @@ struct BufferedSessionChange { ...@@ -69,7 +67,18 @@ struct BufferedSessionChange {
session_index: SessionIndex, session_index: SessionIndex,
} }
pub trait Config: #[frame_support::pallet]
pub mod pallet {
use frame_support::pallet_prelude::*;
use frame_system::pallet_prelude::*;
use super::*;
#[pallet::pallet]
#[pallet::generate_store(pub(super) trait Store)]
pub struct Pallet<T>(_);
#[pallet::config]
pub trait Config:
frame_system::Config frame_system::Config
+ configuration::Config + configuration::Config
+ shared::Config + shared::Config
...@@ -80,15 +89,14 @@ pub trait Config: ...@@ -80,15 +89,14 @@ pub trait Config:
+ dmp::Config + dmp::Config
+ ump::Config + ump::Config
+ hrmp::Config + hrmp::Config
{ {
/// A randomness beacon. /// A randomness beacon.
type Randomness: Randomness<Self::Hash, Self::BlockNumber>; type Randomness: Randomness<Self::Hash, Self::BlockNumber>;
/// An origin which is allowed to force updates to parachains. /// An origin which is allowed to force updates to parachains.
type ForceOrigin: EnsureOrigin<<Self as frame_system::Config>::Origin>; type ForceOrigin: EnsureOrigin<<Self as frame_system::Config>::Origin>;
} }
decl_storage! {
trait Store for Module<T: Config> as Initializer {
/// Whether the parachains modules have been initialized within this block. /// Whether the parachains modules have been initialized within this block.
/// ///
/// Semantically a bool, but this guarantees it should never hit the trie, /// Semantically a bool, but this guarantees it should never hit the trie,
...@@ -97,7 +105,9 @@ decl_storage! { ...@@ -97,7 +105,9 @@ decl_storage! {
/// As a bool, `set(false)` and `remove()` both lead to the next `get()` being false, but one of /// As a bool, `set(false)` and `remove()` both lead to the next `get()` being false, but one of
/// them writes to the trie and one does not. This confusion makes `Option<()>` more suitable for /// them writes to the trie and one does not. This confusion makes `Option<()>` more suitable for
/// the semantics of this variable. /// the semantics of this variable.
HasInitialized: Option<()>; #[pallet::storage]
pub(super) type HasInitialized<T: Config> = StorageValue<_, ()>;
/// Buffered session changes along with the block number at which they should be applied. /// Buffered session changes along with the block number at which they should be applied.
/// ///
/// Typically this will be empty or one element long. Apart from that this item never hits /// Typically this will be empty or one element long. Apart from that this item never hits
...@@ -105,19 +115,11 @@ decl_storage! { ...@@ -105,19 +115,11 @@ decl_storage! {
/// ///
/// However this is a `Vec` regardless to handle various edge cases that may occur at runtime /// However this is a `Vec` regardless to handle various edge cases that may occur at runtime
/// upgrade boundaries or if governance intervenes. /// upgrade boundaries or if governance intervenes.
BufferedSessionChanges: Vec<BufferedSessionChange>; #[pallet::storage]
} pub(super) type BufferedSessionChanges<T: Config> = StorageValue<_, Vec<BufferedSessionChange>, ValueQuery>;
}
decl_error! {
pub enum Error for Module<T: Config> { }
}
decl_module! {
/// The initializer module.
pub struct Module<T: Config> for enum Call where origin: <T as frame_system::Config>::Origin {
type Error = Error<T>;
#[pallet::hooks]
impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
fn on_initialize(now: T::BlockNumber) -> Weight { fn on_initialize(now: T::BlockNumber) -> Weight {
// The other modules are initialized in this order: // The other modules are initialized in this order:
// - Configuration // - Configuration
...@@ -139,12 +141,12 @@ decl_module! { ...@@ -139,12 +141,12 @@ decl_module! {
ump::Module::<T>::initializer_initialize(now) + ump::Module::<T>::initializer_initialize(now) +
hrmp::Module::<T>::initializer_initialize(now); hrmp::Module::<T>::initializer_initialize(now);
HasInitialized::set(Some(())); HasInitialized::<T>::set(Some(()));
total_weight total_weight
} }
fn on_finalize() { fn on_finalize(_: T::BlockNumber) {
// reverse initialization order. // reverse initialization order.
hrmp::Module::<T>::initializer_finalize(); hrmp::Module::<T>::initializer_finalize();
ump::Module::<T>::initializer_finalize(); ump::Module::<T>::initializer_finalize();
...@@ -164,27 +166,31 @@ decl_module! { ...@@ -164,27 +166,31 @@ decl_module! {
session_index, session_index,
validators, validators,
queued, queued,
}) = BufferedSessionChanges::take().pop() }) = BufferedSessionChanges::<T>::take().pop()
{ {
Self::apply_new_session(session_index, validators, queued); Self::apply_new_session(session_index, validators, queued);
} }
HasInitialized::take(); HasInitialized::<T>::take();
}
} }
#[pallet::call]
impl<T: Config> Pallet<T> {
/// Issue a signal to the consensus engine to forcibly act as though all parachain /// Issue a signal to the consensus engine to forcibly act as though all parachain
/// blocks in all relay chain blocks up to and including the given number in the current /// blocks in all relay chain blocks up to and including the given number in the current
/// chain are valid and should be finalized. /// chain are valid and should be finalized.
#[weight = (0, DispatchClass::Operational)] #[pallet::weight((0, DispatchClass::Operational))]
fn force_approve(origin, up_to: BlockNumber) { pub fn force_approve(origin: OriginFor<T>, up_to: BlockNumber) -> DispatchResult {
T::ForceOrigin::ensure_origin(origin)?; T::ForceOrigin::ensure_origin(origin)?;
frame_system::Pallet::<T>::deposit_log(ConsensusLog::ForceApprove(up_to).into()); frame_system::Pallet::<T>::deposit_log(ConsensusLog::ForceApprove(up_to).into());
Ok(())
} }
} }
} }
impl<T: Config> Module<T> { impl<T: Config> Pallet<T> {
fn apply_new_session( fn apply_new_session(
session_index: SessionIndex, session_index: SessionIndex,
all_validators: Vec<ValidatorId>, all_validators: Vec<ValidatorId>,
...@@ -254,7 +260,7 @@ impl<T: Config> Module<T> { ...@@ -254,7 +260,7 @@ impl<T: Config> Module<T> {
// Genesis session should be immediately enacted. // Genesis session should be immediately enacted.
Self::apply_new_session(0, validators, queued); Self::apply_new_session(0, validators, queued);
} else { } else {
BufferedSessionChanges::mutate(|v| v.push(BufferedSessionChange { BufferedSessionChanges::<T>::mutate(|v| v.push(BufferedSessionChange {
validators, validators,
queued, queued,
session_index, session_index,
...@@ -264,24 +270,24 @@ impl<T: Config> Module<T> { ...@@ -264,24 +270,24 @@ impl<T: Config> Module<T> {
} }
} }
impl<T: Config> sp_runtime::BoundToRuntimeAppPublic for Module<T> { impl<T: Config> sp_runtime::BoundToRuntimeAppPublic for Pallet<T> {
type Public = ValidatorId; type Public = ValidatorId;
} }
impl<T: pallet_session::Config + Config> OneSessionHandler<T::AccountId> for Module<T> { impl<T: pallet_session::Config + Config> OneSessionHandler<T::AccountId> for Pallet<T> {
type Key = ValidatorId; type Key = ValidatorId;
fn on_genesis_session<'a, I: 'a>(validators: I) fn on_genesis_session<'a, I: 'a>(validators: I)
where I: Iterator<Item=(&'a T::AccountId, Self::Key)> where I: Iterator<Item=(&'a T::AccountId, Self::Key)>
{ {
<Module<T>>::on_new_session(false, 0, validators, None); <Pallet<T>>::on_new_session(false, 0, validators, None);
} }
fn on_new_session<'a, I: 'a>(changed: bool, validators: I, queued: I) fn on_new_session<'a, I: 'a>(changed: bool, validators: I, queued: I)
where I: Iterator<Item=(&'a T::AccountId, Self::Key)> where I: Iterator<Item=(&'a T::AccountId, Self::Key)>
{ {
let session_index = <pallet_session::Module<T>>::current_index(); let session_index = <pallet_session::Pallet<T>>::current_index();
<Module<T>>::on_new_session(changed, session_index, validators, Some(queued)); <Pallet<T>>::on_new_session(changed, session_index, validators, Some(queued));
} }
fn on_disabled(_i: usize) { } fn on_disabled(_i: usize) { }
...@@ -311,7 +317,7 @@ mod tests { ...@@ -311,7 +317,7 @@ mod tests {
Some(Vec::new().into_iter()), Some(Vec::new().into_iter()),
); );
let v = <BufferedSessionChanges>::get(); let v = <Initializer as Store>::BufferedSessionChanges::get();
assert!(v.is_empty()); assert!(v.is_empty());
assert_eq!(SessionInfo::earliest_stored_session(), 0); assert_eq!(SessionInfo::earliest_stored_session(), 0);
...@@ -332,7 +338,7 @@ mod tests { ...@@ -332,7 +338,7 @@ mod tests {
let now = System::block_number(); let now = System::block_number();
Initializer::on_initialize(now); Initializer::on_initialize(now);
let v = <BufferedSessionChanges>::get(); let v = <Initializer as Store>::BufferedSessionChanges::get();
assert_eq!(v.len(), 1); assert_eq!(v.len(), 1);
}); });
} }
...@@ -350,7 +356,7 @@ mod tests { ...@@ -350,7 +356,7 @@ mod tests {
Initializer::on_finalize(1); Initializer::on_finalize(1);
assert!(<BufferedSessionChanges>::get().is_empty()); assert!(<Initializer as Store>::BufferedSessionChanges::get().is_empty());
}); });
} }
...@@ -359,7 +365,7 @@ mod tests { ...@@ -359,7 +365,7 @@ mod tests {
new_test_ext(Default::default()).execute_with(|| { new_test_ext(Default::default()).execute_with(|| {
Initializer::on_initialize(1); Initializer::on_initialize(1);
assert!(HasInitialized::get().is_some()); assert!(<Initializer as Store>::HasInitialized::get().is_some());
}) })
} }
...@@ -369,7 +375,7 @@ mod tests { ...@@ -369,7 +375,7 @@ mod tests {
Initializer::on_initialize(1); Initializer::on_initialize(1);
Initializer::on_finalize(1); Initializer::on_finalize(1);
assert!(HasInitialized::get().is_none()); assert!(<Initializer as Store>::HasInitialized::get().is_none());
}) })
} }
......
...@@ -306,7 +306,7 @@ impl_opaque_keys! { ...@@ -306,7 +306,7 @@ impl_opaque_keys! {
pub grandpa: Grandpa, pub grandpa: Grandpa,
pub babe: Babe, pub babe: Babe,
pub im_online: ImOnline, pub im_online: ImOnline,
pub para_validator: ParasInitializer, pub para_validator: Initializer,
pub para_assignment: ParasSessionInfo, pub para_assignment: ParasSessionInfo,
pub authority_discovery: AuthorityDiscovery, pub authority_discovery: AuthorityDiscovery,
} }
...@@ -1078,7 +1078,7 @@ construct_runtime! { ...@@ -1078,7 +1078,7 @@ construct_runtime! {
ParasInherent: parachains_paras_inherent::{Pallet, Call, Storage, Inherent} = 45, ParasInherent: parachains_paras_inherent::{Pallet, Call, Storage, Inherent} = 45,
ParasScheduler: parachains_scheduler::{Pallet, Call, Storage} = 46, ParasScheduler: parachains_scheduler::{Pallet, Call, Storage} = 46,
Paras: parachains_paras::{Pallet, Call, Storage, Event, Config} = 47, Paras: parachains_paras::{Pallet, Call, Storage, Event, Config} = 47,
ParasInitializer: parachains_initializer::{Pallet, Call, Storage} = 48, Initializer: parachains_initializer::{Pallet, Call, Storage} = 48,
ParasDmp: parachains_dmp::{Pallet, Call, Storage} = 49, ParasDmp: parachains_dmp::{Pallet, Call, Storage} = 49,
ParasUmp: parachains_ump::{Pallet, Call, Storage, Event} = 50, ParasUmp: parachains_ump::{Pallet, Call, Storage, Event} = 50,
ParasHrmp: parachains_hrmp::{Pallet, Call, Storage, Event} = 51, ParasHrmp: parachains_hrmp::{Pallet, Call, Storage, Event} = 51,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment