merge main and fi conflicts

Author: cameron1024

.github/workflows/python-scripts.yml

@@ -13,4 +13,4 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Check formatting (black)
-        run: black ./scripts/python --check
+        run: black ./catalyst-toolbox/scripts/python --check

Cargo.lock

@@ -380,7 +380,7 @@ OPTIONS:
 ## Python scripts
 
 Use an updated version of `python3` and either create a venv or just install the dependencies from the
-`requirements.txt` file inside the `/scripts/python` folder. 
+`requirements.txt` file inside the `/catalyst-toolbox/scripts/python` folder. 
 
 #### Calculate proposers rewards
 

README.md

@@ -45,9 +45,9 @@ regex = "1.5"
 serde = "1.0"
 serde_json = "1.0"
 structopt = "0.3"
-stderrlog = "0.5"
 serde_yaml = "0.8.17"
 sscanf = "0.1"
+color-eyre = "0.6"
 thiserror = "1.0"
 tokio = { version = "1.8", features = ["rt", "macros"] }
 url = "2.2"
@@ -59,6 +59,9 @@ symmetric-cipher = { git = "https://github.com/input-output-hk/chain-wallet-libs
 graphql_client = "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"
@@ -69,6 +72,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

@@ -75,7 +75,7 @@ There are 2 (two) main input files needed for calculating the community advisors
 1. Proposers reward result output file (approved proposals): We need this to check which of the proposals were approved. 
 Notice that the proposers rewards script output is per challenge. So in order to use it we need to aggregate all the csv
 into a single file (same headers, order is irrelevant). For this we can use the 
-[`csv_merger.py`](https://github.com/input-output-hk/catalyst-toolbox/blob/main/scripts/python/csv_merger.py) script,
+[`csv_merger.py`](https://github.com/input-output-hk/catalyst-toolbox/blob/main/catalyst-toolbox/scripts/python/csv_merger.py) script,
 or any other handier tool.
 2.Assessments csv (assessments): This is a file that comes from the community. It holds the information with the reviews performed
 by the CAs.
@@ -104,4 +104,4 @@ For that we just need to know the amount of rewards done by each veteran:
 
 ### Output
 
-A csv with pairs of anonymize veteran CA ids and the amount of the reward, `veteran_id -> total_rewards`.
+A csv with pairs of anonymize veteran CA ids and the amount of the reward, `veteran_id -> total_rewards`.

catalyst-toolbox/doc/rewards.md

@@ -0,0 +1,9 @@
+query AllReps {
+  representatives {
+    data {
+      attributes {
+        address
+      }
+    }
+  }
+}