Pārlūkot izejas kodu

Merge pull request #64 from mochet/ratesheet

Rolling update
Martin 4 gadi atpakaļ
vecāks
revīzija
1d8ce0f3b5

+ 21 - 10
README.md

@@ -10,18 +10,27 @@
     <a href="/council-reports">
     Council Reports
     </a>
-    <span> | </span>
-    <a href="/tokenomics-reports">
-    Tokenomics Reports
-    </a>
-    <span> | </span>
+	  <span> | </span>
     <a href="/community-contributions">
     Community Contributions
     </a>
-        <span> | </span>
+	  <span> | </span>
+    <a href="/documentation">
+    Documenntation
+    </a>
+	  <span> | </span>
     <a href="/submission-log">
     Submission Log
     </a>
+    <span> | </span>
+    <a href="/tokenomics-reports">
+    Tokenomics Reports
+  </a>
+     <span> | </span>
+    <a href="/workinggroup-reports">
+    Workinggroup Reports
+  </a>
+   <span> | </span>
   </h4>
 </div>
 
@@ -107,12 +116,14 @@ This folder can be used for creating council reports. The council reports submit
 `Council Round #n - DD/MM/YYYY - Council Report.md`
 ### `community-contributions`
 This folder can be used for community coded bots and projects and anything that doesn't fit elsewhere. Each submission should be in a unique folder within this directory.
+### `documentation`
+This folder can be used for documentation.
+### `submission-log`
+This folder can be used for maintaining a log of submissions. If the testnet is started from fresh, a new file should be made.
+Each entry in the log should include the Joystream username of the submission, a link to the proposal, a link to the PR and the amount of tokens awarded to the user (if applicable).
+`#1 - Rome Testnet - Community Repo Submission Log.md`
 ### `tokenomics-reports`
 This folder can be used for creating tokenomics reports, tokenomics reports are to be submitted during each `Council Round`. The tokenomics reports submitted should be formatted in the following way:
 `Council Round #n - DD/MM/YYYY - Tokenomics Report.md`
 ### `workinggroup-reports`
 This folder can be used for creating reports specific to working groups like the storage or curator working groups.
-### `submission-log`
-This folder can be used for maintaining a log of submissions. If the testnet is started from fresh, a new file should be made.
-Each entry in the log should include the Joystream username of the submission, a link to the proposal, a link to the PR and the amount of tokens awarded to the user (if applicable).
-`#1 - Rome Testnet - Community Repo Submission Log.md`

+ 102 - 42
council-reports/alexandria-testnet/Alexandria-Council-Leaderboard.md

@@ -1,39 +1,63 @@
-Notes: All data is taken from Council reports: https://github.com/Joystream/community-repo/tree/master/council-reports/alexandria-testnet or Tokenomics reports: https://github.com/Joystream/community-repo/tree/master/tokenomics-reports
+All data is taken from:
+* Council reports: https://github.com/Joystream/community-repo/tree/master/council-reports/alexandria-testnet
+* Tokenomics reports: https://github.com/Joystream/community-repo/tree/master/tokenomics-reports
+* https://joystreamstats.live
+* Chain State queries
+* Joystream KPI page: https://blog.joystream.org/alexandria-kpis/
 
 ## Council + Tokenomics Overview
 This table shows statistics from the end of each council session, including token generation information. It can be used as an overview of both tokenomics and how things change between council sessions.
 
-| Council # | 1 | 2 | 3 |  |  |
-|-|-|-|-|-|-|
-|  |  |  |  |  | Averages |
-| Proposals Submitted | 14 | 13 | 13 |  | 13.33333333 |
-| Avg. Finalize Time (hours) | 9.89 | 22.48 | 18.6 |  | 16.99 |
-| Approx Exchange Rate | 0.0000514 | 0.0000514 | 0.0000495 |  |  |
-|  |  |  |  |  |  |
-| Validator Count | 20 | 35 | 35 |  | 30 |
-| Avg. Block Gen Time | 6.17 | 6.08 | 6.18 |  | 6 |
-| Total Validator Stake | 14,878,468 | 27,729,355 | 33451502 |  | 25,353,108 |
-|  |  |  |  |  |  |
-|  |  |  |  |  |  |
-| Total Council Applicants | 18 | 9 | 9 |  | 12 |
-| Total Applicant Stake (JOY) | 35,123,001 | 7,532,000 | 6304000 |  | 16,319,667 |
-| Total Election Stake (JOY) | 24,261,001 | 28,431,500 | 31,372,000 |  | 28,021,500 |
-| Total Votes | 17 | 18 | 22 |  | 19 |
-|  |  |  |  |  |  |
-| Total Issuance | 149,540,201 | 164,453,909 | 187127539 |  | 167,040,550 |
-| Tokens Minted (JOY) | 7,518,852 | 12,440,609 | 22,673,630 |  | 14,211,030 |
-| Tokens Burned during term (JOY) | 0 | 1,600,000 | 1,100,000 |  | 900,000 |
-|  |  |  |  |  |  |
-| Total Council Minted (JOY) | 4,553,000 | 7,940,000 | 12,590,000 |  | 8,361,000 |
-| Total Validator Minted (JOY) | 1,211,052 | 1,600,000 | 3,376,219 |  | 2,062,424 |
-| Total Spending Proposal Minted (JOY) | 2,000,000 | 3,500,000 | 8,150,000 |  | 4,550,000 |
-| Total Storage Minted (JOY) | 0 | 2,119,382 | 4,670,998 |  | 2,263,460 |
-| Total Curator Minted (JOY) | 0 | 0 | 1,239,147 |  | 413,049 |
-|  |  |  |  |  |  |
-| Total Election Stake (USD) | $1,247.02 | $1,461.38 | $1,552.91 |  | $1,420.44 |
-| Total Council Minted (USD) | $234.02 | $408.12 | $623.21 |  | $421.78 |
-| Total Spending Proposal Minted (USD) | $102.80 | $179.90 | $403.43 |  | $228.71 |
-| Total Tokens Minted (USD) | $386.47 | $639.45 | $1,122.34 |  | $716.09 |
+| Council   # | 1 | 2 | 3 | 4 | 5 | 6 |  |  |
+|-|:-:|:-:|:-:|:-:|:-:|:-:|-|-|
+| Block range | #57601-#259201 | #259201-#460801 | #460801-#662401 | #662401-#864001 | #864001-#1065601 | #1065601-#1267201 |  |  |
+| Start date | 25/09/2020 | 9/10/2020 | 23/10/2020 | 7/11/2020 | 21/11/2020 | 5/12/2020 |  |  |
+|  |  |  |  |  |  |  |  |  |
+| **Proposals** |  |  |  |  |  |  |  | Averages |
+| Proposals Submitted | 14 | 13 | 13 | 6 | 14 | 13 |  | 12.16666667 |
+| Valid proposals | 11 | 13 | 11 | 6 | 14 | 13 |  | 11.33333333 |
+| Avg. Finalize Time (hours) | 9.89 | 22.48 | 18.6 | 18.98 | 18.88 | 60.65 |  | 24.91333333 |
+| Approx Exchange Rate | 0.0000514 | 0.0000514 | 0.0000495 | 0.000051 | 0.0000494 | 0.000047 |  |  |
+|  |  |  |  |  |  |  |  |  |
+| **Council Election** |  |  |  |  |  |  |  |  |
+| Total Council Applicants | 18 | 9 | 9 | 10 | 8 | 8 |  | 10 |
+| Total Applicant Stake (JOY) | 35,123,001 | 7,532,000 | 6,304,000 | 10,591,890 | 6,000,000 | 18,204,000 |  | 13,959,149 |
+| Total Election Stake (JOY) | 24,261,001 | 28,431,500 | 31,372,000 | 31,707,000 | 28,751,000 | 37,940,100 |  | 30,410,434 |
+| Total Votes | 17 | 18 | 22 | 11 | 17 | 11 |  | 16 |
+|  |  |  |  |  |  |  |  |  |
+| **KPIs & CM payments** |  |  |  |  |  |  |  |  |
+| KPI payout | $195.50 | $300.00 | $400.00 | $170.00 | $408.00 | $0.00 |  |  |
+| KPI penalty | $0.00 | $0.00 | $0.00 | $0.00 | $200.00 | $0.00 |  |  |
+| KPI final payout | $195.50 | $300.00 | $400.00 | $170.00 | $208.00 | $0.00 |  | $212 |
+| KPI bonus / CM | $16.29 | $25.00 | $33.33 | $14.17 | $17.33 | $0.00 |  | $18 |
+| KPI bonus for voters | $97.75 | $150.00 | $200.00 | $85.00 | $104.00 | $0.00 |  | $106 |
+| CM Payments (2 wk) | 4,400,000.00 | 4,400,000.00 | 4,400,000.00 | 4,400,000.00 | 4,400,000.00 | 4,400,000.00 |  |  |
+| CM USD payments Total | $226.16 | $226.16 | $217.80 | $224.40 | $217.36 | $206.80 |  |  |
+| CM USD payments / CM | $37.69 | $37.69 | $36.30 | $37.40 | $36.23 | $34.47 |  |  |
+|  |  |  |  |  |  |  |  |  |
+| **Issuance** |  |  |  |  |  |  |  |  |
+| Total Issuance | 149,540,201 | 164,453,909 | 187,127,539 | 197,257,210 | 191,297,136 | 209,022,308 |  | 183,116,384 |
+| Tokens Minted (JOY) | 7,518,852 | 12,440,609 | 22,673,630 | 10,129,671 | -5,960,074 | 17,725,172 |  | 10,754,643 |
+| Tokens Burned during term   (JOY) | 0 | 1,600,000 | 1,100,000 | 5,000,000 | 1,400,000 | 3,500,000 |  | 2,100,000 |
+|  |  |  |  |  |  |  |  |  |
+| **Validators** |  |  |  |  |  |  |  |  |
+| Validator Count | 20 | 35 | 35 | 35 | 35 | 35 |  | 33 |
+| Avg. Block Gen Time | 6.17 | 6.08 | 6.18 | 6.1 | 6.05 | 6.05 |  | 6 |
+| Total Validator Stake | 14,878,468 | 27,729,355 | 33,451,502 | 39,355,584 | 47,835,148 | 52,090,175 |  | 35,890,039 |
+| Stake : Issuance Ratio | 9.95% | 16.86% | 17.88% | 19.95% | 25.01% | 24.92% |  | 19% |
+|  |  |  |  |  |  |  |  |  |
+| **Mints** |  |  |  |  |  |  |  |  |
+| Total Council Minted (JOY) | 4,553,000 | 7,940,000 | 12,590,000 | 5,825,500 | 13,015,710 | 14,421,436 |  | 9,724,274 |
+| Total Validator Minted (JOY) | 1,211,052 | 1,600,000 | 3,376,219 | 4,241,311 | 4,986,561 | 5,062,892 |  | 3,413,006 |
+| Total Spending Proposal Minted   (JOY) | 2,000,000 | 3,500,000 | 8,150,000 | 1,885,000 | 8,574,000 | 9,981,000 |  | 5,681,667 |
+| Total Storage Minted (JOY) | 0 | 2,119,382 | 4,670,998 | 2,457,616 | 2,457,616 | 2,457,616 |  | 2,311,999 |
+| Total Curator Minted (JOY) | 0 | 0 | 1,239,147 | 1,559,376 | 1,239,147 | 1,559,376 |  | 932,841 |
+|  |  |  |  |  |  |  |  |  |
+| **USD values** |  |  |  |  |  |  |  |  |
+| Total Election Stake (USD) | $1,247.02 | $1,461.38 | $1,552.91 | $1,617.06 | $1,420.30 | $1,783.18 |  | $1,420.44 |
+| Total Council Minted (USD) | $234.02 | $408.12 | $623.21 | $297.10 | $642.98 | $677.81 |  | $421.78 |
+| Total Spending Proposal Minted   (USD) | $102.80 | $179.90 | $403.43 | $96.14 | $423.56 | $469.11 |  | $228.71 |
+| Total Tokens Minted (USD) | $386.47 | $639.45 | $1,122.34 | $516.61 | -$294.43 | $833.08 |  | $716.09 |
 
 ## Council Member Leaderboard
 This table shows how often each council member participates in voting for proposals.
@@ -42,13 +66,49 @@ Notes:
 * Canceled proposals and proposals that do not successfully get voted on by the current council are not included.
 * An `x` means the CM was not elected during that council session
 
-| Council Member       |    |    |    |  |             |
-|----------------------|----|----|----|--|-------------|
-| @anthony             | 10 | 7  | 6  |  | 7.666666667 |
-| @freakstatic_council | 10 | 10 | 10 |  | 10          |
-| @fierydev            | 5  | x  | x  |  | 5           |
-| @hoangptsc           | x  | x  | 11 |  | 11          |
-| @nexusfallout        | 5  | 9  | 5  |  | 6.333333333 |
-| @sparky              | 5  | 4  | 4  |  | 4.333333333 |
-| @supunssw            | x  | 5  | x  |  | 5           |
-| @tomato              | 11 | 11 | 11 |  | 11          |
+| ## Council Member   leaderboard |         |        |         |         |         |         |   | Total voting rate + payout |
+|---------------------------------|---------|--------|---------|---------|---------|---------|---|----------------------------|
+| @anthony                        |      10 |      7 |       6 |       5 |      12 |      10 |   |                            |
+| Vote %                          |  90.91% | 53.85% |  54.55% |  83.33% |  85.71% |  76.92% |   | 74.21%                     |
+| KPI Bonus                       |  $16.29 | $25.00 |  $33.33 |  $14.17 |  $17.33 |   $0.00 |   | $106.13                    |
+| CM USD Payment                  |  $37.69 | $37.69 |  $36.30 |  $37.40 |  $36.23 |  $34.47 |   | $219.78                    |
+|                                 |         |        |         |         |         |         |   |                            |
+| @blackmass                      |       x |      x |       x |       6 |       7 |       9 |   |                            |
+| Vote %                          |         |        |         | 100.00% |  50.00% |  69.23% |   | 73.08%                     |
+| KPI Bonus                       |         |        |         |  $14.17 |  $17.33 |   $0.00 |   | $31.50                     |
+| CM USD Payment                  |         |        |         |  $37.40 |  $36.23 |  $34.47 |   | $108.09                    |
+|                                 |         |        |         |         |         |         |   |                            |
+| @freakstatic_council            |      10 |     10 |      10 |       5 |      12 |      13 |   |                            |
+| Vote %                          |  90.91% | 76.92% |  90.91% |  83.33% |  85.71% | 100.00% |   | 87.96%                     |
+| KPI Bonus                       |  $16.29 | $25.00 |  $33.33 |  $14.17 |  $17.33 |   $0.00 |   | $106.13                    |
+| CM USD Payment                  |  $37.69 | $37.69 |  $36.30 |  $37.40 |  $36.23 |  $34.47 |   | $219.78                    |
+|                                 |         |        |         |         |         |         |   |                            |
+| @fierydev                       |       5 |      x |       x |       6 |       x |       x |   |                            |
+| Vote %                          |  45.45% |        |         | 100.00% |         |         |   | 72.73%                     |
+| KPI Bonus                       |  $16.29 |        |         |  $14.17 |         |         |   | $30.46                     |
+| CM USD Payment                  |  $37.69 |        |         |  $37.40 |         |         |   | $75.09                     |
+|                                 |         |        |         |         |         |         |   |                            |
+| @hoangptsc                      |       x |      x |      11 |       x |       x |       x |   |                            |
+| Vote %                          |         |        | 100.00% |         |         |         |   | 100.00%                    |
+| KPI Bonus                       |         |        |  $33.33 |         |         |         |   | $33.33                     |
+| CM USD Payment                  |         |        |  $36.30 |         |         |         |   | $36.30                     |
+|                                 |         |        |         |         |         |         |   |                            |
+| @nexusfallout                   |       5 |      9 |       5 |       x |       4 |       x |   |                            |
+| Vote %                          |  45.45% | 69.23% |  45.45% |         |  28.57% |         |   | 47.18%                     |
+| KPI Bonus                       |  $16.29 | $25.00 |  $33.33 |         |  $17.33 |         |   | $91.96                     |
+| CM USD Payment                  |  $37.69 | $37.69 |  $36.30 |         |  $36.23 |         |   | $147.91                    |
+|                                 |         |        |         |         |         |         |   |                            |
+| @sparky                         |       5 |      4 |       4 |       1 |       3 |       1 |   |                            |
+| Vote %                          |  45.45% | 30.77% |  36.36% |  16.67% |  21.43% |   7.69% |   | 26.40%                     |
+| KPI Bonus                       |  $16.29 | $25.00 |  $33.33 |  $14.17 |  $17.33 |   $0.00 |   | $106.13                    |
+| CM USD Payment                  |  $37.69 | $37.69 |  $36.30 |  $37.40 |  $36.23 |  $34.47 |   | $219.78                    |
+|                                 |         |        |         |         |         |         |   |                            |
+| @supunssw                       |       x |      5 |       x |       3 |       x |       7 |   |                            |
+| Vote %                          |         | 38.46% |         |  50.00% |         |  53.85% |   | 47.44%                     |
+| KPI Bonus                       |         | $25.00 |         |  $14.17 |         |   $0.00 |   | $39.17                     |
+| CM USD Payment                  |         | $37.69 |         |  $37.40 |         |  $34.47 |   | $109.56                    |
+|                                 |         |        |         |         |         |         |   |                            |
+| @tomato                         |      11 |     11 |      11 |       x |      14 |      13 |   |                            |
+| Vote %                          | 100.00% | 84.62% | 100.00% |         | 100.00% | 100.00% |   | 96.92%                     |
+| KPI Bonus                       | $16.29  | $25.00 | $33.33  |         | $17.33  | $0.00   |   | $91.96                     |
+| CM USD Payment                  |  $37.69 | $37.69 |  $36.30 |         |  $36.23 |  $34.47 |   | $182.38                    |

+ 15 - 0
documentation/council_tasks_rate_sheet.md

@@ -0,0 +1,15 @@
+## Council Tasks Rate Sheet
+
+This document covers the tasks a council is expected to accomplish during a given council term and provides basic rates. These rates have not been agreed upon by the council, and rates might change depending on the scope of work and the scale of the platform. For now it mainly serves to provide users with an idea of what to charge for each task.
+
+Each task includes a rate, which is the amount of tokens commonly charged via `spending proposal` and a frequency, which is the expected number of times a task should be completed within a council term.
+
+| Work Type          | Rate | Frequency     |
+|--------------------|------|---------------|
+| Council Secretary  | 2m   | Once per term |
+| Council Report     | 500k | Once per term |
+| Tokenomics Report  | 385k | Once per term |
+| Curator Spot Check | TBC  | TBC           |
+| Storage Spot Check | TBC  | TBC           |
+| Budget             | TBC  | TBC           |
+|                    |      |               |