fix change_validators call (#515) (#516)

Cardinal-Cryptography · Jul 11, 2022 · 849ee27 · 849ee27
1 parent 650e6cc
commit 849ee27
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/bin/runtime/src/lib.rs b/bin/runtime/src/lib.rs
@@ -112,7 +112,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("aleph-node"),
     impl_name: create_runtime_str!("aleph-node"),
     authoring_version: 1,
-    spec_version: 20,
+    spec_version: 21,
     impl_version: 1,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 8,

diff --git a/pallets/elections/src/impls.rs b/pallets/elections/src/impls.rs
@@ -1,8 +1,8 @@
 use crate::{
     traits::{EraInfoProvider, SessionInfoProvider, ValidatorRewardsHandler},
-    CommitteeSize, Config, CurrentEraValidators, EraValidators, NextEraNonReservedValidators,
-    NextEraReservedValidators, Pallet, SessionValidatorBlockCount, ValidatorEraTotalReward,
-    ValidatorTotalRewards,
+    CommitteeSize, Config, CurrentEraValidators, EraValidators, NextEraCommitteeSize,
+    NextEraNonReservedValidators, NextEraReservedValidators, Pallet, SessionValidatorBlockCount,
+    ValidatorEraTotalReward, ValidatorTotalRewards,
 };
 use frame_election_provider_support::sp_arithmetic::Perquintill;
 use frame_support::pallet_prelude::Get;
@@ -200,10 +200,13 @@ where
         Self::if_era_starts_do(active_era + 1, session, || {
             let reserved_validators = NextEraReservedValidators::<T>::get();
             let non_reserved_validators = NextEraNonReservedValidators::<T>::get();
+            let committee_size = NextEraCommitteeSize::<T>::get();
+
             CurrentEraValidators::<T>::put(EraValidators {
                 reserved: reserved_validators,
                 non_reserved: non_reserved_validators,
             });
+            CommitteeSize::<T>::put(committee_size);
         });
     }
 

diff --git a/pallets/elections/src/lib.rs b/pallets/elections/src/lib.rs
@@ -131,6 +131,18 @@ pub mod pallet {
     #[pallet::storage]
     pub type CommitteeSize<T> = StorageValue<_, u32, ValueQuery>;
 
+    #[pallet::type_value]
+    pub fn DefaultNextEraCommitteeSize<T: Config>() -> u32 {
+        CommitteeSize::<T>::get()
+    }
+
+    /// Desired size of a committee in effect from a new era.
+    ///
+    /// can be changed via `change_validators` call that requires sudo.
+    #[pallet::storage]
+    pub type NextEraCommitteeSize<T> =
+        StorageValue<_, u32, ValueQuery, DefaultNextEraCommitteeSize<T>>;
+
     /// List of reserved validators in force from a new era.
     ///
     /// Can be changed via `change_validators` call that requires sudo.
@@ -173,7 +185,7 @@ pub mod pallet {
             committee_size: Option<u32>,
         ) -> DispatchResult {
             ensure_root(origin)?;
-            let committee_size = committee_size.unwrap_or_else(CommitteeSize::<T>::get);
+            let committee_size = committee_size.unwrap_or_else(NextEraCommitteeSize::<T>::get);
             let reserved_validators =
                 reserved_validators.unwrap_or_else(NextEraReservedValidators::<T>::get);
             let non_reserved_validators =
@@ -187,7 +199,7 @@ pub mod pallet {
 
             NextEraNonReservedValidators::<T>::put(non_reserved_validators.clone());
             NextEraReservedValidators::<T>::put(reserved_validators.clone());
-            CommitteeSize::<T>::put(committee_size);
+            NextEraCommitteeSize::<T>::put(committee_size);
 
             Self::deposit_event(Event::ChangeValidators(
                 reserved_validators,