update libs

Author: cameron1024

Cargo.lock

@@ -33,6 +33,7 @@ jormungandr-integration-tests = { git = "https://github.com/input-output-hk/jorm
 jormungandr-automation = { git = "https://github.com/input-output-hk/jormungandr.git",  branch = "master" }
 thor = { git = "https://github.com/input-output-hk/jormungandr.git",  branch = "master" }
 jortestkit = { git = "https://github.com/input-output-hk/jortestkit.git", branch = "master" }
+rayon = "1.5"
 rust_decimal = "1.16"
 rust_decimal_macros = "1"
 futures = "0.3"
@@ -41,6 +42,7 @@ once_cell = "1.8"
 reqwest = { version = "0.11", features = ["blocking", "json"] }
 rand = "0.8.3"
 rand_chacha = "0.3"
+governor = { version = "0.4", features = ["std", "jitter"], default-features = false}
 regex = "1.5"
 serde = "1.0"
 serde_json = "1.0"
@@ -56,11 +58,12 @@ image = "0.23.12"
 qrcode = "0.12"
 quircs = "0.10.0"
 symmetric-cipher = { git = "https://github.com/input-output-hk/chain-wallet-libs.git", branch = "master" }
-graphql_client = "0.10"
+graphql_client = { version = "0.10" }
 gag = "1"
 vit-servicing-station-lib = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "master" }
 env_logger = "0.9"
 voting-hir = { path = "../voting-hir", features = ["serde"] }
+fraction = "0.10"
 
 [dev-dependencies]
 rand_chacha = "0.3"
@@ -71,6 +74,7 @@ chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch
 proptest = { git = "https://github.com/input-output-hk/proptest", branch = "master" }
 test-strategy = "0.2"
 serde_test = "1"
+voting-hir =  { path = "../voting-hir", features = ["serde", "proptest"] }
 
 [build-dependencies]
 versionisator = "1.0.3"

catalyst-toolbox/Cargo.toml

@@ -8,6 +8,8 @@ use std::collections::HashSet;
 
 use structopt::StructOpt;
 
+use catalyst_toolbox::http::default_http_client;
+
 use serde::de::DeserializeOwned;
 use serde::Serialize;
 use std::path::{Path, PathBuf};
@@ -98,6 +100,8 @@ impl Import {
             stages_filters,
         } = self;
 
+        let client = default_http_client(Some(api_token));
+
         let tags: CustomFieldTags = if let Some(tags_path) = tags {
             read_json_from_file(tags_path)?
         } else {
@@ -110,20 +114,15 @@ impl Import {
             Default::default()
         };
 
-        let runtime = tokio::runtime::Builder::new_multi_thread()
-            .enable_io()
-            .enable_time()
-            .build()?;
-
         let scores = read_scores_file(scores)?;
         let sponsors = read_sponsors_file(sponsors)?;
-        let idescale_data = runtime.block_on(fetch_all(
+        let idescale_data = fetch_all(
             *fund,
             &stage_label.to_lowercase(),
             &stages_filters.iter().map(AsRef::as_ref).collect::<Vec<_>>(),
             &excluded_proposals,
-            api_token.clone(),
-        ))?;
+            &client,
+        )?;
 
         let funds = build_fund(*fund as i32, fund_goal.clone(), *threshold);
         let challenges = build_challenges(*fund as i32, &idescale_data, sponsors);

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

@@ -1,10 +1,12 @@
 mod community_advisors;
 mod full;
+mod proposers;
 mod veterans;
 mod voters;
 
 use std::path::PathBuf;
 
+use catalyst_toolbox::{http::default_http_client, rewards::proposers as proposers_lib};
 use color_eyre::Report;
 use structopt::StructOpt;
 
@@ -22,6 +24,9 @@ pub enum Rewards {
 
     /// Calculate full rewards based on a config file
     Full { path: PathBuf },
+
+    /// Calculate rewards for propsers
+    Proposers(proposers_lib::ProposerRewards),
 }
 
 impl Rewards {
@@ -31,6 +36,9 @@ impl Rewards {
             Rewards::CommunityAdvisors(cmd) => cmd.exec(),
             Rewards::Veterans(cmd) => cmd.exec(),
             Rewards::Full { path } => full::full_rewards(&path),
+            Rewards::Proposers(proposers) => {
+                proposers::rewards(&proposers, &default_http_client(None))
+            }
         }
     }
 }

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

@@ -0,0 +1,61 @@
+use std::{collections::HashSet, fs::File};
+
+use catalyst_toolbox::{
+    http::HttpClient,
+    rewards::proposers::{
+        io::{load_data, write_results},
+        proposer_rewards, ProposerRewards, ProposerRewardsInputs,
+    },
+};
+use color_eyre::eyre::Result;
+
+pub fn rewards(
+    ProposerRewards {
+        output,
+        block0,
+        proposals,
+        excluded_proposals,
+        active_voteplans,
+        challenges,
+        committee_keys,
+        total_stake_threshold,
+        approval_threshold,
+        output_format,
+        vit_station_url,
+    }: &ProposerRewards,
+    http: &impl HttpClient,
+) -> Result<()> {
+    let (proposals, voteplans, challenges) = load_data(
+        http,
+        vit_station_url,
+        proposals.as_deref(),
+        active_voteplans.as_deref(),
+        challenges.as_deref(),
+    )?;
+
+    let block0_config = serde_yaml::from_reader(File::open(block0)?)?;
+
+    let excluded_proposals = match excluded_proposals {
+        Some(path) => serde_json::from_reader(File::open(path)?)?,
+        None => HashSet::new(),
+    };
+    let committee_keys = match committee_keys {
+        Some(path) => serde_json::from_reader(File::open(path)?)?,
+        None => vec![],
+    };
+
+    let results = proposer_rewards(ProposerRewardsInputs {
+        block0_config,
+        proposals,
+        voteplans,
+        challenges,
+        excluded_proposals,
+        committee_keys,
+        total_stake_threshold: *total_stake_threshold,
+        approval_threshold: *approval_threshold,
+    })?;
+
+    write_results(output, *output_format, results)?;
+
+    Ok(())
+}

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

@@ -1,5 +1,5 @@
 use catalyst_toolbox::rewards::voters::{calc_voter_rewards, Rewards, VoteCount};
-use catalyst_toolbox::snapshot::{registration::MainnetRewardAddress, Snapshot};
+use catalyst_toolbox::snapshot::{registration::MainnetRewardAddress, SnapshotInfo};
 use catalyst_toolbox::utils::assert_are_close;
 
 use color_eyre::eyre::eyre;
@@ -9,6 +9,8 @@ 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::jcli_lib::block::Common;
 use structopt::StructOpt;
 
 use std::collections::BTreeMap;
@@ -23,15 +25,9 @@ pub struct VotersRewards {
     #[structopt(long)]
     total_rewards: u64,
 
-    /// Path to raw snapshot
+    /// Path to a json encoded list of `SnapshotInfo`
     #[structopt(long)]
-    snapshot_path: PathBuf,
-
-    /// Stake threshold to be able to participate in a Catalyst sidechain
-    /// Registrations with less than the threshold associated to the stake address
-    /// will be ignored
-    #[structopt(long)]
-    registration_threshold: u64,
+    snapshot_info_path: PathBuf,
 
     #[structopt(long)]
     votes_count_path: PathBuf,
@@ -63,8 +59,7 @@ impl VotersRewards {
         let VotersRewards {
             common,
             total_rewards,
-            snapshot_path,
-            registration_threshold,
+            snapshot_info_path,
             votes_count_path,
             vote_threshold,
         } = self;

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

@@ -1,13 +1,14 @@
 use catalyst_toolbox::snapshot::{voting_group::RepsVotersAssigner, RawSnapshot, Snapshot};
 use color_eyre::Report;
+use fraction::Fraction;
 use jcli_lib::utils::{output_file::OutputFile, output_format::OutputFormat};
 use jormungandr_lib::interfaces::Value;
 use std::fs::File;
 use std::io::Write;
 use std::path::PathBuf;
 use structopt::StructOpt;
 
-const DEFAULT_DIRECT_VOTER_GROUP: &str = "voter";
+const DEFAULT_DIRECT_VOTER_GROUP: &str = "direct";
 const DEFAULT_REPRESENTATIVE_GROUP: &str = "rep";
 
 /// Process raw registrations into blockchain initials
@@ -19,7 +20,7 @@ pub struct SnapshotCmd {
     snapshot: PathBuf,
     /// Registrations voting power threshold for eligibility
     #[structopt(short, long)]
-    threshold: Value,
+    min_stake_threshold: Value,
 
     /// Voter group to assign direct voters to.
     /// If empty, defaults to "voter"
@@ -35,6 +36,10 @@ pub struct SnapshotCmd {
     #[structopt(long)]
     reps_db_api_url: reqwest::Url,
 
+    /// Voting power cap for each account
+    #[structopt(short, long)]
+    voting_power_cap: Fraction,
+
     #[structopt(flatten)]
     output: OutputFile,
 
@@ -52,8 +57,13 @@ impl SnapshotCmd {
             .representatives_group
             .unwrap_or_else(|| DEFAULT_REPRESENTATIVE_GROUP.into());
         let assigner = RepsVotersAssigner::new(direct_voter, representative, self.reps_db_api_url)?;
-        let initials =
-            Snapshot::from_raw_snapshot(raw_snapshot, self.threshold).to_voter_hir(&assigner);
+        let initials = Snapshot::from_raw_snapshot(
+            raw_snapshot,
+            self.min_stake_threshold,
+            self.voting_power_cap,
+            &assigner,
+        )?
+        .to_voter_hir();
         let mut out_writer = self.output.open()?;
         let content = self
             .output_format

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

@@ -0,0 +1,70 @@
+use color_eyre::Result;
+use reqwest::StatusCode;
+
+use super::{HttpClient, HttpResponse};
+
+pub enum Method {
+    Get,
+    Post,
+    Put,
+    Delete,
+    Head,
+    Connect,
+    Options,
+    Trace,
+    Path,
+}
+
+#[non_exhaustive]
+pub struct Spec<'a> {
+    pub method: Method,
+    pub path: &'a str,
+}
+
+pub struct MockClient {
+    handler: fn(&Spec) -> (String, StatusCode),
+}
+
+impl MockClient {
+    pub fn new(handler: fn(&Spec) -> (String, StatusCode)) -> Self {
+        Self { handler }
+    }
+}
+
+impl HttpClient for MockClient {
+    fn get<T>(&self, path: &str) -> Result<super::HttpResponse<T>>
+    where
+        T: for<'a> serde::Deserialize<'a>,
+    {
+        let spec = Spec {
+            method: Method::Get,
+            path,
+        };
+
+        let (body, status) = (self.handler)(&spec);
+        Ok(HttpResponse {
+            body,
+            status,
+            _marker: std::marker::PhantomData,
+        })
+    }
+}
+
+#[test]
+fn example_usage() {
+    fn function_that_calls_api<T: HttpClient>(client: &T) -> Result<i32> {
+        let response = client.get("/example")?;
+        response.json()
+    }
+
+    let mock_client = MockClient::new(|spec| match spec {
+        Spec {
+            method: Method::Get,
+            path: "/example",
+        } => ("123".to_string(), StatusCode::OK),
+        _ => ("not found".to_string(), StatusCode::NOT_FOUND),
+    });
+
+    let response = function_that_calls_api(&mock_client).unwrap();
+    assert_eq!(response, 123);
+}