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

Build on aragonOS #62

Merged
bumi merged 51 commits from aragonos into master 2019-04-02 19:36:36 +00:00
Conversation 39 Commits 51 Files Changed 121 +3 -4
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fbda45376e - Show all commits

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

@ -27,8 +27,6 @@ contract Contribution is AragonApp {
string internal name_;
string internal symbol_;
address public tokenContract;
mapping(uint256 => address) contributionOwner;
mapping(address => uint256[]) ownedContributions;
@ -112,9 +110,10 @@ contract Contribution is AragonApp {
require(c.exists, 'NOT_FOUND');
require(!c.claimed, 'ALREADY_CLAIMED');
require(block.number > c.claimAfterBlock, 'NOT_CLAIMABLE');
c.claimed = true;
address token = getTokenContract();
IToken(token).mintFor(c.contributor, c.amount, contributionId);
emit ContributionClaimed(contributionId, c.contributor, c.amount);
}

2
apps/proposal/contracts/Proposal.sol
View File

@ -123,9 +123,9 @@ contract Proposal is AragonApp {
require(!p.executed, 'ALREADY_EXECUTED');
require(p.votesCount >= p.votesNeeded, 'MISSING_VOTES');
p.executed = true;
address contributorAccount = IContributor(getContributorContract()).getContributorAddressById(p.contributorId);
IContribution(getContributionContract()).add(p.amount, contributorAccount, p.hashDigest, p.hashFunction, p.hashSize);
p.executed = true;
emit ProposalExecuted(proposalId, p.contributorId, p.amount);
}