fix: sort on address modification

pallets/bfc-staking/src/pallet/impls.rs

@@ -2,8 +2,8 @@ use super::pallet::*;
 
 use crate::{
 	inflation::Range, weights::WeightInfo, BalanceOf, Bond, DelayedCommissionSet,
-	DelayedControllerSet, DelayedPayout, ProductivityStatus, RewardDestination, RoundIndex,
-	TierType, TotalSnapshot, ValidatorSnapshot, ValidatorSnapshotOf,
+	DelayedControllerSet, DelayedPayout, ProductivityStatus, RewardDestination, RewardPoint,
+	RoundIndex, TierType, TotalSnapshot, ValidatorSnapshot, ValidatorSnapshotOf,
 };
 
 use pallet_session::ShouldEndSession;
@@ -182,20 +182,23 @@ impl<T: Config> Pallet<T> {
 		selected_candidates
 			.try_push(candidate.clone())
 			.expect("SelectedCandidates out of bound");
+		selected_candidates.sort();
 		<SelectedCandidates<T>>::put(selected_candidates);
 		match tier {
 			TierType::Full => {
 				let mut selected_full_candidates = <SelectedFullCandidates<T>>::get();
 				selected_full_candidates
 					.try_push(candidate.clone())
 					.expect("SelectedFullCandidates out of bound");
+				selected_full_candidates.sort();
 				<SelectedFullCandidates<T>>::put(selected_full_candidates);
 			},
 			_ => {
 				let mut selected_basic_candidates = <SelectedBasicCandidates<T>>::get();
 				selected_basic_candidates
 					.try_push(candidate.clone())
 					.expect("SelectedBasicCandidates out of bound");
+				selected_basic_candidates.sort();
 				<SelectedBasicCandidates<T>>::put(selected_basic_candidates);
 			},
 		};
@@ -744,7 +747,7 @@ impl<T: Config> Pallet<T> {
 
 		let score_plus_5 = <AwardedPts<T>>::get(round_index, &author) + 5;
 		<AwardedPts<T>>::insert(round_index, author, score_plus_5);
-		<Points<T>>::mutate(round_index, |x| *x += 5);
+		<Points<T>>::mutate(round_index, |x: &mut RewardPoint| *x += 5);
 	}
 
 	/// Reset every `per round` related parameters of every candidates

pallets/bfc-staking/src/pallet/mod.rs

@@ -552,26 +552,26 @@ pub mod pallet {
 
 	#[pallet::storage]
 	#[pallet::getter(fn selected_candidates)]
-	/// The active validator set (full and basic) selected for the current round
+	/// The active validator set (full and basic) selected for the current round. This storage is sorted by address.
 	pub type SelectedCandidates<T: Config> =
 		StorageValue<_, BoundedVec<T::AccountId, ConstU32<MAX_AUTHORITIES>>, ValueQuery>;
 
 	#[pallet::storage]
 	#[pallet::getter(fn selected_full_candidates)]
-	/// The active full validator set selected for the current round
+	/// The active full validator set selected for the current round. This storage is sorted by address.
 	pub type SelectedFullCandidates<T: Config> =
 		StorageValue<_, BoundedVec<T::AccountId, ConstU32<MAX_AUTHORITIES>>, ValueQuery>;
 
 	#[pallet::storage]
 	#[pallet::getter(fn selected_basic_candidates)]
-	/// The active basic validator set selected for the current round
+	/// The active basic validator set selected for the current round. This storage is sorted by address.
 	pub type SelectedBasicCandidates<T: Config> =
 		StorageValue<_, BoundedVec<T::AccountId, ConstU32<MAX_AUTHORITIES>>, ValueQuery>;
 
 	#[pallet::storage]
 	#[pallet::unbounded]
 	#[pallet::getter(fn cached_selected_candidates)]
-	/// The cached active validator set selected from previous rounds
+	/// The cached active validator set selected from previous rounds. This storage is sorted by address.
 	pub type CachedSelectedCandidates<T: Config> =
 		StorageValue<_, Vec<(RoundIndex, Vec<T::AccountId>)>, ValueQuery>;
 
@@ -593,7 +593,7 @@ pub mod pallet {
 
 	#[pallet::storage]
 	#[pallet::getter(fn candidate_pool)]
-	/// The pool of validator candidates, each with their total voting power
+	/// The pool of validator candidates, each with their total voting power. This storage is sorted by amount.
 	pub(crate) type CandidatePool<T: Config> = StorageValue<
 		_,
 		BoundedVec<Bond<T::AccountId, BalanceOf<T>>, ConstU32<MAX_AUTHORITIES>>,

pallets/relay-manager/src/pallet/impls.rs

@@ -263,6 +263,7 @@ impl<T: Config> Pallet<T> {
 	fn add_to_selected_relayers(relayer: T::AccountId) {
 		let mut selected_relayers = <SelectedRelayers<T>>::get();
 		selected_relayers.try_push(relayer).expect("SelectedRelayers out of bound");
+		selected_relayers.sort();
 		<SelectedRelayers<T>>::put(selected_relayers);
 	}
 

pallets/relay-manager/src/pallet/mod.rs

@@ -126,27 +126,27 @@ pub mod pallet {
 
 	#[pallet::storage]
 	#[pallet::getter(fn selected_relayers)]
-	/// The active relayer set selected for the current round
+	/// The active relayer set selected for the current round. This storage is sorted by address.
 	pub type SelectedRelayers<T: Config> =
 		StorageValue<_, BoundedVec<T::AccountId, ConstU32<MAX_AUTHORITIES>>, ValueQuery>;
 
 	#[pallet::storage]
 	#[pallet::getter(fn initial_selected_relayers)]
-	/// The active relayer set selected at the beginning of the current round
+	/// The active relayer set selected at the beginning of the current round. This storage is sorted by address.
 	pub type InitialSelectedRelayers<T: Config> =
 		StorageValue<_, BoundedVec<T::AccountId, ConstU32<MAX_AUTHORITIES>>, ValueQuery>;
 
 	#[pallet::storage]
 	#[pallet::unbounded]
 	#[pallet::getter(fn cached_selected_relayers)]
-	/// The cached active relayer set selected from previous rounds
+	/// The cached active relayer set selected from previous rounds. This storage is sorted by address.
 	pub type CachedSelectedRelayers<T: Config> =
 		StorageValue<_, Vec<(RoundIndex, Vec<T::AccountId>)>, ValueQuery>;
 
 	#[pallet::storage]
 	#[pallet::unbounded]
 	#[pallet::getter(fn cached_initial_selected_relayers)]
-	/// The cached active relayer set selected from the beginning of each previous rounds
+	/// The cached active relayer set selected from the beginning of each previous rounds. This storage is sorted by address.
 	pub type CachedInitialSelectedRelayers<T: Config> =
 		StorageValue<_, Vec<(RoundIndex, Vec<T::AccountId>)>, ValueQuery>;
 

runtime/testnet/src/lib.rs

@@ -141,7 +141,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	// The version of the authorship interface.
 	authoring_version: 1,
 	// The version of the runtime spec.
-	spec_version: 460,
+	spec_version: 461,
 	// The version of the implementation of the spec.
 	impl_version: 1,
 	// A list of supported runtime APIs along with their versions.

tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bifrost-platform/bifrost-node",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "author": "bifrost-platform",
   "scripts": {
     "test": "mocha -r ts-node/register tests/**/**/*.ts --exit",

tools/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bifrost-platform/bifrost-node",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "author": "bifrost-platform",
   "scripts": {
     "set_session_keys": "ts-node src/set_session_keys.ts",