refactor contrats with aragonos

apps/contribution/contracts/Contribution.sol

@@ -0,0 +1,139 @@
+pragma solidity ^0.4.24;
+
+import "@aragon/os/contracts/apps/AragonApp.sol";
+import "@aragon/os/contracts/kernel/IKernel.sol";
+
+interface IToken {
+  //function mintFor(address contributorAccount, uint256 amount, uint256 proposalId) external;
+  function mintFor(address contributorAccount, uint256 amount, uint256 contributionId) public;
+}
+
+contract Contribution is AragonApp {
+  bytes32 public constant ADD_CONTRIBUTION_ROLE = keccak256("ADD_CONTRIBUTION_ROLE");
+
+  bytes32 public constant KERNEL_APP_ADDR_NAMESPACE = 0xd6f028ca0e8edb4a8c9757ca4fdccab25fa1e0317da1188108f7d2dee14902fb;
+  bytes32 public constant TOKEN_APP_ID = 0xe04a882e7a6adf5603207d545ea49aec17e6b936c4d9eae3d74dbe482264991a;
+
+  struct ContributionData {
+    address contributor;
+    uint256 amount;
+    bool claimed;
+    bytes32 hashDigest;
+    uint8 hashFunction;
+    uint8 hashSize;
+    string tokenMetadataURL;
+    uint claimAfterBlock;
+    bool exists;
+  }
+  string internal name_;
+  string internal symbol_;
+
+  address public tokenContract;
+
+  mapping(uint256 => address) contributionOwner;
+  mapping(address => uint256[]) ownedContributions;
+
+  mapping(uint256 => ContributionData) public contributions;
+  uint256 public contributionsCount;
+
+  uint256 public blocksToWait = 0;
+
+  event ContributionAdded(uint256 id, address indexed contributor, uint256 amount);
+  event ContributionClaimed(uint256 id, address indexed contributor, uint256 amount);
+
+  function initialize() public onlyInit {
+    initialized();
+  }
+
+  function name() external view returns (string) {
+    return name_;
+  }
+
+  function symbol() external view returns (string) {
+    return symbol_;
+  }
+
+  function balanceOf(address owner) public view returns (uint256) {
+    require(owner != address(0));
+    return ownedContributions[owner].length;
+  }
+
+  function ownerOf(uint256 contributionId) public view returns (address) {
+    require(exists(contributionId));
+    return contributions[contributionId].contributor;
+  }
+
+  function tokenOfOwnerByIndex(address contributor, uint256 index) public view returns (uint256) {
+    return ownedContributions[contributor][index];
+  }
+
+  function tokenMetadata(uint256 contributionId) public view returns (string) {
+    return contributions[contributionId].tokenMetadataURL;
+  }
+
+  function getContribution(uint256 contributionId) public view returns (uint256 id, address contributor, uint256 amount, bool claimed, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize, uint claimAfterBlock, bool exists) {
+    id = contributionId;
+    ContributionData storage c = contributions[id];
+    return (
+      id,
+      c.contributor,
+      c.amount, 
+      c.claimed, 
+      c.hashDigest,
+      c.hashFunction,
+      c.hashSize,
+      c.claimAfterBlock,
+      c.exists
+    );
+  }
+
+  function add(uint256 amount, address contributorAccount, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize) public isInitialized auth(ADD_CONTRIBUTION_ROLE) {
+    //require(canPerform(msg.sender, ADD_CONTRIBUTION_ROLE, new uint256[](0)), 'nope');
+    uint256 contributionId = contributionsCount + 1;
+    ContributionData storage c = contributions[contributionId];
+    c.exists = true;
+    c.amount = amount;
+    c.claimed = false;
+    c.contributor = contributorAccount;
+    c.hashDigest = hashDigest;
+    c.hashFunction = hashFunction;
+    c.hashSize = hashSize;
+    c.claimAfterBlock = block.number; // + blocksToWait;
+
+    contributionsCount++;
+
+    contributionOwner[contributionId] = contributorAccount;
+    ownedContributions[contributorAccount].push(contributionId);
+ 
+    emit ContributionAdded(contributionId, contributorAccount, amount);
+  }
+
+  function claim(uint256 contributionId) public isInitialized {
+    ContributionData storage c = contributions[contributionId];
+    require(c.exists, 'NOT_FOUND');
+    require(!c.claimed, 'ALREADY_CLAIMED');
+    require(block.number > c.claimAfterBlock, 'NOT_CLAIMABLE');
+    //c.claimed = true;
+    //IToken(getTokenContract()).mintFor(c.contributor, c.amount, contributionId); // somehow this does not work
+    bytes4 sig = bytes4(keccak256("mintFor()"));
+    address token = getTokenContract();
+    //IToken token = IToken(getTokenContract());
+
+    //token.call(sig);
+    //IToken(token).mintFor(c.contributor, c.amount, contributionId);
+    IToken(token).mintFor(c.contributor, c.amount, contributionId);
+    
+    //emit ContributionClaimed(contributionId, c.contributor, c.amount);
+  }
+
+  function getTokenContract() public view returns (address) {
+    return 0x8779fc70eeea01d00efa9044c29d3c930fdb874a;
+    //IKernel k = IKernel(kernel());
+
+    //return k.getApp(KERNEL_APP_ADDR_NAMESPACE, TOKEN_APP_ID);
+  }
+  
+  function exists(uint256 contributionId) view public returns (bool) {
+    return contributions[contributionId].exists;
+  }
+}

apps/contribution/contracts/misc/Migrations.sol

@@ -0,0 +1,23 @@
+pragma solidity ^0.4.4;
+
+contract Migrations {
+  address public owner;
+  uint public last_completed_migration;
+
+  modifier restricted() {
+    if (msg.sender == owner) _;
+  }
+
+  function Migrations() {
+    owner = msg.sender;
+  }
+
+  function setCompleted(uint completed) restricted {
+    last_completed_migration = completed;
+  }
+
+  function upgrade(address new_address) restricted {
+    Migrations upgraded = Migrations(new_address);
+    upgraded.setCompleted(last_completed_migration);
+  }
+}