From 6a648424156ed680b107d87de3773116877084f0 Mon Sep 17 00:00:00 2001 From: Michael Bumann Date: Sat, 8 Jun 2019 17:49:24 +0200 Subject: [PATCH] Only count not-vetoed contributions for total balances --- apps/contribution/contracts/Contribution.sol | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/contribution/contracts/Contribution.sol b/apps/contribution/contracts/Contribution.sol index 1cc78be..4b62129 100644 --- a/apps/contribution/contracts/Contribution.sol +++ b/apps/contribution/contracts/Contribution.sol @@ -118,11 +118,11 @@ contract Contribution is AragonApp { // Custom functions // - function totalKreditsEarned(bool confirmedOnly) public view returns (uint256 count) { + function totalKreditsEarned(bool confirmedOnly) public view returns (uint256 amount) { for (uint32 i = 1; i <= contributionsCount; i++) { ContributionData memory c = contributions[i]; - if (block.number >= c.confirmedAtBlock || !confirmedOnly) { - count += c.amount; // should use safemath + if (!c.vetoed && (block.number >= c.confirmedAtBlock || !confirmedOnly)) { + amount += c.amount; // should use safemath } } } @@ -132,7 +132,7 @@ contract Contribution is AragonApp { for (uint256 i = 0; i < tokenCount; i++) { uint32 cId = ownedContributions[contributorId][i]; ContributionData memory c = contributions[cId]; - if (block.number >= c.confirmedAtBlock || !confirmedOnly) { + if (!c.vetoed && (block.number >= c.confirmedAtBlock || !confirmedOnly)) { amount += c.amount; // should use safemath } }