merge rust rewards script

Author: cameron1024

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

@@ -18,14 +18,14 @@ pub(super) struct Inputs {
     pub(super) snapshot_path: PathBuf,
     pub(super) vote_count_path: PathBuf,
     pub(super) reviews_csv: PathBuf,
-    pub(super) assessments_path: PathBuf, // is assessments the same as reviews?
+    pub(super) assessments_path: PathBuf, 
     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,
+    pub(super) committee_keys: PathBuf,
+    pub(super) excluded_proposals: Option<PathBuf>,
 }
 
 #[derive(Debug, Deserialize)]
@@ -48,15 +48,12 @@ pub(super) struct Params {
 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)]

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

@@ -1,13 +1,15 @@
 use std::{fs::File, path::Path};
 
+use catalyst_toolbox::{
+    http::HttpClient,
+    rewards::proposers::{OutputFormat, ProposerRewards},
+};
 use color_eyre::Result;
 use config::*;
 use log::info;
 use serde_json::from_reader;
 
 mod config;
-mod proposers;
-mod python;
 
 pub(super) fn full_rewards(path: &Path) -> Result<()> {
     let config = from_reader(File::open(path)?)?;
@@ -21,11 +23,11 @@ pub(super) fn full_rewards(path: &Path) -> Result<()> {
                 assessments_path,
                 proposal_bonus_output,
                 approved_proposals_path,
-                proposer_script_path,
-                csv_merger_script_path,
                 active_voteplans,
                 challenges,
                 proposals_path,
+                committee_keys,
+                excluded_proposals,
             },
         outputs:
             Outputs {
@@ -45,11 +47,9 @@ pub(super) fn full_rewards(path: &Path) -> Result<()> {
 
     info!("calculating voter rewards");
     super::voters::voter_rewards(
-        &block_file,
         &voter_rewards_output,
         &vote_count_path,
         &snapshot_path,
-        voter_params.registration_threshold,
         voter_params.vote_threshold,
         voter_params.total_rewards,
     )?;
@@ -80,18 +80,33 @@ pub(super) fn full_rewards(path: &Path) -> Result<()> {
     )?;
 
     info!("calculating proposer rewards");
-    proposers::proposers_rewards(
-        &proposer_script_path,
-        &csv_merger_script_path,
-        &block_file,
-        &proposer_rewards_output,
-        proposer_params.stake_threshold,
-        proposer_params.approval_threshold,
-        &proposals_path,
-        &challenges,
-        &active_voteplans,
-        &proposer_params.pattern,
+    super::proposers::rewards(
+        &ProposerRewards {
+            output: proposer_rewards_output,
+            block0: block_file,
+            total_stake_threshold: proposer_params.stake_threshold,
+            approval_threshold: proposer_params.approval_threshold,
+            proposals: Some(proposals_path),
+            active_voteplans: Some(active_voteplans),
+            challenges: Some(challenges),
+            committee_keys: Some(committee_keys),
+            excluded_proposals,
+            output_format: OutputFormat::Csv,
+            vit_station_url: "not used".into(),
+        },
+        &PanickingHttpClient,
     )?;
 
     Ok(())
 }
+
+struct PanickingHttpClient;
+
+impl HttpClient for PanickingHttpClient {
+    fn get<T>(&self, _path: &str) -> Result<catalyst_toolbox::http::HttpResponse<T>>
+    where
+        T: for<'a> serde::Deserialize<'a>,
+    {
+        unimplemented!("this implementation always panics");
+    }
+}

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

@@ -4,13 +4,9 @@ use catalyst_toolbox::utils::assert_are_close;
 
 use color_eyre::eyre::eyre;
 use color_eyre::{Report, Result};
-use jcli_lib::block::{load_block, open_block_file};
-use jcli_lib::jcli_lib::block::{open_output, Common};
-use jcli_lib::utils::io::open_file_read;
-use jormungandr_lib::interfaces::Block0Configuration;
-
-use color_eyre::Report;
+use jcli_lib::block::open_output;
 use jcli_lib::jcli_lib::block::Common;
+
 use structopt::StructOpt;
 
 use std::collections::BTreeMap;
@@ -65,48 +61,35 @@ impl VotersRewards {
         } = self;
 
         voter_rewards(
-            common
-                .input
-                .input_file
-                .as_deref()
-                .ok_or(eyre!("missing block file"))?,
             common
                 .output_file
                 .as_deref()
                 .ok_or(eyre!("missing output file"))?,
             &votes_count_path,
-            &snapshot_path,
-            registration_threshold,
+            &snapshot_info_path,
             vote_threshold,
             total_rewards,
         )
     }
 }
 
 pub fn voter_rewards(
-    block_file: &Path,
     output: &Path,
     votes_count_path: &Path,
     snapshot_path: &Path,
-    registration_threshold: u64,
     vote_threshold: u64,
     total_rewards: u64,
 ) -> Result<()> {
-    let block = open_block_file(&Some(block_file.to_path_buf()))?;
-    let block = load_block(block)?;
-
-    let block0 = Block0Configuration::from_block(&block)?;
+    let vote_count: VoteCount = serde_json::from_reader(jcli_lib::utils::io::open_file_read(
+        &Some(votes_count_path),
+    )?)?;
 
-    let vote_count: VoteCount = serde_json::from_reader(open_file_read(&Some(votes_count_path))?)?;
-    let snapshot = Snapshot::from_raw_snapshot(
-        serde_json::from_reader(open_file_read(&Some(snapshot_path))?)?,
-        registration_threshold.into(),
-    );
+    let snapshot: Vec<SnapshotInfo> =
+        serde_json::from_reader(jcli_lib::utils::io::open_file_read(&Some(snapshot_path))?)?;
 
     let results = calc_voter_rewards(
         vote_count,
         vote_threshold,
-        &block0,
         snapshot,
         Rewards::from(total_rewards),
     )?;