feat: implement reward history getter and query handler

Signed-off-by: William Hankins <[email protected]>

Author: whankinsiv

common/src/queries/accounts.rs

@@ -13,7 +13,7 @@ pub const DEFAULT_HISTORICAL_ACCOUNTS_QUERY_TOPIC: (&str, &str) = (
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub enum AccountsStateQuery {
     GetAccountInfo { stake_address: StakeAddress },
-    GetAccountRewardHistory { stake_key: Vec<u8> },
+    GetAccountRewardHistory { account: StakeAddress },
     GetAccountHistory { stake_key: Vec<u8> },
     GetAccountRegistrationHistory { account: StakeAddress },
     GetAccountDelegationHistory { account: StakeAddress },
@@ -47,7 +47,7 @@ pub enum AccountsStateQuery {
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub enum AccountsStateQueryResponse {
     AccountInfo(AccountInfo),
-    AccountRewardHistory(AccountRewardHistory),
+    AccountRewardHistory(Vec<RewardHistory>),
     AccountHistory(AccountHistory),
     AccountRegistrationHistory(Vec<RegistrationUpdate>),
     AccountDelegationHistory(Vec<DelegationUpdate>),
@@ -91,9 +91,6 @@ pub struct AccountInfo {
     pub delegated_drep: Option<DRepChoice>,
 }
 
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-pub struct AccountRewardHistory {}
-
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub struct AccountHistory {}
 
@@ -150,6 +147,20 @@ pub struct AccountWithdrawal {
     pub amount: u64,
 }
 
+#[derive(
+    Debug, Clone, minicbor::Decode, minicbor::Encode, serde::Serialize, serde::Deserialize,
+)]
+pub struct RewardHistory {
+    #[n(0)]
+    pub epoch: u32,
+    #[n(1)]
+    pub amount: u64,
+    #[n(2)]
+    pub pool: PoolId,
+    #[n(3)]
+    pub is_owner: bool,
+}
+
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub struct AccountWithdrawalHistory {}
 

modules/historical_accounts_state/src/historical_accounts_state.rs

@@ -348,6 +348,15 @@ impl HistoricalAccountsState {
                             Err(e) => AccountsStateQueryResponse::Error(e.to_string()),
                         }
                     }
+                    AccountsStateQuery::GetAccountRewardHistory { account } => {
+                        match state.lock().await.get_reward_history(account).await {
+                            Ok(Some(rewards)) => {
+                                AccountsStateQueryResponse::AccountRewardHistory(rewards)
+                            }
+                            Ok(None) => AccountsStateQueryResponse::NotFound,
+                            Err(e) => AccountsStateQueryResponse::Error(e.to_string()),
+                        }
+                    }
                     _ => AccountsStateQueryResponse::Error(format!(
                         "Unimplemented query variant: {:?}",
                         query

modules/historical_accounts_state/src/immutable_historical_account_store.rs

@@ -1,7 +1,7 @@
 use std::{collections::HashMap, path::Path};
 
 use acropolis_common::{
-    queries::accounts::{AccountWithdrawal, DelegationUpdate, RegistrationUpdate},
+    queries::accounts::{AccountWithdrawal, DelegationUpdate, RegistrationUpdate, RewardHistory},
     ShelleyAddress, StakeAddress,
 };
 use anyhow::Result;
@@ -11,7 +11,7 @@ use rayon::iter::{IntoParallelIterator, ParallelIterator};
 use tokio::sync::Mutex;
 use tracing::{debug, error};
 
-use crate::state::{AccountEntry, ActiveStakeHistory, HistoricalAccountsConfig, RewardHistory};
+use crate::state::{AccountEntry, ActiveStakeHistory, HistoricalAccountsConfig};
 
 pub struct ImmutableHistoricalAccountStore {
     rewards_history: Partition,
@@ -152,7 +152,7 @@ impl ImmutableHistoricalAccountStore {
         pending.extend(drained);
     }
 
-    pub async fn _get_rewards_history(
+    pub async fn get_reward_history(
         &self,
         account: &StakeAddress,
     ) -> Result<Option<Vec<RewardHistory>>> {

modules/historical_accounts_state/src/state.rs

@@ -8,10 +8,10 @@ use acropolis_common::{
         AddressDeltasMessage, StakeRewardDeltasMessage, TxCertificatesMessage, WithdrawalsMessage,
     },
     queries::accounts::{
-        AccountWithdrawal, DelegationUpdate, RegistrationStatus, RegistrationUpdate,
+        AccountWithdrawal, DelegationUpdate, RegistrationStatus, RegistrationUpdate, RewardHistory,
     },
-    BlockInfo, InstantaneousRewardTarget, PoolId, ShelleyAddress, StakeAddress, StakeCredential,
-    TxCertificate, TxIdentifier,
+    BlockInfo, InstantaneousRewardTarget, PoolId, ShelleyAddress, StakeAddress, TxCertificate,
+    TxIdentifier,
 };
 use tracing::warn;
 
@@ -33,18 +33,6 @@ pub struct AccountEntry {
     pub addresses: Option<Vec<ShelleyAddress>>,
 }
 
-#[derive(Debug, Clone, minicbor::Decode, minicbor::Encode)]
-pub struct RewardHistory {
-    #[n(0)]
-    pub epoch: u32,
-    #[n(1)]
-    pub amount: u64,
-    #[n(2)]
-    pub pool: PoolId,
-    #[n(3)]
-    pub is_owner: bool,
-}
-
 #[derive(Debug, Clone, minicbor::Decode, minicbor::Encode)]
 pub struct ActiveStakeHistory {
     #[n(0)]
@@ -239,11 +227,23 @@ impl State {
         }
     }
 
-    pub async fn _get_reward_history(
+    pub async fn get_reward_history(
         &self,
-        _account: &StakeCredential,
-    ) -> Result<Vec<RewardHistory>> {
-        Ok(Vec::new())
+        account: &StakeAddress,
+    ) -> Result<Option<Vec<RewardHistory>>> {
+        let immutable = self.immutable.get_reward_history(account).await?;
+
+        let mut volatile = Vec::new();
+        self.merge_volatile_history(account, |e| e.reward_history.as_ref(), &mut volatile);
+
+        match immutable {
+            Some(mut rewards) => {
+                rewards.extend(volatile);
+                Ok(Some(rewards))
+            }
+            None if volatile.is_empty() => Ok(None),
+            None => Ok(Some(volatile)),
+        }
     }
 
     pub async fn _get_active_stake_history(