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

Merge pull request #78 from 67P/feature/veto-period

Browse Source 
Set contribution veto period to 1 week
This commit is contained in:
Basti 2019-04-06 00:30:30 +02:00 committed by GitHub
commit cbfe39f804
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,7 @@ contract Contribution is AragonApp {
uint8 hashFunction; uint8 hashFunction;
uint8 hashSize; uint8 hashSize;
string tokenMetadataURL; string tokenMetadataURL;
uint claimAfterBlock; uint256 confirmedAtBlock;
bool vetoed; bool vetoed;
bool exists; bool exists;
} }
@ -48,7 +48,7 @@ contract Contribution is AragonApp {
mapping(uint32 => ContributionData) public contributions; mapping(uint32 => ContributionData) public contributions;
uint32 public contributionsCount; uint32 public contributionsCount;
uint32 public blocksToWait = 0; uint32 public blocksToWait;
event ContributionAdded(uint32 id, uint32 indexed contributorId, uint32 amount); event ContributionAdded(uint32 id, uint32 indexed contributorId, uint32 amount);
event ContributionClaimed(uint32 id, uint32 indexed contributorId, uint32 amount); event ContributionClaimed(uint32 id, uint32 indexed contributorId, uint32 amount);
@ -56,6 +56,7 @@ contract Contribution is AragonApp {
function initialize(bytes32[4] _appIds) public onlyInit { function initialize(bytes32[4] _appIds) public onlyInit {
appIds = _appIds; appIds = _appIds;
blocksToWait = 40320; // 7 days; 15 seconds block time
initialized(); initialized();
} }
@ -117,7 +118,7 @@ contract Contribution is AragonApp {
// Custom functions // Custom functions
// //
function getContribution(uint32 contributionId) public view returns (uint32 id, uint32 contributorId, uint32 amount, bool claimed, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize, uint claimAfterBlock, bool exists, bool vetoed) { function getContribution(uint32 contributionId) public view returns (uint32 id, uint32 contributorId, uint32 amount, bool claimed, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize, uint256 confirmedAtBlock, bool exists, bool vetoed) {
id = contributionId; id = contributionId;
ContributionData storage c = contributions[id]; ContributionData storage c = contributions[id];
return ( return (
@ -128,7 +129,7 @@ contract Contribution is AragonApp {
c.hashDigest, c.hashDigest,
c.hashFunction, c.hashFunction,
c.hashSize, c.hashSize,
c.claimAfterBlock, c.confirmedAtBlock,
c.exists, c.exists,
c.vetoed c.vetoed
); );
@ -145,7 +146,11 @@ contract Contribution is AragonApp {
c.hashDigest = hashDigest; c.hashDigest = hashDigest;
c.hashFunction = hashFunction; c.hashFunction = hashFunction;
c.hashSize = hashSize; c.hashSize = hashSize;
c.claimAfterBlock = block.number; // + blocksToWait; if (contributionId < 10) {
c.confirmedAtBlock = block.number;
} else {
c.confirmedAtBlock = block.number + blocksToWait;
}
contributionsCount++; contributionsCount++;
@ -159,6 +164,7 @@ contract Contribution is AragonApp {
ContributionData storage c = contributions[contributionId]; ContributionData storage c = contributions[contributionId];
require(c.exists, 'NOT_FOUND'); require(c.exists, 'NOT_FOUND');
require(!c.claimed, 'ALREADY_CLAIMED'); require(!c.claimed, 'ALREADY_CLAIMED');
require(block.number < c.confirmedAtBlock, 'VETO_PERIOD_ENDED');
c.vetoed = true; c.vetoed = true;
emit ContributionVetoed(contributionId, msg.sender); emit ContributionVetoed(contributionId, msg.sender);
@ -169,7 +175,7 @@ contract Contribution is AragonApp {
require(c.exists, 'NOT_FOUND'); require(c.exists, 'NOT_FOUND');
require(!c.claimed, 'ALREADY_CLAIMED'); require(!c.claimed, 'ALREADY_CLAIMED');
require(!c.vetoed, 'VETOED'); require(!c.vetoed, 'VETOED');
require(block.number > c.claimAfterBlock, 'NOT_CLAIMABLE'); require(block.number >= c.confirmedAtBlock, 'NOT_CLAIMABLE');
c.claimed = true; c.claimed = true;
address token = getTokenContract(); address token = getTokenContract();

2
lib/abis/Contribution.json
View File

File diff suppressed because one or more lines are too long