From f8ff32f811c06dd517ca124904c5c32eb9bb342f Mon Sep 17 00:00:00 2001 From: Lucio Baglione Date: Wed, 21 Sep 2022 15:25:30 +0200 Subject: [PATCH 1/2] Fix proposers rewards from generation from remote. Fix key for `proposal_id` when generating the proposers rewards directly from the API remote endpoint instead of using local files. --- catalyst-toolbox/scripts/python/proposers_rewards.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalyst-toolbox/scripts/python/proposers_rewards.py b/catalyst-toolbox/scripts/python/proposers_rewards.py index 039eb285..245bf21e 100644 --- a/catalyst-toolbox/scripts/python/proposers_rewards.py +++ b/catalyst-toolbox/scripts/python/proposers_rewards.py @@ -219,7 +219,7 @@ async def get_proposals_voteplans_and_challenges_from_api( proposal.chain_proposal_id: proposal for proposal in await proposals_task } voteplans_proposals = { - proposal.chain_proposal_id: proposal + proposal.proposal_id: proposal for proposal in itertools.chain.from_iterable( voteplan.proposals for voteplan in await voteplans_task ) From ac8f777e52e3032138a3eb7201349bb774850a8e Mon Sep 17 00:00:00 2001 From: Lucio Baglione Date: Wed, 21 Sep 2022 15:29:40 +0200 Subject: [PATCH 2/2] Add wallets count to proposer rewards Extract from voteplans the `votes_cast` field for each proposal to include the count of unique wallets to results. --- catalyst-toolbox/scripts/python/proposers_rewards.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/catalyst-toolbox/scripts/python/proposers_rewards.py b/catalyst-toolbox/scripts/python/proposers_rewards.py index 245bf21e..d44e08f7 100644 --- a/catalyst-toolbox/scripts/python/proposers_rewards.py +++ b/catalyst-toolbox/scripts/python/proposers_rewards.py @@ -317,6 +317,7 @@ def calc_vote_difference_and_threshold_success( "no", "result", "meets_approval_threshold", + "wallets", "requested_dollars", "status", "fund_depletion", @@ -371,6 +372,7 @@ def calc_results( no=no_result, result=total_result, meets_approval_threshold=YES if threshold_success else NO, + wallets=voteplan_proposal.votes_cast, requested_dollars=proposal.proposal_funds, status=FUNDED if funded else NOT_FUNDED, fund_depletion=depletion,