Fix farming boost (#969)

* fix: 🐛 set_next_round_whitelist * add refresh_voting * fix * fix test
bifrost-io · May 10, 2023 · 0d58be5 · 0d58be5
1 parent 0e12789
commit 0d58be5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/pallets/farming/src/boost.rs b/pallets/farming/src/boost.rs
@@ -91,16 +91,16 @@ impl<T: Config> Pallet<T> {
 		ensure!(round_length != Zero::zero(), Error::<T>::RoundLengthNotSet);
 		let mut boost_pool_info = Self::boost_pool_infos();
 		ensure!(boost_pool_info.end_round == Zero::zero(), Error::<T>::RoundNotOver);
-		let whitelist_iter = BoostWhitelist::<T>::iter_keys();
+
 		// Update whitelist
-		if BoostNextRoundWhitelist::<T>::iter().count() != 0 {
+		if BoostNextRoundWhitelist::<T>::iter_keys().count() != 0 {
 			let _ = BoostWhitelist::<T>::clear(u32::max_value(), None);
-			whitelist_iter.for_each(|pid| {
+			BoostNextRoundWhitelist::<T>::iter_keys().for_each(|pid| {
 				BoostWhitelist::<T>::insert(pid, ());
 			});
 			let _ = BoostNextRoundWhitelist::<T>::clear(u32::max_value(), None);
 		} else {
-			ensure!(whitelist_iter.count() != 0, Error::<T>::WhitelistEmpty);
+			ensure!(BoostWhitelist::<T>::iter_keys().count() != 0, Error::<T>::WhitelistEmpty);
 		}
 
 		Self::send_boost_rewards(&boost_pool_info)?;

diff --git a/pallets/farming/src/tests.rs b/pallets/farming/src/tests.rs
@@ -24,7 +24,7 @@ use crate::{mock::*, *};
 use bifrost_asset_registry::AssetMetadata;
 use bifrost_runtime_common::milli;
 use bifrost_ve_minting::VeMintingInterface;
-use frame_support::{assert_err, assert_ok};
+use frame_support::{assert_err, assert_noop, assert_ok};
 use node_primitives::TokenInfo;
 
 fn asset_registry() {
@@ -77,12 +77,16 @@ fn boost() {
 		assert_ok!(Farming::claim(RuntimeOrigin::signed(CHARLIE), pid));
 		assert_eq!(Tokens::free_balance(KSM, &CHARLIE), 999999999000);
 
-		let whitelist: Vec<PoolId> = vec![pid];
 		let vote_list: Vec<(u32, Percent)> = vec![(pid, Percent::from_percent(100))];
 		let charge_list = vec![(KSM, 1000)];
-		assert_ok!(Farming::add_boost_pool_whitelist(RuntimeOrigin::signed(ALICE), whitelist));
+		assert_ok!(Farming::add_boost_pool_whitelist(RuntimeOrigin::signed(ALICE), vec![2]));
+		assert_ok!(Farming::set_next_round_whitelist(RuntimeOrigin::signed(ALICE), vec![pid]));
 		assert_ok!(Farming::start_boost_round(RuntimeOrigin::signed(ALICE), 100));
 		assert_ok!(Farming::charge_boost(RuntimeOrigin::signed(ALICE), charge_list));
+		assert_noop!(
+			Farming::vote(RuntimeOrigin::signed(CHARLIE), vec![(2, Percent::from_percent(100))]),
+			Error::<Runtime>::NotInWhitelist
+		);
 		assert_ok!(Farming::vote(RuntimeOrigin::signed(CHARLIE), vote_list));
 		assert_eq!(Farming::boost_basic_rewards(pid, KSM), None);
 		assert_ok!(Farming::claim(RuntimeOrigin::signed(CHARLIE), pid));

diff --git a/runtime/bifrost-polkadot/src/constants.rs b/runtime/bifrost-polkadot/src/constants.rs
@@ -48,7 +48,7 @@ pub mod currency {
 		type Balance = Balance;
 		fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {
 			// extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT:
-			let p = base_tx_fee::<Runtime>() * 10;
+			let p = base_tx_fee::<Runtime>() * 580;
 			let q = Balance::from(ExtrinsicBaseWeight::get().ref_time());
 			smallvec![WeightToFeeCoefficient {
 				degree: 1,