merge main

Author: cameron1024

.pre-commit-config.yaml

@@ -1 +1 @@
-/nix/store/i1k30qr48lvl8zyzymny3qy00ks9ihy2-pre-commit-config.json
+/nix/store/mm6z36vc1ss0scr9yf1gf40rp43ddj5j-pre-commit-config.json

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

@@ -1,6 +1,3 @@
-use chain_crypto::digest::DigestOf;
-use color_eyre::eyre::bail;
-use color_eyre::Report;
 use serde::{Deserialize, Serialize};
 use std::collections::{BTreeMap, BTreeSet};
 use std::path::{Path, PathBuf};
@@ -15,10 +12,6 @@ use chain_crypto::digest::DigestOf;
 use color_eyre::eyre::{bail, eyre};
 use color_eyre::Report;
 use rust_decimal::prelude::ToPrimitive;
-use serde::Serialize;
-use std::collections::{BTreeMap, BTreeSet};
-use std::path::{Path, PathBuf};
-use std::str::FromStr;
 
 use catalyst_toolbox::community_advisors::models::{
     AdvisorReviewRow, ApprovedProposalRow, ProposalStatus,

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

@@ -6,8 +6,8 @@ use catalyst_toolbox::{
 };
 use color_eyre::Result;
 use config::*;
-use log::info;
 use serde_json::from_reader;
+use tracing::info;
 
 mod config;
 

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

@@ -1,13 +1,21 @@
 mod community_advisors;
+mod dreps;
 mod full;
 mod proposers;
 mod veterans;
 mod voters;
 
-use std::path::PathBuf;
+use std::{collections::HashMap, path::PathBuf};
 
-use catalyst_toolbox::{http::default_http_client, rewards::proposers as proposers_lib};
-use color_eyre::Report;
+use catalyst_toolbox::{
+    http::default_http_client,
+    rewards::{proposers as proposers_lib, VoteCount},
+};
+use color_eyre::{eyre::eyre, Report};
+use jormungandr_lib::{
+    crypto::{account::Identifier, hash::Hash},
+    interfaces::AccountVotes,
+};
 use structopt::StructOpt;
 use vit_servicing_station_lib::db::models::proposals::FullProposalInfo;
 

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

@@ -1,6 +1,5 @@
 use catalyst_toolbox::community_advisors::models::VeteranRankingRow;
 use catalyst_toolbox::rewards::veterans::{self, VcaRewards, VeteranAdvisorIncentive};
-use catalyst_toolbox::rewards::Rewards;
 use catalyst_toolbox::utils::csv;
 use color_eyre::eyre::{bail, eyre};
 use color_eyre::Report;
@@ -20,7 +19,7 @@ pub struct VeteransRewards {
 
     /// Reward to be distributed (integer value)
     #[structopt(long = "total-rewards")]
-    total_rewards: u64,
+    total_rewards: Decimal,
 
     /// Minimum number of rankings for each vca to be considered for reputation and rewards
     /// distribution
@@ -119,34 +118,14 @@ pub fn vca_rewards(
         bail!(
                 "Expected same number of reputation_agreement_rate_cutoffs and reputation_agreement_rate_modifiers"
             );
-        }
-
-        if !is_descending(&rewards_agreement_rate_cutoffs) {
-            bail!("Expected rewards_agreement_rate_cutoffs to be descending");
-        }
-
-        if !is_descending(&reputation_agreement_rate_cutoffs) {
-            bail!("Expected rewards_agreement_rate_cutoffs to be descending");
-        }
-
-        let results = veterans::calculate_veteran_advisors_incentives(
-            &reviews,
-            Rewards::from(total_rewards),
-            min_rankings..=max_rankings_rewards,
-            min_rankings..=max_rankings_reputation,
-            rewards_agreement_rate_cutoffs
-                .into_iter()
-                .zip(rewards_agreement_rate_modifiers.into_iter())
-                .collect(),
-            reputation_agreement_rate_cutoffs
-                .into_iter()
-                .zip(reputation_agreement_rate_modifiers.into_iter())
-                .collect(),
-        );
-
-        csv::dump_data_to_csv(rewards_to_csv_data(results)?.iter(), &to).unwrap();
-
-        Ok(())
+    }
+
+    if !is_descending(&rewards_agreement_rate_cutoffs) {
+        bail!("Expected rewards_agreement_rate_cutoffs to be descending");
+    }
+
+    if !is_descending(&reputation_agreement_rate_cutoffs) {
+        bail!("Expected rewards_agreement_rate_cutoffs to be descending");
     }
 
     if !is_descending(&rewards_agreement_rate_cutoffs) {

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

@@ -1,14 +1,15 @@
 use catalyst_toolbox::rewards::voters::calc_voter_rewards;
-use catalyst_toolbox::rewards::{Rewards, Threshold};
+use catalyst_toolbox::rewards::{Rewards, Threshold, VoteCount};
 use catalyst_toolbox::utils::assert_are_close;
 
 use color_eyre::eyre::eyre;
 use color_eyre::{Report, Result};
 use jcli_lib::block::open_output;
 use jcli_lib::jcli_lib::block::Common;
 
+use snapshot_lib::registration::MainnetRewardAddress;
+use snapshot_lib::SnapshotInfo;
 use structopt::StructOpt;
-use vit_servicing_station_lib::db::models::proposals::FullProposalInfo;
 
 use std::collections::BTreeMap;
 use std::path::{Path, PathBuf};
@@ -35,7 +36,7 @@ pub struct VotersRewards {
 
     /// Number of global votes required to be able to receive voter rewards
     #[structopt(long, default_value)]
-    vote_threshold: usize,
+    vote_threshold: u64,
 
     /// Path to a json-encoded map from challenge id to an optional required threshold
     /// per-challenge in order to receive rewards.
@@ -77,7 +78,6 @@ impl VotersRewards {
             proposals,
         } = self;
 
-<<<<<<< HEAD
         voter_rewards(
             common
                 .output_file
@@ -88,42 +88,6 @@ impl VotersRewards {
             vote_threshold,
             total_rewards,
         )
-=======
-        let proposals = serde_json::from_reader::<_, Vec<FullProposalInfo>>(
-            jcli_lib::utils::io::open_file_read(&Some(proposals))?,
-        )?;
-
-        let vote_count = super::extract_individual_votes(
-            proposals.clone(),
-            serde_json::from_reader::<_, HashMap<Identifier, Vec<AccountVotes>>>(
-                jcli_lib::utils::io::open_file_read(&Some(votes_count_path))?,
-            )?,
-        )?;
-
-        let snapshot: Vec<SnapshotInfo> = serde_json::from_reader(
-            jcli_lib::utils::io::open_file_read(&Some(snapshot_info_path))?,
-        )?;
-
-        let additional_thresholds: HashMap<i32, usize> = if let Some(file) = per_challenge_threshold
-        {
-            serde_json::from_reader(jcli_lib::utils::io::open_file_read(&Some(file))?)?
-        } else {
-            HashMap::new()
-        };
-
-        let results = calc_voter_rewards(
-            vote_count,
-            snapshot,
-            Threshold::new(vote_threshold, additional_thresholds, proposals)?,
-            Rewards::from(total_rewards),
-        )?;
-
-        let actual_rewards = results.values().sum::<Rewards>();
-        assert_are_close(actual_rewards, Rewards::from(total_rewards));
-
-        write_rewards_results(common, &results)?;
-        Ok(())
->>>>>>> main
     }
 }
 
@@ -143,8 +107,12 @@ pub fn voter_rewards(
 
     let results = calc_voter_rewards(
         vote_count,
-        vote_threshold,
         snapshot,
+        Threshold::new(
+            vote_threshold as usize,
+            Default::default(),
+            Default::default(),
+        )?,
         Rewards::from(total_rewards),
     )?;
 

catalyst-toolbox/src/lib.rs

@@ -1,5 +1,6 @@
 pub mod archive;
 pub mod community_advisors;
+pub mod http;
 pub mod ideascale;
 pub mod kedqr;
 pub mod logs;
@@ -10,10 +11,6 @@ pub mod stats;
 pub mod utils;
 pub mod vca_reviews;
 pub mod vote_check;
-pub mod http;
-
-#[cfg(feature = "test-api")]
-pub mod testing;
 
 #[macro_use]
 extern crate tracing;

catalyst-toolbox/src/rewards/mod.rs

@@ -1,6 +1,6 @@
 pub mod community_advisors;
-pub mod proposers;
 pub mod dreps;
+pub mod proposers;
 pub mod veterans;
 pub mod voters;
 

catalyst-toolbox/src/rewards/proposers/io.rs

@@ -4,8 +4,8 @@ use jormungandr_lib::{
     crypto::hash::Hash,
     interfaces::{VotePlanStatus, VoteProposalStatus},
 };
-use log::{info, warn};
 use std::{collections::HashMap, fs::File, io::BufWriter, path::Path};
+use tracing::{info, warn};
 use vit_servicing_station_lib::db::models::{challenges::Challenge, proposals::Proposal};
 
 use serde::Deserialize;

catalyst-toolbox/src/rewards/proposers/mod.rs

@@ -12,7 +12,7 @@ use jormungandr_lib::{
         Address, Block0Configuration, Initial, Tally, VotePlanStatus, VoteProposalStatus,
     },
 };
-use log::debug;
+use tracing::debug;
 use vit_servicing_station_lib::db::models::{challenges::Challenge, proposals::Proposal};
 
 pub use types::*;