Skip to content

Commit

Permalink
update rewards endpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kirill-K-1
Kirill-K-1 committed Nov 25, 2024
1 parent 4b75941 commit a76a20e
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 24 deletions.
16 changes: 14 additions & 2 deletions gov-portal-db/src/rewards_manager/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ impl RewardsManager {
.await?
}

pub fn get_total_rewards(
pub fn get_available_rewards(
&self,
requestor: &Address,
wallet: &Address,
Expand All @@ -189,7 +189,19 @@ impl RewardsManager {
return Err(error::Error::Unauthorized);
}

Ok(self.rewards_cache.get_total_rewards(wallet))
Ok(self.rewards_cache.get_available_rewards(wallet))
}

pub fn get_total_rewards(&self, requestor: &Address) -> Result<U256, error::Error> {
if !self
.config
.moderators
.iter()
.any(|wallet| wallet == requestor)
{
return Err(error::Error::Unauthorized);
}
Ok(self.rewards_cache.get_total_rewards())
}

/// Counts all rewards allocated by requestor within MongoDB by provided wallet EVM-like address [`Address`]
Expand Down
51 changes: 36 additions & 15 deletions gov-portal-db/src/rewards_manager/rewards_cache.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ use super::error;
const REWARDS_BUF_LENGTH: usize = 128;

pub struct RewardsCache {
total_rewards_by_wallets: Arc<RwLock<HashMap<Address, Reward>>>,
total_rewards: Arc<RwLock<Reward>>,
available_rewards_by_wallets: Arc<RwLock<HashMap<Address, Reward>>>,
unclaimed_rewards: Arc<RwLock<HashMap<BatchId, HashMap<Address, Reward>>>>,
total_rewards_tx: mpsc::UnboundedSender<RewardsDelta>,
}
Expand Down Expand Up @@ -55,7 +56,9 @@ impl RewardsCache {
pub fn init(rewards: Vec<RewardsDbEntry>) -> Result<Self, error::Error> {
let (total_rewards_tx, mut total_rewards_rx) = mpsc::unbounded_channel();

let mut total_rewards_by_wallet = HashMap::<Address, Reward>::with_capacity(rewards.len());
let mut total_rewards = Reward::default();
let mut available_rewards_by_wallet =
HashMap::<Address, Reward>::with_capacity(rewards.len());
let mut unclaimed_rewards = HashMap::<BatchId, HashMap<Address, Reward>>::default();

for entry in rewards {
Expand All @@ -73,20 +76,25 @@ impl RewardsCache {
continue;
}
RewardStatus::Granted => {
total_rewards.add(reward.amount, block_number);

unclaimed_rewards
.entry(entry.id)
.or_default()
.insert(wallet, Reward::new(reward.amount, block_number));
}
RewardStatus::Claimed => {}
RewardStatus::Claimed => {
total_rewards.add(reward.amount, block_number);
continue;
}
RewardStatus::Reverted => {
return Err(
anyhow::anyhow!("Unexpected status for reward {reward:?}").into()
);
}
}

total_rewards_by_wallet
available_rewards_by_wallet
.entry(wallet)
.or_default()
.add(reward.amount, block_number);
Expand All @@ -95,11 +103,13 @@ impl RewardsCache {

let cache = Self {
total_rewards_tx,
total_rewards_by_wallets: Arc::new(RwLock::new(total_rewards_by_wallet)),
total_rewards: Arc::new(RwLock::new(total_rewards)),
available_rewards_by_wallets: Arc::new(RwLock::new(available_rewards_by_wallet)),
unclaimed_rewards: Arc::new(RwLock::new(unclaimed_rewards)),
};

let total_rewards_by_wallets = cache.total_rewards_by_wallets.clone();
let total_rewards = cache.total_rewards.clone();
let available_rewards_by_wallets = cache.available_rewards_by_wallets.clone();
let unclaimed_rewards = cache.unclaimed_rewards.clone();

tokio::spawn(async move {
Expand All @@ -110,18 +120,21 @@ impl RewardsCache {
.await
> 0
{
let mut total_rewards_by_wallets = total_rewards_by_wallets.write();
let mut total_rewards = total_rewards.write();
let mut available_rewards_by_wallets = available_rewards_by_wallets.write();
let mut unclaimed_rewards = unclaimed_rewards.write();

for rewards_delta in total_rewards_buf.drain(..) {
match rewards_delta {
RewardsDelta::Grant(block_number, id, wallet, amount) => {
total_rewards.add(amount, block_number);

unclaimed_rewards
.entry(id)
.or_default()
.insert(wallet, Reward::new(amount, block_number));

total_rewards_by_wallets
available_rewards_by_wallets
.entry(wallet)
.or_default()
.add(amount, block_number);
Expand All @@ -131,8 +144,10 @@ impl RewardsCache {
entry.remove(&wallet);
});

if let Some(total_reward) = total_rewards_by_wallets.get_mut(&wallet) {
total_reward.updated_at_block = block_number;
if let Some(available_reward) =
available_rewards_by_wallets.get_mut(&wallet)
{
available_reward.sub(available_reward.amount, block_number);
}
}
RewardsDelta::RevertBatch(block_number, id) => {
Expand All @@ -141,11 +156,13 @@ impl RewardsCache {
};

for (wallet, reward) in rewards_by_wallets {
if let Some(total_reward) =
total_rewards_by_wallets.get_mut(&wallet)
if let Some(available_reward) =
available_rewards_by_wallets.get_mut(&wallet)
{
total_reward.sub(reward.amount, block_number);
available_reward.sub(reward.amount, block_number);
}

total_rewards.sub(reward.amount, block_number);
}
}
}
Expand All @@ -162,11 +179,15 @@ impl RewardsCache {
.map_err(error::Error::from)
}

pub fn get_total_rewards(&self, wallet: &Address) -> U256 {
self.total_rewards_by_wallets
pub fn get_available_rewards(&self, wallet: &Address) -> U256 {
self.available_rewards_by_wallets
.read()
.get(wallet)
.map(|reward| reward.amount)
.unwrap_or_default()
}

pub fn get_total_rewards(&self) -> U256 {
self.total_rewards.read().amount
}
}
9 changes: 7 additions & 2 deletions gov-portal-db/src/server.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ pub struct RewardsResponse {
pub data: Vec<Rewards>,
pub total: u64,
pub total_rewards: Option<U256>,
pub available_rewards: Option<U256>,
}

/// JSON-serialized request passed as POST-data to `/users` endpoint
Expand Down Expand Up @@ -609,7 +610,8 @@ async fn rewards_route(
.map(|data| RewardsResponse {
data,
total,
total_rewards: None,
available_rewards: None,
total_rewards: manager.get_total_rewards(&requestor).ok(),
})
}
})
Expand Down Expand Up @@ -644,7 +646,10 @@ async fn rewards_route(
.map(|data| RewardsResponse {
data,
total,
total_rewards: manager.get_total_rewards(&requestor, &wallet).ok(),
available_rewards: manager
.get_available_rewards(&requestor, &wallet)
.ok(),
total_rewards: None,
})
}
})
Expand Down
10 changes: 5 additions & 5 deletions gov-portal-db/tests/test_rewards_manager.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ async fn test_rewards_by_wallet() -> Result<(), anyhow::Error> {

assert_eq!(
rewards_manager
.get_total_rewards(&Address::from_low_u64_le(1), &Address::from_low_u64_le(1))
.get_available_rewards(&Address::from_low_u64_le(1), &Address::from_low_u64_le(1))
.unwrap(),
U256::from_dec_str("31248000000000").unwrap()
);
Expand All @@ -598,14 +598,14 @@ async fn test_rewards_by_wallet() -> Result<(), anyhow::Error> {

assert_eq!(
rewards_manager
.get_total_rewards(&Address::from_low_u64_le(1), &Address::from_low_u64_le(1))
.get_available_rewards(&Address::from_low_u64_le(1), &Address::from_low_u64_le(1))
.unwrap(),
U256::from_dec_str("31248000000000").unwrap()
);

assert_eq!(
rewards_manager
.get_total_rewards(
.get_available_rewards(
&rewards_manager.config.moderators[0],
&Address::from_low_u64_le(1)
)
Expand All @@ -625,7 +625,7 @@ async fn test_rewards_by_wallet() -> Result<(), anyhow::Error> {

assert_eq!(
rewards_manager
.get_total_rewards(&Address::from_low_u64_le(1), &Address::from_low_u64_le(1))
.get_available_rewards(&Address::from_low_u64_le(1), &Address::from_low_u64_le(1))
.unwrap(),
U256::from_dec_str("31232000000000").unwrap()
);
Expand All @@ -642,7 +642,7 @@ async fn test_rewards_by_wallet() -> Result<(), anyhow::Error> {

assert_eq!(
rewards_manager
.get_total_rewards(
.get_available_rewards(
&rewards_manager.config.moderators[0],
&Address::from_low_u64_le(1)
)
Expand Down

0 comments on commit a76a20e

Please sign in to comment.