Merge pull request #467 from traumschule/owgreports

Correct tokenomics salaries

contributions/tech/report-generator/package.json

@@ -19,6 +19,7 @@
     "@polkadot/util-crypto": "^6.0.5",
     "@polkadot/wasm-crypto": "^4.0.2",
     "@types/bn.js": "^4.11.6",
+    "axios": "^0.24.0",
     "bn.js": "^5.1.2",
     "csv-parse": "^4.15.4",
     "ts-node": "^10.3.0"

contributions/tech/report-generator/src/StatisticsCollector.ts

@@ -274,17 +274,15 @@ export class StatisticsCollector {
     }
     this.saveStats({ bountiesTotalPaid });
 
-    let roundNrBlocks = endBlock - startBlock;
     const spendingProposalsTotal = spendingProposals.reduce(
       (n, p) => n + p.amount,
       0
     );
     const newCouncilRewards = await this.computeCouncilReward(
-      roundNrBlocks,
+      endBlock - startBlock,
       endHash
     );
     const newCuratorInfo = await this.computeWorkingGroupReward(
-      roundNrBlocks,
       startHash,
       endHash,
       "contentDirectory"
@@ -354,7 +352,6 @@ export class StatisticsCollector {
 
   // Summarize stakes and rewards at start and end
   async computeWorkingGroupReward(
-    roundNrBlocks: number,
     startHash: Hash,
     endHash: Hash,
     workingGroup: string
@@ -400,35 +397,22 @@ export class StatisticsCollector {
       this.saveStats({ [groupTag]: header + workers });
     } else this.saveStats({ [groupTag]: `` });
 
-    info.rewards = await this.computeReward(
-      roundNrBlocks,
-      workersEnd.filter((w) => w.reward).map((w) => w.reward)
-    );
+    const mintId = await getGroupMint(this.api, group);
+    const mintStart: Mint = await getMint(this.api, startHash, mintId);
+    const mintEnd: Mint = await getMint(this.api, endHash, mintId);
+    const totalMinted = (m: Mint) => Number(m.total_minted);
+    info.rewards = totalMinted(mintEnd) - totalMinted(mintStart);
     info.endNrOfWorkers = workersEnd.length;
     return info;
   }
 
-  async computeReward(
-    roundNrBlocks: number,
-    recurringRewards: RewardRelationship[]
-  ): Promise<number> {
-    let rewardPerBlock = 0;
-    recurringRewards.forEach((recurringReward: RewardRelationship) => {
-      if (!recurringReward) return;
-      const amount = recurringReward.amount_per_payout.toNumber();
-      const payoutInterval = Number(recurringReward.payout_interval);
-      if (amount && payoutInterval) rewardPerBlock += amount / payoutInterval;
-    });
-    return rewardPerBlock * roundNrBlocks;
-  }
-
   async computeGroupMintStats(
     [label, tag]: string[],
     startHash: Hash,
     endHash: Hash
   ) {
     const group = label + "WorkingGroup";
-    const mint = await getGroupMint(this.api, group, endHash);
+    const mint = await getGroupMint(this.api, group);
     const info = await this.getMintInfo(this.api, mint, startHash, endHash);
     let stats: { [key: string]: number } = {};
     stats[`start${tag}Minted`] = info.startMinted;
@@ -595,9 +579,7 @@ export class StatisticsCollector {
     startHash: Hash,
     endHash: Hash
   ): Promise<void> {
-    let roundNrBlocks = endBlock - startBlock;
     let storageProvidersRewards = await this.computeWorkingGroupReward(
-      roundNrBlocks,
       startHash,
       endHash,
       "storage"
@@ -647,9 +629,7 @@ export class StatisticsCollector {
     startHash: Hash,
     endHash: Hash
   ): Promise<void> {
-    const roundNrBlocks = endBlock - startBlock;
     const operationsRewards = await this.computeWorkingGroupReward(
-      roundNrBlocks,
       startHash,
       endHash,
       "operations"
@@ -757,9 +737,11 @@ export class StatisticsCollector {
     let sumerGenesis = new Date("2021-04-07T18:20:54.000Z");
 
     console.log("Fetching fiat events....");
-    await axios.get(statusUrl).then((response: { data: StatusData }) => {
+    await axios.get(statusUrl).then(({ data }) => {
+      const { burns, exchanges, dollarPoolChanges } = data as StatusData;
+
       console.log("# Exchanges");
-      let filteredExchanges = response.data.exchanges.filter(
+      let filteredExchanges = exchanges.filter(
         (exchange) =>
           exchange.blockHeight >= startBlockHeight &&
           exchange.blockHeight <= endBlockHeight &&
@@ -772,7 +754,7 @@ export class StatisticsCollector {
         );
       }
 
-      let filteredBurns = response.data.burns.filter(
+      let filteredBurns = burns.filter(
         (burn: any) =>
           burn.blockHeight >= startBlockHeight &&
           burn.blockHeight <= endBlockHeight &&
@@ -786,13 +768,13 @@ export class StatisticsCollector {
       }
 
       console.log("# Dollar Pool Changes");
-      const allDollarPoolChanges = response.data.dollarPoolChanges.filter(
+      const allDollarPoolChanges = dollarPoolChanges.filter(
         (dollarPoolChange: any) =>
           dollarPoolChange.blockHeight >= startBlockHeight &&
           dollarPoolChange.blockHeight <= endBlockHeight &&
           new Date(dollarPoolChange.blockTime) > sumerGenesis
       );
-      const filteredDollarPoolChanges = response.data.dollarPoolChanges.filter(
+      const filteredDollarPoolChanges = dollarPoolChanges.filter(
         (dollarPoolChange: any) =>
           dollarPoolChange.blockHeight >= startBlockHeight &&
           dollarPoolChange.blockHeight <= endBlockHeight &&

contributions/tech/report-generator/src/lib

@@ -1 +1 @@
-Subproject commit 7a0df3177dbb47836c7968af0e12e3f722425d5b
+Subproject commit b66ce1329015715d32d7d3f873a411401d691583

council/tokenomics/antioch-3/Council_Round1_118800-277199_Tokenomics_Report.md

@@ -19,8 +19,8 @@ This is a report which explains the current state of the Joystream network in nu
 | Spending Proposals (Executed) | 21487585 |
 | Bounties paid       | 18102585 |
 | Validator Role      | 6322734 |
-| Storage Role        | 1011993.61 |
-| Curator Role        | 2771982.50 |
+| Storage Role        | 0 |
+| Curator Role        | 454000.00 |
 | Operations Role     | 0 |
 
 ### 2.2 Fiat Pool

council/tokenomics/antioch-3/Council_Round2_277200-377999_Tokenomics_Report.md

@@ -19,8 +19,8 @@ This is a report which explains the current state of the Joystream network in nu
 | Spending Proposals (Executed) | 21542226 |
 | Bounties paid       | 21542226 |
 | Validator Role      | 3663208 |
-| Storage Role        | 772792.33 |
-| Curator Role        | 3379566.47 |
+| Storage Role        | 667000 |
+| Curator Role        | 2863000.00 |
 | Operations Role     | 0 |
 
 ### 2.2 Fiat Pool

council/tokenomics/antioch-3/Council_Round3_378000-478799_Tokenomics_Report.md

@@ -19,8 +19,8 @@ This is a report which explains the current state of the Joystream network in nu
 | Spending Proposals (Executed) | 36816486 |
 | Bounties paid       | 36816486 |
 | Validator Role      | 3313300 |
-| Storage Role        | 3506069.22 |
-| Curator Role        | 3519229.09 |
+| Storage Role        | 2785244 |
+| Curator Role        | 3418808.00 |
 | Operations Role     | 0 |
 
 ### 2.2 Fiat Pool

council/tokenomics/antioch-3/Council_Round4_478800-579599_Tokenomics_Report.md

@@ -19,8 +19,8 @@ This is a report which explains the current state of the Joystream network in nu
 | Spending Proposals (Executed) | 18485327 |
 | Bounties paid       | 18485327 |
 | Validator Role      | 5566011 |
-| Storage Role        | 2975166.48 |
-| Curator Role        | 4905635.33 |
+| Storage Role        | 3073567 |
+| Curator Role        | 4681757.00 |
 | Operations Role     | 0 |
 
 ### 2.2 Fiat Pool

council/tokenomics/antioch-3/Council_Round5_579600-680399_Tokenomics_Report.md

@@ -19,8 +19,8 @@ This is a report which explains the current state of the Joystream network in nu
 | Spending Proposals (Executed) | 17294942 |
 | Bounties paid       | 15144942 |
 | Validator Role      | 8440062 |
-| Storage Role        | 3506069.22 |
-| Curator Role        | 4205642.28 |
+| Storage Role        | 4457720 |
+| Curator Role        | 4755684.00 |
 | Operations Role     | 0 |
 
 ### 2.2 Fiat Pool

council/tokenomics/antioch-3/Council_Round6_680400-781199_Tokenomics_Report.md

@@ -19,8 +19,8 @@ This is a report which explains the current state of the Joystream network in nu
 | Spending Proposals (Executed) | 3572490 |
 | Bounties paid       | 3572490 |
 | Validator Role      | 4168763 |
-| Storage Role        | 4154570.78 |
-| Curator Role        | 4748332.89 |
+| Storage Role        | 3689750 |
+| Curator Role        | 4348886.00 |
 | Operations Role     | 0 |
 
 ### 2.2 Fiat Pool

council/tokenomics/sumer-4/Council_Round10_1083600-1184399_Tokenomics_Report.md

@@ -19,9 +19,9 @@ This is a report which explains the current state of the Joystream network in nu
 | Spending Proposals (Executed) | 30456138 |
 | Bounties paid       | 30456138 |
 | Validator Role      | 10818876 |
-| Storage Role        | 5564244.8 |
-| Curator Role        | 7495525.64 |
-| Operations Role     | 2136742.8 |
+| Storage Role        | 4973885 |
+| Curator Role        | 8012000.00 |
+| Operations Role     | 1790260 |
 
 ### 2.2 Fiat Pool
 | Property            | Start Block, USD | End Block, USD | % Change |

council/tokenomics/sumer-4/Council_Round11_1184400-1285199_Tokenomics_Report.md

@@ -19,9 +19,9 @@ This is a report which explains the current state of the Joystream network in nu
 | Spending Proposals (Executed) | 18906015 |
 | Bounties paid       | 15906015 |
 | Validator Role      | 6082007 |
-| Storage Role        | 8420216.47 |
-| Curator Role        | 7350767.07 |
-| Operations Role     | 3850325.8 |
+| Storage Role        | 7910300 |
+| Curator Role        | 7520050.00 |
+| Operations Role     | 3275809 |
 
 ### 2.2 Fiat Pool
 | Property            | Start Block, USD | End Block, USD | % Change |

council/tokenomics/sumer-4/Council_Round12_1285200-1385999_Tokenomics_Report.md

@@ -19,9 +19,9 @@ This is a report which explains the current state of the Joystream network in nu
 | Spending Proposals (Executed) | 30754200 |
 | Bounties paid       | 30754200 |
 | Validator Role      | 12919403 |
-| Storage Role        | 8672213.97 |
-| Curator Role        | 8180118.85 |
-| Operations Role     | 3850325.8 |
+| Storage Role        | 8465300 |
+| Curator Role        | 8097020.00 |
+| Operations Role     | 3850347 |
 
 ### 2.2 Fiat Pool
 | Property            | Start Block, USD | End Block, USD | % Change |

council/tokenomics/sumer-4/Council_Round13_1386000-1486799_Tokenomics_Report.md

@@ -19,9 +19,9 @@ This is a report which explains the current state of the Joystream network in nu
 | Spending Proposals (Executed) | 66399263 |
 | Bounties paid       | 62236669 |
 | Validator Role      | 13752418 |
-| Storage Role        | 9880261.98 |
-| Curator Role        | 8426516.40 |
-| Operations Role     | 7931481.31 |
+| Storage Role        | 10633805 |
+| Curator Role        | 8031900.00 |
+| Operations Role     | 6668738 |
 
 ### 2.2 Fiat Pool
 | Property            | Start Block, USD | End Block, USD | % Change |

council/tokenomics/sumer-4/Council_Round14_1486800-1587599_Tokenomics_Report.md

@@ -19,9 +19,9 @@ This is a report which explains the current state of the Joystream network in nu
 | Spending Proposals (Executed) | 30879798 |
 | Bounties paid       | 23631616 |
 | Validator Role      | 12709365 |
-| Storage Role        | 10864032.22 |
-| Curator Role        | 6203758.45 |
-| Operations Role     | 17410619.27 |
+| Storage Role        | 10298715 |
+| Curator Role        | 8189365.00 |
+| Operations Role     | 12228832 |
 
 ### 2.2 Fiat Pool
 | Property            | Start Block, USD | End Block, USD | % Change |

council/tokenomics/sumer-4/Council_Round15_1587600-1688399_Tokenomics_Report.md

@@ -19,9 +19,9 @@ This is a report which explains the current state of the Joystream network in nu
 | Spending Proposals (Executed) | 31792993 |
 | Bounties paid       | 19745223 |
 | Validator Role      | 14270773 |
-| Storage Role        | 11028138.59 |
-| Curator Role        | 8135739.29 |
-| Operations Role     | 16377037.53 |
+| Storage Role        | 10088796 |
+| Curator Role        | 6635070.00 |
+| Operations Role     | 11268667 |
 
 ### 2.2 Fiat Pool
 | Property            | Start Block, USD | End Block, USD | % Change |

council/tokenomics/sumer-4/Council_Round16_1688400-1789199_Tokenomics_Report.md

@@ -19,9 +19,9 @@ This is a report which explains the current state of the Joystream network in nu
 | Spending Proposals (Executed) | 20893103 |
 | Bounties paid       | 13793103 |
 | Validator Role      | 14215503 |
-| Storage Role        | 11989705.05 |
-| Curator Role        | 5721743.24 |
-| Operations Role     | 43185931.56 |
+| Storage Role        | 11242881 |
+| Curator Role        | 7616125.00 |
+| Operations Role     | 18811221 |
 
 ### 2.2 Fiat Pool
 | Property            | Start Block, USD | End Block, USD | % Change |

council/tokenomics/sumer-4/Council_Round17_1789200-1889999_Tokenomics_Report.md

@@ -19,9 +19,9 @@ This is a report which explains the current state of the Joystream network in nu
 | Spending Proposals (Executed) | 3566666 |
 | Bounties paid       | 0 |
 | Validator Role      | 14740861 |
-| Storage Role        | 11687308.05 |
-| Curator Role        | 8469915.97 |
-| Operations Role     | 22186139.9 |
+| Storage Role        | 9956803 |
+| Curator Role        | 7000850.00 |
+| Operations Role     | 17497400 |
 
 ### 2.2 Fiat Pool
 | Property            | Start Block, USD | End Block, USD | % Change |

council/tokenomics/sumer-4/Council_Round18_1890000-1990799_Tokenomics_Report.md

@@ -19,9 +19,9 @@ This is a report which explains the current state of the Joystream network in nu
 | Spending Proposals (Executed) | 51216981 |
 | Bounties paid       | 13275805 |
 | Validator Role      | 12241670 |
-| Storage Role        | 11561085.31 |
-| Curator Role        | 8469915.97 |
-| Operations Role     | 12320857.77 |
+| Storage Role        | 8707707 |
+| Curator Role        | 8470000.00 |
+| Operations Role     | 9182695 |
 
 ### 2.2 Fiat Pool
 | Property            | Start Block, USD | End Block, USD | % Change |

council/tokenomics/sumer-4/Council_Round19_1990800-2091599_Tokenomics_Report.md

@@ -19,9 +19,9 @@ This is a report which explains the current state of the Joystream network in nu
 | Spending Proposals (Executed) | 36676575 |
 | Bounties paid       | 29746998 |
 | Validator Role      | 13934248 |
-| Storage Role        | 11692152.01 |
-| Curator Role        | 8766713.03 |
-| Operations Role     | 12669874.31 |
+| Storage Role        | 11687587 |
+| Curator Role        | 8554440.00 |
+| Operations Role     | 11691300 |
 
 ### 2.2 Fiat Pool
 | Property            | Start Block, USD | End Block, USD | % Change |

council/tokenomics/sumer-4/Council_Round20_2091600-2192399_Tokenomics_Report.md

@@ -19,9 +19,9 @@ This is a report which explains the current state of the Joystream network in nu
 | Spending Proposals (Executed) | 32923557 |
 | Bounties paid       | 23923557 |
 | Validator Role      | 11031708 |
-| Storage Role        | 11947509.47 |
-| Curator Role        | 7586524.74 |
-| Operations Role     | 11269888.19 |
+| Storage Role        | 7864628 |
+| Curator Role        | 8298500.00 |
+| Operations Role     | 9940000 |
 
 ### 2.2 Fiat Pool
 | Property            | Start Block, USD | End Block, USD | % Change |

council/tokenomics/sumer-4/Council_Round21_2192400-2293199_Tokenomics_Report.md

@@ -19,9 +19,9 @@ This is a report which explains the current state of the Joystream network in nu
 | Spending Proposals (Executed) | 38008919 |
 | Bounties paid       | 29097645 |
 | Validator Role      | 16566109 |
-| Storage Role        | 10203126.78 |
-| Curator Role        | 7159556.97 |
-| Operations Role     | 11269888.19 |
+| Storage Role        | 8990828 |
+| Curator Role        | 7226036.00 |
+| Operations Role     | 8220000 |
 
 ### 2.2 Fiat Pool
 | Property            | Start Block, USD | End Block, USD | % Change |

council/tokenomics/sumer-4/Council_Round22_2293200-2393999_Tokenomics_Report.md

@@ -19,9 +19,9 @@ This is a report which explains the current state of the Joystream network in nu
 | Spending Proposals (Executed) | 16449268 |
 | Bounties paid       | 12449799 |
 | Validator Role      | 11388562 |
-| Storage Role        | 9836190.42 |
-| Curator Role        | 5975280.72 |
-| Operations Role     | 13918157.92 |
+| Storage Role        | 5934713 |
+| Curator Role        | 6514935.00 |
+| Operations Role     | 11455596 |
 
 ### 2.2 Fiat Pool
 | Property            | Start Block, USD | End Block, USD | % Change |

council/tokenomics/sumer-4/Council_Round23_2394000-2494799_Tokenomics_Report.md

@@ -19,9 +19,9 @@ This is a report which explains the current state of the Joystream network in nu
 | Spending Proposals (Executed) | 17220110 |
 | Bounties paid       | 10849429 |
 | Validator Role      | 11071874 |
-| Storage Role        | 4556114.8 |
-| Curator Role        | 5975280.72 |
-| Operations Role     | 14478124.37 |
+| Storage Role        | 4744736 |
+| Curator Role        | 5975340.00 |
+| Operations Role     | 11055439 |
 
 ### 2.2 Fiat Pool
 | Property            | Start Block, USD | End Block, USD | % Change |

council/tokenomics/sumer-4/Council_Round24_2494800-2595599_Tokenomics_Report.md

@@ -19,9 +19,9 @@ This is a report which explains the current state of the Joystream network in nu
 | Spending Proposals (Executed) | 11246267 |
 | Bounties paid       | 6156716 |
 | Validator Role      | 10571855 |
-| Storage Role        | 4556114.8 |
-| Curator Role        | 5975280.72 |
-| Operations Role     | 14478124.37 |
+| Storage Role        | 4419897 |
+| Curator Role        | 5975340.00 |
+| Operations Role     | 5046080 |
 
 ### 2.2 Fiat Pool
 | Property            | Start Block, USD | End Block, USD | % Change |

council/tokenomics/sumer-4/Council_Round25_2595600-2696399_Tokenomics_Report.md

@@ -19,9 +19,9 @@ This is a report which explains the current state of the Joystream network in nu
 | Spending Proposals (Executed) | 34664099 |
 | Bounties paid       | 32748391 |
 | Validator Role      | 11152787 |
-| Storage Role        | 4556114.8 |
-| Curator Role        | 5975280.72 |
-| Operations Role     | 15458058.64 |
+| Storage Role        | 4393441 |
+| Curator Role        | 5975340.00 |
+| Operations Role     | 9407590 |
 
 ### 2.2 Fiat Pool
 | Property            | Start Block, USD | End Block, USD | % Change |

council/tokenomics/sumer-4/Council_Round26_2696400-2782799_Tokenomics_Report.md

@@ -19,9 +19,9 @@ This is a report which explains the current state of the Joystream network in nu
 | Spending Proposals (Executed) | 23882485 |
 | Bounties paid       | 16925509 |
 | Validator Role      | 7406957 |
-| Storage Role        | 3905234.8 |
-| Curator Role        | 5121660.72 |
-| Operations Role     | 13489691.87 |
+| Storage Role        | 3905280 |
+| Curator Role        | 5121720.00 |
+| Operations Role     | 10827026 |
 
 ### 2.2 Fiat Pool
 | Property            | Start Block, USD | End Block, USD | % Change |

council/tokenomics/sumer-4/Council_Round27_2782800-2883599_Tokenomics_Report.md

@@ -19,9 +19,9 @@ This is a report which explains the current state of the Joystream network in nu
 | Spending Proposals (Executed) | 33126088 |
 | Bounties paid       | 33126088 |
 | Validator Role      | 13954081 |
-| Storage Role        | 4556114.8 |
-| Curator Role        | 5975280.72 |
-| Operations Role     | 18537972.09 |
+| Storage Role        | 4556160 |
+| Curator Role        | 5975340.00 |
+| Operations Role     | 14524458 |
 
 ### 2.2 Fiat Pool
 | Property            | Start Block, USD | End Block, USD | % Change |

council/tokenomics/sumer-4/Council_Round28_2883600-2984399_Tokenomics_Report.md

@@ -19,9 +19,16 @@ This is a report which explains the current state of the Joystream network in nu
 | Spending Proposals (Executed) | 16718064 |
 | Bounties paid       | 11881188 |
 | Validator Role      | 7702182 |
-| Storage Role        | 4556114.8 |
-| Curator Role        | 5975280.72 |
-| Operations Role     | 18537972.09 |
+| Storage Role        | 2603532 |
+| Curator Role        | 5975340.00 |
+| Operations Role     | 6965534 |
+
+### 2.2 Fiat Pool
+| Property            | Start Block, USD | End Block, USD | % Change |
+|---------------------|--------------|--------------|----------|
+| USD Pool | 46726.82 | 45073.92 | -3.54 |
+
+
 
 ### 2.2 Fiat Pool
 | Property            | Start Block, USD | End Block, USD | % Change |

council/tokenomics/sumer-4/Council_Round29_2984400-3085199_Tokenomics_Report.md

@@ -19,9 +19,9 @@ This is a report which explains the current state of the Joystream network in nu
 | Spending Proposals (Executed) | 61824480 |
 | Bounties paid       | 51979520 |
 | Validator Role      | 13511525 |
-| Storage Role        | 4556114.8 |
-| Curator Role        | 5975280.72 |
-| Operations Role     | 24137916.53 |
+| Storage Role        | 4556160 |
+| Curator Role        | 5975340.00 |
+| Operations Role     | 14927062 |
 
 ### 2.2 Fiat Pool
 | Property            | Start Block, USD | End Block, USD | % Change |

council/tokenomics/sumer-4/Council_Round7_781200-881999_Tokenomics_Report.md

@@ -19,9 +19,9 @@ This is a report which explains the current state of the Joystream network in nu
 | Spending Proposals (Executed) | 8633519 |
 | Bounties paid       | 8633519 |
 | Validator Role      | 9957579 |
-| Storage Role        | 4031260.01 |
-| Curator Role        | 7615084.45 |
-| Operations Role     | 923990.83 |
+| Storage Role        | 3993021 |
+| Curator Role        | 4092847.00 |
+| Operations Role     | 33000 |
 
 ### 2.2 Fiat Pool
 | Property            | Start Block, USD | End Block, USD | % Change |

council/tokenomics/sumer-4/Council_Round8_882000-982799_Tokenomics_Report.md

@@ -19,9 +19,9 @@ This is a report which explains the current state of the Joystream network in nu
 | Spending Proposals (Executed) | 23793787 |
 | Bounties paid       | 23793787 |
 | Validator Role      | 10311013 |
-| Storage Role        | 3753502.76 |
-| Curator Role        | 7615084.45 |
-| Operations Role     | 923990.83 |
+| Storage Role        | 3813060 |
+| Curator Role        | 7495460.00 |
+| Operations Role     | 924000 |
 
 ### 2.2 Fiat Pool
 | Property            | Start Block, USD | End Block, USD | % Change |

council/tokenomics/sumer-4/Council_Round9_982800-1083599_Tokenomics_Report.md

@@ -19,9 +19,9 @@ This is a report which explains the current state of the Joystream network in nu
 | Spending Proposals (Executed) | 23602198 |
 | Bounties paid       | 23602198 |
 | Validator Role      | 8148871 |
-| Storage Role        | 3837501.93 |
-| Curator Role        | 7712803.48 |
-| Operations Role     | 923990.83 |
+| Storage Role        | 2917540 |
+| Curator Role        | 7705900.00 |
+| Operations Role     | 924000 |
 
 ### 2.2 Fiat Pool
 | Property            | Start Block, USD | End Block, USD | % Change |

working-groups/operations-group/README.md

@@ -5,14 +5,44 @@
 - Tasks: https://git.joystreamstats.live/Operations/process
 - Openings: https://pioneer.joystreamstats.live/#/working-groups/opportunities/operationsGroup
 
+## Budget
+
+| Round           | Spent [M tJOY] | Budget [USD] | Rate [$/M tJOY] | Budget [M tJOY] | Term Balance [M tJOY] | Balance [M tJOY] | Balance [$] |
+|-----------------|----------------|--------------|-----------------|-----------------|-----------------------|------------------|-------------|
+| [7](#round-7)   |            0.3 |          130 |            37.9 |            3.43 |                  3.13 |             3.13 |      118.63 |
+| [8](#round-8)   |            0.9 |          130 |            37.3 |            3.49 |                  2.59 |             5.72 |      213.07 |
+| [9](#round-8)   |            0.9 |          255 |            36.0 |            7.08 |                  6.18 |            11.90 |      428.40 |
+| [10](#round-10) |            1.8 |          245 |            35.4 |            6.92 |                  5.12 |            17.02 |      602.51 |
+| [11](#round-11) |            3.3 |          245 |            34.8 |            7.04 |                  3.74 |            20.76 |      722.45 |
+| [12](#round-12) |            3.9 |          245 |            33.8 |            7.25 |                  3.35 |            24.11 |      814.92 |
+| [13](#round-13) |            9.1 |          245 |            33.7 |            7.27 |                 -1.83 |            22.28 |      750.84 |
+| [14](#round-14) |           12.2 |          245 |            34.0 |            7.21 |                 -4.99 |            17.29 |      587.86 |
+| [15](#round-15) |           12.8 |          245 |            31.7 |            7.73 |                 -5.07 |            12.22 |      387.37 |
+| [16](#round-16) |           18.8 |          475 |            28.9 |           16.44 |                 -2.36 |             9.86 |      284.95 |
+| [17](#round-17) |           17.5 |          475 |            30.7 |           15.47 |                 -2.03 |             7.83 |      240.38 |
+| [18](#round-18) |           44.1 |          600 |            30.4 |           19.74 |                -24.36 |           -16.53 |     -502.51 |
+| [19](#round-19) |           20.7 |          600 |            29.2 |           20.55 |                 -0.15 |           -16.68 |     -487.06 |
+| [20](#round-20) |           10.0 |          600 |            26.3 |           22.81 |                 12.81 |            -3.87 |     -101.78 |
+| [21](#round-21) |            8.2 |          600 |            25.5 |           23.53 |                 15.33 |            11.46 |      292.23 |
+| [22](#round-22) |           11.5 |          600 |            24.8 |           24.19 |                 12.69 |            24.15 |      598.92 |
+| [23](#round-23) |           11.1 |          365 |            25.3 |           14.43 |                  3.33 |            27.48 |      695.24 |
+| [24](#round-24) |            5.0 |          365 |            25.4 |           14.37 |                  9.37 |            36.85 |      935.99 |
+| [25](#round-25) |            9.5 |          365 |            27.1 |           13.47 |                  3.97 |            40.82 |     1106.22 |
+| [26](#round-26) |           10.8 |          365 |            25.9 |           14.09 |                  3.29 |            44.11 |     1142.45 |
+| [27](#round-27) |           14.5 |          365 |            25.8 |           14.15 |                 -0.35 |            43.76 |     1129.01 |
+| [28](#round-28) |            7.0 |          365 |            25.8 |           14.15 |                  7.15 |            50.91 |     1313.48 |
+| [29](#round-29) |           24.1 |          365 |            23.0 |           15.87 |                 -8.23 |            42.68 |      981.64 |
+
 ## Reports
 
 ### [Round 7](../../council/tokenomics/sumer-4/Council_Round7_781200-881999_Tokenomics_Report.md)
 
 - **Date:** `6/1/2021 - 6/8/2021`
-- **Budget:** `$175`
-- **Spent:** `0.9 M / 4.6M (@37.9 $/M)`
-- **Balance:** `3.7 M`
+- **Budget:** `$130`
+- **Spent:** `0.3 M / 3.43 M (@37.9 $/M)`
+- **Balance:** `3.13 M ($118.63)`
+
+* [Antioch KPI 6.x - Antioch WG Budget 3(b)](https://pioneer.joystreamstats.live/#/proposals/118)
 
 | Property                | Start Block | End Block | % Change |
 |-------------------------|--------------|--------------|----------|
@@ -26,9 +56,9 @@
 ### [Round 8](../../council/tokenomics/sumer-4/Council_Round8_882000-982799_Tokenomics_Report.md)
 
 - **Date:** `6/8/2021 - 6/15/2021`
-- **Budget:** `$175`
-- **Spent:** `0.9 M / 4.7M (@37.25 $/M)`
-- **Balance:** `7.5 M`
+- **Budget:** `$130`
+- **Spent:** `0.9 M / 3.49 M (@37.25 $/M)`
+- **Balance:** `5.72 M ($213.07)`
 
 | Property                | Start Block | End Block | % Change |
 |-------------------------|--------------|--------------|----------|
@@ -42,9 +72,11 @@
 ### [Round 9](../../council/tokenomics/sumer-4/Council_Round9_982800-1083599_Tokenomics_Report.md)
 
 - **Date:** `6/15/2021 - 6/22/2021`
-- **Budget:** `$175`
-- **Spent:** `0.9 M / 4.8M (@36.0 $/M)`
-- **Balance:** `11.4 M`
+- **Budget:** `$255`
+- **Spent:** `0.9 M / 7.8 M (@36.0 $/M)`
+- **Balance:** `11.9 M ($428.40)`
+
+* [KPI 8.8 - Budget 4](https://pioneer.joystreamstats.live/#/proposals/163)
 
 | Property                | Start Block | End Block | % Change |
 |-------------------------|--------------|--------------|----------|
@@ -58,9 +90,11 @@
 ### [Round 10](../../council/tokenomics/sumer-4/Council_Round10_1083600-1184399_Tokenomics_Report.md)
 
 - **Date:** `6/22/2021 - 6/29/2021`
-- **Budget:** `$175`
-- **Spent:** `0.9 M / 4.9M (@35.4 $/M)`
-- **Balance:** `15.4 M`
+- **Budget:** `$245`
+- **Spent:** `1.8 M / 6.92 M (@35.4 $/M)`
+- **Balance:** `17.2 M ($602.51)`
+
+* [Sumer KPI 9.x - Budget 5 (correction)](https://pioneer.joystreamstats.live/#/proposals/180)
 
 | Property                | Start Block | End Block | % Change |
 |-------------------------|--------------|--------------|----------|
@@ -74,9 +108,9 @@
 ### [Round 11](../../council/tokenomics/sumer-4/Council_Round11_1184400-1285199_Tokenomics_Report.md)
 
 - **Date:** `6/29/2021 - 7/6/2021`
-- **Budget:** `$175`
-- **Spent:** `3.8 M / 5M (@34.8 $/M)`
-- **Balance:** `16.6 M`
+- **Budget:** `$245`
+- **Spent:** `3.3 M / 7.04 M (@34.8 $/M)`
+- **Balance:** `20.76 M ($722.45)`
 
 | Property                | Start Block | End Block | % Change |
 |-------------------------|--------------|--------------|----------|
@@ -97,9 +131,11 @@
 ### [Round 12](../../council/tokenomics/sumer-4/Council_Round12_1285200-1385999_Tokenomics_Report.md)
 
 - **Date:** `7/6/2021 - 7/13/2021`
-- **Budget:** `$175`
-- **Spent:** `3.8 M / 5.2M (@33.8 $/M)`
-- **Balance:** `18.0 M`
+- **Budget:** `$245`
+- **Spent:** `3.9 M / 7.25 M (@33.8 $/M)`
+- **Balance:** `24.11 M ($814.92)`
+
+* [Budget 6 - July 11 2021](https://pioneer.joystreamstats.live/#/proposals/254)
 
 | Property                | Start Block | End Block | % Change |
 |-------------------------|--------------|--------------|----------|
@@ -120,9 +156,11 @@
 ### [Round 13](../../council/tokenomics/sumer-4/Council_Round13_1386000-1486799_Tokenomics_Report.md)
 
 - **Date:** `7/13/2021 - 7/20/2021`
-- **Budget:** `$175`
-- **Spent:** `7.9 M / 5.2M (@33.7 $/M)`
-- **Balance:** `15.3 M`
+- **Budget:** `$245`
+- **Spent:** `6.7 M / 7.27 M (@33.7 $/M)`
+ - 2 M [Telegram bot](https://pioneer.joystreamstats.live/#/proposals/282)
+ - 0.4 M [Proposing Telegram bot](https://pioneer.joystreamstats.live/#/proposals/283)
+- **Balance:** `22.28 M ($750.84)`
 
 | Property                | Start Block | End Block | % Change |
 |-------------------------|--------------|--------------|----------|
@@ -143,9 +181,9 @@
 ### [Round 14](../../council/tokenomics/sumer-4/Council_Round14_1486800-1587599_Tokenomics_Report.md)
 
 - **Date:** `7/20/2021 - 7/27/2021`
-- **Budget:** `$175`
-- **Spent:** `17.4 M / 5.1M (@34 $/M)`
-- **Balance:** `3 M`
+- **Budget:** `$245`
+- **Spent:** `12.2 M / 7.21 M (@34 $/M)`
+- **Balance:** `17.29 M ($587.86)`
 
 | Property                | Start Block | End Block | % Change |
 |-------------------------|--------------|--------------|----------|
@@ -167,9 +205,10 @@
 ### [Round 15](../../council/tokenomics/sumer-4/Council_Round15_1587600-1688399_Tokenomics_Report.md)
 
 - **Date:** `7/27/2021 - 8/3/2021`
-- **Budget:** `$175`
-- **Spent:** `16.3 M / 5.5M (@31.7 $/M)`
-- **Balance:** `-7.8 M`
+- **Budget:** `$245`
+- **Spent:** `11.3 M / 7.73 M (@31.7 $/M)`
+ - 1.5 M [Discord bot](https://pioneer.joystreamstats.live/#/proposals/335)
+- **Balance:** `12.22 M ($387.37)`
 
 - [Budget Summary](https://pioneer.joystreamstats.live/#/forum/threads/517?page=2&replyIdx=15)
 - [Budget Overspending Discussion](https://pioneer.joystreamstats.live//#/forum/threads/518)
@@ -196,9 +235,9 @@
 ### [Round 16](../../council/tokenomics/sumer-4/Council_Round16_1688400-1789199_Tokenomics_Report.md)
 
 - **Date:** `8/3/2021 - 8/10/2021`
-- **Budget:** `$175`
-- **Spent:** `43 M / 6M (@28.9 $/M)`
-- **Balance:** `-44.8 M`
+- **Budget:** `$475`
+- **Spent:** `18.8 M / 16.44 M (@28.9 $/M)`
+- **Balance:** `9.86 M ($284.95)`
 
 - [Proposal 347](https://pioneer.joystreamstats.live/#/proposals/347) (Expired): Operations Tasks Budget
 - [Proposal 377](https://pioneer.joystreamstats.live/#/proposals/377): increase Operations budget to 400$
@@ -220,9 +259,9 @@
 ### [Round 17](../../council/tokenomics/sumer-4/Council_Round17_1789200-1889999_Tokenomics_Report.md)
 
 - **Date:** `8/10/2021 - 8/17/2021`
-- **Budget:** `$400`
-- **Spent:** `22.2 M / 13 M (@30.7 $/M)`
-- **Balance:** `-54 M`
+- **Budget:** `$475`
+- **Spent:** `17.5 M / 15.47 M (@30.7 $/M)`
+- **Balance:** `7.83 M ($240.38)`
 
 - [Proposal 426](https://pioneer.joystreamstats.live/#/proposals/377): Bounty for promotional content
 
@@ -242,9 +281,11 @@
 ### [Round 18](../../council/tokenomics/sumer-4/Council_Round18_1890000-1990799_Tokenomics_Report.md)
 
 - **Date:** `8/17/2021 - 8/24/2021`
-- **Budget:** `$525`
-- **Spent:** `12.3 M / 17.3 M (@30.4 $/M)`
-- **Balance:** `-49 M`
+- **Budget:** `$600`
+- **Spent:** `9.1 M / 19.74 M (@30.4 $/M)`
+ - 26 M [jsstats maintenance, HELIOS history, sprites.joystreamstats.live, storage bot](https://pioneer.joystreamstats.live/#/proposals/451)
+ - 9 M [Storage bot](https://joystreamstats.live/proposals/457)
+- **Balance:** `-16.53 M ($-502.51)`
 
 - [Proposal 127](https://pioneer.joystreamstats.live/#/proposals/127): Add endpoints budget to Operations ($50 per term), implemented at [block 1,912,078](https://pioneer.joystreamstats.live/#/explorer/query/0xca2763a4a87b533a61ef1604b9309476ae63e73bc76b0b59d09c0dfb44d57f31)
 - [Proposal 393](https://pioneer.joystreamstats.live/#/proposals/393): Pay Community Manager salary for [@andybut](https://pioneer.joystreamstats.live/#/members/andybut) ($75 per term)
@@ -267,9 +308,10 @@
 ### [Round 19](../../council/tokenomics/sumer-4/Council_Round19_1990800-2091599_Tokenomics_Report.md)
 
 - **Date:** `8/24/2021 - 8/31/2021`
-- **Budget:** `$525`
-- **Spent:** `12.6 M / 18 M (@29.2 $/M)`
-- **Balance:** `-43.6 M`
+- **Budget:** `$600`
+- **Spent:** `11.7 M / 20.55 M (@29.2 $/M)`
+ - 9 M [faucet bot](https://pioneer.joystreamstats.live/#/proposals/499)
+- **Balance:** `-16.68 M ($-487.06)`
 
 | Property                | Start Block | End Block | % Change |
 |-------------------------|--------------|--------------|----------|
@@ -288,9 +330,11 @@
 ### [Round 20](../../council/tokenomics/sumer-4/Council_Round20_2091600-2192399_Tokenomics_Report.md)
 
 - **Date:** `8/31/2021 - 9/7/2021`
-- **Budget:** `$525`
-- **Spent:** `11.2 M / 20 M (@26.3 $/M)`
-- **Balance:** `-34.8 M`
+- **Budget:** `$600`
+- **Spent:** `10 M / 22.81 M (@26.3 $/M)`
+- **Balance:** `-3.87 M ($-101.78)`
+
+- **Spending** 11.5 M ($300) [pioneer improvements](https://pioneer.joystreamstats.live/#/proposals/526) (**Canceled**, paid via salary to @freakstatic)
 
 | Property                | Start Block | End Block | % Change |
 |-------------------------|--------------|--------------|----------|
@@ -309,9 +353,9 @@
 ### [Round 21](../../council/tokenomics/sumer-4/Council_Round21_2192400-2293199_Tokenomics_Report.md)
 
 - **Date:** `9/7/2021 - 9/14/2021`
-- **Budget:** `$525`
-- **Spent:** `11.2 M / 20.6 M (@25.5 $/M)`
-- **Balance:** `-25.4 M`
+- **Budget:** `$600`
+- **Spent:** `8.2 M / 23.53 M (@25.5 $/M)`
+- **Balance:** `11.46 M ($292.23)`
 
 | Property                | Start Block | End Block | % Change |
 |-------------------------|--------------|--------------|----------|
@@ -330,9 +374,9 @@
 ### [Round 22](../../council/tokenomics/sumer-4/Council_Round22_2293200-2393999_Tokenomics_Report.md)
 
 - **Date:** `9/14/2021 - 9/21/2021`
-- **Budget:** `$525`
-- **Spent:** `13.9 M / 21.2 M (@24.8 $/M)`
-- **Balance:** `-18.1 M`
+- **Budget:** `$600`
+- **Spent:** `11.5 M / 24.19 M (@24.8 $/M)`
+- **Balance:** `24.15 M ($598.92)`
 
 | Property                | Start Block | End Block | % Change |
 |-------------------------|--------------|--------------|----------|
@@ -369,9 +413,11 @@
 ### [Round 23](../../council/tokenomics/sumer-4/Council_Round23_2394000-2494799_Tokenomics_Report.md)
 
 - **Date:** `9/21/2021 - 9/28/2021`
-- **Budget:** `$525`
-- **Spent:** `14.5 M / 20.8 M (@25.3 $/M)`
-- **Balance:** `-11.8 M`
+- **Budget:** `$365`
+- **Spent:** `11.1 M / 14.43 M (@25.3 $/M)`
+- **Balance:** `27.48 M ($695.24)`
+
+- [Budget 7](https://pioneer.joystreamstats.live/#/proposals/576) (Approved 17 Sep 2021), reduce Operations budget ($70 lead salary, $195 worker salaries, $25 servers, $75 community manager)
 
 | Property                | Start Block | End Block | % Change |
 |-------------------------|--------------|--------------|----------|
@@ -409,9 +455,9 @@
 ### [Round 24](../../council/tokenomics/sumer-4/Council_Round24_2494800-2595599_Tokenomics_Report.md)
 
 - **Date:** `9/28/2021 - 10/5/2021`
-- **Budget:** `$525`
-- **Spent:** `14.4 M / 20.7 M (@25.4 $/M)`
-- **Balance:** `-5.5 M`
+- **Budget:** `$365`
+- **Spent:** `5 M / 14.37 M (@25.4 $/M)`
+- **Balance:** `36.85 M ($935.99)`
 
 | Property                | Start Block | End Block | % Change |
 |-------------------------|--------------|--------------|----------|
@@ -448,9 +494,9 @@
 ### [Round 25](../../council/tokenomics/sumer-4/Council_Round25_2595600-2696399_Tokenomics_Report.md)
 
 - **Date:** `9/28/2021 - 10/5/2021`
-- **Budget:** `$525`
-- **Spent:** `15.4 M / 19.4 M (@27.1 $/M)`
-- **Balance:** `-1.5 M`
+- **Budget:** `$365`
+- **Spent:** `9.5 M / 13.47 M (@27.1 $/M)`
+- **Balance:** `40.82 M ($1106.22)`
 
 | Property                | Start Block | End Block | % Change |
 |-------------------------|--------------|--------------|----------|
@@ -487,9 +533,9 @@
 ### [Round 26](../../council/tokenomics/sumer-4/Council_Round26_2696400-2782799_Tokenomics_Report.md)
 
 - **Date:** `10/12/2021 - 10/18/2021`
-- **Budget:** `$525`
-- **Spent:** `13.4 M / 20.3 M (@25.9 $/M)`
-- **Balance:** `5.4 M`
+- **Budget:** `$365`
+- **Spent:** `10.8 M / 14.08 M (@25.9 $/M)`
+- **Balance:** `44.11 M ($1142.45)`
 
 | Property                | Start Block | End Block | % Change |
 |-------------------------|--------------|--------------|----------|
@@ -526,9 +572,9 @@
 ### [Round 27](../../council/tokenomics/sumer-4/Council_Round27_2782800-2883599_Tokenomics_Report.md)
 
 - **Date:** `10/18/2021 - 10/26/2021`
-- **Budget:** `$525`
-- **Spent:** `18.5 M / 20.3 M (@25.8 $/M)`
-- **Balance:** `7.7 M`
+- **Budget:** `$365`
+- **Spent:** `14.5 M / 14.15 M (@25.8 $/M)`
+- **Balance:** `43.76 M ($1129.01)`
 
 | Property                | Start Block | End Block | % Change |
 |-------------------------|--------------|--------------|----------|
@@ -567,9 +613,9 @@
 ### [Round 28](../../council/tokenomics/sumer-4/Council_Round28_2883600-2984399_Tokenomics_Report.md)
 
 - **Date:** `10/26/2021 - 11/2/2021`
-- **Budget:** `$525`
-- **Spent:** `18.5 M / 20.3 M (@25.8 $/M)`
-- **Balance:** `9.5 M`
+- **Budget:** `$365`
+- **Spent:** `7 M / 14.15 M (@25.8 $/M)`
+- **Balance:** `50.91 M ($1313.48)`
 
 | Property                | Start Block | End Block | % Change |
 |-------------------------|--------------|--------------|----------|
@@ -607,9 +653,9 @@
 ### [Round 29](../../council/tokenomics/sumer-4/Council_Round29_2984400-3085199_Tokenomics_Report.md)
 
 - **Date:** `11/2/2021 - 11/9/2021`
-- **Budget:** `$525`
-- **Spent:** `24.1 M / 22.8 M (@23 $/M)`
-- **Balance:** `8.2 M`
+- **Budget:** `$365`
+- **Spent:** `24.1 M / 15.87 M (@23 $/M)`
+- **Balance:** `42.68 M ($981.64)`
 
 | Property                | Start Block | End Block | % Change |
 |-------------------------|--------------|--------------|----------|