Add base and adjusted rewards total to summary csv (#1876)

Author: pietrodimarco-dfinity

rs/cli/src/commands/node_rewards/common.rs

@@ -20,7 +20,6 @@ pub struct NodeRewardsCtx {
     pub end_date: NaiveDate,
     pub algorithm_version: Option<RewardsCalculationAlgorithmVersion>,
     pub csv_detailed_output_path: Option<String>,
-    pub provider_id: Option<String>,
     pub compare_with_governance: bool,
     pub governance_providers_rewards: BTreeMap<PrincipalId, u64>,
     pub governance_rewards_raw: ic_nns_governance_api::MonthlyNodeProviderRewards,
@@ -86,14 +85,6 @@ pub trait NodeRewardsDataFetcher {
             }
         }
 
-        if let Some(ref provider_filter) = ctx.provider_id {
-            providers_rewards.retain(|provider_id, _| {
-                let provider_id_str = provider_id.to_string();
-                let prefix = get_provider_prefix(&provider_id_str);
-                provider_id_str == *provider_filter || prefix == *provider_filter
-            });
-        }
-
         Ok(NrcData {
             providers_rewards,
             subnets_failure_rates,
@@ -402,7 +393,7 @@ pub trait NodeRewardsCsvOutput {
 
         // Generate node providers summary CSV with ICP rewards and accounts only for PastRewards mode
         if ctx.is_past_rewards_mode {
-            self.create_node_providers_summary_csv(&rewards_dir)?;
+            self.create_node_providers_summary_csv(&rewards_dir, nrc_data)?;
         }
 
         Ok(())
@@ -781,12 +772,18 @@ pub trait NodeRewardsCsvOutput {
     }
 
     /// Create node providers summary CSV with provider IDs, rewards in ICP, and account information
-    fn create_node_providers_summary_csv(&self, output_dir: &str) -> anyhow::Result<()> {
+    fn create_node_providers_summary_csv(&self, output_dir: &str, nrc_data: &NrcData) -> anyhow::Result<()> {
         let filename = format!("{}/node_providers_summary.csv", output_dir);
         let mut wtr = Writer::from_path(&filename)?;
 
         // Write header
-        wtr.write_record(["node_provider_id", "rewards_icp", "account_id"])?;
+        wtr.write_record([
+            "node_provider_id",
+            "rewards_icp",
+            "account_id",
+            "total_base_rewards_xdr_permyriad",
+            "total_adjusted_rewards_xdr_permyriad",
+        ])?;
 
         let ctx = self.ctx();
 
@@ -820,7 +817,29 @@ pub trait NodeRewardsCsvOutput {
                 .map(|s| s.to_string())
                 .unwrap_or("".to_string());
 
-            wtr.write_record([&provider_id, &format!("{:.8}", rewards_icp), &account_id])?;
+            // Calculate total base and adjusted rewards from nrc_data (sum across all days)
+            let (total_base_rewards, total_adjusted_rewards) = provider_id_principal
+                .and_then(|id| nrc_data.providers_rewards.get(&id))
+                .map(|daily_rewards| {
+                    let base_total: u64 = daily_rewards
+                        .iter()
+                        .map(|(_, reward)| reward.total_base_rewards_xdr_permyriad.unwrap_or(0))
+                        .sum();
+                    let adjusted_total: u64 = daily_rewards
+                        .iter()
+                        .map(|(_, reward)| reward.total_adjusted_rewards_xdr_permyriad.unwrap_or(0))
+                        .sum();
+                    (base_total, adjusted_total)
+                })
+                .unwrap_or((0, 0));
+
+            wtr.write_record([
+                &provider_id,
+                &format!("{:.8}", rewards_icp),
+                &account_id,
+                &total_base_rewards.to_string(),
+                &total_adjusted_rewards.to_string(),
+            ])?;
         }
 
         wtr.flush()?;
@@ -836,10 +855,6 @@ pub struct CommonArgs {
     #[arg(long)]
     pub csv_detailed_output_path: Option<String>,
 
-    /// Filter to a single provider (full principal or provider prefix)
-    #[arg(long)]
-    pub provider_id: Option<String>,
-
     /// If set, display comparison table with governance rewards
     #[arg(long)]
     pub compare_with_governance: bool,

rs/cli/src/commands/node_rewards/ongoing.rs

@@ -72,7 +72,6 @@ impl ExecutableCommand for Ongoing {
             end_date,
             algorithm_version: None,
             csv_detailed_output_path: self.common.csv_detailed_output_path.clone(),
-            provider_id: self.common.provider_id.clone(),
             governance_providers_rewards,
             compare_with_governance: self.common.compare_with_governance,
             governance_rewards_raw: last.clone(),

rs/cli/src/commands/node_rewards/past_rewards.rs

@@ -83,7 +83,6 @@ impl ExecutableCommand for PastRewards {
             end_date,
             algorithm_version,
             csv_detailed_output_path: self.common.csv_detailed_output_path.clone(),
-            provider_id: self.common.provider_id.clone(),
             governance_providers_rewards,
             compare_with_governance: self.common.compare_with_governance,
             governance_rewards_raw: last.clone(),