Skip to content

support multi currency rewards #601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 24 commits into from
Sep 15, 2021
Merged

support multi currency rewards #601

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
7dbb354
support multi currency rewards
ermalkaleci Sep 2, 2021
1bf3f1e
update migration
ermalkaleci Sep 2, 2021
e5a1f85
remove storage_version
ermalkaleci Sep 2, 2021
ad7891e
fixes
ermalkaleci Sep 3, 2021
11393dd
add missing import
ermalkaleci Sep 3, 2021
dbe1747
update docs
ermalkaleci Sep 3, 2021
119e958
add missing import
ermalkaleci Sep 3, 2021
e07d497
fix currency type
ermalkaleci Sep 4, 2021
39e2cc3
make sure there're no empty entries
ermalkaleci Sep 4, 2021
56bef3b
import prelude::*
ermalkaleci Sep 4, 2021
0f2c74a
update std import
ermalkaleci Sep 4, 2021
48b0e98
accumulate reward returns error if pool does not exist
ermalkaleci Sep 4, 2021
175984e
cleanup
ermalkaleci Sep 4, 2021
f128062
cleanup
ermalkaleci Sep 4, 2021
bf6253d
move PoolInfoV0 to migration
ermalkaleci Sep 4, 2021
bac9058
test migration
ermalkaleci Sep 6, 2021
19f00f4
update migration test
ermalkaleci Sep 6, 2021
f07b16c
keep old map storage for migrate keys
wangjj9219 Sep 13, 2021
531e9f5
Merge remote-tracking branch 'origin/master' into multi_currency_rewards
wangjj9219 Sep 13, 2021
c08a150
new migration
wangjj9219 Sep 13, 2021
6e50ef4
fix migration
wangjj9219 Sep 13, 2021
f9e27b4
update
wangjj9219 Sep 13, 2021
01690b1
limit migration
wangjj9219 Sep 14, 2021
1eea735
fix
wangjj9219 Sep 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions rewards/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,12 @@ pub mod module {
type Handler: RewardHandler<Self::AccountId, Self::CurrencyId, Balance = Self::Balance, PoolId = Self::PoolId>;
}

#[pallet::error]
pub enum Error<T> {
/// Pool does not exist
PoolDoesNotExist,
}

/// Stores reward pool info.
#[pallet::storage]
#[pallet::getter(fn pools)]
Expand Down Expand Up @@ -124,11 +130,16 @@ pub mod module {
}

impl<T: Config> Pallet<T> {
pub fn accumulate_reward(pool: &T::PoolId, reward_currency: T::CurrencyId, reward_increment: T::Balance) {
pub fn accumulate_reward(
pool: &T::PoolId,
reward_currency: T::CurrencyId,
reward_increment: T::Balance,
) -> DispatchResult {
if reward_increment.is_zero() {
return;
return Ok(());
}
Pools::<T>::mutate_exists(pool, |maybe_pool_info| {
Pools::<T>::mutate_exists(pool, |maybe_pool_info| -> DispatchResult {
ensure!(maybe_pool_info.is_some(), Error::<T>::PoolDoesNotExist);
Copy link
Member

@xlc xlc Sep 4, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let pool_info = maybe_pool_info.ok_or(Error::<T>::PoolDoesNotExist)?;

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let pool_info = maybe_pool_info.ok_or(Error::::PoolDoesNotExist)?;

missed that 👌

if let Some(pool_info) = maybe_pool_info {
if let Some((total_reward, _)) = pool_info.rewards.get_mut(&reward_currency) {
*total_reward = total_reward.saturating_add(reward_increment);
Expand All @@ -138,7 +149,8 @@ impl<T: Config> Pallet<T> {
.insert(reward_currency, (reward_increment, Zero::zero()));
}
}
});
Ok(())
})
}

pub fn add_share(who: &T::AccountId, pool: &T::PoolId, add_amount: T::Share) {
Expand Down
10 changes: 7 additions & 3 deletions rewards/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#![cfg(test)]

use super::*;
use frame_support::{assert_noop, assert_ok};
use mock::*;

#[test]
Expand Down Expand Up @@ -434,12 +435,15 @@ fn accumulate_reward_should_work() {
assert_eq!(RewardsModule::pools(DOT_POOL), Default::default());

// should not accumulate if pool doesn't exist
RewardsModule::accumulate_reward(&DOT_POOL, NATIVE_COIN, 100);
assert_noop!(
RewardsModule::accumulate_reward(&DOT_POOL, NATIVE_COIN, 100),
Error::<Runtime>::PoolDoesNotExist
);
assert_eq!(RewardsModule::pools(DOT_POOL), PoolInfo::default());

RewardsModule::add_share(&ALICE, &DOT_POOL, 100);

RewardsModule::accumulate_reward(&DOT_POOL, NATIVE_COIN, 100);
assert_ok!(RewardsModule::accumulate_reward(&DOT_POOL, NATIVE_COIN, 100));
assert_eq!(
RewardsModule::pools(DOT_POOL),
PoolInfo {
Expand All @@ -448,7 +452,7 @@ fn accumulate_reward_should_work() {
}
);

RewardsModule::accumulate_reward(&DOT_POOL, STABLE_COIN, 200);
assert_ok!(RewardsModule::accumulate_reward(&DOT_POOL, STABLE_COIN, 200));
assert_eq!(
RewardsModule::pools(DOT_POOL),
PoolInfo {
Expand Down