difftreelog
feat(collator-selection) initial post-pallet-transmigration commit + minor refactoring
in: master
14 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5780,21 +5780,27 @@
[[package]]
name = "pallet-collator-selection"
version = "3.0.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328"
dependencies = [
"frame-benchmarking",
"frame-support",
"frame-system",
"log",
+ "pallet-aura",
"pallet-authorship",
+ "pallet-balances",
"pallet-session",
+ "pallet-timestamp",
"parity-scale-codec 3.2.1",
"rand 0.8.5",
"scale-info",
"serde",
+ "sp-consensus-aura",
+ "sp-core",
+ "sp-io",
"sp-runtime",
"sp-staking",
"sp-std",
+ "sp-tracing",
]
[[package]]
node/cli/src/chain_spec.rsdiffbeforeafterboth--- a/node/cli/src/chain_spec.rs
+++ b/node/cli/src/chain_spec.rs
@@ -24,7 +24,7 @@
use serde_json::map::Map;
use up_common::types::opaque::*;
-use up_common::constants::CANDIDACY_BOND;
+use up_common::constants::GENESIS_CANDIDACY_BOND;
#[cfg(feature = "unique-runtime")]
pub use unique_runtime as default_runtime;
@@ -192,7 +192,7 @@
.cloned()
.map(|(acc, _)| acc)
.collect(),
- candidacy_bond: CANDIDACY_BOND,
+ candidacy_bond: GENESIS_CANDIDACY_BOND,
..Default::default()
},
session: SessionConfig {
pallets/collator-selection/CHANGELOG.mddiffbeforeafterboth--- /dev/null
+++ b/pallets/collator-selection/CHANGELOG.md
@@ -0,0 +1,5 @@
+## [3.0.0] - 2022-10-28
+
+### Added
+
+ - Entire functionality moved over from cumulus/pallet-collator-selection (v3.0.0).
\ No newline at end of file
pallets/collator-selection/Cargo.tomldiffbeforeafterboth--- /dev/null
+++ b/pallets/collator-selection/Cargo.toml
@@ -0,0 +1,63 @@
+[package]
+name = "pallet-collator-selection"
+version = "3.0.0"
+description = "Simple staking pallet with a fixed stake."
+authors = ["Unique Network <support@uniquenetwork.io>"]
+edition = "2021"
+homepage = "https://unique.network"
+repository = "https://github.com/UniqueNetwork/unique-chain"
+license = "GPLv3"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+log = { version = "0.4.17", default-features = false }
+codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.0.0" }
+rand = { version = "0.8.5", features = ["std_rng"], default-features = false }
+scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
+serde = { version = "1.0.145", default-features = false }
+
+sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+sp-staking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+
+frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+
+[dev-dependencies]
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+
+[features]
+default = ["std"]
+runtime-benchmarks = [
+ "frame-benchmarking/runtime-benchmarks",
+ "frame-support/runtime-benchmarks",
+ "frame-system/runtime-benchmarks",
+]
+std = [
+ "codec/std",
+ "log/std",
+ "scale-info/std",
+ "rand/std",
+ "sp-runtime/std",
+ "sp-staking/std",
+ "sp-std/std",
+ "frame-support/std",
+ "frame-system/std",
+ "frame-benchmarking/std",
+ "pallet-authorship/std",
+ "pallet-session/std",
+]
+
+try-runtime = [ "frame-support/try-runtime" ]
pallets/collator-selection/src/benchmarking.rsdiffbeforeafterboth--- /dev/null
+++ b/pallets/collator-selection/src/benchmarking.rs
@@ -0,0 +1,275 @@
+// 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/>.
+
+// Original license:
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Benchmarking setup for pallet-collator-selection
+
+use super::*;
+
+#[allow(unused)]
+use crate::Pallet as CollatorSelection;
+use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, whitelisted_caller};
+use frame_support::{
+ assert_ok,
+ codec::Decode,
+ traits::{Currency, EnsureOrigin, Get},
+};
+use frame_system::{EventRecord, RawOrigin};
+use pallet_authorship::EventHandler;
+use pallet_session::{self as session, SessionManager};
+use sp_std::prelude::*;
+
+pub type BalanceOf<T> =
+ <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+
+const SEED: u32 = 0;
+
+// TODO: remove if this is given in substrate commit.
+macro_rules! whitelist {
+ ($acc:ident) => {
+ frame_benchmarking::benchmarking::add_to_whitelist(
+ frame_system::Account::<T>::hashed_key_for(&$acc).into(),
+ );
+ };
+}
+
+fn assert_last_event<T: Config>(generic_event: <T as Config>::RuntimeEvent) {
+ let events = frame_system::Pallet::<T>::events();
+ let system_event: <T as frame_system::Config>::RuntimeEvent = generic_event.into();
+ // compare to the last event record
+ let EventRecord { event, .. } = &events[events.len() - 1];
+ assert_eq!(event, &system_event);
+}
+
+fn create_funded_user<T: Config>(
+ string: &'static str,
+ n: u32,
+ balance_factor: u32,
+) -> T::AccountId {
+ let user = account(string, n, SEED);
+ let balance = T::Currency::minimum_balance() * balance_factor.into();
+ let _ = T::Currency::make_free_balance_be(&user, balance);
+ user
+}
+
+fn keys<T: Config + session::Config>(c: u32) -> <T as session::Config>::Keys {
+ use rand::{RngCore, SeedableRng};
+
+ let keys = {
+ let mut keys = [0u8; 128];
+
+ if c > 0 {
+ let mut rng = rand::rngs::StdRng::seed_from_u64(c as u64);
+ rng.fill_bytes(&mut keys);
+ }
+
+ keys
+ };
+
+ Decode::decode(&mut &keys[..]).unwrap()
+}
+
+fn validator<T: Config + session::Config>(c: u32) -> (T::AccountId, <T as session::Config>::Keys) {
+ (create_funded_user::<T>("candidate", c, 1000), keys::<T>(c))
+}
+
+fn register_validators<T: Config + session::Config>(count: u32) -> Vec<T::AccountId> {
+ let validators = (0..count).map(|c| validator::<T>(c)).collect::<Vec<_>>();
+
+ for (who, keys) in validators.clone() {
+ <session::Pallet<T>>::set_keys(RawOrigin::Signed(who).into(), keys, Vec::new()).unwrap();
+ }
+
+ validators.into_iter().map(|(who, _)| who).collect()
+}
+
+fn register_candidates<T: Config>(count: u32) {
+ let candidates = (0..count).map(|c| account("candidate", c, SEED)).collect::<Vec<_>>();
+ assert!(<CandidacyBond<T>>::get() > 0u32.into(), "Bond cannot be zero!");
+
+ for who in candidates {
+ T::Currency::make_free_balance_be(&who, <CandidacyBond<T>>::get() * 2u32.into());
+ <CollatorSelection<T>>::register_as_candidate(RawOrigin::Signed(who).into()).unwrap();
+ }
+}
+
+benchmarks! {
+ where_clause { where T: pallet_authorship::Config + session::Config }
+
+ set_invulnerables {
+ let b in 1 .. T::MaxInvulnerables::get();
+ let new_invulnerables = register_validators::<T>(b);
+ let origin = T::UpdateOrigin::successful_origin();
+ }: {
+ assert_ok!(
+ <CollatorSelection<T>>::set_invulnerables(origin, new_invulnerables.clone())
+ );
+ }
+ verify {
+ assert_last_event::<T>(Event::NewInvulnerables{invulnerables: new_invulnerables}.into());
+ }
+
+ set_desired_candidates {
+ let max: u32 = 999;
+ let origin = T::UpdateOrigin::successful_origin();
+ }: {
+ assert_ok!(
+ <CollatorSelection<T>>::set_desired_candidates(origin, max.clone())
+ );
+ }
+ verify {
+ assert_last_event::<T>(Event::NewDesiredCandidates{desired_candidates: max}.into());
+ }
+
+ set_candidacy_bond {
+ let bond_amount: BalanceOf<T> = T::Currency::minimum_balance() * 10u32.into();
+ let origin = T::UpdateOrigin::successful_origin();
+ }: {
+ assert_ok!(
+ <CollatorSelection<T>>::set_candidacy_bond(origin, bond_amount.clone())
+ );
+ }
+ verify {
+ assert_last_event::<T>(Event::NewCandidacyBond{bond_amount}.into());
+ }
+
+ // worse case is when we have all the max-candidate slots filled except one, and we fill that
+ // one.
+ register_as_candidate {
+ let c in 1 .. T::MaxCandidates::get();
+
+ <CandidacyBond<T>>::put(T::Currency::minimum_balance());
+ <DesiredCandidates<T>>::put(c + 1);
+
+ register_validators::<T>(c);
+ register_candidates::<T>(c);
+
+ let caller: T::AccountId = whitelisted_caller();
+ let bond: BalanceOf<T> = T::Currency::minimum_balance() * 2u32.into();
+ T::Currency::make_free_balance_be(&caller, bond.clone());
+
+ <session::Pallet<T>>::set_keys(
+ RawOrigin::Signed(caller.clone()).into(),
+ keys::<T>(c + 1),
+ Vec::new()
+ ).unwrap();
+
+ }: _(RawOrigin::Signed(caller.clone()))
+ verify {
+ assert_last_event::<T>(Event::CandidateAdded{account_id: caller, deposit: bond / 2u32.into()}.into());
+ }
+
+ // worse case is the last candidate leaving.
+ leave_intent {
+ let c in (T::MinCandidates::get() + 1) .. T::MaxCandidates::get();
+ <CandidacyBond<T>>::put(T::Currency::minimum_balance());
+ <DesiredCandidates<T>>::put(c);
+
+ register_validators::<T>(c);
+ register_candidates::<T>(c);
+
+ let leaving = <Candidates<T>>::get().last().unwrap().who.clone();
+ whitelist!(leaving);
+ }: _(RawOrigin::Signed(leaving.clone()))
+ verify {
+ assert_last_event::<T>(Event::CandidateRemoved{account_id: leaving}.into());
+ }
+
+ // worse case is paying a non-existing candidate account.
+ note_author {
+ <CandidacyBond<T>>::put(T::Currency::minimum_balance());
+ T::Currency::make_free_balance_be(
+ &<CollatorSelection<T>>::account_id(),
+ T::Currency::minimum_balance() * 4u32.into(),
+ );
+ let author = account("author", 0, SEED);
+ let new_block: T::BlockNumber = 10u32.into();
+
+ frame_system::Pallet::<T>::set_block_number(new_block);
+ assert!(T::Currency::free_balance(&author) == 0u32.into());
+ }: {
+ <CollatorSelection<T> as EventHandler<_, _>>::note_author(author.clone())
+ } verify {
+ assert!(T::Currency::free_balance(&author) > 0u32.into());
+ assert_eq!(frame_system::Pallet::<T>::block_number(), new_block);
+ }
+
+ // worst case for new session.
+ new_session {
+ let r in 1 .. T::MaxCandidates::get();
+ let c in 1 .. T::MaxCandidates::get();
+
+ <CandidacyBond<T>>::put(T::Currency::minimum_balance());
+ <DesiredCandidates<T>>::put(c);
+ frame_system::Pallet::<T>::set_block_number(0u32.into());
+
+ register_validators::<T>(c);
+ register_candidates::<T>(c);
+
+ let new_block: T::BlockNumber = 1800u32.into();
+ let zero_block: T::BlockNumber = 0u32.into();
+ let candidates = <Candidates<T>>::get();
+
+ let non_removals = c.saturating_sub(r);
+
+ for i in 0..c {
+ <LastAuthoredBlock<T>>::insert(candidates[i as usize].who.clone(), zero_block);
+ }
+
+ if non_removals > 0 {
+ for i in 0..non_removals {
+ <LastAuthoredBlock<T>>::insert(candidates[i as usize].who.clone(), new_block);
+ }
+ } else {
+ for i in 0..c {
+ <LastAuthoredBlock<T>>::insert(candidates[i as usize].who.clone(), new_block);
+ }
+ }
+
+ let pre_length = <Candidates<T>>::get().len();
+
+ frame_system::Pallet::<T>::set_block_number(new_block);
+
+ assert!(<Candidates<T>>::get().len() == c as usize);
+ }: {
+ <CollatorSelection<T> as SessionManager<_>>::new_session(0)
+ } verify {
+ if c > r && non_removals >= T::MinCandidates::get() {
+ assert!(<Candidates<T>>::get().len() < pre_length);
+ } else if c > r && non_removals < T::MinCandidates::get() {
+ assert!(<Candidates<T>>::get().len() == T::MinCandidates::get() as usize);
+ } else {
+ assert!(<Candidates<T>>::get().len() == pre_length);
+ }
+ }
+}
+
+impl_benchmark_test_suite!(CollatorSelection, crate::mock::new_test_ext(), crate::mock::Test,);
pallets/collator-selection/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// Original license:18// Copyright (C) 2021 Parity Technologies (UK) Ltd.19// SPDX-License-Identifier: Apache-2.02021// Licensed under the Apache License, Version 2.0 (the "License");22// you may not use this file except in compliance with the License.23// You may obtain a copy of the License at24//25// http://www.apache.org/licenses/LICENSE-2.026//27// Unless required by applicable law or agreed to in writing, software28// distributed under the License is distributed on an "AS IS" BASIS,29// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.30// See the License for the specific language governing permissions and31// limitations under the License.3233//! Collator Selection pallet.34//!35//! A pallet to manage collators in a parachain.36//!37//! ## Overview38//!39//! The Collator Selection pallet manages the collators of a parachain. **Collation is _not_ a40//! secure activity** and this pallet does not implement any game-theoretic mechanisms to meet BFT41//! safety assumptions of the chosen set.42//!43//! ## Terminology44//!45//! - Collator: A parachain block producer.46//! - Bond: An amount of `Balance` _reserved_ for candidate registration.47//! - Invulnerable: An account guaranteed to be in the collator set.48//!49//! ## Implementation50//!51//! The final `Collators` are aggregated from two individual lists:52//!53//! 1. [`Invulnerables`]: a set of collators appointed by governance. These accounts will always be54//! collators.55//! 2. [`Candidates`]: these are *candidates to the collation task* and may or may not be elected as56//! a final collator.57//!58//! The current implementation resolves congestion of [`Candidates`] in a first-come-first-serve59//! manner.60//!61//! Candidates will not be allowed to get kicked or leave_intent if the total number of candidates62//! fall below MinCandidates. This is for potential disaster recovery scenarios.63//!64//! ### Rewards65//!66//! The Collator Selection pallet maintains an on-chain account (the "Pot"). In each block, the67//! collator who authored it receives:68//!69//! - Half the value of the Pot.70//! - Half the value of the transaction fees within the block. The other half of the transaction71//! fees are deposited into the Pot.72//!73//! To initiate rewards an ED needs to be transferred to the pot address.74//!75//! Note: Eventually the Pot distribution may be modified as discussed in76//! [this issue](https://github.com/paritytech/statemint/issues/21#issuecomment-810481073).7778#![cfg_attr(not(feature = "std"), no_std)]7980pub use pallet::*;8182#[cfg(test)]83mod mock;8485#[cfg(test)]86mod tests;8788#[cfg(feature = "runtime-benchmarks")]89mod benchmarking;90pub mod weights;9192#[frame_support::pallet]93pub mod pallet {94 pub use crate::weights::WeightInfo;95 use core::ops::Div;96 use frame_support::{97 dispatch::{DispatchClass, DispatchResultWithPostInfo},98 inherent::Vec,99 pallet_prelude::*,100 sp_runtime::{101 traits::{AccountIdConversion, CheckedSub, Saturating, Zero},102 RuntimeDebug,103 },104 traits::{105 Currency, EnsureOrigin, ExistenceRequirement::KeepAlive, ReservableCurrency,106 ValidatorRegistration,107 },108 BoundedVec, PalletId,109 };110 use frame_system::{pallet_prelude::*, Config as SystemConfig};111 use pallet_session::SessionManager;112 use sp_runtime::traits::Convert;113 use sp_staking::SessionIndex;114115 type BalanceOf<T> =116 <<T as Config>::Currency as Currency<<T as SystemConfig>::AccountId>>::Balance;117118 /// A convertor from collators id. Since this pallet does not have stash/controller, this is119 /// just identity.120 pub struct IdentityCollator;121 impl<T> sp_runtime::traits::Convert<T, Option<T>> for IdentityCollator {122 fn convert(t: T) -> Option<T> {123 Some(t)124 }125 }126127 /// Configure the pallet by specifying the parameters and types on which it depends.128 #[pallet::config]129 pub trait Config: frame_system::Config {130 /// Overarching event type.131 type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;132133 /// The currency mechanism.134 type Currency: ReservableCurrency<Self::AccountId>;135136 /// Origin that can dictate updating parameters of this pallet.137 type UpdateOrigin: EnsureOrigin<Self::RuntimeOrigin>;138139 /// Account Identifier from which the internal Pot is generated.140 type PotId: Get<PalletId>;141142 /// Maximum number of candidates that we should have. This is enforced in code.143 ///144 /// This does not take into account the invulnerables.145 type MaxCandidates: Get<u32>;146147 /// Minimum number of candidates that we should have. This is used for disaster recovery.148 ///149 /// This does not take into account the invulnerables.150 type MinCandidates: Get<u32>;151152 /// Maximum number of invulnerables. This is enforced in code.153 type MaxInvulnerables: Get<u32>;154155 // Will be kicked if block is not produced in threshold.156 type KickThreshold: Get<Self::BlockNumber>;157158 /// A stable ID for a validator.159 type ValidatorId: Member + Parameter;160161 /// A conversion from account ID to validator ID.162 ///163 /// Its cost must be at most one storage read.164 type ValidatorIdOf: Convert<Self::AccountId, Option<Self::ValidatorId>>;165166 /// Validate a user is registered167 type ValidatorRegistration: ValidatorRegistration<Self::ValidatorId>;168169 /// The weight information of this pallet.170 type WeightInfo: WeightInfo;171 }172173 /// Basic information about a collation candidate.174 #[derive(175 PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, scale_info::TypeInfo, MaxEncodedLen,176 )]177 pub struct CandidateInfo<AccountId, Balance> {178 /// Account identifier.179 pub who: AccountId,180 /// Reserved deposit.181 pub deposit: Balance,182 }183184 #[pallet::pallet]185 #[pallet::generate_store(pub(super) trait Store)]186 pub struct Pallet<T>(_);187188 /// The invulnerable, fixed collators.189 #[pallet::storage]190 #[pallet::getter(fn invulnerables)]191 pub type Invulnerables<T: Config> =192 StorageValue<_, BoundedVec<T::AccountId, T::MaxInvulnerables>, ValueQuery>;193194 /// The (community, limited) collation candidates.195 #[pallet::storage]196 #[pallet::getter(fn candidates)]197 pub type Candidates<T: Config> = StorageValue<198 _,199 BoundedVec<CandidateInfo<T::AccountId, BalanceOf<T>>, T::MaxCandidates>,200 ValueQuery,201 >;202203 /// Last block authored by collator.204 #[pallet::storage]205 #[pallet::getter(fn last_authored_block)]206 pub type LastAuthoredBlock<T: Config> =207 StorageMap<_, Twox64Concat, T::AccountId, T::BlockNumber, ValueQuery>;208209 /// Desired number of candidates.210 ///211 /// This should ideally always be less than [`Config::MaxCandidates`] for weights to be correct.212 #[pallet::storage]213 #[pallet::getter(fn desired_candidates)]214 pub type DesiredCandidates<T> = StorageValue<_, u32, ValueQuery>;215216 /// Fixed amount to deposit to become a collator.217 ///218 /// When a collator calls `leave_intent` they immediately receive the deposit back.219 #[pallet::storage]220 #[pallet::getter(fn candidacy_bond)]221 pub type CandidacyBond<T> = StorageValue<_, BalanceOf<T>, ValueQuery>;222223 #[pallet::genesis_config]224 pub struct GenesisConfig<T: Config> {225 pub invulnerables: Vec<T::AccountId>,226 pub candidacy_bond: BalanceOf<T>,227 pub desired_candidates: u32,228 }229230 #[cfg(feature = "std")]231 impl<T: Config> Default for GenesisConfig<T> {232 fn default() -> Self {233 Self {234 invulnerables: Default::default(),235 candidacy_bond: Default::default(),236 desired_candidates: Default::default(),237 }238 }239 }240241 #[pallet::genesis_build]242 impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {243 fn build(&self) {244 let duplicate_invulnerables =245 self.invulnerables.iter().collect::<std::collections::BTreeSet<_>>();246 assert!(247 duplicate_invulnerables.len() == self.invulnerables.len(),248 "duplicate invulnerables in genesis."249 );250251 let bounded_invulnerables =252 BoundedVec::<_, T::MaxInvulnerables>::try_from(self.invulnerables.clone())253 .expect("genesis invulnerables are more than T::MaxInvulnerables");254 assert!(255 T::MaxCandidates::get() >= self.desired_candidates,256 "genesis desired_candidates are more than T::MaxCandidates",257 );258259 <DesiredCandidates<T>>::put(&self.desired_candidates);260 <CandidacyBond<T>>::put(&self.candidacy_bond);261 <Invulnerables<T>>::put(bounded_invulnerables);262 }263 }264265 #[pallet::event]266 #[pallet::generate_deposit(pub(super) fn deposit_event)]267 pub enum Event<T: Config> {268 NewInvulnerables { invulnerables: Vec<T::AccountId> },269 NewDesiredCandidates { desired_candidates: u32 },270 NewCandidacyBond { bond_amount: BalanceOf<T> },271 CandidateAdded { account_id: T::AccountId, deposit: BalanceOf<T> },272 CandidateRemoved { account_id: T::AccountId },273 }274275 // Errors inform users that something went wrong.276 #[pallet::error]277 pub enum Error<T> {278 /// Too many candidates279 TooManyCandidates,280 /// Too few candidates281 TooFewCandidates,282 /// Unknown error283 Unknown,284 /// Permission issue285 Permission,286 /// User is already a candidate287 AlreadyCandidate,288 /// User is not a candidate289 NotCandidate,290 /// Too many invulnerables291 TooManyInvulnerables,292 /// User is already an Invulnerable293 AlreadyInvulnerable,294 /// Account has no associated validator ID295 NoAssociatedValidatorId,296 /// Validator ID is not yet registered297 ValidatorNotRegistered,298 }299300 #[pallet::hooks]301 impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}302303 #[pallet::call]304 impl<T: Config> Pallet<T> {305 /// Set the list of invulnerable (fixed) collators.306 #[pallet::weight(T::WeightInfo::set_invulnerables(new.len() as u32))]307 pub fn set_invulnerables(308 origin: OriginFor<T>,309 new: Vec<T::AccountId>,310 ) -> DispatchResultWithPostInfo {311 T::UpdateOrigin::ensure_origin(origin)?;312 let bounded_invulnerables = BoundedVec::<_, T::MaxInvulnerables>::try_from(new)313 .map_err(|_| Error::<T>::TooManyInvulnerables)?;314315 // check if the invulnerables have associated validator keys before they are set316 for account_id in bounded_invulnerables.iter() {317 let validator_key = T::ValidatorIdOf::convert(account_id.clone())318 .ok_or(Error::<T>::NoAssociatedValidatorId)?;319 ensure!(320 T::ValidatorRegistration::is_registered(&validator_key),321 Error::<T>::ValidatorNotRegistered322 );323 }324325 <Invulnerables<T>>::put(&bounded_invulnerables);326 Self::deposit_event(Event::NewInvulnerables {327 invulnerables: bounded_invulnerables.to_vec(),328 });329 Ok(().into())330 }331332 /// Set the ideal number of collators (not including the invulnerables).333 /// If lowering this number, then the number of running collators could be higher than this figure.334 /// Aside from that edge case, there should be no other way to have more collators than the desired number.335 #[pallet::weight(T::WeightInfo::set_desired_candidates())]336 pub fn set_desired_candidates(337 origin: OriginFor<T>,338 max: u32,339 ) -> DispatchResultWithPostInfo {340 T::UpdateOrigin::ensure_origin(origin)?;341 // we trust origin calls, this is just a for more accurate benchmarking342 if max > T::MaxCandidates::get() {343 log::warn!("max > T::MaxCandidates; you might need to run benchmarks again");344 }345 <DesiredCandidates<T>>::put(&max);346 Self::deposit_event(Event::NewDesiredCandidates { desired_candidates: max });347 Ok(().into())348 }349350 /// Set the candidacy bond amount.351 #[pallet::weight(T::WeightInfo::set_candidacy_bond())]352 pub fn set_candidacy_bond(353 origin: OriginFor<T>,354 bond: BalanceOf<T>,355 ) -> DispatchResultWithPostInfo {356 T::UpdateOrigin::ensure_origin(origin)?;357 <CandidacyBond<T>>::put(&bond);358 Self::deposit_event(Event::NewCandidacyBond { bond_amount: bond });359 Ok(().into())360 }361362 /// Register this account as a collator candidate. The account must (a) already have363 /// registered session keys and (b) be able to reserve the `CandidacyBond`.364 ///365 /// This call is not available to `Invulnerable` collators.366 #[pallet::weight(T::WeightInfo::register_as_candidate(T::MaxCandidates::get()))]367 pub fn register_as_candidate(origin: OriginFor<T>) -> DispatchResultWithPostInfo {368 let who = ensure_signed(origin)?;369370 // ensure we are below limit.371 let length = <Candidates<T>>::decode_len().unwrap_or_default();372 ensure!((length as u32) < Self::desired_candidates(), Error::<T>::TooManyCandidates);373 ensure!(!Self::invulnerables().contains(&who), Error::<T>::AlreadyInvulnerable);374375 let validator_key = T::ValidatorIdOf::convert(who.clone())376 .ok_or(Error::<T>::NoAssociatedValidatorId)?;377 ensure!(378 T::ValidatorRegistration::is_registered(&validator_key),379 Error::<T>::ValidatorNotRegistered380 );381382 let deposit = Self::candidacy_bond();383 // First authored block is current block plus kick threshold to handle session delay384 let incoming = CandidateInfo { who: who.clone(), deposit };385386 let current_count =387 <Candidates<T>>::try_mutate(|candidates| -> Result<usize, DispatchError> {388 if candidates.iter().any(|candidate| candidate.who == who) {389 Err(Error::<T>::AlreadyCandidate)?390 } else {391 T::Currency::reserve(&who, deposit)?;392 candidates.try_push(incoming).map_err(|_| Error::<T>::TooManyCandidates)?;393 <LastAuthoredBlock<T>>::insert(394 who.clone(),395 frame_system::Pallet::<T>::block_number() + T::KickThreshold::get(),396 );397 Ok(candidates.len())398 }399 })?;400401 Self::deposit_event(Event::CandidateAdded { account_id: who, deposit });402 Ok(Some(T::WeightInfo::register_as_candidate(current_count as u32)).into())403 }404405 /// Deregister `origin` as a collator candidate. Note that the collator can only leave on406 /// session change. The `CandidacyBond` will be unreserved immediately.407 ///408 /// This call will fail if the total number of candidates would drop below `MinCandidates`.409 ///410 /// This call is not available to `Invulnerable` collators.411 #[pallet::weight(T::WeightInfo::leave_intent(T::MaxCandidates::get()))]412 pub fn leave_intent(origin: OriginFor<T>) -> DispatchResultWithPostInfo {413 let who = ensure_signed(origin)?;414 ensure!(415 Self::candidates().len() as u32 > T::MinCandidates::get(),416 Error::<T>::TooFewCandidates417 );418 let current_count = Self::try_remove_candidate(&who)?;419420 Ok(Some(T::WeightInfo::leave_intent(current_count as u32)).into())421 }422 }423424 impl<T: Config> Pallet<T> {425 /// Get a unique, inaccessible account id from the `PotId`.426 pub fn account_id() -> T::AccountId {427 T::PotId::get().into_account_truncating()428 }429430 /// Removes a candidate if they exist and sends them back their deposit431 fn try_remove_candidate(who: &T::AccountId) -> Result<usize, DispatchError> {432 let current_count =433 <Candidates<T>>::try_mutate(|candidates| -> Result<usize, DispatchError> {434 let index = candidates435 .iter()436 .position(|candidate| candidate.who == *who)437 .ok_or(Error::<T>::NotCandidate)?;438 let candidate = candidates.remove(index);439 T::Currency::unreserve(who, candidate.deposit);440 <LastAuthoredBlock<T>>::remove(who.clone());441 Ok(candidates.len())442 })?;443 Self::deposit_event(Event::CandidateRemoved { account_id: who.clone() });444 Ok(current_count)445 }446447 /// Assemble the current set of candidates and invulnerables into the next collator set.448 ///449 /// This is done on the fly, as frequent as we are told to do so, as the session manager.450 pub fn assemble_collators(451 candidates: BoundedVec<T::AccountId, T::MaxCandidates>,452 ) -> Vec<T::AccountId> {453 let mut collators = Self::invulnerables().to_vec();454 collators.extend(candidates);455 collators456 }457458 /// Kicks out candidates that did not produce a block in the kick threshold459 /// and refund their deposits.460 pub fn kick_stale_candidates(461 candidates: BoundedVec<CandidateInfo<T::AccountId, BalanceOf<T>>, T::MaxCandidates>,462 ) -> BoundedVec<T::AccountId, T::MaxCandidates> {463 let now = frame_system::Pallet::<T>::block_number();464 let kick_threshold = T::KickThreshold::get();465 candidates466 .into_iter()467 .filter_map(|c| {468 let last_block = <LastAuthoredBlock<T>>::get(c.who.clone());469 let since_last = now.saturating_sub(last_block);470 if since_last < kick_threshold ||471 Self::candidates().len() as u32 <= T::MinCandidates::get()472 {473 Some(c.who)474 } else {475 let outcome = Self::try_remove_candidate(&c.who);476 if let Err(why) = outcome {477 log::warn!("Failed to remove candidate {:?}", why);478 debug_assert!(false, "failed to remove candidate {:?}", why);479 }480 None481 }482 })483 .collect::<Vec<_>>()484 .try_into()485 .expect("filter_map operation can't result in a bounded vec larger than its original; qed")486 }487 }488489 /// Keep track of number of authored blocks per authority, uncles are counted as well since490 /// they're a valid proof of being online.491 impl<T: Config + pallet_authorship::Config>492 pallet_authorship::EventHandler<T::AccountId, T::BlockNumber> for Pallet<T>493 {494 fn note_author(author: T::AccountId) {495 let pot = Self::account_id();496 // assumes an ED will be sent to pot.497 let reward = T::Currency::free_balance(&pot)498 .checked_sub(&T::Currency::minimum_balance())499 .unwrap_or_else(Zero::zero)500 .div(2u32.into());501 // `reward` is half of pot account minus ED, this should never fail.502 let _success = T::Currency::transfer(&pot, &author, reward, KeepAlive);503 debug_assert!(_success.is_ok());504 <LastAuthoredBlock<T>>::insert(author, frame_system::Pallet::<T>::block_number());505506 frame_system::Pallet::<T>::register_extra_weight_unchecked(507 T::WeightInfo::note_author(),508 DispatchClass::Mandatory,509 );510 }511512 fn note_uncle(_author: T::AccountId, _age: T::BlockNumber) {513 //TODO can we ignore this?514 }515 }516517 /// Play the role of the session manager.518 impl<T: Config> SessionManager<T::AccountId> for Pallet<T> {519 fn new_session(index: SessionIndex) -> Option<Vec<T::AccountId>> {520 log::info!(521 "assembling new collators for new session {} at #{:?}",522 index,523 <frame_system::Pallet<T>>::block_number(),524 );525526 let candidates = Self::candidates();527 let candidates_len_before = candidates.len();528 let active_candidates = Self::kick_stale_candidates(candidates);529 let removed = candidates_len_before - active_candidates.len();530 let result = Self::assemble_collators(active_candidates);531532 frame_system::Pallet::<T>::register_extra_weight_unchecked(533 T::WeightInfo::new_session(candidates_len_before as u32, removed as u32),534 DispatchClass::Mandatory,535 );536 Some(result)537 }538 fn start_session(_: SessionIndex) {539 // we don't care.540 }541 fn end_session(_: SessionIndex) {542 // we don't care.543 }544 }545}pallets/collator-selection/src/mock.rsdiffbeforeafterboth--- /dev/null
+++ b/pallets/collator-selection/src/mock.rs
@@ -0,0 +1,272 @@
+// 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/>.
+
+// Original license:
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use super::*;
+use crate as collator_selection;
+use frame_support::{
+ ord_parameter_types, parameter_types,
+ traits::{FindAuthor, GenesisBuild, ValidatorRegistration},
+ PalletId,
+};
+use frame_system as system;
+use frame_system::EnsureSignedBy;
+use sp_core::H256;
+use sp_runtime::{
+ testing::{Header, UintAuthorityId},
+ traits::{BlakeTwo256, IdentityLookup, OpaqueKeys},
+ RuntimeAppPublic,
+};
+
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+// Configure a mock runtime to test the pallet.
+frame_support::construct_runtime!(
+ pub enum Test where
+ Block = Block,
+ NodeBlock = Block,
+ UncheckedExtrinsic = UncheckedExtrinsic,
+ {
+ System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+ Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
+ Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
+ Aura: pallet_aura::{Pallet, Storage, Config<T>},
+ Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+ CollatorSelection: collator_selection::{Pallet, Call, Storage, Event<T>},
+ Authorship: pallet_authorship::{Pallet, Call, Storage, Inherent},
+ }
+);
+
+parameter_types! {
+ pub const BlockHashCount: u64 = 250;
+ pub const SS58Prefix: u8 = 42;
+}
+
+impl system::Config for Test {
+ type BaseCallFilter = frame_support::traits::Everything;
+ type BlockWeights = ();
+ type BlockLength = ();
+ type DbWeight = ();
+ type RuntimeOrigin = RuntimeOrigin;
+ type RuntimeCall = RuntimeCall;
+ type Index = u64;
+ type BlockNumber = u64;
+ type Hash = H256;
+ type Hashing = BlakeTwo256;
+ type AccountId = u64;
+ type Lookup = IdentityLookup<Self::AccountId>;
+ type Header = Header;
+ type RuntimeEvent = RuntimeEvent;
+ type BlockHashCount = BlockHashCount;
+ type Version = ();
+ type PalletInfo = PalletInfo;
+ type AccountData = pallet_balances::AccountData<u64>;
+ type OnNewAccount = ();
+ type OnKilledAccount = ();
+ type SystemWeightInfo = ();
+ type SS58Prefix = SS58Prefix;
+ type OnSetCode = ();
+ type MaxConsumers = frame_support::traits::ConstU32<16>;
+}
+
+parameter_types! {
+ pub const ExistentialDeposit: u64 = 5;
+ pub const MaxReserves: u32 = 50;
+}
+
+impl pallet_balances::Config for Test {
+ type Balance = u64;
+ type RuntimeEvent = RuntimeEvent;
+ type DustRemoval = ();
+ type ExistentialDeposit = ExistentialDeposit;
+ type AccountStore = System;
+ type WeightInfo = ();
+ type MaxLocks = ();
+ type MaxReserves = MaxReserves;
+ type ReserveIdentifier = [u8; 8];
+}
+
+pub struct Author4;
+impl FindAuthor<u64> for Author4 {
+ fn find_author<'a, I>(_digests: I) -> Option<u64>
+ where
+ I: 'a + IntoIterator<Item = (frame_support::ConsensusEngineId, &'a [u8])>,
+ {
+ Some(4)
+ }
+}
+
+impl pallet_authorship::Config for Test {
+ type FindAuthor = Author4;
+ type UncleGenerations = ();
+ type FilterUncle = ();
+ type EventHandler = CollatorSelection;
+}
+
+parameter_types! {
+ pub const MinimumPeriod: u64 = 1;
+}
+
+impl pallet_timestamp::Config for Test {
+ type Moment = u64;
+ type OnTimestampSet = Aura;
+ type MinimumPeriod = MinimumPeriod;
+ type WeightInfo = ();
+}
+
+impl pallet_aura::Config for Test {
+ type AuthorityId = sp_consensus_aura::sr25519::AuthorityId;
+ type MaxAuthorities = MaxAuthorities;
+ type DisabledValidators = ();
+}
+
+sp_runtime::impl_opaque_keys! {
+ pub struct MockSessionKeys {
+ // a key for aura authoring
+ pub aura: UintAuthorityId,
+ }
+}
+
+impl From<UintAuthorityId> for MockSessionKeys {
+ fn from(aura: sp_runtime::testing::UintAuthorityId) -> Self {
+ Self { aura }
+ }
+}
+
+parameter_types! {
+ pub static SessionHandlerCollators: Vec<u64> = Vec::new();
+ pub static SessionChangeBlock: u64 = 0;
+}
+
+pub struct TestSessionHandler;
+impl pallet_session::SessionHandler<u64> for TestSessionHandler {
+ const KEY_TYPE_IDS: &'static [sp_runtime::KeyTypeId] = &[UintAuthorityId::ID];
+ fn on_genesis_session<Ks: OpaqueKeys>(keys: &[(u64, Ks)]) {
+ SessionHandlerCollators::set(keys.into_iter().map(|(a, _)| *a).collect::<Vec<_>>())
+ }
+ fn on_new_session<Ks: OpaqueKeys>(_: bool, keys: &[(u64, Ks)], _: &[(u64, Ks)]) {
+ SessionChangeBlock::set(System::block_number());
+ dbg!(keys.len());
+ SessionHandlerCollators::set(keys.into_iter().map(|(a, _)| *a).collect::<Vec<_>>())
+ }
+ fn on_before_session_ending() {}
+ fn on_disabled(_: u32) {}
+}
+
+parameter_types! {
+ pub const Offset: u64 = 0;
+ pub const Period: u64 = 10;
+}
+
+impl pallet_session::Config for Test {
+ type RuntimeEvent = RuntimeEvent;
+ type ValidatorId = <Self as frame_system::Config>::AccountId;
+ // we don't have stash and controller, thus we don't need the convert as well.
+ type ValidatorIdOf = IdentityCollator;
+ type ShouldEndSession = pallet_session::PeriodicSessions<Period, Offset>;
+ type NextSessionRotation = pallet_session::PeriodicSessions<Period, Offset>;
+ type SessionManager = CollatorSelection;
+ type SessionHandler = TestSessionHandler;
+ type Keys = MockSessionKeys;
+ type WeightInfo = ();
+}
+
+ord_parameter_types! {
+ pub const RootAccount: u64 = 777;
+}
+
+parameter_types! {
+ pub const PotId: PalletId = PalletId(*b"PotStake");
+ pub const MaxCandidates: u32 = 20;
+ pub const MaxInvulnerables: u32 = 20;
+ pub const MinCandidates: u32 = 1;
+ pub const MaxAuthorities: u32 = 100_000;
+}
+
+pub struct IsRegistered;
+impl ValidatorRegistration<u64> for IsRegistered {
+ fn is_registered(id: &u64) -> bool {
+ if *id == 7u64 {
+ false
+ } else {
+ true
+ }
+ }
+}
+
+impl Config for Test {
+ type RuntimeEvent = RuntimeEvent;
+ type Currency = Balances;
+ type UpdateOrigin = EnsureSignedBy<RootAccount, u64>;
+ type PotId = PotId;
+ type MaxCandidates = MaxCandidates;
+ type MinCandidates = MinCandidates;
+ type MaxInvulnerables = MaxInvulnerables;
+ type KickThreshold = Period;
+ type ValidatorId = <Self as frame_system::Config>::AccountId;
+ type ValidatorIdOf = IdentityCollator;
+ type ValidatorRegistration = IsRegistered;
+ type WeightInfo = ();
+}
+
+pub fn new_test_ext() -> sp_io::TestExternalities {
+ sp_tracing::try_init_simple();
+ let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+ let invulnerables = vec![1, 2];
+
+ let balances = vec![(1, 100), (2, 100), (3, 100), (4, 100), (5, 100)];
+ let keys = balances
+ .iter()
+ .map(|&(i, _)| (i, i, MockSessionKeys { aura: UintAuthorityId(i) }))
+ .collect::<Vec<_>>();
+ let collator_selection = collator_selection::GenesisConfig::<Test> {
+ desired_candidates: 2,
+ candidacy_bond: 10,
+ invulnerables,
+ };
+ let session = pallet_session::GenesisConfig::<Test> { keys };
+ pallet_balances::GenesisConfig::<Test> { balances }
+ .assimilate_storage(&mut t)
+ .unwrap();
+ // collator selection must be initialized before session.
+ collator_selection.assimilate_storage(&mut t).unwrap();
+ session.assimilate_storage(&mut t).unwrap();
+
+ t.into()
+}
+
+pub fn initialize_to_block(n: u64) {
+ for i in System::block_number() + 1..=n {
+ System::set_block_number(i);
+ <AllPalletsWithSystem as frame_support::traits::OnInitialize<u64>>::on_initialize(i);
+ }
+}
pallets/collator-selection/src/tests.rsdiffbeforeafterboth--- /dev/null
+++ b/pallets/collator-selection/src/tests.rs
@@ -0,0 +1,414 @@
+// 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/>.
+
+// Original license:
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate as collator_selection;
+use crate::{mock::*, CandidateInfo, Error};
+use frame_support::{
+ assert_noop, assert_ok,
+ traits::{Currency, GenesisBuild, OnInitialize},
+};
+use pallet_balances::Error as BalancesError;
+use sp_runtime::traits::BadOrigin;
+
+#[test]
+fn basic_setup_works() {
+ new_test_ext().execute_with(|| {
+ assert_eq!(CollatorSelection::desired_candidates(), 2);
+ assert_eq!(CollatorSelection::candidacy_bond(), 10);
+
+ assert!(CollatorSelection::candidates().is_empty());
+ assert_eq!(CollatorSelection::invulnerables(), vec![1, 2]);
+ });
+}
+
+#[test]
+fn it_should_set_invulnerables() {
+ new_test_ext().execute_with(|| {
+ let new_set = vec![1, 2, 3, 4];
+ assert_ok!(CollatorSelection::set_invulnerables(
+ RuntimeOrigin::signed(RootAccount::get()),
+ new_set.clone()
+ ));
+ assert_eq!(CollatorSelection::invulnerables(), new_set);
+
+ // cannot set with non-root.
+ assert_noop!(
+ CollatorSelection::set_invulnerables(RuntimeOrigin::signed(1), new_set.clone()),
+ BadOrigin
+ );
+
+ // cannot set invulnerables without associated validator keys
+ let invulnerables = vec![7];
+ assert_noop!(
+ CollatorSelection::set_invulnerables(
+ RuntimeOrigin::signed(RootAccount::get()),
+ invulnerables.clone()
+ ),
+ Error::<Test>::ValidatorNotRegistered
+ );
+ });
+}
+
+#[test]
+fn set_desired_candidates_works() {
+ new_test_ext().execute_with(|| {
+ // given
+ assert_eq!(CollatorSelection::desired_candidates(), 2);
+
+ // can set
+ assert_ok!(CollatorSelection::set_desired_candidates(
+ RuntimeOrigin::signed(RootAccount::get()),
+ 7
+ ));
+ assert_eq!(CollatorSelection::desired_candidates(), 7);
+
+ // rejects bad origin
+ assert_noop!(
+ CollatorSelection::set_desired_candidates(RuntimeOrigin::signed(1), 8),
+ BadOrigin
+ );
+ });
+}
+
+#[test]
+fn set_candidacy_bond() {
+ new_test_ext().execute_with(|| {
+ // given
+ assert_eq!(CollatorSelection::candidacy_bond(), 10);
+
+ // can set
+ assert_ok!(CollatorSelection::set_candidacy_bond(
+ RuntimeOrigin::signed(RootAccount::get()),
+ 7
+ ));
+ assert_eq!(CollatorSelection::candidacy_bond(), 7);
+
+ // rejects bad origin.
+ assert_noop!(CollatorSelection::set_candidacy_bond(RuntimeOrigin::signed(1), 8), BadOrigin);
+ });
+}
+
+#[test]
+fn cannot_register_candidate_if_too_many() {
+ new_test_ext().execute_with(|| {
+ // reset desired candidates:
+ <crate::DesiredCandidates<Test>>::put(0);
+
+ // can't accept anyone anymore.
+ assert_noop!(
+ CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)),
+ Error::<Test>::TooManyCandidates,
+ );
+
+ // reset desired candidates:
+ <crate::DesiredCandidates<Test>>::put(1);
+ assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
+
+ // but no more
+ assert_noop!(
+ CollatorSelection::register_as_candidate(RuntimeOrigin::signed(5)),
+ Error::<Test>::TooManyCandidates,
+ );
+ })
+}
+
+#[test]
+fn cannot_unregister_candidate_if_too_few() {
+ new_test_ext().execute_with(|| {
+ // reset desired candidates:
+ <crate::DesiredCandidates<Test>>::put(1);
+ assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
+
+ // can not remove too few
+ assert_noop!(
+ CollatorSelection::leave_intent(RuntimeOrigin::signed(4)),
+ Error::<Test>::TooFewCandidates,
+ );
+ })
+}
+
+#[test]
+fn cannot_register_as_candidate_if_invulnerable() {
+ new_test_ext().execute_with(|| {
+ assert_eq!(CollatorSelection::invulnerables(), vec![1, 2]);
+
+ // can't 1 because it is invulnerable.
+ assert_noop!(
+ CollatorSelection::register_as_candidate(RuntimeOrigin::signed(1)),
+ Error::<Test>::AlreadyInvulnerable,
+ );
+ })
+}
+
+#[test]
+fn cannot_register_as_candidate_if_keys_not_registered() {
+ new_test_ext().execute_with(|| {
+ // can't 7 because keys not registered.
+ assert_noop!(
+ CollatorSelection::register_as_candidate(RuntimeOrigin::signed(7)),
+ Error::<Test>::ValidatorNotRegistered
+ );
+ })
+}
+
+#[test]
+fn cannot_register_dupe_candidate() {
+ new_test_ext().execute_with(|| {
+ // can add 3 as candidate
+ assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+ let addition = CandidateInfo { who: 3, deposit: 10 };
+ assert_eq!(CollatorSelection::candidates(), vec![addition]);
+ assert_eq!(CollatorSelection::last_authored_block(3), 10);
+ assert_eq!(Balances::free_balance(3), 90);
+
+ // but no more
+ assert_noop!(
+ CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)),
+ Error::<Test>::AlreadyCandidate,
+ );
+ })
+}
+
+#[test]
+fn cannot_register_as_candidate_if_poor() {
+ new_test_ext().execute_with(|| {
+ assert_eq!(Balances::free_balance(&3), 100);
+ assert_eq!(Balances::free_balance(&33), 0);
+
+ // works
+ assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+
+ // poor
+ assert_noop!(
+ CollatorSelection::register_as_candidate(RuntimeOrigin::signed(33)),
+ BalancesError::<Test>::InsufficientBalance,
+ );
+ });
+}
+
+#[test]
+fn register_as_candidate_works() {
+ new_test_ext().execute_with(|| {
+ // given
+ assert_eq!(CollatorSelection::desired_candidates(), 2);
+ assert_eq!(CollatorSelection::candidacy_bond(), 10);
+ assert_eq!(CollatorSelection::candidates(), Vec::new());
+ assert_eq!(CollatorSelection::invulnerables(), vec![1, 2]);
+
+ // take two endowed, non-invulnerables accounts.
+ assert_eq!(Balances::free_balance(&3), 100);
+ assert_eq!(Balances::free_balance(&4), 100);
+
+ assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+ assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
+
+ assert_eq!(Balances::free_balance(&3), 90);
+ assert_eq!(Balances::free_balance(&4), 90);
+
+ assert_eq!(CollatorSelection::candidates().len(), 2);
+ });
+}
+
+#[test]
+fn leave_intent() {
+ new_test_ext().execute_with(|| {
+ // register a candidate.
+ assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+ assert_eq!(Balances::free_balance(3), 90);
+
+ // register too so can leave above min candidates
+ assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(5)));
+ assert_eq!(Balances::free_balance(5), 90);
+
+ // cannot leave if not candidate.
+ assert_noop!(
+ CollatorSelection::leave_intent(RuntimeOrigin::signed(4)),
+ Error::<Test>::NotCandidate
+ );
+
+ // bond is returned
+ assert_ok!(CollatorSelection::leave_intent(RuntimeOrigin::signed(3)));
+ assert_eq!(Balances::free_balance(3), 100);
+ assert_eq!(CollatorSelection::last_authored_block(3), 0);
+ });
+}
+
+#[test]
+fn authorship_event_handler() {
+ new_test_ext().execute_with(|| {
+ // put 100 in the pot + 5 for ED
+ Balances::make_free_balance_be(&CollatorSelection::account_id(), 105);
+
+ // 4 is the default author.
+ assert_eq!(Balances::free_balance(4), 100);
+ assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
+ // triggers `note_author`
+ Authorship::on_initialize(1);
+
+ let collator = CandidateInfo { who: 4, deposit: 10 };
+
+ assert_eq!(CollatorSelection::candidates(), vec![collator]);
+ assert_eq!(CollatorSelection::last_authored_block(4), 0);
+
+ // half of the pot goes to the collator who's the author (4 in tests).
+ assert_eq!(Balances::free_balance(4), 140);
+ // half + ED stays.
+ assert_eq!(Balances::free_balance(CollatorSelection::account_id()), 55);
+ });
+}
+
+#[test]
+fn fees_edgecases() {
+ new_test_ext().execute_with(|| {
+ // Nothing panics, no reward when no ED in balance
+ Authorship::on_initialize(1);
+ // put some money into the pot at ED
+ Balances::make_free_balance_be(&CollatorSelection::account_id(), 5);
+ // 4 is the default author.
+ assert_eq!(Balances::free_balance(4), 100);
+ assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
+ // triggers `note_author`
+ Authorship::on_initialize(1);
+
+ let collator = CandidateInfo { who: 4, deposit: 10 };
+
+ assert_eq!(CollatorSelection::candidates(), vec![collator]);
+ assert_eq!(CollatorSelection::last_authored_block(4), 0);
+ // Nothing received
+ assert_eq!(Balances::free_balance(4), 90);
+ // all fee stays
+ assert_eq!(Balances::free_balance(CollatorSelection::account_id()), 5);
+ });
+}
+
+#[test]
+fn session_management_works() {
+ new_test_ext().execute_with(|| {
+ initialize_to_block(1);
+
+ assert_eq!(SessionChangeBlock::get(), 0);
+ assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
+
+ initialize_to_block(4);
+
+ assert_eq!(SessionChangeBlock::get(), 0);
+ assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
+
+ // add a new collator
+ assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+
+ // session won't see this.
+ assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
+ // but we have a new candidate.
+ assert_eq!(CollatorSelection::candidates().len(), 1);
+
+ initialize_to_block(10);
+ assert_eq!(SessionChangeBlock::get(), 10);
+ // pallet-session has 1 session delay; current validators are the same.
+ assert_eq!(Session::validators(), vec![1, 2]);
+ // queued ones are changed, and now we have 3.
+ assert_eq!(Session::queued_keys().len(), 3);
+ // session handlers (aura, et. al.) cannot see this yet.
+ assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);
+
+ initialize_to_block(20);
+ assert_eq!(SessionChangeBlock::get(), 20);
+ // changed are now reflected to session handlers.
+ assert_eq!(SessionHandlerCollators::get(), vec![1, 2, 3]);
+ });
+}
+
+#[test]
+fn kick_mechanism() {
+ new_test_ext().execute_with(|| {
+ // add a new collator
+ assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+ assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(4)));
+ initialize_to_block(10);
+ assert_eq!(CollatorSelection::candidates().len(), 2);
+ initialize_to_block(20);
+ assert_eq!(SessionChangeBlock::get(), 20);
+ // 4 authored this block, gets to stay 3 was kicked
+ assert_eq!(CollatorSelection::candidates().len(), 1);
+ // 3 will be kicked after 1 session delay
+ assert_eq!(SessionHandlerCollators::get(), vec![1, 2, 3, 4]);
+ let collator = CandidateInfo { who: 4, deposit: 10 };
+ assert_eq!(CollatorSelection::candidates(), vec![collator]);
+ assert_eq!(CollatorSelection::last_authored_block(4), 20);
+ initialize_to_block(30);
+ // 3 gets kicked after 1 session delay
+ assert_eq!(SessionHandlerCollators::get(), vec![1, 2, 4]);
+ // kicked collator gets funds back
+ assert_eq!(Balances::free_balance(3), 100);
+ });
+}
+
+#[test]
+fn should_not_kick_mechanism_too_few() {
+ new_test_ext().execute_with(|| {
+ // add a new collator
+ assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(3)));
+ assert_ok!(CollatorSelection::register_as_candidate(RuntimeOrigin::signed(5)));
+ initialize_to_block(10);
+ assert_eq!(CollatorSelection::candidates().len(), 2);
+ initialize_to_block(20);
+ assert_eq!(SessionChangeBlock::get(), 20);
+ // 4 authored this block, 5 gets to stay too few 3 was kicked
+ assert_eq!(CollatorSelection::candidates().len(), 1);
+ // 3 will be kicked after 1 session delay
+ assert_eq!(SessionHandlerCollators::get(), vec![1, 2, 3, 5]);
+ let collator = CandidateInfo { who: 5, deposit: 10 };
+ assert_eq!(CollatorSelection::candidates(), vec![collator]);
+ assert_eq!(CollatorSelection::last_authored_block(4), 20);
+ initialize_to_block(30);
+ // 3 gets kicked after 1 session delay
+ assert_eq!(SessionHandlerCollators::get(), vec![1, 2, 5]);
+ // kicked collator gets funds back
+ assert_eq!(Balances::free_balance(3), 100);
+ });
+}
+
+#[test]
+#[should_panic = "duplicate invulnerables in genesis."]
+fn cannot_set_genesis_value_twice() {
+ sp_tracing::try_init_simple();
+ let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+ let invulnerables = vec![1, 1];
+
+ let collator_selection = collator_selection::GenesisConfig::<Test> {
+ desired_candidates: 2,
+ candidacy_bond: 10,
+ invulnerables,
+ };
+ // collator selection must be initialized before session.
+ collator_selection.assimilate_storage(&mut t).unwrap();
+}
pallets/collator-selection/src/weights.rsdiffbeforeafterboth--- /dev/null
+++ b/pallets/collator-selection/src/weights.rs
@@ -0,0 +1,148 @@
+// 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/>.
+
+// Original license:
+// This file is part of Substrate.
+
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{
+ traits::Get,
+ weights::{constants::RocksDbWeight, Weight},
+};
+use sp_std::marker::PhantomData;
+
+// The weight info trait for `pallet_collator_selection`.
+pub trait WeightInfo {
+ fn set_invulnerables(_b: u32) -> Weight;
+ fn set_desired_candidates() -> Weight;
+ fn set_candidacy_bond() -> Weight;
+ fn register_as_candidate(_c: u32) -> Weight;
+ fn leave_intent(_c: u32) -> Weight;
+ fn note_author() -> Weight;
+ fn new_session(_c: u32, _r: u32) -> Weight;
+}
+
+/// Weights for pallet_collator_selection using the Substrate node and recommended hardware.
+pub struct SubstrateWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
+ fn set_invulnerables(b: u32) -> Weight {
+ Weight::from_ref_time(18_563_000 as u64)
+ // Standard Error: 0
+ .saturating_add(Weight::from_ref_time(68_000 as u64).saturating_mul(b as u64))
+ .saturating_add(T::DbWeight::get().writes(1 as u64))
+ }
+ fn set_desired_candidates() -> Weight {
+ Weight::from_ref_time(16_363_000 as u64).saturating_add(T::DbWeight::get().writes(1 as u64))
+ }
+ fn set_candidacy_bond() -> Weight {
+ Weight::from_ref_time(16_840_000 as u64).saturating_add(T::DbWeight::get().writes(1 as u64))
+ }
+ fn register_as_candidate(c: u32) -> Weight {
+ Weight::from_ref_time(71_196_000 as u64)
+ // Standard Error: 0
+ .saturating_add(Weight::from_ref_time(198_000 as u64).saturating_mul(c as u64))
+ .saturating_add(T::DbWeight::get().reads(4 as u64))
+ .saturating_add(T::DbWeight::get().writes(2 as u64))
+ }
+ fn leave_intent(c: u32) -> Weight {
+ Weight::from_ref_time(55_336_000 as u64)
+ // Standard Error: 0
+ .saturating_add(Weight::from_ref_time(151_000 as u64).saturating_mul(c as u64))
+ .saturating_add(T::DbWeight::get().reads(1 as u64))
+ .saturating_add(T::DbWeight::get().writes(2 as u64))
+ }
+ fn note_author() -> Weight {
+ Weight::from_ref_time(71_461_000 as u64)
+ .saturating_add(T::DbWeight::get().reads(3 as u64))
+ .saturating_add(T::DbWeight::get().writes(4 as u64))
+ }
+ fn new_session(r: u32, c: u32) -> Weight {
+ Weight::from_ref_time(0 as u64)
+ // Standard Error: 1_010_000
+ .saturating_add(Weight::from_ref_time(109_961_000 as u64).saturating_mul(r as u64))
+ // Standard Error: 1_010_000
+ .saturating_add(Weight::from_ref_time(151_952_000 as u64).saturating_mul(c as u64))
+ .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64)))
+ .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(c as u64)))
+ .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(r as u64)))
+ .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(c as u64)))
+ }
+}
+
+// For backwards compatibility and tests
+impl WeightInfo for () {
+ fn set_invulnerables(b: u32) -> Weight {
+ Weight::from_ref_time(18_563_000 as u64)
+ // Standard Error: 0
+ .saturating_add(Weight::from_ref_time(68_000 as u64).saturating_mul(b as u64))
+ .saturating_add(RocksDbWeight::get().writes(1 as u64))
+ }
+ fn set_desired_candidates() -> Weight {
+ Weight::from_ref_time(16_363_000 as u64)
+ .saturating_add(RocksDbWeight::get().writes(1 as u64))
+ }
+ fn set_candidacy_bond() -> Weight {
+ Weight::from_ref_time(16_840_000 as u64)
+ .saturating_add(RocksDbWeight::get().writes(1 as u64))
+ }
+ fn register_as_candidate(c: u32) -> Weight {
+ Weight::from_ref_time(71_196_000 as u64)
+ // Standard Error: 0
+ .saturating_add(Weight::from_ref_time(198_000 as u64).saturating_mul(c as u64))
+ .saturating_add(RocksDbWeight::get().reads(4 as u64))
+ .saturating_add(RocksDbWeight::get().writes(2 as u64))
+ }
+ fn leave_intent(c: u32) -> Weight {
+ Weight::from_ref_time(55_336_000 as u64)
+ // Standard Error: 0
+ .saturating_add(Weight::from_ref_time(151_000 as u64).saturating_mul(c as u64))
+ .saturating_add(RocksDbWeight::get().reads(1 as u64))
+ .saturating_add(RocksDbWeight::get().writes(2 as u64))
+ }
+ fn note_author() -> Weight {
+ Weight::from_ref_time(71_461_000 as u64)
+ .saturating_add(RocksDbWeight::get().reads(3 as u64))
+ .saturating_add(RocksDbWeight::get().writes(4 as u64))
+ }
+ fn new_session(r: u32, c: u32) -> Weight {
+ Weight::from_ref_time(0 as u64)
+ // Standard Error: 1_010_000
+ .saturating_add(Weight::from_ref_time(109_961_000 as u64).saturating_mul(r as u64))
+ // Standard Error: 1_010_000
+ .saturating_add(Weight::from_ref_time(151_952_000 as u64).saturating_mul(c as u64))
+ .saturating_add(RocksDbWeight::get().reads((1 as u64).saturating_mul(r as u64)))
+ .saturating_add(RocksDbWeight::get().reads((2 as u64).saturating_mul(c as u64)))
+ .saturating_add(RocksDbWeight::get().writes((2 as u64).saturating_mul(r as u64)))
+ .saturating_add(RocksDbWeight::get().writes((2 as u64).saturating_mul(c as u64)))
+ }
+}
primitives/common/src/constants.rsdiffbeforeafterboth--- a/primitives/common/src/constants.rs
+++ b/primitives/common/src/constants.rs
@@ -44,7 +44,7 @@
/// Minimum balance required to create or keep an account open.
pub const EXISTENTIAL_DEPOSIT: u128 = 0;
/// Amount of Balance reserved for candidate registration.
-pub const CANDIDACY_BOND: u128 = EXISTENTIAL_DEPOSIT;
+pub const GENESIS_CANDIDACY_BOND: u128 = EXISTENTIAL_DEPOSIT;
// Targeting 0.1 UNQ per transfer
pub const WEIGHT_TO_FEE_COEFF: u32 = /*<weight2fee>*/207_163_598/*</weight2fee>*/;
runtime/common/mod.rsdiffbeforeafterboth--- a/runtime/common/mod.rs
+++ b/runtime/common/mod.rs
@@ -188,7 +188,7 @@
RuntimeAppPublic,
};
use pallet_session::SessionManager;
- use up_common::constants::CANDIDACY_BOND;
+ use up_common::constants::GENESIS_CANDIDACY_BOND;
use crate::config::pallets::collator_selection::MaxInvulnerables;
let mut weight = <Runtime as frame_system::Config>::DbWeight::get().reads(1);
@@ -239,7 +239,7 @@
<pallet_collator_selection::Invulnerables<Runtime>>::put(bounded_invulnerables);
<pallet_collator_selection::DesiredCandidates<Runtime>>::put(0);
- <pallet_collator_selection::CandidacyBond<Runtime>>::put(CANDIDACY_BOND);
+ <pallet_collator_selection::CandidacyBond<Runtime>>::put(GENESIS_CANDIDACY_BOND);
let keys = invulnerables
.into_iter()
runtime/opal/Cargo.tomldiffbeforeafterboth--- a/runtime/opal/Cargo.toml
+++ b/runtime/opal/Cargo.toml
@@ -29,7 +29,6 @@
'pallet-evm-migration/runtime-benchmarks',
'pallet-evm-coder-substrate/runtime-benchmarks',
'pallet-balances/runtime-benchmarks',
- "pallet-collator-selection/runtime-benchmarks",
'pallet-timestamp/runtime-benchmarks',
'pallet-common/runtime-benchmarks',
'pallet-structure/runtime-benchmarks',
@@ -69,6 +68,9 @@
'pallet-xcm/try-runtime',
'cumulus-pallet-xcm/try-runtime',
'cumulus-pallet-dmp-queue/try-runtime',
+ "pallet-authorship/try-runtime",
+ "pallet-collator-selection/try-runtime",
+ "pallet-session/try-runtime",
'pallet-inflation/try-runtime',
'pallet-unique/try-runtime',
'pallet-unique-scheduler/try-runtime',
@@ -243,11 +245,6 @@
default-features = false
git = "https://github.com/paritytech/substrate"
branch = "polkadot-v0.9.30"
-
-[dependencies.pallet-collator-selection]
-default-features = false
-git = 'https://github.com/paritytech/cumulus'
-branch = 'polkadot-v0.9.30'
[dependencies.pallet-authorship]
default-features = false
@@ -480,6 +477,7 @@
pallet-inflation = { path = '../../pallets/inflation', default-features = false }
pallet-app-promotion = { path = '../../pallets/app-promotion', default-features = false }
up-data-structs = { path = '../../primitives/data-structs', default-features = false }
+pallet-collator-selection = { default-features = false, path = "../../pallets/collator-selection" }
pallet-configuration = { default-features = false, path = "../../pallets/configuration" }
pallet-common = { default-features = false, path = "../../pallets/common" }
pallet-structure = { default-features = false, path = "../../pallets/structure" }
runtime/quartz/Cargo.tomldiffbeforeafterboth--- a/runtime/quartz/Cargo.toml
+++ b/runtime/quartz/Cargo.toml
@@ -29,7 +29,6 @@
'pallet-evm-migration/runtime-benchmarks',
'pallet-evm-coder-substrate/runtime-benchmarks',
'pallet-balances/runtime-benchmarks',
- "pallet-collator-selection/runtime-benchmarks",
'pallet-timestamp/runtime-benchmarks',
'pallet-common/runtime-benchmarks',
'pallet-structure/runtime-benchmarks',
@@ -68,6 +67,9 @@
'pallet-xcm/try-runtime',
'cumulus-pallet-xcm/try-runtime',
'cumulus-pallet-dmp-queue/try-runtime',
+ "pallet-authorship/try-runtime",
+ "pallet-collator-selection/try-runtime",
+ "pallet-session/try-runtime",
'pallet-inflation/try-runtime',
'pallet-unique/try-runtime',
'pallet-unique-scheduler/try-runtime',
@@ -240,11 +242,6 @@
default-features = false
git = "https://github.com/paritytech/substrate"
branch = "polkadot-v0.9.30"
-
-[dependencies.pallet-collator-selection]
-default-features = false
-git = 'https://github.com/paritytech/cumulus'
-branch = 'polkadot-v0.9.30'
[dependencies.pallet-authorship]
default-features = false
@@ -484,6 +481,7 @@
pallet-inflation = { path = '../../pallets/inflation', default-features = false }
pallet-app-promotion = { path = '../../pallets/app-promotion', default-features = false }
up-data-structs = { path = '../../primitives/data-structs', default-features = false }
+pallet-collator-selection = { default-features = false, path = "../../pallets/collator-selection" }
pallet-configuration = { default-features = false, path = "../../pallets/configuration" }
pallet-common = { default-features = false, path = "../../pallets/common" }
pallet-structure = { default-features = false, path = "../../pallets/structure" }
runtime/unique/Cargo.tomldiffbeforeafterboth--- a/runtime/unique/Cargo.toml
+++ b/runtime/unique/Cargo.toml
@@ -29,7 +29,6 @@
'pallet-evm-migration/runtime-benchmarks',
'pallet-evm-coder-substrate/runtime-benchmarks',
'pallet-balances/runtime-benchmarks',
- "pallet-collator-selection/runtime-benchmarks",
'pallet-timestamp/runtime-benchmarks',
'pallet-common/runtime-benchmarks',
'pallet-structure/runtime-benchmarks',
@@ -69,6 +68,9 @@
'pallet-xcm/try-runtime',
'cumulus-pallet-xcm/try-runtime',
'cumulus-pallet-dmp-queue/try-runtime',
+ "pallet-authorship/try-runtime",
+ "pallet-collator-selection/try-runtime",
+ "pallet-session/try-runtime",
'pallet-inflation/try-runtime',
'pallet-unique/try-runtime',
'pallet-unique-scheduler/try-runtime',
@@ -241,11 +243,6 @@
default-features = false
git = "https://github.com/paritytech/substrate"
branch = "polkadot-v0.9.30"
-
-[dependencies.pallet-collator-selection]
-default-features = false
-git = 'https://github.com/paritytech/cumulus'
-branch = 'polkadot-v0.9.30'
[dependencies.pallet-authorship]
default-features = false
@@ -477,6 +474,7 @@
pallet-inflation = { path = '../../pallets/inflation', default-features = false }
pallet-app-promotion = { path = '../../pallets/app-promotion', default-features = false }
up-data-structs = { path = '../../primitives/data-structs', default-features = false }
+pallet-collator-selection = { default-features = false, path = "../../pallets/collator-selection" }
pallet-configuration = { default-features = false, path = "../../pallets/configuration" }
pallet-common = { default-features = false, path = "../../pallets/common" }
pallet-structure = { default-features = false, path = "../../pallets/structure" }