upgrade rewards

Cargo.toml

@@ -11,7 +11,7 @@ members = [
   "libs/utils",
   "pallets/anchors",
   "pallets/bridge",
-  #"pallets/block-rewards",
+  "pallets/block-rewards",
   "pallets/collator-allowlist",
   #"pallets/crowdloan-claim",
   #"pallets/crowdloan-reward",
@@ -25,7 +25,7 @@ members = [
   #"pallets/liquidity-pools-gateway",
   #"pallets/liquidity-pools-gateway/axelar-gateway-precompile",
   #"pallets/liquidity-pools-gateway/routers",
-  #"pallets/liquidity-rewards",
+  "pallets/liquidity-rewards",
   #"pallets/loans",
   "pallets/oracle-feed",
   "pallets/oracle-collection",
@@ -36,7 +36,7 @@ members = [
   #"pallets/pool-registry",
   #"pallets/restricted-tokens",
   #"pallets/restricted-xtokens",
-  #"pallets/rewards",
+  "pallets/rewards",
   "pallets/swaps",
   #"pallets/token-mux",
   #"pallets/transfer-allowlist",

pallets/block-rewards/src/benchmarking.rs

@@ -7,7 +7,6 @@ use frame_support::{
 };
 use frame_system::RawOrigin;
 use sp_runtime::traits::Zero;
-use sp_std::vec; // required for #[benchmarks]
 
 use super::*;
 use crate::{pallet::Config, Pallet as BlockRewards};

pallets/block-rewards/src/migrations.rs

@@ -20,7 +20,7 @@ use parity_scale_codec::{Decode, Encode};
 use sp_runtime::FixedPointNumber;
 #[cfg(feature = "try-runtime")]
 use sp_runtime::TryRuntimeError;
-use sp_std::{marker::PhantomData, vec::Vec};
+use sp_std::marker::PhantomData;
 
 use crate::{pallet, Config, Pallet, SessionData};
 
@@ -31,7 +31,7 @@ fn inflation_rate<T: Config>(percent: u32) -> T::Rate {
 pub mod init {
 	use cfg_traits::rewards::{AccountRewards, CurrencyGroupChange, GroupRewards};
 	use num_traits::Zero;
-	use sp_runtime::{BoundedVec, SaturatedConversion};
+	use sp_runtime::SaturatedConversion;
 
 	use super::*;
 
@@ -40,19 +40,6 @@ pub mod init {
 		PhantomData<(T, CollatorReward, AnnualTreasuryInflationPercent)>,
 	);
 
-	fn get_collators<T: pallet_collator_selection::Config>() -> Vec<T::AccountId> {
-		let candidates = BoundedVec::<
-			T::AccountId,
-			<T as pallet_collator_selection::Config>::MaxCandidates,
-		>::truncate_from(
-			pallet_collator_selection::Pallet::<T>::candidates()
-				.into_iter()
-				.map(|c| c.who)
-				.collect(),
-		);
-		pallet_collator_selection::Pallet::<T>::assemble_collators(candidates)
-	}
-
 	impl<T, CollatorReward, AnnualTreasuryInflationPercent> OnRuntimeUpgrade
 		for InitBlockRewards<T, CollatorReward, AnnualTreasuryInflationPercent>
 	where
@@ -63,7 +50,7 @@ pub mod init {
 	{
 		#[cfg(feature = "try-runtime")]
 		fn pre_upgrade() -> Result<Vec<u8>, TryRuntimeError> {
-			let collators = get_collators::<T>();
+			let collators = pallet_collator_selection::Pallet::<T>::assemble_collators();
 			assert!(!collators.is_empty());
 
 			assert!(!CollatorReward::get().is_zero());
@@ -85,7 +72,7 @@ pub mod init {
 				pallet::ActiveSessionData::<T>::get() != Default::default();
 
 			log::info!("{LOG_PREFIX} Getting list of collators");
-			let collators = get_collators::<T>();
+			let collators = pallet_collator_selection::Pallet::<T>::assemble_collators();
 
 			let collators_are_staked = collators.clone().into_iter().all(|c| {
 				log::info!("{LOG_PREFIX} Checking stake of collator {c:?}");

pallets/rewards/src/issuance.rs

@@ -15,6 +15,7 @@ use cfg_traits::rewards::RewardIssuance;
 use frame_support::traits::{fungibles::Mutate, tokens::Preservation};
 use parity_scale_codec::{Decode, Encode};
 use sp_runtime::{traits::Get, DispatchResult};
+use sp_std::cmp::Eq;
 use sp_std::marker::PhantomData;
 
 /// Enables rewarding out of thin air, e.g. via minting.
@@ -25,7 +26,7 @@ pub struct MintReward<AccountId, Balance, CurrencyId, Currency>(
 impl<AccountId, Balance, CurrencyId, Currency> RewardIssuance
 	for MintReward<AccountId, Balance, CurrencyId, Currency>
 where
-	AccountId: Encode + Decode,
+	AccountId: Encode + Decode + Eq,
 	Currency: Mutate<AccountId, AssetId = CurrencyId, Balance = Balance>,
 {
 	type AccountId = AccountId;
@@ -49,7 +50,7 @@ pub struct TransferReward<AccountId, Balance, CurrencyId, Currency, SourceAddres
 impl<AccountId, Balance, CurrencyId, Currency, SourceAddress> RewardIssuance
 	for TransferReward<AccountId, Balance, CurrencyId, Currency, SourceAddress>
 where
-	AccountId: Encode + Decode,
+	AccountId: Encode + Decode + Eq,
 	Currency: Mutate<AccountId, AssetId = CurrencyId, Balance = Balance>,
 	SourceAddress: Get<AccountId>,
 {