Add balance when loading contributor

This is a regression introduced by the latest contract updates.
Now we return the balance again when loading contributor data.

README.md

@@ -2,13 +2,12 @@
 
 # Kredits Contracts
 
-This repository contains the Solidity smart contracts organized as
+This repository contains the Solidity smart contracts organized as [Aragon](https://hack.aragon.org/) 
-[Aragon](https://hack.aragon.org/) apps and JavaScript API wrapper for [Kosmos
+apps and JavaScript API wrapper for [Kosmos Kredits](https://wiki.kosmos.org/Kredits).
-Kredits](https://wiki.kosmos.org/Kredits).
 
-It is based on [aragonOS](https://hack.aragon.org/docs/aragonos-intro.html) and
+It is based on [aragonOS](https://hack.aragon.org/docs/aragonos-intro.html) and 
-follows the aragonOS conventions.  Aragon itself uses the [Truffle
+follows the aragonOS conventions.
-framework](http://truffleframework.com/) for some things.
+Aragon itself uses the [Truffle framework](http://truffleframework.com/) for some things.
 
 ## Development
 
@@ -23,36 +22,35 @@ Each of the aragon apps are separate packages:
     $ cd apps/[app]
     $ npm install
 
-You can use `npm run install-all` to install all app dependencies at once.
+or use the bootstrap command (see below)
 
 ### Local development chain
 
-For local development it is recommended to use
+For local development it is recommended to use 
-[ganache](http://truffleframework.com/ganache/) to run a local development
+[ganache](http://truffleframework.com/ganache/) to run a local development 
 chain. Using the ganache simulator no full Ethereum node is required.
 
-We use the default aragon-cli devchain command to confgure and run a local
+We use the default aragon-cli devchain command to confgure and run a local 
 development ganache.
 
     $ npm run devchain (or aragon devchain --port 7545)
 
-To clear/reset the chain use:
+To clear/reset the chain use: 
 
     $ npm run devchain -- --reset (or aragon devchain --port 7545 --reset)
 
-We default to port 7545 for development to not get in conflict with the default
+We default to port 7545 for development to not get in conflict with the default 
 Ethereum RPC port.
 
 ### Bootstrap
 
 1. Run an Ethereum node and ipfs
-
+    
         $ npm run devchain
         $ ipfs daemon
 
 2. Deploy each app to the devchain
 
-        (make sure you've run `npm install` for every app - see installation)
         $ npm run deploy:apps
 
 3. Deploy a new KreditsKit and create a new DAO with the latest app versions
@@ -60,28 +58,23 @@ Ethereum RPC port.
         $ npm run deploy:kit
         $ npm run deploy:dao
 
-4. Execute seeds to create demo contributors, contributons, etc. (optional)
+4. Execute seeds to create demo contributors, contributons, etc. (optional) 
 
         $ npm run seeds
 
 **Step 2-4 is also summarized in `npm run bootstrap`**
 
-If you want to reset your local setup:
-
-        $ npm run reset // deploys a new kit and a new DAO
-        $ npm run reset:hard // deploys all apps and does reset
-
 ## Contract architecture
 
-Contracts are organized in independent apps (see `/apps`) and are developed and
+Contracts are organized in independent apps (see `/apps`) and are developed 
-deployed independently. Each app has a version and can be "installed" on the
+and deployed independently. Each app has a version and can be "installed" 
-Kredits DAO independently.
+on the Kredits DAO independently.
 
 ![](docs/kredits-diagram.png)
 
-A DAO can be deployed using the `scripts/deploy-kit.js` script or with the
+A DAO can be deployed using the `scripts/deploy-kit.js` script or with the 
-`npm run deploy:dao` command. This deploys a new Kredits DAO, installs the
+`npm run deploy:dao` command. This deploys a new Kredits DAO, installs
-latest app versions and sets the required permissions.
+the latest app versions and sets the required permissions.
 
 See each app in `/apps/*` for details.
 
@@ -94,8 +87,6 @@ CLI. _At some point these should be moved into a real nice CLI._
 To run these scripts use `truffle exec`. For example: `truffle exec
 scripts/add-proposal.js`.
 
-Some scripts are also defined as npm script, see package.json.
-
 ### cli.js
 
 Call any function on any contract:
@@ -115,11 +106,11 @@ Script to add a new entries to the contracts using the JS wrapper
 
     $ truffle exec scripts/add-{contributor, contribution, proposal}.js
 
-### list-{contributors, contributions, proposals}.js
+### list-{contributor, contribution, proposal}.js
 
 List contract entries
 
-    $ truffle exec scripts/list-{contributors, contributions, proposals}.js
+    $ truffle exec scripts/list-{contributor, contribution, proposal}.js
 
 ### send-funds.js
 
@@ -152,7 +143,7 @@ Deploys a new KreditsKit that allows to create a new DAO
     or
     $ npm run deploy:kit
 
-`ENS` address is required as environment variable.
+`ENS` address is required as environment variable.  
 `DAO_FACTORY` can optionally be set as environment variable. (see aragon)
 
 ### new-dao.js
@@ -163,7 +154,7 @@ Creates and configures a new DAO instance.
     or
     $ npm run deploy:dao
 
-KreditsKit address is load from `lib/addresses/KreditsKit.json` or can be
+KreditsKit address is load from `lib/addresses/KreditsKit.json` or can be 
 configured through the `KREDITS_KIT` environment variable.
 
 ### deploy-apps.sh
@@ -174,32 +165,14 @@ Runs `npm install` for each app and publishes a new version.
     or
     $ npm run deploy:apps
 
-## Deployment
-
-### Apps deployment
-
-To deploy a new app version run:
-
-    $ aragon apm publish major --environment=NETWORK_TO_DEPLOY
-
-### KreditsKit
-
-deploy the KreditsKit as Kit to create new DAOs
-
-    $ truffle exec scripts/deploy-kit.js --network=NETWORK_TO_DEPLOY
-
-### Creating a new DAO
-
-make sure all apps and the KreditsKit are deployed, then create a new DAO:
-
-    $ truffle exec scripts/new-dao.js --network=NETWORK_TO_DEPLOY
 
 ## ACL / Permissions
 
+
 ## Upgradeable contracts
 
-We use aragonOS for upgradeablity of the different contracts.  Refer to the
+We use aragonOS for upgradeablity of the different contracts.
-[aragonOS upgradeablity documentation](https://hack.aragon.org/docs/upgradeability-intro)
+Refer to the [aragonOS upgradeablity documentation](https://hack.aragon.org/docs/upgradeability-intro) 
 for more details.
 
 ### Example

apps/contribution/contracts/Contribution.sol

@@ -4,14 +4,7 @@ import "@aragon/os/contracts/apps/AragonApp.sol";
 import "@aragon/os/contracts/kernel/IKernel.sol";
 
 interface IToken {
-  function mintFor(address contributorAccount, uint256 amount, uint32 contributionId) public;
+  function mintFor(address contributorAccount, uint256 amount, uint256 contributionId) public;
-}
-
-interface ContributorInterface {
-  function getContributorAddressById(uint32 contributorId) public view returns (address);
-  function getContributorIdByAddress(address contributorAccount) public view returns (uint32);
-  // TODO Maybe use for validation
-  // function exists(uint32 contributorId) public view returns (bool);
 }
 
 contract Contribution is AragonApp {
@@ -19,70 +12,47 @@ contract Contribution is AragonApp {
   bytes32 public constant VETO_CONTRIBUTION_ROLE = keccak256("VETO_CONTRIBUTION_ROLE");
 
   bytes32 public constant KERNEL_APP_ADDR_NAMESPACE = 0xd6f028ca0e8edb4a8c9757ca4fdccab25fa1e0317da1188108f7d2dee14902fb;
-
   // ensure alphabetic order
   enum Apps { Contribution, Contributor, Proposal, Token }
   bytes32[4] public appIds;
 
   struct ContributionData {
-    uint32 contributorId;
+    address contributor;
-    uint32 amount;
+    uint256 amount;
     bool claimed;
     bytes32 hashDigest;
     uint8 hashFunction;
     uint8 hashSize;
     string tokenMetadataURL;
-    uint256 confirmedAtBlock;
+    uint claimAfterBlock;
     bool vetoed;
     bool exists;
   }
-
   string internal name_;
   string internal symbol_;
 
-  // map contribution ID to contributor
+  mapping(uint256 => address) contributionOwner;
-  mapping(uint32 => uint32) public contributionOwner;
+  mapping(address => uint256[]) ownedContributions;
-  // map contributor to contribution IDs
-  mapping(uint32 => uint32[]) public ownedContributions;
 
-  mapping(uint32 => ContributionData) public contributions;
+  mapping(uint256 => ContributionData) public contributions;
-  uint32 public contributionsCount;
+  uint256 public contributionsCount;
 
-  uint32 public blocksToWait;
+  uint256 public blocksToWait = 0;
 
-  event ContributionAdded(uint32 id, uint32 indexed contributorId, uint32 amount);
+  event ContributionAdded(uint256 id, address indexed contributor, uint256 amount);
-  event ContributionClaimed(uint32 id, uint32 indexed contributorId, uint32 amount);
+  event ContributionClaimed(uint256 id, address indexed contributor, uint256 amount);
-  event ContributionVetoed(uint32 id, address vetoedByAccount);
+  event ContributionVetoed(uint256 id, address vetoedByAccount);
 
   function initialize(bytes32[4] _appIds) public onlyInit {
     appIds = _appIds;
-    blocksToWait = 40320; // 7 days; 15 seconds block time
     initialized();
   }
 
-  // TODO refactor into a single function
   function getTokenContract() public view returns (address) {
     IKernel k = IKernel(kernel());
+
     return k.getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[uint8(Apps.Token)]);
   }
-  function getContributorContract() public view returns (address) {
-    IKernel k = IKernel(kernel());
-    return k.getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[uint8(Apps.Contributor)]);
-  }
-
-  function getContributorIdByAddress(address contributorAccount) public view returns (uint32) {
-    address contributor = getContributorContract();
-    return ContributorInterface(contributor).getContributorIdByAddress(contributorAccount);
-  }
-
-  function getContributorAddressById(uint32 contributorId) public view returns (address) {
-    address contributor = getContributorContract();
-    return ContributorInterface(contributor).getContributorAddressById(contributorId);
-  }
-
-  //
-  // Token standard functions (ERC 721)
-  //
 
   function name() external view returns (string) {
     return name_;
@@ -92,100 +62,85 @@ contract Contribution is AragonApp {
     return symbol_;
   }
 
-  // Balance is amount of ERC271 tokens, not amount of kredits
   function balanceOf(address owner) public view returns (uint256) {
     require(owner != address(0));
-    uint32 contributorId = getContributorIdByAddress(owner);
+    return ownedContributions[owner].length;
-    return ownedContributions[contributorId].length;
   }
 
-  function ownerOf(uint32 contributionId) public view returns (address) {
+  function ownerOf(uint256 contributionId) public view returns (address) {
     require(exists(contributionId));
-    uint32 contributorId = contributions[contributionId].contributorId;
+    return contributions[contributionId].contributor;
-    return getContributorAddressById(contributorId);
   }
 
-  function tokenOfOwnerByIndex(address owner, uint32 index) public view returns (uint32) {
+  function tokenOfOwnerByIndex(address contributor, uint256 index) public view returns (uint256) {
-    uint32 contributorId = getContributorIdByAddress(owner);
+    return ownedContributions[contributor][index];
-    return ownedContributions[contributorId][index];
   }
 
-  function tokenMetadata(uint32 contributionId) public view returns (string) {
+  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, bool vetoed) {
-  // Custom functions
-  //
-
-  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;
     ContributionData storage c = contributions[id];
     return (
       id,
-      c.contributorId,
+      c.contributor,
-      c.amount,
+      c.amount, 
-      c.claimed,
+      c.claimed, 
       c.hashDigest,
       c.hashFunction,
       c.hashSize,
-      c.confirmedAtBlock,
+      c.claimAfterBlock,
       c.exists,
       c.vetoed
     );
   }
 
-  function add(uint32 amount, uint32 contributorId, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize) public isInitialized auth(ADD_CONTRIBUTION_ROLE) {
+  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 uint32[](0)), 'nope');
+    //require(canPerform(msg.sender, ADD_CONTRIBUTION_ROLE, new uint256[](0)), 'nope');
-    uint32 contributionId = contributionsCount + 1;
+    uint256 contributionId = contributionsCount + 1;
     ContributionData storage c = contributions[contributionId];
     c.exists = true;
     c.amount = amount;
     c.claimed = false;
-    c.contributorId = contributorId;
+    c.contributor = contributorAccount;
     c.hashDigest = hashDigest;
     c.hashFunction = hashFunction;
     c.hashSize = hashSize;
-    if (contributionId < 10) {
+    c.claimAfterBlock = block.number; // + blocksToWait;
-      c.confirmedAtBlock = block.number;
-    } else {
-      c.confirmedAtBlock = block.number + blocksToWait;
-    }
 
     contributionsCount++;
 
-    contributionOwner[contributionId] = contributorId;
+    contributionOwner[contributionId] = contributorAccount;
-    ownedContributions[contributorId].push(contributionId);
+    ownedContributions[contributorAccount].push(contributionId);
-
+ 
-    emit ContributionAdded(contributionId, contributorId, amount);
+    emit ContributionAdded(contributionId, contributorAccount, amount);
   }
 
-  function veto(uint32 contributionId) public isInitialized auth(VETO_CONTRIBUTION_ROLE) {
+  function veto(uint256 contributionId) public isInitialized auth(VETO_CONTRIBUTION_ROLE) {
     ContributionData storage c = contributions[contributionId];
     require(c.exists, 'NOT_FOUND');
     require(!c.claimed, 'ALREADY_CLAIMED');
-    require(block.number < c.confirmedAtBlock, 'VETO_PERIOD_ENDED');
     c.vetoed = true;
 
     emit ContributionVetoed(contributionId, msg.sender);
   }
 
-  function claim(uint32 contributionId) public isInitialized {
+  function claim(uint256 contributionId) public isInitialized {
     ContributionData storage c = contributions[contributionId];
     require(c.exists, 'NOT_FOUND');
     require(!c.claimed, 'ALREADY_CLAIMED');
     require(!c.vetoed, 'VETOED');
-    require(block.number >= c.confirmedAtBlock, 'NOT_CLAIMABLE');
+    require(block.number > c.claimAfterBlock, 'NOT_CLAIMABLE');
 
     c.claimed = true;
     address token = getTokenContract();
-    address contributorAccount = getContributorAddressById(c.contributorId);
+    IToken(token).mintFor(c.contributor, c.amount, contributionId);
-    uint256 amount = uint256(c.amount);
+    emit ContributionClaimed(contributionId, c.contributor, c.amount);
-    IToken(token).mintFor(contributorAccount, amount, contributionId);
-    emit ContributionClaimed(contributionId, c.contributorId, c.amount);
   }
-
+  
-  function exists(uint32 contributionId) view public returns (bool) {
+  function exists(uint256 contributionId) view public returns (bool) {
     return contributions[contributionId].exists;
   }
 }

apps/contribution/package.json

@@ -11,10 +11,10 @@
     "start": "npm run start:aragon:ipfs",
     "start:aragon:ipfs": "aragon run",
     "start:aragon:http": "aragon run --http localhost:8001 --http-served-from ./dist",
-    "start:app": "",
+    "start:app": "npm run sync-assets && npm run build:script -- --no-minify && parcel serve app/index.html -p 8001 --out-dir dist/ --no-cache",
     "test": "aragon contracts test",
     "compile": "aragon contracts compile",
-    "sync-assets": "",
+    "sync-assets": "copy-aragon-ui-assets -n aragon-ui ./dist",
     "build:app": "",
     "build:script": "",
     "build": "",

apps/contribution/test/app.js

@@ -1,4 +1,4 @@
-const Contribution = artifacts.require('Contribution.sol')
+const CounterApp = artifacts.require('Contribution.sol')
 
 contract('Contribution', (accounts) => {
   it('should be tested')

apps/contributor/contracts/Contributor.sol

@@ -6,32 +6,41 @@ import "@aragon/os/contracts/kernel/IKernel.sol";
 interface ITokenBalance {
   function balanceOf(address contributorAccount) public view returns (uint256);
 }
-
 contract Contributor is AragonApp {
   bytes32 public constant KERNEL_APP_ADDR_NAMESPACE = 0xd6f028ca0e8edb4a8c9757ca4fdccab25fa1e0317da1188108f7d2dee14902fb;
+
   bytes32 public constant MANAGE_CONTRIBUTORS_ROLE = keccak256("MANAGE_CONTRIBUTORS_ROLE");
 
   struct Contributor {
     address account;
-    bytes32 hashDigest;
+    bytes32 ipfsHash;
     uint8 hashFunction;
     uint8 hashSize;
+    bool isCore;
     bool exists;
   }
 
-  mapping (address => uint32) public contributorIds;
+  mapping (address => uint) public contributorIds;
-  mapping (uint32 => Contributor) public contributors;
+  mapping (uint => Contributor) public contributors;
-  uint32 public contributorsCount;
+  uint256 public contributorsCount;
 
   // ensure alphabetic order
   enum Apps { Contribution, Contributor, Proposal, Token }
   bytes32[4] public appIds;
 
-  event ContributorProfileUpdated(uint32 id, bytes32 oldHashDigest, bytes32 newHashDigest); // what should be logged
+  event ContributorProfileUpdated(uint id, bytes32 oldIpfsHash, bytes32 newIpfsHash);
-  event ContributorAccountUpdated(uint32 id, address oldAccount, address newAccount);
+  event ContributorAccountUpdated(uint id, address oldAccount, address newAccount);
-  event ContributorAdded(uint32 id, address account);
+  event ContributorAdded(uint id, address account);
 
   function initialize(address root,bytes32[4] _appIds) public onlyInit {
+    uint _id = contributorsCount + 1;
+    Contributor storage c = contributors[_id];
+    c.exists = true;
+    c.isCore = true;
+    c.account = root;
+    contributorIds[root] = _id;
+    contributorsCount += 1;
+
     appIds = _appIds;
 
     initialized();
@@ -43,40 +52,41 @@ contract Contributor is AragonApp {
     return k.getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[uint8(Apps.Token)]);
   }
 
-  function coreContributorsCount() view public returns (uint32) {
+  function coreContributorsCount() view public returns (uint) {
-    uint32 count = 0;
+    uint count = 0;
-    for (uint32 i = 1; i <= contributorsCount; i++) {
+    for (uint256 i = 1; i <= contributorsCount; i++) {
-      if (isCoreTeam(i)) {
+      if (contributors[i].isCore) {
         count += 1;
       }
     }
     return count;
   }
 
-  function updateContributorAccount(uint32 id, address oldAccount, address newAccount) public auth(MANAGE_CONTRIBUTORS_ROLE) {
+  function updateContributorAccount(uint id, address oldAccount, address newAccount) public auth(MANAGE_CONTRIBUTORS_ROLE) {
     contributorIds[oldAccount] = 0;
     contributorIds[newAccount] = id;
     contributors[id].account = newAccount;
     ContributorAccountUpdated(id, oldAccount, newAccount);
   }
 
-  function updateContributorProfileHash(uint32 id, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize) public isInitialized auth(MANAGE_CONTRIBUTORS_ROLE) {
+  function updateContributorIpfsHash(uint id, bytes32 ipfsHash, uint8 hashFunction, uint8 hashSize) public isInitialized auth(MANAGE_CONTRIBUTORS_ROLE) {
     Contributor storage c = contributors[id];
-    bytes32 oldHashDigest = c.hashDigest;
+    bytes32 oldIpfsHash = c.ipfsHash;
-    c.hashDigest = hashDigest;
+    c.ipfsHash = ipfsHash;
     c.hashFunction = hashFunction;
     c.hashSize = hashSize;
 
-    ContributorProfileUpdated(id, oldHashDigest, c.hashDigest);
+    ContributorProfileUpdated(id, oldIpfsHash, c.ipfsHash);
   }
 
-  function addContributor(address account, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize) public isInitialized auth(MANAGE_CONTRIBUTORS_ROLE) {
+  function addContributor(address account, bytes32 ipfsHash, uint8 hashFunction, uint8 hashSize, bool isCore) public isInitialized auth(MANAGE_CONTRIBUTORS_ROLE) {
     require(!addressExists(account));
-    uint32 _id = contributorsCount + 1;
+    uint _id = contributorsCount + 1;
     assert(!contributors[_id].exists); // this can not be acually
     Contributor storage c = contributors[_id];
     c.exists = true;
-    c.hashDigest = hashDigest;
+    c.isCore = isCore;
+    c.ipfsHash = ipfsHash;
     c.hashFunction = hashFunction;
     c.hashSize = hashSize;
     c.account = account;
@@ -86,61 +96,49 @@ contract Contributor is AragonApp {
     emit ContributorAdded(_id, account);
   }
 
-  function isCoreTeam(uint32 id) view public returns (bool) {
+  function isCore(uint id) view public returns (bool) {
-    // TODO: for simplicity we simply define the first contributors as core
+    return contributors[id].isCore;
-    // later this needs to be changed to something more dynamic
-    return id < 7;
   }
 
-  function exists(uint32 id) view public returns (bool) {
+  function exists(uint id) view public returns (bool) {
     return contributors[id].exists;
   }
 
   function addressIsCore(address account) view public returns (bool) {
-    uint32 id = getContributorIdByAddress(account);
+    return getContributorByAddress(account).isCore;
-    return isCoreTeam(id);
   }
 
   function addressExists(address account) view public returns (bool) {
     return getContributorByAddress(account).exists;
   }
 
-  function getContributorIdByAddress(address account) view public returns (uint32) {
+  function getContributorIdByAddress(address account) view public returns (uint) {
     return contributorIds[account];
   }
 
-  function getContributorAddressById(uint32 id) view public returns (address) {
+  function getContributorAddressById(uint id) view public returns (address) {
     return contributors[id].account;
   }
 
   function getContributorByAddress(address account) internal view returns (Contributor) {
-    uint32 id = contributorIds[account];
+    uint id = contributorIds[account];
     return contributors[id];
   }
 
-  function getContributorById(uint32 _id) public view returns (uint32 id, address account, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize, bool isCore, uint256 balance, bool exists ) {
+  function getContributorById(uint _id) public view returns (uint id, address account, bytes32 ipfsHash, uint8 hashFunction, uint8 hashSize, bool isCore, uint256 balance, bool exists ) {
     id = _id;
     Contributor storage c = contributors[_id];
     account = c.account;
-    hashDigest = c.hashDigest;
+    ipfsHash = c.ipfsHash;
     hashFunction = c.hashFunction;
     hashSize = c.hashSize;
-    isCore = isCoreTeam(id);
+    isCore = c.isCore;
     address token = getTokenContract();
     balance = ITokenBalance(token).balanceOf(c.account);
     exists = c.exists;
   }
 
-  function canPerform(address _who, address _where, bytes32 _what/*, uint256[] memory _how*/) public returns (bool) {
+  function canPerform(address _who, address _where, bytes32 _what, uint256[] _how) public view returns (bool) {
-    address sender = _who;
+    return addressExists(_who);
-    if (sender == address(-1)) {
-      sender = tx.origin;
-    }
-    // _what == keccak256('VOTE_PROPOSAL_ROLE')
-    if (_what == 0xd61216798314d2fc33e42ff2021d66707b1e38517d3f7166798a9d3a196a9c96) {
-      return contributorIds[sender] != uint256(0);
-    }
-
-    return addressIsCore(sender);
   }
 }

apps/contributor/test/app.js

@@ -1,5 +1,5 @@
-const Contributor = artifacts.require('Contributor.sol')
+const CounterApp = artifacts.require('CounterApp.sol')
 
-contract('Contributor', (accounts) => {
+contract('CounterApp', (accounts) => {
   it('should be tested')
 })

apps/proposal/contracts/Proposal.sol

@@ -4,13 +4,13 @@ import "@aragon/os/contracts/apps/AragonApp.sol";
 import "@aragon/os/contracts/kernel/IKernel.sol";
 
 interface IContributor {
-  function getContributorAddressById(uint32 contributorId) public view returns (address);
+  function getContributorAddressById(uint256 contributorId) public view returns (address);
-  function getContributorIdByAddress(address contributorAccount) public view returns (uint32);
+  function getContributorIdByAddress(address contributorAccount) public view returns (uint256);
-  function exists(uint32 contributorId) public view returns (bool);
+  function exists(uint256 contributorId) public view returns (bool);
 }
 
 interface IContribution {
-  function add(uint32 amount, uint32 contributorId, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize) public;
+  function add(uint256 amount, address contributor, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize) public;
 }
 
 contract Proposal is AragonApp {
@@ -25,26 +25,26 @@ contract Proposal is AragonApp {
 
   struct Proposal {
     address creatorAccount;
-    uint32 contributorId;
+    uint contributorId;
-    uint16 votesCount;
+    uint votesCount;
-    uint16 votesNeeded;
+    uint votesNeeded;
-    uint32 amount;
+    uint256 amount;
     bool executed;
     bytes32 hashDigest;
     uint8 hashFunction;
     uint8 hashSize;
-    uint32[] voterIds;
+    uint256[] voterIds;
-    mapping (uint32 => bool) votes;
+    mapping (uint256 => bool) votes;
     bool exists;
   }
 
-  mapping(uint32 => Proposal) public proposals;
+  mapping(uint256 => Proposal) public proposals;
-  uint32 public proposalsCount;
+  uint256 public proposalsCount;
 
-  event ProposalCreated(uint32 id, address creatorAccount, uint32 contributorId, uint32 amount);
+  event ProposalCreated(uint256 id, address creatorAccount, uint256 contributorId, uint256 amount);
 
-  event ProposalVoted(uint32 id, uint32 voterId, uint16 totalVotes);
+  event ProposalVoted(uint256 id, uint256 voterId, uint256 totalVotes);
-  event ProposalExecuted(uint32 id, uint32 contributorId, uint32 amount);
+  event ProposalExecuted(uint256 id, uint256 contributorId, uint256 amount);
 
   function initialize(bytes32[4] _appIds) public onlyInit {
     appIds = _appIds;
@@ -59,11 +59,11 @@ contract Proposal is AragonApp {
     return IKernel(kernel()).getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[uint8(Apps.Contribution)]);
   }
 
-  function addProposal(uint32 contributorId, uint32 amount, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize) public isInitialized auth(ADD_PROPOSAL_ROLE) {
+  function addProposal(uint contributorId, uint256 amount, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize) public isInitialized auth(ADD_PROPOSAL_ROLE) {
     require(IContributor(getContributorContract()).exists(contributorId), 'CONTRIBUTOR_NOT_FOUND');
 
-    uint32 proposalId = proposalsCount + 1;
+    uint256 proposalId = proposalsCount + 1;
-    uint16 _votesNeeded = 1; //contributorsContract().coreContributorsCount() / 100 * 75;
+    uint256 _votesNeeded = 1; //contributorsContract().coreContributorsCount() / 100 * 75;
 
     Proposal storage p = proposals[proposalId];
     p.creatorAccount = msg.sender;
@@ -75,23 +75,23 @@ contract Proposal is AragonApp {
     p.votesCount =  0;
     p.votesNeeded = _votesNeeded;
     p.exists = true;
-
+   
     proposalsCount++;
     emit ProposalCreated(proposalId, msg.sender, p.contributorId, p.amount);
   }
 
-  function getProposal(uint32 proposalId) public view returns (uint32 id, address creatorAccount, uint32 contributorId, uint16 votesCount, uint16 votesNeeded, uint32 amount, bool executed, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize, uint32[] voterIds, bool exists) {
+  function getProposal(uint proposalId) public view returns (uint256 id, address creatorAccount, uint256 contributorId, uint256 votesCount, uint256 votesNeeded, uint256 amount, bool executed, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize, uint256[] voterIds, bool exists) {
     id = proposalId;
     Proposal storage p = proposals[id];
     return (
       id,
       p.creatorAccount,
-      p.contributorId,
+      p.contributorId, 
-      p.votesCount,
+      p.votesCount, 
       p.votesNeeded,
       p.amount,
-      p.executed,
+      p.executed, 
-      p.hashDigest,
+      p.hashDigest, 
       p.hashFunction,
       p.hashSize,
       p.voterIds,
@@ -99,10 +99,10 @@ contract Proposal is AragonApp {
     );
   }
 
-  function vote(uint32 proposalId) public isInitialized auth(VOTE_PROPOSAL_ROLE) {
+  function vote(uint256 proposalId) public isInitialized auth(VOTE_PROPOSAL_ROLE) {
     Proposal storage p = proposals[proposalId];
     require(!p.executed, 'ALREADY_EXECUTED');
-    uint32 voterId = IContributor(getContributorContract()).getContributorIdByAddress(msg.sender);
+    uint256 voterId = IContributor(getContributorContract()).getContributorIdByAddress(msg.sender);
     require(p.votes[voterId] != true, 'ALREADY_VOTED');
     p.voterIds.push(voterId);
     p.votes[voterId] = true;
@@ -114,19 +114,20 @@ contract Proposal is AragonApp {
     emit ProposalVoted(proposalId, voterId, p.votesCount);
   }
 
-  function batchVote(uint32[] _proposalIds) public isInitialized auth(VOTE_PROPOSAL_ROLE) {
+  function batchVote(uint256[] _proposalIds) public isInitialized auth(VOTE_PROPOSAL_ROLE) {
-    for (uint32 i = 0; i < _proposalIds.length; i++) {
+    for (uint256 i = 0; i < _proposalIds.length; i++) {
       vote(_proposalIds[i]);
     }
   }
 
-  function executeProposal(uint32 proposalId) private {
+  function executeProposal(uint proposalId) private {
     Proposal storage p = proposals[proposalId];
     require(!p.executed, 'ALREADY_EXECUTED');
     require(p.votesCount >= p.votesNeeded, 'MISSING_VOTES');
-
+    
     p.executed = true;
-    IContribution(getContributionContract()).add(p.amount, p.contributorId, p.hashDigest, p.hashFunction, p.hashSize);
+    address contributorAccount = IContributor(getContributorContract()).getContributorAddressById(p.contributorId);
+    IContribution(getContributionContract()).add(p.amount, contributorAccount, p.hashDigest, p.hashFunction, p.hashSize);
     emit ProposalExecuted(proposalId, p.contributorId, p.amount);
   }
 

apps/proposal/manifest.json

@@ -1,4 +1,4 @@
 {
   "name": "Proposal",
-  "description": "Kredits Proposal app"
+  "description": "Kredits proposal app"
 }

apps/proposal/test/app.js

@@ -1,5 +0,0 @@
-const Proposal = artifacts.require('Proposal.sol')
-
-contract('Proposal', (accounts) => {
-  it('should be tested')
-})

apps/token/contracts/Token.sol

@@ -9,20 +9,16 @@ contract Token is ERC20Token, AragonApp {
   // ensure alphabetic order
   enum Apps { Contribution, Contributor, Proposal, Token }
   bytes32[4] public appIds;
-
+ 
-  event LogMint(address indexed recipient, uint256 amount, uint32 contributionId);
+  event LogMint(address indexed recipient, uint256 amount, uint256 contributionId);
-
+  
   function initialize(bytes32[4] _appIds) public onlyInit {
     appIds = _appIds;
-    name = 'Kredits';
-    symbol = '₭S';
-    decimals = 18;
     initialized();
   }
 
-  function mintFor(address contributorAccount, uint256 amount, uint32 contributionId) public isInitialized auth(MINT_TOKEN_ROLE) {
+  function mintFor(address contributorAccount, uint256 amount, uint256 contributionId) public isInitialized auth(MINT_TOKEN_ROLE) {
-    uint256 amountInWei = amount.mul(1 ether);
+    _mint(contributorAccount, amount);
-    _mint(contributorAccount, amountInWei);
     emit LogMint(contributorAccount, amount, contributionId);
   }
 

apps/token/manifest.json

@@ -1,4 +1,4 @@
 {
   "name": "Token",
-  "description": "Kredits Token app"
+  "description": "Kredits token app"
 }

apps/token/test/app.js

@@ -1,5 +1,5 @@
-const Token = artifacts.require('Token.sol')
+const CounterApp = artifacts.require('CounterApp.sol')
 
-contract('Token', (accounts) => {
+contract('CounterApp', (accounts) => {
   it('should be tested')
 })

config/seeds.js

@@ -1,18 +1,14 @@
-const contractCalls = [
+let contractCalls = [
-  ['Contributor', 'add', [{ account: '0x7e8f313c56f809188313aa274fa67ee58c31515d', name: 'bumi', kind: 'person', url: '', github_username: 'bumi', github_uid: 318, wiki_username: 'bumi' }, { gasLimit: 200000 }]],
+  ['Contributor', 'add', [{ account: '0x7e8f313c56f809188313aa274fa67ee58c31515d', name: 'bumi', isCore: true, kind: 'preson', url: '', github_username: 'bumi', github_uid: 318, wiki_username: 'bumi' }, {gasLimit: 200000}]],
-  ['Contributor', 'add', [{ account: '0x49575f3DD9a0d60aE661BC992f72D837A77f05Bc', name: 'raucao', kind: 'person', url: '', github_username: 'skddc', github_uid: 842, wiki_username: 'raucau' }, { gasLimit: 200000 }]],
+  ['Contributor', 'add', [{ account: '0xa502eb4021f3b9ab62f75b57a94e1cfbf81fd827', name: 'raucau', isCore: true, kind: 'person', url: '', github_username: 'skddc', github_uid: 842, wiki_username: 'raucau' }, {gasLimit: 200000}]],
-  ['Proposal', 'addProposal', [{ contributorId: 1, contributorIpfsHash: 'QmWKCYGr2rSf6abUPaTYqf98urvoZxGrb7dbspFZA6oyVF', date: '2019-04-09', amount: 500, kind: 'dev', description: '[67P/kredits-contracts] Ran the seeds', url: '' }, { gasLimit: 350000 }]],
+  ['Proposal', 'addProposal', [{ contributorId: 2, amount: 42, kind: 'code', description: 'runs the seeds', url: '' }, {gasLimit: 350000}]],
-  ['Proposal', 'addProposal', [{ contributorId: 2, contributorIpfsHash: 'QmcHzEeAM26HV2zHTf5HnZrCtCtGdEccL5kUtDakAB7ozB', date: '2019-04-10', amount: 500, kind: 'dev', description: '[67P/kredits-contracts] Ran the seeds', url: '' }, { gasLimit: 350000 }]],
+  ['Proposal', 'addProposal', [{ contributorId: 3, amount: 23, kind: 'code', description: 'runs the seeds', url: '' }, {gasLimit: 350000}]],
-  ['Proposal', 'addProposal', [{ contributorId: 2, contributorIpfsHash: 'QmcHzEeAM26HV2zHTf5HnZrCtCtGdEccL5kUtDakAB7ozB', date: '2019-04-11', amount: 500, kind: 'dev', description: '[67P/kredits-contracts] Hacked on kredits', url: '' }, { gasLimit: 350000 }]],
+  ['Proposal', 'addProposal', [{contributorId: 3, amount: 100, kind: 'code', description: 'hacks on kredits', url: '' }, {gasLimit: 350000}]],
-  ['Proposal', 'vote', [1, { gasLimit: 550000 }]],
+  ['Proposal', 'vote', [1, {gasLimit: 550000}]],
-  ['Contribution', 'addContribution', [{ contributorId: 1, contributorIpfsHash: 'QmWKCYGr2rSf6abUPaTYqf98urvoZxGrb7dbspFZA6oyVF', date: '2019-04-11', amount: 5000, kind: 'dev', description: '[67P/kredits-contracts] Introduce contribution token', url: '' }, { gasLimit: 350000 }]],
+  ['Contribution', 'addContribution', [{contributorAccount: '0xa502eb4021f3b9ab62f75b57a94e1cfbf81fd827', amount: 100, kind: 'code', description: 'hacks on kredits', url: '' }, {gasLimit: 350000}]],
-  ['Contribution', 'addContribution', [{ contributorId: 2, contributorIpfsHash: 'QmcHzEeAM26HV2zHTf5HnZrCtCtGdEccL5kUtDakAB7ozB', date: '2019-04-11', amount: 1500, kind: 'dev', description: '[67P/kredits-web] Reviewed stuff', url: '' }, { gasLimit: 350000 }]],
-  ['Contribution', 'claim', [1, { gasLimit: 300000 }]]
 ];
-
+let funds = [
-const funds = [
   '0x7e8f313c56f809188313aa274fa67ee58c31515d',
   '0xa502eb4021f3b9ab62f75b57a94e1cfbf81fd827'
 ];
-
 module.exports = { contractCalls, funds };

contracts/KreditsKit.sol

@@ -33,7 +33,7 @@ contract KreditsKit is KitBase  {
 
         Contributor contributor = Contributor(_installApp(dao, appIds[uint8(Apps.Contributor)]));
         contributor.initialize(root, appIds);
-        acl.createPermission(root, contributor, contributor.MANAGE_CONTRIBUTORS_ROLE(), this);
+        acl.createPermission(root, contributor, contributor.MANAGE_CONTRIBUTORS_ROLE(), root);
         
         Token token = Token(_installApp(dao, appIds[uint8(Apps.Token)]));
         token.initialize(appIds);
@@ -50,23 +50,20 @@ contract KreditsKit is KitBase  {
         
         uint256[] memory params = new uint256[](1);
         params[0] = uint256(203) << 248 | uint256(1) << 240 | uint240(contributor);
-        acl.grantPermissionP(acl.ANY_ENTITY(), contribution, contribution.ADD_CONTRIBUTION_ROLE(), params);
+        acl.grantPermissionP(root, contribution, contribution.ADD_CONTRIBUTION_ROLE(), params);
-        acl.grantPermissionP(acl.ANY_ENTITY(), contribution, contribution.VETO_CONTRIBUTION_ROLE(), params);
+        acl.grantPermissionP(root, contribution, contribution.VETO_CONTRIBUTION_ROLE(), params);
-        acl.grantPermissionP(acl.ANY_ENTITY(), contributor, contributor.MANAGE_CONTRIBUTORS_ROLE(), params);
 
         //acl.setPermissionManager(this, proposal, proposal.VOTE_PROPOSAL_ROLE();
         acl.createPermission(root, proposal, proposal.VOTE_PROPOSAL_ROLE(), this);
-        acl.grantPermissionP(acl.ANY_ENTITY(), proposal, proposal.VOTE_PROPOSAL_ROLE(), params);
+        acl.grantPermissionP(root, proposal, proposal.VOTE_PROPOSAL_ROLE(), params);
         
         acl.createPermission(root, proposal, proposal.ADD_PROPOSAL_ROLE(), this);
-        //acl.grantPermissionP(address(-1), proposal, proposal.ADD_PROPOSAL_ROLE(), params);
+        acl.grantPermissionP(root, proposal, proposal.ADD_PROPOSAL_ROLE(), params);
-        acl.grantPermission(acl.ANY_ENTITY(), proposal, proposal.ADD_PROPOSAL_ROLE());
 
         acl.setPermissionManager(root, proposal, proposal.VOTE_PROPOSAL_ROLE());
         acl.setPermissionManager(root, proposal, proposal.ADD_PROPOSAL_ROLE());
         acl.setPermissionManager(root, contribution, contribution.ADD_CONTRIBUTION_ROLE());
         acl.setPermissionManager(root, contribution, contribution.VETO_CONTRIBUTION_ROLE());
-        acl.setPermissionManager(root, contributor, contributor.MANAGE_CONTRIBUTORS_ROLE());
         
         acl.createPermission(root, token, token.MINT_TOKEN_ROLE(), this);
         acl.grantPermission(contribution, token, token.MINT_TOKEN_ROLE());        

deployments/rinkeby/contribution.md

@@ -1,21 +1,5 @@
 # Contribution deployments
 
-## 2019-04-10 - Weltempfänger release
-
-✔ Successfully published kredits-contribution.open.aragonpm.eth v5.0.0: 
- ℹ Contract address: 0xe0f7dB486321b917e3A986Bdb2F2b9d51BA98fa9
- ℹ Content (ipfs): QmU3XEBb4f5jU8MFFEpwaa95C1mhc82UeYLRWLrKsvcQNw
- ℹ Transaction hash: 0xd736ff5f79f8142be3fad1a50580fb40aa468838da397f8630285fd91a445af3
-
-
-## 2019-04-04
-
- ✔ Successfully published kredits-contribution.open.aragonpm.eth v4.0.0: 
- ℹ Contract address: 0x7485e8fbde0112C53587079db450Eb002D359372
- ℹ Content (ipfs): QmZKxYPm8wz4phgL4428Gh7MjmbyFFDMP2st7qhNL9qGDQ
- ℹ Transaction hash: 0x7d9be7920db675be88e8f60ebf08dc62ee77c4e6e454c5fbf0f91f6ac97e4c26
-
-
 ## 2019-03-26
 
 ### v3.0.0 appids

deployments/rinkeby/contributor.md

@@ -1,20 +1,5 @@
 # Contributor deployments
 
-## 2019-04-10 - Weltempfänger release
-
-✔ Successfully published kredits-contributor.open.aragonpm.eth v4.0.0: 
- ℹ Contract address: 0x08a6D4D915FCAA5524F05F5F715a6C17cB6eeA6B
- ℹ Content (ipfs): QmR62PWwe1EzommfkhJDYcTvHoZjbXuv9dTG6vCn5dWCsb
- ℹ Transaction hash: 0xd5317c9e207a413485c55ec3046b09d467d978443680304737a6d7d3db0c90e1
-
-
-## 2019-04-04
-
- ✔ Successfully published kredits-contributor.open.aragonpm.eth v3.0.0: 
- ℹ Contract address: 0x95D8458E28C8de7216279512601A3B9Dc512D70B
- ℹ Content (ipfs): QmSpHnmsf8FybvqfD49kwxvDixwiBUR7D5yG4BWSnnwCPS
- ℹ Transaction hash: 0x736f9751b07a91178f453c279ecb57604b3b5686ae5d7115880f3b27fbeb50f2
-
 ## 2019-03-26
 
 ### v2.0.0 support for appids

deployments/rinkeby/dao.md

@@ -1,15 +1,5 @@
 # Kredits deployment
 
-## 2019-04-10 - Weltempfänger release
-
-Using KreditsKit at: 0x76e069b47b79442657eaf0555a32c6b16fa1b8b4
-Created new DAO at: 0xc34edf7d11b7f8433d597f0bb0697acdff55ef14
-
-## 2019-04-04
-
-Using KreditsKit at: 0x76e069b47b79442657eaf0555a32c6b16fa1b8b4
-Created new DAO at: 0xcd75458fbc4aa2231252d5b21f1391fd031e5cb2
-
 ### 2019-03-26
 
 kredits/truffle-kredits@aragonos  » truffle exec scripts/new-dao.js --network=rinkeby

deployments/rinkeby/kreditskit.md

@@ -1,13 +1,5 @@
 # KreditsKit deployments
 
-## 2019-04-04
-
-Deploying to networkId: 4
-Using ENS at: 0x98Df287B6C145399Aaa709692c8D308357bC085D
-Using DAOFactory at: 0x2298d27a9b847c681d2b2c2828ab9d79013f5f1d
-Found apps: [contribution,contributor,proposal,token].open.aragonpm.eth
-Deployed KreditsKit at: 0x76e069b47b79442657eaf0555a32c6b16fa1b8b4
-
 ## 2019-03-26
 
 Using network 'rinkeby'.

deployments/rinkeby/proposal.md

@@ -1,21 +1,5 @@
 # Proposal deployments
 
-## 2019-04-10 - Weltempfänger release
-
-✔ Successfully published kredits-proposal.open.aragonpm.eth v5.0.0: 
- ℹ Contract address: 0x4ce5b0286483c66b861e5599a199054687434552
- ℹ Content (ipfs): QmNYXEcmvKTGxYiob7WUf85oZhdmFDCuGiA6TsRrDE9TYb
- ℹ Transaction hash: 0x0482b58a1ba87d494c6391026399d0ac41b45384330d916f3f99ba70e501584b
-
-
-## 2019-04-04
-
- ✔ Successfully published kredits-proposal.open.aragonpm.eth v4.0.0: 
- ℹ Contract address: 0x4993275362Ba50D76f349A262B7b842e7FbD7490
- ℹ Content (ipfs): QmesCPKLapASPTB3rnPpSdD7ULkg8BQwRcpdE1B8WwfSh7
- ℹ Transaction hash: 0xe4be7b1a75b663eb345b957b216a8476b0f75e2bbfc5880943b05c82fab15dff
-
-
 ## 2019-03-26
 
 ### v3.0.0 appids

deployments/rinkeby/token.md

@@ -1,21 +1,5 @@
 # Token deployments
 
-## 2019-04-10 - Weltempfänger release
-
-✔ Successfully published kredits-token.open.aragonpm.eth v4.0.0: 
- ℹ Contract address: 0x05E0C2bbdA8e5BeE22AC1E20C1457dA4de63aE26
- ℹ Content (ipfs): QmUuYLRMRNZcundUk2pxVaSjMNvtB7hzdf3eyoaUNqDPow
- ℹ Transaction hash: 0x98c28b5ca645904d56eb83c4783682f018c0fcee015b3a3d5fa8bd609223fb89
-
-
-## 2019-04-04
-
- ✔ Successfully published kredits-token.open.aragonpm.eth v3.0.0: 
- ℹ Contract address: 0xd9913A96e087f50E71BF14c62cBCa3b9635392A9
- ℹ Content (ipfs): QmfZ7LwjkQRuLsEnVjrEF3ryTaHsL6YTxffiiDS5KWmHQG
- ℹ Transaction hash: 0x102b27e154d1e144ec084f5e8dc78e1626fda9f26c20db3e3b230fac381c317a
-
-
 ## 2019-03-26
 
 ### v2.0.0 support for appIds

lib/addresses/KreditsKit.json

@@ -1,3 +1,4 @@
 {
-  "4": "0x76e069b47b79442657eaf0555a32c6b16fa1b8b4"
+  "4": "0x1d6a9c2146a330575ee860eef9a012b5ff7caa68",
-}
+  "41787949": "0xa35aacdfccac54d3d96e0d29050c773b251c2c83"
+}

lib/addresses/dao.json

@@ -1,3 +1,4 @@
 {
-  "4": "0xc34edf7d11b7f8433d597f0bb0697acdff55ef14"
+  "4": "0x95a7ce185efc2d1f13efd2a00ee9247c51ea7009",
-}
+  "41787949": "0x183af3950364390a266edff2a0e7c4c2f95c0691"
+}

lib/contracts/base.js

@@ -20,5 +20,4 @@ class Base {
     return this.contract.on(type, callback);
   }
 }
-
 module.exports = Base;

lib/contracts/contribution.js

@@ -1,4 +1,5 @@
 const ethers = require('ethers');
+const RSVP = require('rsvp');
 
 const ContributionSerializer = require('../serializers/contribution');
 const Base = require('./base');
@@ -6,61 +7,56 @@ const Base = require('./base');
 class Contribution extends Base {
   all() {
     return this.functions.contributionsCount()
-      .then(async (count) => {
+      .then((count) => {
+        count = count.toNumber();
         let contributions = [];
 
         for (let id = 1; id <= count; id++) {
-          const contribution = await this.getById(id)
+          contributions.push(this.getById(id));
-          contributions.push(contribution);
         }
 
-        return contributions;
+        return RSVP.all(contributions);
       });
   }
 
   getById(id) {
+    id = ethers.utils.bigNumberify(id);
+
     return this.functions.getContribution(id)
-      .then(data => {
+      .then((data) => {
         return this.ipfs.catAndMerge(data, ContributionSerializer.deserialize);
       });
 
   }
 
-  getByContributorId(contributorId) {
+  getByContributor(contributor) {
-    return this.functions.getContributorAddressById(contributorId)
+    return this.functions.balanceOf(contributor)
-      .then(address => this.getByContributorAddress(address));
+      then((balance) => {
-  }
+        count = balance.toNumber();
 
-  getByContributorAddress(address) {
+        let contributions = [];
-    return this.functions.balanceOf(address)
-      .then(async (balance) => {
-        const count = balance.toNumber();
-        const contributions = [];
 
-        for (let index = 0; index < count; index++) {
+        for (let index = 0; index <= count; index++) {
-          const id = await this.functions.tokenOfOwnerByIndex(address, index);
+          this.functions.tokenOfOwnerByIndex(contributor, index)
-          const contribution = await this.getById(id);
+            .then((id) => {
-          contributions.push(contribution);
+              contributions.push(this.getById(id));
+            });
         }
 
-        return contributions;
+        return RSVP.all(contributions);
       });
   }
 
-  async addContribution(contributionAttr, callOptions = {}) {
+  addContribution(contributionAttr, callOptions = {}) {
-    const contribution = new ContributionSerializer(contributionAttr);
+    let json = ContributionSerializer.serialize(contributionAttr);
-
+    // TODO: validate against schema
-    try { await contribution.validate(); }
-    catch (error) { return Promise.reject(error); }
-
-    const jsonStr = contribution.serialize();
 
     return this.ipfs
-      .add(jsonStr)
+      .add(json)
-      .then(ipfsHashAttr => {
+      .then((ipfsHashAttr) => {
         let contribution = [
           contributionAttr.amount,
-          contributionAttr.contributorId,
+          contributionAttr.contributorAccount,
           ipfsHashAttr.hashDigest,
           ipfsHashAttr.hashFunction,
           ipfsHashAttr.hashSize,

lib/contracts/contributor.js

@@ -1,3 +1,4 @@
+const ethers = require('ethers');
 const RSVP = require('rsvp');
 
 const ContributorSerializer = require('../serializers/contributor');
@@ -6,7 +7,8 @@ const Base = require('./base');
 class Contributor extends Base {
   all() {
     return this.functions.contributorsCount()
-      .then(count => {
+      .then((count) => {
+        count = count.toNumber();
         let contributors = [];
 
         for (let id = 1; id <= count; id++) {
@@ -18,7 +20,15 @@ class Contributor extends Base {
   }
 
   getById(id) {
+    id = ethers.utils.bigNumberify(id);
+
     return this.functions.getContributorById(id)
+      .then((data) => {
+        // TODO: remove when naming updated on the contract
+        data.hashDigest = data.ipfsHash;
+        return data;
+      })
+      // Fetch IPFS data if available
       .then((data) => {
         return this.ipfs.catAndMerge(data, ContributorSerializer.deserialize);
       });
@@ -60,6 +70,7 @@ class Contributor extends Base {
           ipfsHashAttr.hashDigest,
           ipfsHashAttr.hashFunction,
           ipfsHashAttr.hashSize,
+          contributorAttr.isCore,
         ];
 
         return this.functions.addContributor(...contributor, callOptions);

lib/contracts/kernel.js

@@ -1,4 +1,4 @@
-const namehash = require('ethers').utils.namehash;
+const namehash = require('eth-ens-namehash').hash;
 const Base = require('./base');
 
 const KERNEL_APP_ADDR_NAMESPACE = '0xd6f028ca0e8edb4a8c9757ca4fdccab25fa1e0317da1188108f7d2dee14902fb';

lib/contracts/proposal.js

@@ -1,3 +1,4 @@
+const ethers = require('ethers');
 const RSVP = require('rsvp');
 
 const ContributionSerializer = require('../serializers/contribution');
@@ -6,7 +7,8 @@ const Base = require('./base');
 class Proposal extends Base {
   all() {
     return this.functions.proposalsCount()
-      .then(count => {
+      .then((count) => {
+        count = count.toNumber();
         let proposals = [];
 
         for (let id = 1; id <= count; id++) {
@@ -18,22 +20,20 @@ class Proposal extends Base {
   }
 
   getById(id) {
+    id = ethers.utils.bigNumberify(id);
+
     return this.functions.getProposal(id)
-      .then(data => {
+      .then((data) => {
         return this.ipfs.catAndMerge(data, ContributionSerializer.deserialize);
       });
   }
 
-  async addProposal(proposalAttr, callOptions = {}) {
+  addProposal(proposalAttr, callOptions = {}) {
-    const contribution = new ContributionSerializer(proposalAttr);
+    let json = ContributionSerializer.serialize(proposalAttr);
-
+    // TODO: validate against schema
-    try { await contribution.validate(); }
-    catch (error) { return Promise.reject(error); }
-
-    const jsonStr = contribution.serialize();
 
     return this.ipfs
-      .add(jsonStr)
+      .add(json)
       .then((ipfsHashAttr) => {
         let proposal = [
           proposalAttr.contributorId,

lib/contracts/token.js

@@ -4,3 +4,4 @@ class Token extends Base {
 }
 
 module.exports = Token;
+

lib/serializers/contribution.js

@@ -1,33 +1,48 @@
-const schemas = require('kosmos-schemas');
-const validator = require('../utils/validator');
-
 /**
- * Serialization and validation for JSON-LD document of the contribution.
+ * Handle serialization for JSON-LD object of the contribution, according to
+ * https://github.com/67P/kosmos-schemas/blob/master/schemas/contribution.json
  *
  * @class
  * @public
  */
 class Contribution {
+ /**
+  * Deserialize JSON to object
+  *
+  * @method
+  * @public
+  */
+  static deserialize(serialized) {
+    let {
+      kind,
+      description,
+      details,
+      url,
+    } = JSON.parse(serialized.toString('utf8'));
 
-  constructor(attrs) {
+    return {
-    Object.keys(attrs).forEach(a => this[a] = attrs[a]);
+      kind,
+      description,
+      details,
+      url,
+      ipfsData: serialized,
+    };
   }
 
-  /**
+ /**
-   * Serialize object to JSON
+  * Serialize object to JSON
-   *
+  *
-   * @public
+  * @method
-   */
+  * @public
-  serialize () {
+  */
+  static serialize(deserialized) {
     let {
       contributorIpfsHash,
-      date,
-      time,
       kind,
       description,
       url,
       details
-    } = this;
+    } = deserialized;
 
     let data = {
       "@context": "https://schema.kosmos.org",
@@ -35,8 +50,6 @@ class Contribution {
       "contributor": {
         "ipfs": contributorIpfsHash
       },
-      date,
-      time,
       kind,
       description,
       "details": details || {}
@@ -49,44 +62,6 @@ class Contribution {
     // Write it pretty to ipfs
     return JSON.stringify(data, null, 2);
   }
-
-  /**
-   * Validate serialized data against schema
-   *
-   * @public
-   */
-  validate () {
-    const serialized = JSON.parse(this.serialize());
-    const valid = validator.validate(serialized, schemas['contribution']);
-    return valid ? Promise.resolve() : Promise.reject(validator.error);
-  }
-
-  /**
-   * Deserialize JSON to object
-   *
-   * @public
-   */
-  static deserialize (serialized) {
-    let {
-      date,
-      time,
-      kind,
-      description,
-      details,
-      url,
-    } = JSON.parse(serialized.toString('utf8'));
-
-    return {
-      date,
-      time,
-      kind,
-      description,
-      details,
-      url,
-      ipfsData: serialized,
-    };
-  }
-
 }
 
 module.exports = Contribution;

lib/utils/ipfs.js

@@ -1,4 +1,4 @@
-const ipfsClient = require('ipfs-http-client');
+const ipfsAPI = require('ipfs-api');
 const multihashes = require('multihashes');
 
 class IPFS {
@@ -7,7 +7,7 @@ class IPFS {
     if (!config) {
       config = { host: 'localhost', port: '5001', protocol: 'http' };
     }
-    this._ipfsAPI = ipfsClient(config);
+    this._ipfsAPI = ipfsAPI(config);
     this._config = config;
   }
 
@@ -28,7 +28,7 @@ class IPFS {
 
   add(data) {
     return this._ipfsAPI
-      .add(ipfsClient.Buffer.from(data))
+      .add(new this._ipfsAPI.Buffer(data))
       .then((res) => {
         return this.decodeHash(res[0].hash);
       });
@@ -53,7 +53,7 @@ class IPFS {
   }
 
   encodeHash(hashData) {
-    let digest = ipfsClient.Buffer.from(hashData.hashDigest.slice(2), 'hex');
+    let digest = this._ipfsAPI.Buffer.from(hashData.hashDigest.slice(2), 'hex');
     return multihashes.encode(digest, hashData.hashFunction, hashData.hashSize);
   }
 

lib/utils/validator.js

@@ -1,15 +0,0 @@
-const tv4 = require('tv4');
-const validator = tv4.freshApi();
-
-validator.addFormat({
-  'date': function(value) {
-    const dateRegexp = /^[0-9]{4,}-[0-9]{2}-[0-9]{2}$/;
-    return dateRegexp.test(value) ? null : "A valid ISO 8601 full-date string is expected";
-  },
-  'time': function(value) {
-    const timeRegexp = /^([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9]|60)(\.[0-9]+)?(([Zz])|([\+|\-]([01][0-9]|2[0-3]):[0-5][0-9]))$/;
-    return timeRegexp.test(value) ? null : "A valid ISO 8601 full-time string is expected";
-  }
-})
-
-module.exports = validator;

package.json

@@ -1,23 +1,21 @@
 {
   "name": "kredits-contracts",
-  "version": "5.1.0",
+  "version": "3.0.2",
   "description": "Ethereum contracts and npm wrapper for Kredits",
   "main": "./lib/kredits.js",
   "directories": {
     "test": "test"
   },
   "scripts": {
-    "install-all": "./scripts/every-app.sh \"npm install\"",
     "build-json": "npm run compile-contracts && node ./scripts/build-json.js",
     "repl": "truffle exec scripts/repl.js",
     "seeds": "truffle exec scripts/seeds.js",
     "compile-contracts": "aragon contracts compile --all",
-    "bootstrap": "npm run reset:hard && npm run seeds",
+    "bootstrap": "npm run reset && truffle exec scripts/seeds.js",
-    "reset": "npm run deploy:kit && npm run deploy:dao",
+    "reset": "npm run deploy:apps && npm run deploy:kit && npm run deploy:dao",
-    "reset:hard": "npm run deploy:apps && npm run reset",
+    "deploy:kit": "npm run compile-contracts && ENS=0x5f6f7e8cc7346a11ca2def8f827b7a0b612c56a1 aragon contracts exec scripts/deploy-kit.js",
-    "deploy:kit": "npm run compile-contracts && aragon contracts exec scripts/deploy-kit.js",
     "deploy:dao": "aragon contracts exec scripts/new-dao.js",
-    "deploy:apps": "./scripts/every-app.sh \"aragon apm publish major\"",
+    "deploy:apps": "./scripts/deploy-apps.sh",
     "devchain": "aragon devchain --port 7545",
     "dao:address": "truffle exec scripts/current-address.js",
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -43,11 +41,10 @@
     "solc": "^0.4.25"
   },
   "dependencies": {
+    "eth-ens-namehash": "^2.0.8",
     "ethers": "^4.0.27",
-    "ipfs-http-client": "^30.1.1",
+    "ipfs-api": "^19.0.0",
-    "kosmos-schemas": "github:67P/kosmos-schemas#feature/contribution_date_time",
+    "rsvp": "^4.8.2"
-    "rsvp": "^4.8.2",
-    "tv4": "^1.3.0"
   },
   "keywords": [
     "kosmos",

scripts/add-contribution.js

@@ -1,5 +1,4 @@
 const promptly = require('promptly');
-const { inspect } = require('util');
 
 const initKredits = require('./helpers/init_kredits.js');
 
@@ -27,32 +26,23 @@ module.exports = async function(callback) {
 
   console.log(`Creating a contribution for contributor account ${contributorAccount} ID: ${contributorId}`);
 
-  [ dateNow, timeNow ] = (new Date()).toISOString().split('T');
-
   let contributionAttributes = {
-    contributorId,
+    contributorAccount,
-    date: dateNow,
-    time: timeNow,
     amount: await promptly.prompt('Amount: '),
     description: await promptly.prompt('Description: '),
     kind: await promptly.prompt('Kind: ', { default: 'dev' }),
     url: await promptly.prompt('URL: ', { default: '' })
   }
 
-  const contributorData = await kredits.Contributor.getById(contributorId);
-  contributionAttributes.contributorIpfsHash = contributorData.ipfsHash;
-
   console.log("\nAdding contribution:");
   console.log(contributionAttributes);
 
-  kredits.Contribution.addContribution(contributionAttributes, { gasLimit: 300000 })
+  kredits.Contribution.addContribution(contributionAttributes, { gasLimit: 300000 }).then((result) => {
-    .then(result => {
+    console.log("\n\nResult:");
-      console.log("\n\nResult:");
+    console.log(result);
-      console.log(result);
+    callback();
-      callback();
+  }).catch((error) => {
-    })
+    console.log('Failed to create contribution');
-    .catch(error => {
+    callback(error);
-      console.log('Failed to create contribution');
+  });
-      callback(inspect(error));
-    });
 }

scripts/add-contributor.js

@@ -23,6 +23,7 @@ module.exports = async function(callback) {
   let contributorAttributes = {
     account: await prompt('Contributor address: ', {}),
     name: await prompt('Name: '),
+    isCore: await prompt('core? y/n') === 'y',
     kind: await prompt('Kind (default person): ', {default: 'person'}),
     url: await prompt('URL: '),
     github_username: await prompt('GitHub username: '),
@@ -33,7 +34,7 @@ module.exports = async function(callback) {
   console.log("\nAdding contributor:");
   console.log(contributorAttributes);
 
-  kredits.Contributor.add(contributorAttributes, { gasLimit: 350000 }).then((result) => {
+  kredits.Contributor.add(contributorAttributes, { gasLimit: 250000 }).then((result) => {
     console.log("\n\nResult:");
     console.log(result);
     callback();

scripts/add-proposal.js

@@ -1,5 +1,4 @@
 const promptly = require('promptly');
-const { inspect } = require('util');
 
 const initKredits = require('./helpers/init_kredits.js');
 
@@ -26,31 +25,23 @@ module.exports = async function(callback) {
   }
   console.log(`Creating a proposal for contributor ID #${contributorId} account: ${contributorAccount}`);
 
-  [ dateNow, timeNow ] = (new Date()).toISOString().split('T');
-
   let contributionAttributes = {
     contributorId,
-    date: dateNow,
-    time: timeNow,
     amount: await promptly.prompt('Amount: '),
     description: await promptly.prompt('Description: '),
     kind: await promptly.prompt('Kind: ', { default: 'dev' }),
     url: await promptly.prompt('URL: ', { default: '' })
   }
 
-  const contributorData = await kredits.Contributor.getById(contributorId);
-  contributionAttributes.contributorIpfsHash = contributorData.ipfsHash;
-
   console.log("\nAdding proposal:");
   console.log(contributionAttributes);
 
-  kredits.Proposal.addProposal(contributionAttributes, { gasLimit: 300000 })
+  kredits.Proposal.addProposal(contributionAttributes, { gasLimit: 300000 }).then((result) => {
-    .then((result) => {
+    console.log("\n\nResult:");
-      console.log("\n\nResult:");
+    console.log(result);
-      console.log(result);
+    callback();
-      callback();
+  }).catch((error) => {
-    }).catch((error) => {
+    console.log('Failed to create proposal');
-      console.log('Failed to create proposal');
+    callback(error);
-      callback(inspect(error));
+  });
-    });
 }

scripts/deploy-apps.sh

@@ -10,7 +10,13 @@ echo "Setting up each aragon app in ./apps"
 echo "a new app version will be deployed"
 echo "----"
 
-./scripts/every-app.sh "npm install"
+for dir in ./apps/*/; do
-./scripts/every-app.sh "aragon apm publish major"
+  set -x
+  cd $dir
+  npm install
+  aragon apm publish major 
+  cd $rootDir
+  set +x
+done
 
 echo "Done, new versions of all apps deployed"

scripts/deploy-kit.js

@@ -3,7 +3,7 @@ const deployDAOFactory = require('@aragon/os/scripts/deploy-daofactory.js')
 const fs = require('fs');
 const path = require('path');
 const argv = require('yargs').argv
-const namehash = require('ethers').utils.namehash;
+const namehash = require('eth-ens-namehash').hash
 
 const fileInject = require('./helpers/file_inject.js')
 const getNetworkId = require('./helpers/networkid.js')

scripts/every-app.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -e
-
-rootDir=`pwd`
-
-for dir in ./apps/*/; do
-  set -x
-  cd $dir
-  eval $1
-  cd $rootDir
-  set +x
-done
-

scripts/helpers/init_kredits.js

@@ -20,7 +20,7 @@ module.exports = async function(web3) {
       });
     }).catch(e => {
       console.log(`Signer account not available; readonly connection (${e.message}`);
-      new Kredits(provider, null, { apm }).init().then(kredits => {
+      new Kredits(provider, null).init().then(kredits => {
         resolve(kredits);
       }).catch(e => {
         reject(e);

scripts/list-contributions.js

@@ -14,33 +14,23 @@ module.exports = async function(callback) {
 
   console.log(`Using Contribution at: ${kredits.Contribution.contract.address}`);
 
+
   const table = new Table({
-    head: ['ID', 'Contributor ID', 'Description', 'Amount', 'Confirmed?', 'Vetoed?', 'Claimed?', 'IPFS']
+    head: ['ID', 'Contributor account', 'Amount', 'Claimed?', 'Vetoed?', 'Description']
   })
 
-  try {
+  let contributions = await kredits.Contribution.all()
-    let blockNumber = await kredits.provider.getBlockNumber();
-    let contributions = await kredits.Contribution.all();
 
-    contributions.forEach((c) => {
+  contributions.forEach((c) => {
-      const confirmed = c.confirmedAtBlock <= blockNumber;
+    table.push([
-
+      c.id.toString(),
-      table.push([
+      c.contributor,
-        c.id.toString(),
+      c.amount.toString(),
-        c.contributorId,
+      c.claimed,
-        `${c.description}`,
+      c.vetoed,
-        c.amount.toString(),
+      `${c.description}`
-        confirmed,
+    ])
-        c.vetoed,
+  })
-        c.claimed,
+  console.log(table.toString())
-        c.ipfsHash
+  callback()
-      ])
-    });
-
-    console.log(table.toString());
-  } catch (err) {
-    console.log(err);
-  }
-
-  callback();
 }

scripts/list-contributors.js

@@ -1,6 +1,5 @@
 const promptly = require('promptly');
 const Table = require('cli-table');
-const ethers = require('ethers');
 
 const initKredits = require('./helpers/init_kredits.js');
 
@@ -17,7 +16,7 @@ module.exports = async function(callback) {
 
 
   const table = new Table({
-    head: ['ID', 'Account', 'Name', 'Core?', 'Balance', 'IPFS']
+    head: ['ID', 'Account', 'Core?', 'Name']
   })
 
   let contributors = await kredits.Contributor.all()
@@ -26,10 +25,8 @@ module.exports = async function(callback) {
     table.push([
       c.id.toString(),
       c.account,
-      `${c.name}`,
       c.isCore,
-      ethers.utils.formatEther(c.balance),
+      `${c.name}`
-      c.ipfsHash
     ])
   })
   console.log(table.toString())

scripts/list-proposals.js

@@ -14,6 +14,7 @@ module.exports = async function(callback) {
 
   console.log(`Using Proposal at: ${kredits.Proposal.contract.address}`);
 
+
   const table = new Table({
     head: ['ID', 'Contributor ID', 'Amount', 'Votes', 'Executed?', 'Description']
   })

scripts/seeds.js

@@ -39,9 +39,8 @@ module.exports = async function(callback) {
       console.log(`[OK] kredits.${contractName}.${method}(${JSON.stringify(args)}) => ${result.hash}`);
       next();
     }).catch((error) => {
-      console.log(`[FAILED] kredits.${contractName}.${method}(${JSON.stringify(args)})`);
+      console.log(`[FAILD] kredits.${contractName}.${method}(${JSON.stringify(args)})`);
-      console.log(`Error: ${error.message}`);
+      callback(error)
-      next();
     });
   }, () => { console.log("\nDone!") });
 

scripts/upgrade.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-
-set -e
-
-rootDir=`pwd`
-
-app=$1
-daoAddress=$2
-if [ -z "$2" ]; then
-  daoAddress=$KREDITS_DAO_ADDRESS
-fi
-
-echo "## Deploying $app for $daoAddress"
-
-set -x
-cd "apps/$app"
-aragon apm publish major
-cd $rootDir
-aragon dao upgrade $daoAddress kredits-$app
-npm run build-json
-set +x
-
-echo "Done"

truffle.js

@@ -28,7 +28,7 @@ const providerForNetwork = (network) => (
         let [first, ...rest] = network;
         preset = `infura${first.toUpperCase()}${rest.join('')}`;
       }
-      return provider(['frame', 'local', preset]);
+      return provider('frame', 'local', preset);
     }
   }
 )