kredits/contracts
kredits/contracts
9
1
Fork 0
Code Issues 21 Pull Requests Actions Projects 1 Releases 8 Activity

Merge pull request #121 from 67P/refactor/amounts_vs_counts

Browse Source 
Improve totalKreditsEarned
This commit is contained in:
Basti 2019-06-09 13:57:44 +02:00 committed by GitHub
commit 17bc4e7d8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apps/contribution/contracts/Contribution.sol
View File

@ -118,22 +118,22 @@ contract Contribution is AragonApp {
// Custom functions // Custom functions
// //
function totalKreditsEarned(bool confirmedOnly) public view returns (uint256 count) { function totalKreditsEarned(bool confirmedOnly) public view returns (uint32 amount) {
for (uint32 i = 1; i <= contributionsCount; i++) { for (uint32 i = 1; i <= contributionsCount; i++) {
ContributionData memory c = contributions[i]; ContributionData memory c = contributions[i];
if (block.number >= c.confirmedAtBlock || !confirmedOnly) { if (!c.vetoed && (block.number >= c.confirmedAtBlock || !confirmedOnly)) {
count += c.amount; // should use safemath amount += c.amount; // should use safemath
} }
} }
} }
function totalKreditsEarnedByContributor(uint32 contributorId, bool confirmedOnly) public view returns (uint256 count) { function totalKreditsEarnedByContributor(uint32 contributorId, bool confirmedOnly) public view returns (uint32 amount) {
uint256 tokenBalance = ownedContributions[contributorId].length; uint256 tokenCount = ownedContributions[contributorId].length;
for (uint256 i = 0; i < tokenBalance; i++) { for (uint256 i = 0; i < tokenCount; i++) {
uint32 cId = ownedContributions[contributorId][i]; uint32 cId = ownedContributions[contributorId][i];
ContributionData memory c = contributions[cId]; ContributionData memory c = contributions[cId];
if (block.number >= c.confirmedAtBlock || !confirmedOnly) { if (!c.vetoed && (block.number >= c.confirmedAtBlock || !confirmedOnly)) {
count += c.amount; // should use safemath amount += c.amount; // should use safemath
} }
} }
} }

4
apps/contributor/contracts/Contributor.sol
View File

@ -7,7 +7,7 @@ interface ITokenBalance {
function balanceOf(address contributorAccount) public view returns (uint256); function balanceOf(address contributorAccount) public view returns (uint256);
} }
interface IContributionBalance { interface IContributionBalance {
function totalKreditsEarnedByContributor(uint32 contributorId, bool confirmedOnly) public view returns (uint256 count); function totalKreditsEarnedByContributor(uint32 contributorId, bool confirmedOnly) public view returns (uint32 amount);
function balanceOf(address owner) public view returns (uint256); function balanceOf(address owner) public view returns (uint256);
} }
@ -128,7 +128,7 @@ contract Contributor is AragonApp {
return contributors[id]; return contributors[id];
} }
function getContributorById(uint32 _id) public view returns (uint32 id, address account, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize, bool isCore, uint256 balance, uint256 totalKreditsEarned, uint256 contributionsCount, bool exists ) { function getContributorById(uint32 _id) public view returns (uint32 id, address account, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize, bool isCore, uint256 balance, uint32 totalKreditsEarned, uint256 contributionsCount, bool exists ) {
id = _id; id = _id;
Contributor storage c = contributors[_id]; Contributor storage c = contributors[_id];
account = c.account; account = c.account;

2
lib/abis/Contribution.json
View File

File diff suppressed because one or more lines are too long

2
lib/abis/Contributor.json
View File

File diff suppressed because one or more lines are too long