difftreelog
refactor(collator-selection) shuffle pallets + add benchmarks to bench
in: master
7 files changed
Makefilediffbeforeafterboth--- a/Makefile
+++ b/Makefile
@@ -143,4 +143,4 @@
.PHONY: bench
# Disabled: bench-scheduler, bench-rmrk-core, bench-rmrk-equip
-bench: bench-evm-migration bench-unique bench-structure bench-fungible bench-refungible bench-nonfungible bench-foreign-assets
+bench: bench-evm-migration bench-unique bench-structure bench-fungible bench-refungible bench-nonfungible bench-foreign-assets bench-collator-selection bench-identity
runtime/common/construct_runtime/mod.rsdiffbeforeafterboth--- a/runtime/common/construct_runtime/mod.rs
+++ b/runtime/common/construct_runtime/mod.rs
@@ -32,20 +32,17 @@
ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Config, Storage, Inherent, Event<T>, ValidateUnsigned} = 20,
ParachainInfo: parachain_info::{Pallet, Storage, Config} = 21,
- #[runtimes(opal)]
- Authorship: pallet_authorship::{Pallet, Call, Storage} = 22,
+ Aura: pallet_aura::{Pallet, Config<T>} = 22,
+ AuraExt: cumulus_pallet_aura_ext::{Pallet, Config} = 23,
#[runtimes(opal)]
- CollatorSelection: pallet_collator_selection::{Pallet, Call, Storage, Event<T>, Config<T>} = 23,
+ Authorship: pallet_authorship::{Pallet, Call, Storage} = 24,
#[runtimes(opal)]
- Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 24,
+ CollatorSelection: pallet_collator_selection::{Pallet, Call, Storage, Event<T>, Config<T>} = 25,
- Aura: pallet_aura::{Pallet, Config<T>} = 25,
- AuraExt: cumulus_pallet_aura_ext::{Pallet, Config} = 26,
-
#[runtimes(opal)]
- Identity: pallet_identity::{Pallet, Call, Storage, Event<T>} = 27,
+ Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 26,
Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 30,
RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 31,
@@ -59,6 +56,9 @@
Tokens: orml_tokens = 39,
// Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>} = 38,
+ #[runtimes(opal)]
+ Identity: pallet_identity::{Pallet, Call, Storage, Event<T>} = 40,
+
// XCM helpers.
XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 50,
PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin} = 51,
runtime/common/data_management.rsdiffbeforeafterboth--- a/runtime/common/data_management.rs
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
-// This file is part of Unique Network.
-
-// Unique Network 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.
-
-// Unique Network 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 Unique Network. If not, see <http://www.gnu.org/licenses/>.
-
-use scale_info::TypeInfo;
-use codec::{Encode, Decode};
-use up_common::types::AccountId;
-use crate::RuntimeCall;
-
-use sp_runtime::{
- traits::{DispatchInfoOf, SignedExtension},
- transaction_validity::{
- TransactionValidity, ValidTransaction, InvalidTransaction, TransactionValidityError,
- },
-};
-
-#[derive(Debug, Encode, Decode, PartialEq, Eq, Clone, TypeInfo)]
-pub struct FilterIdentity;
-
-impl SignedExtension for FilterIdentity {
- type AccountId = AccountId;
- type Call = RuntimeCall;
- type AdditionalSigned = ();
- type Pre = ();
-
- const IDENTIFIER: &'static str = "FilterIdentity";
-
- fn additional_signed(&self) -> Result<Self::AdditionalSigned, TransactionValidityError> {
- Ok(())
- }
-
- fn pre_dispatch(
- self,
- who: &Self::AccountId,
- call: &Self::Call,
- info: &DispatchInfoOf<Self::Call>,
- len: usize,
- ) -> Result<Self::Pre, TransactionValidityError> {
- self.validate(who, call, info, len).map(|_| ())
- }
-
- fn validate(
- &self,
- _who: &Self::AccountId,
- call: &Self::Call,
- _info: &DispatchInfoOf<Self::Call>,
- _len: usize,
- ) -> TransactionValidity {
- match call {
- #[cfg(feature = "collator-selection")]
- RuntimeCall::Identity(_) => Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),
- _ => Ok(ValidTransaction::default()),
- }
- }
-}
runtime/common/identity.rsdiffbeforeafterboth--- /dev/null
+++ b/runtime/common/identity.rs
@@ -0,0 +1,67 @@
+// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
+// This file is part of Unique Network.
+
+// Unique Network 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.
+
+// Unique Network 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 Unique Network. If not, see <http://www.gnu.org/licenses/>.
+
+use scale_info::TypeInfo;
+use codec::{Encode, Decode};
+use up_common::types::AccountId;
+use crate::RuntimeCall;
+
+use sp_runtime::{
+ traits::{DispatchInfoOf, SignedExtension},
+ transaction_validity::{
+ TransactionValidity, ValidTransaction, InvalidTransaction, TransactionValidityError,
+ },
+};
+
+#[derive(Debug, Encode, Decode, PartialEq, Eq, Clone, TypeInfo)]
+pub struct DisableIdentityCalls;
+
+impl SignedExtension for DisableIdentityCalls {
+ type AccountId = AccountId;
+ type Call = RuntimeCall;
+ type AdditionalSigned = ();
+ type Pre = ();
+
+ const IDENTIFIER: &'static str = "DisableIdentityCalls";
+
+ fn additional_signed(&self) -> Result<Self::AdditionalSigned, TransactionValidityError> {
+ Ok(())
+ }
+
+ fn pre_dispatch(
+ self,
+ who: &Self::AccountId,
+ call: &Self::Call,
+ info: &DispatchInfoOf<Self::Call>,
+ len: usize,
+ ) -> Result<Self::Pre, TransactionValidityError> {
+ self.validate(who, call, info, len).map(|_| ())
+ }
+
+ fn validate(
+ &self,
+ _who: &Self::AccountId,
+ call: &Self::Call,
+ _info: &DispatchInfoOf<Self::Call>,
+ _len: usize,
+ ) -> TransactionValidity {
+ match call {
+ #[cfg(feature = "collator-selection")]
+ RuntimeCall::Identity(_) => Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),
+ _ => Ok(ValidTransaction::default()),
+ }
+ }
+}
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 data_management;20pub mod dispatch;21pub mod ethereum;22pub mod instance;23pub mod maintenance;24pub mod runtime_apis;25pub mod xcm;2627#[cfg(feature = "scheduler")]28pub mod scheduler;2930pub mod sponsoring;31pub mod weights;3233#[cfg(test)]34pub mod tests;3536use sp_core::H160;37use frame_support::{38 traits::{Currency, OnUnbalanced, Imbalance},39 weights::Weight,40};41use sp_runtime::{42 generic,43 traits::{BlakeTwo256, BlockNumberProvider},44 impl_opaque_keys,45};46use sp_std::vec::Vec;4748#[cfg(feature = "std")]49use sp_version::NativeVersion;5051use crate::{52 Runtime, RuntimeCall, Balances, Treasury, Aura, Signature, AllPalletsWithSystem,53 InherentDataExt,54};55use up_common::types::{AccountId, BlockNumber};5657#[macro_export]58macro_rules! unsupported {59 () => {60 pallet_common::unsupported!($crate::Runtime)61 };62}6364/// The address format for describing accounts.65pub type Address = sp_runtime::MultiAddress<AccountId, ()>;66/// Block header type as expected by this runtime.67pub type Header = generic::Header<BlockNumber, BlakeTwo256>;68/// Block type as expected by this runtime.69pub type Block = generic::Block<Header, UncheckedExtrinsic>;70/// A Block signed with a Justification71pub type SignedBlock = generic::SignedBlock<Block>;72/// BlockId type as expected by this runtime.73pub type BlockId = generic::BlockId<Block>;7475impl_opaque_keys! {76 pub struct SessionKeys {77 pub aura: Aura,78 }79}8081/// The version information used to identify this runtime when compiled natively.82#[cfg(feature = "std")]83pub fn native_version() -> NativeVersion {84 NativeVersion {85 runtime_version: crate::VERSION,86 can_author_with: Default::default(),87 }88}8990pub type ChargeTransactionPayment = pallet_charge_transaction::ChargeTransactionPayment<Runtime>;9192pub type SignedExtra = (93 frame_system::CheckSpecVersion<Runtime>,94 frame_system::CheckTxVersion<Runtime>,95 frame_system::CheckGenesis<Runtime>,96 frame_system::CheckEra<Runtime>,97 frame_system::CheckNonce<Runtime>,98 frame_system::CheckWeight<Runtime>,99 maintenance::CheckMaintenance,100 data_management::FilterIdentity,101 ChargeTransactionPayment,102 //pallet_contract_helpers::ContractHelpersExtension<Runtime>,103 pallet_ethereum::FakeTransactionFinalizer<Runtime>,104);105106/// Unchecked extrinsic type as expected by this runtime.107pub type UncheckedExtrinsic =108 fp_self_contained::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;109110/// Extrinsic type that has already been checked.111pub type CheckedExtrinsic =112 fp_self_contained::CheckedExtrinsic<AccountId, RuntimeCall, SignedExtra, H160>;113114/// Executive: handles dispatch to the various modules.115pub type Executive = frame_executive::Executive<116 Runtime,117 Block,118 frame_system::ChainContext<Runtime>,119 Runtime,120 AllPalletsWithSystem,121 AuraToCollatorSelection,122>;123124type NegativeImbalance = <Balances as Currency<AccountId>>::NegativeImbalance;125126pub struct DealWithFees;127impl OnUnbalanced<NegativeImbalance> for DealWithFees {128 fn on_unbalanceds<B>(mut fees_then_tips: impl Iterator<Item = NegativeImbalance>) {129 if let Some(fees) = fees_then_tips.next() {130 // for fees, 100% to treasury131 let mut split = fees.ration(100, 0);132 if let Some(tips) = fees_then_tips.next() {133 // for tips, if any, 100% to treasury134 tips.ration_merge_into(100, 0, &mut split);135 }136 Treasury::on_unbalanced(split.0);137 // Author::on_unbalanced(split.1);138 }139 }140}141142pub struct RelayChainBlockNumberProvider<T>(sp_std::marker::PhantomData<T>);143144impl<T: cumulus_pallet_parachain_system::Config> BlockNumberProvider145 for RelayChainBlockNumberProvider<T>146{147 type BlockNumber = BlockNumber;148149 fn current_block_number() -> Self::BlockNumber {150 cumulus_pallet_parachain_system::Pallet::<T>::validation_data()151 .map(|d| d.relay_parent_number)152 .unwrap_or_default()153 }154 #[cfg(feature = "runtime-benchmarks")]155 fn set_block_number(block: Self::BlockNumber) {156 cumulus_pallet_parachain_system::RelaychainBlockNumberProvider::<T>::set_block_number(block)157 }158}159160pub(crate) struct CheckInherents;161162impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {163 fn check_inherents(164 block: &Block,165 relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,166 ) -> sp_inherents::CheckInherentsResult {167 let relay_chain_slot = relay_state_proof168 .read_slot()169 .expect("Could not read the relay chain slot from the proof");170171 let inherent_data =172 cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration(173 relay_chain_slot,174 sp_std::time::Duration::from_secs(6),175 )176 .create_inherent_data()177 .expect("Could not create the timestamp inherent data");178179 inherent_data.check_extrinsics(block)180 }181}182183#[derive(codec::Encode, codec::Decode)]184pub enum XCMPMessage<XAccountId, XBalance> {185 /// Transfer tokens to the given account from the Parachain account.186 TransferToken(XAccountId, XBalance),187}188189pub struct AuraToCollatorSelection;190impl frame_support::traits::OnRuntimeUpgrade for AuraToCollatorSelection {191 fn on_runtime_upgrade() -> Weight {192 #[cfg(feature = "collator-selection")]193 {194 use frame_support::{BoundedVec, storage::migration};195 use sp_runtime::{traits::OpaqueKeys, RuntimeAppPublic};196 use pallet_session::SessionManager;197 use crate::config::pallets::MaxCollators;198199 let mut weight = <Runtime as frame_system::Config>::DbWeight::get().reads(1);200201 let version = migration::get_storage_value::<()>(202 b"AuraToCollatorSelection",203 b"StorageVersion",204 &[],205 );206207 let should_upgrade = match version {208 None => true,209 Some(_) => false,210 };211212 if should_upgrade {213 log::info!(214 target: "runtime::aura_to_collator_selection",215 "Running migration of Aura authorities to Collator Selection invulnerables"216 );217218 let invulnerables = pallet_aura::Pallet::<Runtime>::authorities()219 .iter()220 .cloned()221 .filter_map(|authority_id| {222 weight.saturating_accrue(<Runtime as frame_system::Config>::DbWeight::get().reads_writes(1, 1));223 let vec = authority_id.clone().to_raw_vec();224 let slice = vec.as_slice();225 let array: Option<[u8; 32]> = match slice.try_into() {226 Ok(a) => Some(a),227 Err(_) => {228 log::error!("Failed to convert an Aura authority to a Collator Selection invulnerable: {:?}", authority_id);229 None230 },231 };232 array.map(|a| (AccountId::from(a), authority_id))233 })234 .collect::<Vec<_>>();235236 let bounded_invulnerables = BoundedVec::<_, MaxCollators>::try_from(237 invulnerables238 .iter()239 .cloned()240 .map(|(acc, _)| acc)241 .collect::<Vec<_>>(),242 )243 .expect("Existing collators/invulnerables are more than MaxCollators");244245 <pallet_collator_selection::Invulnerables<Runtime>>::put(bounded_invulnerables);246247 let keys = invulnerables248 .into_iter()249 .map(|(acc, aura)| {250 (251 acc.clone(), // account id252 acc, // validator id253 SessionKeys { aura: aura.clone() }, // session keys254 )255 })256 .collect::<Vec<_>>();257258 for (account, val, keys) in keys.iter().cloned() {259 for id in <Runtime as pallet_session::Config>::Keys::key_ids() {260 <pallet_session::KeyOwner<Runtime>>::insert((*id, keys.get_raw(*id)), &val)261 }262 <pallet_session::NextKeys<Runtime>>::insert(&val, &keys);263 // todo exercise caution, the following is taken from genesis264 if frame_system::Pallet::<Runtime>::inc_consumers_without_limit(&account)265 .is_err()266 {267 log::warn!(268 "We have entered an error with incrementing consumers without limit during the migration"269 );270 // This will leak a provider reference, however it only happens once (at271 // genesis) so it's really not a big deal and we assume that the user wants to272 // do this since it's the only way a non-endowed account can contain a session273 // key.274 frame_system::Pallet::<Runtime>::inc_providers(&account);275 }276 }277278 let initial_validators_0 =279 <Runtime as pallet_session::Config>::SessionManager::new_session(0)280 .unwrap_or_else(|| {281 frame_support::print(282 "No initial validator provided by `SessionManager`, use \283 session config keys to generate initial validator set.",284 );285 keys.iter().map(|x| x.1.clone()).collect()286 });287 /*assert!(288 !initial_validators_0.is_empty(),289 "Empty validator set for session 0 in (pseudo) genesis block!"290 );*/291292 let initial_validators_1 =293 <Runtime as pallet_session::Config>::SessionManager::new_session(1)294 .unwrap_or_else(|| initial_validators_0.clone());295 /*assert!(296 !initial_validators_1.is_empty(),297 "Empty validator set for session 1 in (pseudo) genesis block!"298 );*/299300 let queued_keys: Vec<_> = initial_validators_1301 .iter()302 .cloned()303 .map(|v| {304 (305 v.clone(),306 <pallet_session::NextKeys<Runtime>>::get(&v)307 .expect("Validator in session 1 missing keys!"),308 )309 })310 .collect();311312 // Tell everyone about the genesis session keys -- Aura must've already initialized it313 //<Runtime as pallet_session::Config>::SessionHandler::on_genesis_session::<<Runtime as pallet_session::Config>::Keys>(&queued_keys);314315 <pallet_session::Validators<Runtime>>::put(initial_validators_0);316 <pallet_session::QueuedKeys<Runtime>>::put(queued_keys);317318 <Runtime as pallet_session::Config>::SessionManager::start_session(0);319320 log::info!(321 target: "runtime::aura_to_collator_selection",322 "Migration of Aura authorities to Collator Selection invulnerables is complete."323 );324325 migration::put_storage_value::<()>(326 b"AuraToCollatorSelection",327 b"StorageVersion",328 &[],329 (),330 );331332 weight += <Runtime as frame_system::Config>::DbWeight::get().writes(1)333 } else {334 log::info!(335 target: "runtime::aura_to_collator_selection",336 "The storage migration has already been flagged as complete. No migration needs to be done.",337 );338 }339340 weight341 }342343 #[cfg(not(feature = "collator-selection"))]344 {345 Weight::zero()346 }347 }348}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;25pub mod xcm;2627#[cfg(feature = "scheduler")]28pub mod scheduler;2930pub mod sponsoring;31pub mod weights;3233#[cfg(test)]34pub mod tests;3536use sp_core::H160;37use frame_support::{38 traits::{Currency, OnUnbalanced, Imbalance},39 weights::Weight,40};41use sp_runtime::{42 generic,43 traits::{BlakeTwo256, BlockNumberProvider},44 impl_opaque_keys,45};46use sp_std::vec::Vec;4748#[cfg(feature = "std")]49use sp_version::NativeVersion;5051use crate::{52 Runtime, RuntimeCall, Balances, Treasury, Aura, Signature, AllPalletsWithSystem,53 InherentDataExt,54};55use up_common::types::{AccountId, BlockNumber};5657#[macro_export]58macro_rules! unsupported {59 () => {60 pallet_common::unsupported!($crate::Runtime)61 };62}6364/// The address format for describing accounts.65pub type Address = sp_runtime::MultiAddress<AccountId, ()>;66/// Block header type as expected by this runtime.67pub type Header = generic::Header<BlockNumber, BlakeTwo256>;68/// Block type as expected by this runtime.69pub type Block = generic::Block<Header, UncheckedExtrinsic>;70/// A Block signed with a Justification71pub type SignedBlock = generic::SignedBlock<Block>;72/// BlockId type as expected by this runtime.73pub type BlockId = generic::BlockId<Block>;7475impl_opaque_keys! {76 pub struct SessionKeys {77 pub aura: Aura,78 }79}8081/// The version information used to identify this runtime when compiled natively.82#[cfg(feature = "std")]83pub fn native_version() -> NativeVersion {84 NativeVersion {85 runtime_version: crate::VERSION,86 can_author_with: Default::default(),87 }88}8990pub type ChargeTransactionPayment = pallet_charge_transaction::ChargeTransactionPayment<Runtime>;9192pub type SignedExtra = (93 frame_system::CheckSpecVersion<Runtime>,94 frame_system::CheckTxVersion<Runtime>,95 frame_system::CheckGenesis<Runtime>,96 frame_system::CheckEra<Runtime>,97 frame_system::CheckNonce<Runtime>,98 frame_system::CheckWeight<Runtime>,99 maintenance::CheckMaintenance,100 identity::DisableIdentityCalls,101 ChargeTransactionPayment,102 //pallet_contract_helpers::ContractHelpersExtension<Runtime>,103 pallet_ethereum::FakeTransactionFinalizer<Runtime>,104);105106/// Unchecked extrinsic type as expected by this runtime.107pub type UncheckedExtrinsic =108 fp_self_contained::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;109110/// Extrinsic type that has already been checked.111pub type CheckedExtrinsic =112 fp_self_contained::CheckedExtrinsic<AccountId, RuntimeCall, SignedExtra, H160>;113114/// Executive: handles dispatch to the various modules.115pub type Executive = frame_executive::Executive<116 Runtime,117 Block,118 frame_system::ChainContext<Runtime>,119 Runtime,120 AllPalletsWithSystem,121 AuraToCollatorSelection,122>;123124type NegativeImbalance = <Balances as Currency<AccountId>>::NegativeImbalance;125126pub struct DealWithFees;127impl OnUnbalanced<NegativeImbalance> for DealWithFees {128 fn on_unbalanceds<B>(mut fees_then_tips: impl Iterator<Item = NegativeImbalance>) {129 if let Some(fees) = fees_then_tips.next() {130 // for fees, 100% to treasury131 let mut split = fees.ration(100, 0);132 if let Some(tips) = fees_then_tips.next() {133 // for tips, if any, 100% to treasury134 tips.ration_merge_into(100, 0, &mut split);135 }136 Treasury::on_unbalanced(split.0);137 // Author::on_unbalanced(split.1);138 }139 }140}141142pub struct RelayChainBlockNumberProvider<T>(sp_std::marker::PhantomData<T>);143144impl<T: cumulus_pallet_parachain_system::Config> BlockNumberProvider145 for RelayChainBlockNumberProvider<T>146{147 type BlockNumber = BlockNumber;148149 fn current_block_number() -> Self::BlockNumber {150 cumulus_pallet_parachain_system::Pallet::<T>::validation_data()151 .map(|d| d.relay_parent_number)152 .unwrap_or_default()153 }154 #[cfg(feature = "runtime-benchmarks")]155 fn set_block_number(block: Self::BlockNumber) {156 cumulus_pallet_parachain_system::RelaychainBlockNumberProvider::<T>::set_block_number(block)157 }158}159160pub(crate) struct CheckInherents;161162impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {163 fn check_inherents(164 block: &Block,165 relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,166 ) -> sp_inherents::CheckInherentsResult {167 let relay_chain_slot = relay_state_proof168 .read_slot()169 .expect("Could not read the relay chain slot from the proof");170171 let inherent_data =172 cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration(173 relay_chain_slot,174 sp_std::time::Duration::from_secs(6),175 )176 .create_inherent_data()177 .expect("Could not create the timestamp inherent data");178179 inherent_data.check_extrinsics(block)180 }181}182183#[derive(codec::Encode, codec::Decode)]184pub enum XCMPMessage<XAccountId, XBalance> {185 /// Transfer tokens to the given account from the Parachain account.186 TransferToken(XAccountId, XBalance),187}188189pub struct AuraToCollatorSelection;190impl frame_support::traits::OnRuntimeUpgrade for AuraToCollatorSelection {191 fn on_runtime_upgrade() -> Weight {192 #[cfg(feature = "collator-selection")]193 {194 use frame_support::{BoundedVec, storage::migration};195 use sp_runtime::{traits::OpaqueKeys, RuntimeAppPublic};196 use pallet_session::SessionManager;197 use crate::config::pallets::MaxCollators;198199 let mut weight = <Runtime as frame_system::Config>::DbWeight::get().reads(1);200201 let version = migration::get_storage_value::<()>(202 b"AuraToCollatorSelection",203 b"StorageVersion",204 &[],205 );206207 let should_upgrade = match version {208 None => true,209 Some(_) => false,210 };211212 if should_upgrade {213 log::info!(214 target: "runtime::aura_to_collator_selection",215 "Running migration of Aura authorities to Collator Selection invulnerables"216 );217218 let invulnerables = pallet_aura::Pallet::<Runtime>::authorities()219 .iter()220 .cloned()221 .filter_map(|authority_id| {222 weight.saturating_accrue(<Runtime as frame_system::Config>::DbWeight::get().reads_writes(1, 1));223 let vec = authority_id.clone().to_raw_vec();224 let slice = vec.as_slice();225 let array: Option<[u8; 32]> = match slice.try_into() {226 Ok(a) => Some(a),227 Err(_) => {228 log::error!("Failed to convert an Aura authority to a Collator Selection invulnerable: {:?}", authority_id);229 None230 },231 };232 array.map(|a| (AccountId::from(a), authority_id))233 })234 .collect::<Vec<_>>();235236 let bounded_invulnerables = BoundedVec::<_, MaxCollators>::try_from(237 invulnerables238 .iter()239 .cloned()240 .map(|(acc, _)| acc)241 .collect::<Vec<_>>(),242 )243 .expect("Existing collators/invulnerables are more than MaxCollators");244245 <pallet_collator_selection::Invulnerables<Runtime>>::put(bounded_invulnerables);246247 let keys = invulnerables248 .into_iter()249 .map(|(acc, aura)| {250 (251 acc.clone(), // account id252 acc, // validator id253 SessionKeys { aura: aura.clone() }, // session keys254 )255 })256 .collect::<Vec<_>>();257258 for (account, val, keys) in keys.iter().cloned() {259 for id in <Runtime as pallet_session::Config>::Keys::key_ids() {260 <pallet_session::KeyOwner<Runtime>>::insert((*id, keys.get_raw(*id)), &val)261 }262 <pallet_session::NextKeys<Runtime>>::insert(&val, &keys);263 // todo exercise caution, the following is taken from genesis264 if frame_system::Pallet::<Runtime>::inc_consumers_without_limit(&account)265 .is_err()266 {267 log::warn!(268 "We have entered an error with incrementing consumers without limit during the migration"269 );270 // This will leak a provider reference, however it only happens once (at271 // genesis) so it's really not a big deal and we assume that the user wants to272 // do this since it's the only way a non-endowed account can contain a session273 // key.274 frame_system::Pallet::<Runtime>::inc_providers(&account);275 }276 }277278 let initial_validators_0 =279 <Runtime as pallet_session::Config>::SessionManager::new_session(0)280 .unwrap_or_else(|| {281 frame_support::print(282 "No initial validator provided by `SessionManager`, use \283 session config keys to generate initial validator set.",284 );285 keys.iter().map(|x| x.1.clone()).collect()286 });287 /*assert!(288 !initial_validators_0.is_empty(),289 "Empty validator set for session 0 in (pseudo) genesis block!"290 );*/291292 let initial_validators_1 =293 <Runtime as pallet_session::Config>::SessionManager::new_session(1)294 .unwrap_or_else(|| initial_validators_0.clone());295 /*assert!(296 !initial_validators_1.is_empty(),297 "Empty validator set for session 1 in (pseudo) genesis block!"298 );*/299300 let queued_keys: Vec<_> = initial_validators_1301 .iter()302 .cloned()303 .map(|v| {304 (305 v.clone(),306 <pallet_session::NextKeys<Runtime>>::get(&v)307 .expect("Validator in session 1 missing keys!"),308 )309 })310 .collect();311312 // Tell everyone about the genesis session keys -- Aura must've already initialized it313 //<Runtime as pallet_session::Config>::SessionHandler::on_genesis_session::<<Runtime as pallet_session::Config>::Keys>(&queued_keys);314315 <pallet_session::Validators<Runtime>>::put(initial_validators_0);316 <pallet_session::QueuedKeys<Runtime>>::put(queued_keys);317318 <Runtime as pallet_session::Config>::SessionManager::start_session(0);319320 log::info!(321 target: "runtime::aura_to_collator_selection",322 "Migration of Aura authorities to Collator Selection invulnerables is complete."323 );324325 migration::put_storage_value::<()>(326 b"AuraToCollatorSelection",327 b"StorageVersion",328 &[],329 (),330 );331332 weight += <Runtime as frame_system::Config>::DbWeight::get().writes(1)333 } else {334 log::info!(335 target: "runtime::aura_to_collator_selection",336 "The storage migration has already been flagged as complete. No migration needs to be done.",337 );338 }339340 weight341 }342343 #[cfg(not(feature = "collator-selection"))]344 {345 Weight::zero()346 }347 }348}tests/src/.outdated/substrate/substrate-api.tsdiffbeforeafterboth--- a/tests/src/.outdated/substrate/substrate-api.ts
+++ b/tests/src/.outdated/substrate/substrate-api.ts
@@ -41,7 +41,7 @@
extrinsic: {},
payload: {},
},
- FilterIdentity: {
+ DisableIdentityCalls: {
extrinsic: {},
payload: {},
},
tests/src/util/playgrounds/unique.dev.tsdiffbeforeafterboth--- a/tests/src/util/playgrounds/unique.dev.ts
+++ b/tests/src/util/playgrounds/unique.dev.ts
@@ -93,7 +93,7 @@
extrinsic: {},
payload: {},
},
- FilterIdentity: {
+ DisableIdentityCalls: {
extrinsic: {},
payload: {},
},