small changes

Author: cameron1024

catalyst-toolbox/src/bin/cli/rewards/full/config.rs

@@ -22,13 +22,23 @@ pub(super) struct Inputs {
     pub(super) proposal_bonus_output: Option<PathBuf>,
     pub(super) approved_proposals_path: PathBuf,
     pub(super) proposer_script_path: PathBuf,
+    pub(super) csv_merger_script_path: PathBuf,
     pub(super) active_voteplans: PathBuf,
     pub(super) challenges: PathBuf,
     pub(super) proposals_path: PathBuf,
 }
 
+/// A set of files required to calculate proposer rewards. There is one set per proposal, which are
+/// then later merged with csv_merger.py
+pub(super) struct ProposalFiles {
+    
+}
+
+
+
 #[derive(Debug, Deserialize)]
 pub(super) struct Outputs {
+    pub(super) voter_rewards_output: PathBuf,
     pub(super) veterans_rewards_output: PathBuf,
     pub(super) ca_rewards_output: PathBuf,
     pub(super) proposer_rewards_output: PathBuf,

catalyst-toolbox/src/bin/cli/rewards/full/mod.rs

@@ -22,12 +22,14 @@ pub(super) fn full_rewards(path: &Path) -> Result<()> {
                 proposal_bonus_output,
                 approved_proposals_path,
                 proposer_script_path,
+                csv_merger_script_path,
                 active_voteplans,
                 challenges,
                 proposals_path,
             },
         outputs:
             Outputs {
+                voter_rewards_output,
                 veterans_rewards_output,
                 ca_rewards_output,
                 proposer_rewards_output,
@@ -55,8 +57,9 @@ pub(super) fn full_rewards(path: &Path) -> Result<()> {
     info!("calculating voter rewards");
     super::voters::voter_rewards(
         &block_file,
-        vote_count_path,
-        snapshot_path,
+        &voter_rewards_output,
+        &vote_count_path,
+        &snapshot_path,
         registration_threshold,
         vote_threshold,
         total_rewards,

catalyst-toolbox/src/bin/cli/rewards/full/proposers.rs

@@ -1,20 +1,37 @@
 use std::{ffi::OsStr, path::Path};
 
+use assert_fs::TempDir;
 use color_eyre::Result;
 
 use super::python::exec_python_script;
 
 #[allow(clippy::too_many_arguments)]
 pub(super) fn proposers_rewards(
     proposer_reward_script: &Path,
+    csv_merger_script: &Path,
     block0: &Path,
     output: &Path,
     stake_threshold: f64,
     approval_threshold: f64,
     proposals: &Path,
     active_voteplans: &Path,
     challenges: &Path,
+    pattern: &str
 ) -> Result<()> {
+    let temp = TempDir::new()?;
+    exec_python_script(
+        csv_merger_script,
+        [
+            OsStr::new("--output-file"),
+            temp.path().as_ref(),
+            OsStr::new("--pattern"),
+            OsStr::new(pattern),
+            OsStr::new("--pattern"),
+            OsStr::new(pattern),
+            
+        ],
+    )?;
+
     exec_python_script(
         proposer_reward_script,
         [

catalyst-toolbox/src/bin/cli/rewards/voters.rs

@@ -71,11 +71,16 @@ impl VotersRewards {
 
         voter_rewards(
             common
-                .output_file
+                .input
+                .input_file
                 .as_deref()
                 .ok_or(eyre!("missing block file"))?,
-            votes_count_path,
-            snapshot_path,
+            common
+                .output_file
+                .as_deref()
+                .ok_or(eyre!("missing output file"))?,
+            &votes_count_path,
+            &snapshot_path,
             registration_threshold,
             vote_threshold,
             total_rewards,
@@ -85,8 +90,9 @@ impl VotersRewards {
 
 pub fn voter_rewards(
     block_file: &Path,
-    votes_count_path: PathBuf,
-    snapshot_path: PathBuf,
+    output: &Path,
+    votes_count_path: &Path,
+    snapshot_path: &Path,
     registration_threshold: u64,
     vote_threshold: u64,
     total_rewards: u64,
@@ -113,6 +119,6 @@ pub fn voter_rewards(
     let actual_rewards = results.values().sum::<Rewards>();
     assert_are_close(actual_rewards, Rewards::from(total_rewards));
 
-    write_rewards_results(&Some(block_file.to_path_buf()), &results)?;
+    write_rewards_results(&Some(output.to_path_buf()), &results)?;
     Ok(())
 }