few changes before rewriting proposer script

Author: cameron1024

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

@@ -28,14 +28,6 @@ pub(super) struct Inputs {
     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,
@@ -46,8 +38,36 @@ pub(super) struct Outputs {
 
 #[derive(Debug, Deserialize)]
 pub(super) struct Params {
-    pub(super) registration_threshold: u64,
+    pub(super) voter_params: VoterParams,
+    pub(super) proposer_params: ProposerParams,
+    pub(super) ca_params: CaParams,
+    pub(super) vca_params: VcaParams,
+}
+
+#[derive(Debug, Deserialize)]
+pub(super) struct VoterParams {
+    pub(super) total_rewards: u64,
     pub(super) vote_threshold: u64,
+    pub(super) registration_threshold: u64,
+}
+
+#[derive(Debug, Deserialize)]
+pub(super) struct ProposerParams {
+    pub(super) total_rewards: u64,
+    pub(super) stake_threshold: f64,
+    pub(super) approval_threshold: f64,
+    pub(super) pattern: String,
+}
+
+#[derive(Debug, Deserialize)]
+pub(super) struct CaParams {
+    pub(super) rewards_slots: ProposalRewardsSlotsOpt,
+    pub(super) fund_settings: FundSettingOpt,
+    pub(super) seed: String,
+}
+
+#[derive(Debug, Deserialize)]
+pub(super) struct VcaParams {
     pub(super) total_rewards: u64,
     pub(super) rewards_agreement_rate_cutoffs: Vec<Decimal>,
     pub(super) rewards_agreement_rate_modifiers: Vec<Decimal>,
@@ -56,9 +76,4 @@ pub(super) struct Params {
     pub(super) min_rankings: usize,
     pub(super) max_rankings_reputation: usize,
     pub(super) max_rankings_rewards: usize,
-    pub(super) rewards_slots: ProposalRewardsSlotsOpt,
-    pub(super) fund_settings: FundSettingOpt,
-    pub(super) ca_seed: String,
-    pub(super) proposer_stake_threshold: f64,
-    pub(super) proposer_approval_threshold: f64,
 }

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

@@ -36,21 +36,10 @@ pub(super) fn full_rewards(path: &Path) -> Result<()> {
             },
         params:
             Params {
-                registration_threshold,
-                vote_threshold,
-                total_rewards,
-                rewards_agreement_rate_cutoffs,
-                rewards_agreement_rate_modifiers,
-                reputation_agreement_rate_cutoffs,
-                reputation_agreement_rate_modifiers,
-                min_rankings,
-                max_rankings_reputation,
-                max_rankings_rewards,
-                rewards_slots,
-                fund_settings,
-                ca_seed,
-                proposer_stake_threshold,
-                proposer_approval_threshold,
+                voter_params,
+                proposer_params,
+                ca_params,
+                vca_params,
             },
     } = config;
 
@@ -60,46 +49,48 @@ pub(super) fn full_rewards(path: &Path) -> Result<()> {
         &voter_rewards_output,
         &vote_count_path,
         &snapshot_path,
-        registration_threshold,
-        vote_threshold,
-        total_rewards,
+        voter_params.registration_threshold,
+        voter_params.vote_threshold,
+        voter_params.total_rewards,
     )?;
 
     info!("calculating vca rewards");
     super::veterans::vca_rewards(
         reviews_csv,
         veterans_rewards_output,
-        rewards_agreement_rate_cutoffs,
-        rewards_agreement_rate_modifiers,
-        reputation_agreement_rate_cutoffs,
-        reputation_agreement_rate_modifiers,
-        total_rewards.into(),
-        min_rankings,
-        max_rankings_reputation,
-        max_rankings_rewards,
+        vca_params.rewards_agreement_rate_cutoffs,
+        vca_params.rewards_agreement_rate_modifiers,
+        vca_params.reputation_agreement_rate_cutoffs,
+        vca_params.reputation_agreement_rate_modifiers,
+        vca_params.total_rewards.into(),
+        vca_params.min_rankings,
+        vca_params.max_rankings_reputation,
+        vca_params.max_rankings_rewards,
     )?;
 
     info!("calculating ca rewards");
     super::community_advisors::ca_rewards(
         assessments_path,
         approved_proposals_path,
-        fund_settings,
-        rewards_slots,
+        ca_params.fund_settings,
+        ca_params.rewards_slots,
         ca_rewards_output,
-        ca_seed,
+        ca_params.seed,
         proposal_bonus_output,
     )?;
 
     info!("calculating proposer rewards");
     proposers::proposers_rewards(
         &proposer_script_path,
+        &csv_merger_script_path,
         &block_file,
         &proposer_rewards_output,
-        proposer_stake_threshold,
-        proposer_approval_threshold,
+        proposer_params.stake_threshold,
+        proposer_params.approval_threshold,
         &proposals_path,
-        &active_voteplans,
         &challenges,
+        &active_voteplans,
+        &proposer_params.pattern,
     )?;
 
     Ok(())