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

Correct contact associations

Browse Source 
So far our contract discovery was wrong.
https://spectrum.chat/aragon/aragonos/how-do-i-get-the-appid-namehash-of-an-app-in-open-aragonpm-eth~50dd2c67-63a2-49cf-bc64-aa033e33f48d

All dependent contract connections that are needed must be passed in and
can not be discovered from the DAO/Kernel/whatever.

So far I have no idea how we upgrade to these new contracts.
This commit is contained in:
bumi
2020-06-13 19:15:00 +02:00
parent 2c567fa71a
commit 2882094c75
13 changed files with 56 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,9 +12,11 @@ interface IContributionBalance {
}
contract Contributor is AragonApp {
bytes32 public constant KERNEL_APP_ADDR_NAMESPACE = 0xd6f028ca0e8edb4a8c9757ca4fdccab25fa1e0317da1188108f7d2dee14902fb;
bytes32 public constant MANAGE_CONTRIBUTORS_ROLE = keccak256("MANAGE_CONTRIBUTORS_ROLE");
ITokenBalance public kreditsToken;
IContributionBalance public kreditsContribution;
struct Contributor {
address account;
bytes32 hashDigest;
@@ -27,25 +29,16 @@ contract Contributor is AragonApp {
mapping (uint32 => Contributor) public contributors;
uint32 public contributorsCount;
// ensure alphabetic order
enum Apps { Contribution, Contributor, Proposal, Reimbursement, Token }
bytes32[5] public appIds;
event ContributorProfileUpdated(uint32 id, bytes32 oldHashDigest, bytes32 newHashDigest); // what should be logged
event ContributorAccountUpdated(uint32 id, address oldAccount, address newAccount);
event ContributorAdded(uint32 id, address account);
function initialize(address root, bytes32[5] _appIds) public onlyInit {
appIds = _appIds;
function initialize(address _contribution, address _token) public onlyInit {
kreditsToken = ITokenBalance(_token);
kreditsContribution = IContributionBalance(_contribution);
initialized();
}
function getContract(uint8 appId) public view returns (address) {
IKernel k = IKernel(kernel());
return k.getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[appId]);
}
function coreContributorsCount() public view returns (uint32) {
uint32 count = 0;
for (uint32 i = 1; i <= contributorsCount; i++) {
@@ -132,11 +125,9 @@ contract Contributor is AragonApp {
hashFunction = c.hashFunction;
hashSize = c.hashSize;
isCore = isCoreTeam(id);
address token = getContract(uint8(Apps.Token));
balance = ITokenBalance(token).balanceOf(c.account);
address contribution = getContract(uint8(Apps.Contribution));
totalKreditsEarned = IContributionBalance(contribution).totalKreditsEarnedByContributor(_id, true);
contributionsCount = IContributionBalance(contribution).balanceOf(c.account);
balance = kreditsToken.balanceOf(c.account);
totalKreditsEarned = kreditsContribution.totalKreditsEarnedByContributor(_id, true);
contributionsCount = kreditsContribution.balanceOf(c.account);
exists = c.exists;
}