Fix past councils spending amounts #4554
Conversation
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
chrlschwb
added
community-dev
|
"total spent" column should include the total of councilor reward + WG budget updates + funding proposals + channel payout rewards |
| proposalsApproved: data?.proposalsApproved?.totalCount ?? 0, | ||
| proposalsRejected: (data?.proposalsRejected?.totalCount || 0) + (data?.proposalsSlashed?.totalCount || 0), | ||
| totalSpent: data && getTotalSpent(data.budgetSpendingEvents), | ||
| // totalSpent: data && getTotalSpent(data.budgetSpendingEvents), |
There was a problem hiding this comment.
please remove unnecessary line
|
Tested on https://dao-h1gyak8tv-joystream.vercel.app/#/council/past-councils @chrlschwb I couldn't find the numbers that correspond to the total spent... this is term 19 
|
| // totalSpent: getTotalSpent(spendingEvents), | ||
| totalSpent: councilFields.councilMembers | ||
| .reduce((a, b) => a.add(new BN(b.accumulatedReward)), BN_ZERO) | ||
| .add(workingGroupBudgets.reduce((a, b) => a.add(new BN(b.budgetChangeAmount)), BN_ZERO)) | ||
| .add(getSpentOnProposals(fundingRequestsApproved)) | ||
| .add(workingGroupRewardPaidEvents.reduce((a, b) => a.add(new BN(b.amount)), BN_ZERO)), |
There was a problem hiding this comment.
Because this code will probably have to be updated in the furture I think it's worth makin it a bit clearer so please remove the export from getTotalSpent and update it's definition to something like:
const getTotalSpent = (
councilMembers: ...,
workingGroupBudgets: ...,
workingGroupRewardPaidEvents: ...,
fundingRequestsApproved: ...,
) => {
const totalAccumulatedReward = councilMembers
.reduce((a, b) => a.add(new BN(b.accumulatedReward)), BN_ZERO)
const totalBudgetChange = workingGroupBudgets
.reduce((a, b) => a.add(new BN(b.budgetChangeAmount)), BN_ZERO)
const totalRewardPaid = workingGroupRewardPaidEvents
.reduce((a, b) => a.add(new BN(b.amount)), BN_ZERO)
const spentOnProposal = getSpentOnProposals(fundingRequestsApproved)
return totalAccumulatedReward
.add(totalBudgetChange)
.add(totalRewardPaid)
.add(spentOnProposal)
}Then:
| // totalSpent: getTotalSpent(spendingEvents), | |
| totalSpent: councilFields.councilMembers | |
| .reduce((a, b) => a.add(new BN(b.accumulatedReward)), BN_ZERO) | |
| .add(workingGroupBudgets.reduce((a, b) => a.add(new BN(b.budgetChangeAmount)), BN_ZERO)) | |
| .add(getSpentOnProposals(fundingRequestsApproved)) | |
| .add(workingGroupRewardPaidEvents.reduce((a, b) => a.add(new BN(b.amount)), BN_ZERO)), | |
| totalSpent: getTotalSpent(councilFields.councilMembers, workingGroupBudgets, workingGroupRewardPaidEvents, spentOnProposal), |
Also @chrlschwb should channel payout be included here ?
There was a problem hiding this comment.
Yes, I believe channel payout should be included
|
@ivanturlakov thanks for the test. can you please check with other council term reports? |
|
Tested on https://dao-h1gyak8tv-joystream.vercel.app/#/council/past-councils @chrlschwb Seems that the amount of validator rewards is not the cause I tried playing with numbers yesterday but it didn't help me find the cause
|
|
@ivanturlakov I think council reports could contain some errors since they are amalgamation of WG reports and WG reports can contain slight errors due to unpaid rewards at the time of writing them, etc. However, this will require a more detailed analysis. |
|
@thesan @chrlschwb I have added channelPaymentMadeEvent for calculating |
thesan
changed the title
thesan
changed the title
|
@chrlschwb same result as prev test |
| fundingRequestsApproved: proposals( | ||
| where: { | ||
| inBlock_gt: $fromBlock | ||
| inBlock_lt: $toBlock | ||
| proposal: { details_json: { isTypeOf_eq: "FundingRequestProposalDetails" } } | ||
| statusSetAtBlock_gt: $fromBlock | ||
| statusSetAtBlock_lt: $toBlock | ||
| details_json: { isTypeOf_eq: "FundingRequestProposalDetails" } |
There was a problem hiding this comment.
The query should only return actually executed funding requests, and maybe just those approved between $fromBlock and $toBlock regardless from when they executed.
Fix the #4121 (wrong values in Councils and past councils)
