Merge branch 'master' into fix/ipfs-config

# Conflicts:
#	lib/utils/ipfs.js
#	lib/utils/preflight.js

.eslintignore

@@ -1 +0,0 @@
-/scripts/

.eslintrc.js

@@ -28,6 +28,5 @@ module.exports = {
       named: 'always',
       asyncArrow: 'always',
     }],
-    'indent': ['error', 2]
   }
 }

.github/release-drafter.yml

@@ -1,4 +0,0 @@
-template: |
-  ## Changes
-
-  $CHANGES

.travis.yml

@@ -1,32 +1,25 @@
 ---
 language: node_js
 node_js:
-  - "lts/*"
+  - "11"
 
 sudo: false
 dist: xenial
 
 cache:
-  directories:
+  yarn: true
-    - node_modules
+
-    - apps/contribution/node_modules
+before_install:
-    - apps/contributor/node_modules
+  - curl -o- -L https://yarnpkg.com/install.sh | bash
-    - apps/proposal/node_modules
+  - export PATH=$HOME/.yarn/bin:$PATH
-    - apps/token/node_modules
-    - apps/vault/node_modules
 
 install:
-  - npm install -g @aragon/cli
+  - yarn install --no-lockfile --non-interactive
-  - npm install -g truffle
-  - npm install
-
-before_script:
-  - npm run devchain &
 
 script:
-  - npm run lint:wrapper
+  - yarn lint:wrapper
-  - npm run lint:contract-tests
+  - yarn lint:contract-tests
-  - npm run test
+  # - yarn lint:contracts
 
 branches:
   only:

README.md

@@ -14,8 +14,6 @@ framework](http://truffleframework.com/) for some things.
 
 ### Installation
 
-#### App dependencies
-
 All requirements are defined in `package.json`.
 
     $ npm install
@@ -27,20 +25,13 @@ Each of the aragon apps are separate packages:
 
 You can use `npm run install-all` to install all app dependencies at once.
 
-#### Sytem dependencies
-
-Aragon CLI and Truffle need to be installed on your sytem as well:
-
-    npm install -g @aragon/cli
-    npm install -g truffle
-
 ### Local development chain
 
 For local development it is recommended to use
 [ganache](http://truffleframework.com/ganache/) to run a local development
-chain. When using the ganache simulator, no full Ethereum node is required.
+chain. Using the ganache simulator no full Ethereum node is required.
 
-We use the default aragon-cli devchain command to configure 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)
@@ -52,10 +43,6 @@ To clear/reset the chain use (e.g. if you run out of funds on your devchain)
 We default to port 7545 for development to not get in conflict with the default
 Ethereum RPC port.
 
-You can also set certain ganache options to configure the devchain, for example
-if you want to increase the block time to 10 seconds you can add
-`--block-time=10`.
-
 ### Bootstrap
 
 1. Run an Ethereum node and ipfs
@@ -73,7 +60,7 @@ if you want to increase the block time to 10 seconds you can add
         $ npm run deploy:kit
         $ npm run deploy:dao
 
-4. Execute seeds to create demo contributors, contributions, etc. (optional)
+4. Execute seeds to create demo contributors, contributons, etc. (optional)
 
         $ npm run seeds
 
@@ -176,7 +163,7 @@ Creates and configures a new DAO instance.
     or
     $ npm run deploy:dao
 
-KreditsKit address is loaded 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
@@ -211,7 +198,7 @@ make sure all apps and the KreditsKit are deployed, then create a new DAO:
 
 ## Upgradeable contracts
 
-We use aragonOS for upgradeability of the different contracts.  Refer to the
+We use aragonOS for upgradeablity of the different contracts.  Refer to the
 [aragonOS upgradeablity documentation](https://hack.aragon.org/docs/upgradeability-intro)
 for more details.
 

apps/contribution/arapp.json

@@ -19,7 +19,7 @@
   "environments": {
     "default": {
       "network": "development",
-      "appName": "kredits-contribution.open.aragonpm.eth"
+      "appName": "kredits-contribution.aragonpm.eth"
     },
     "rinkeby": {
       "registry": "0x98df287b6c145399aaa709692c8d308357bc085d",

apps/contribution/contracts/Contribution.sol

@@ -60,18 +60,23 @@ contract Contribution is AragonApp {
     initialized();
   }
 
-  function getContract(uint8 appId) public view returns (address) {
+  // TODO refactor into a single function
+  function getTokenContract() public view returns (address) {
     IKernel k = IKernel(kernel());
-    return k.getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[appId]);
+    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 = getContract(uint8(Apps.Contributor));
+    address contributor = getContributorContract();
     return ContributorInterface(contributor).getContributorIdByAddress(contributorAccount);
   }
 
   function getContributorAddressById(uint32 contributorId) public view returns (address) {
-    address contributor = getContract(uint8(Apps.Contributor));
+    address contributor = getContributorContract();
     return ContributorInterface(contributor).getContributorAddressById(contributorId);
   }
 
@@ -113,22 +118,22 @@ contract Contribution is AragonApp {
   // Custom functions
   //
 
-  function totalKreditsEarned(bool confirmedOnly) public view returns (uint32 amount) {
+  function totalKreditsEarned(bool confirmedOnly) public view returns (uint256 count) {
     for (uint32 i = 1; i <= contributionsCount; i++) {
       ContributionData memory c = contributions[i];
-      if (!c.vetoed && (block.number >= c.confirmedAtBlock || !confirmedOnly)) {
+      if (block.number >= c.confirmedAtBlock || !confirmedOnly) {
-        amount += c.amount; // should use safemath
+        count += c.amount; // should use safemath
       }
     }
   }
 
-  function totalKreditsEarnedByContributor(uint32 contributorId, bool confirmedOnly) public view returns (uint32 amount) {
+  function totalKreditsEarnedByContributor(uint32 contributorId, bool confirmedOnly) public view returns (uint256 count) {
-    uint256 tokenCount = ownedContributions[contributorId].length;
+    uint256 tokenBalance = ownedContributions[contributorId].length;
-    for (uint256 i = 0; i < tokenCount; i++) {
+    for (uint256 i = 0; i < tokenBalance; i++) {
       uint32 cId = ownedContributions[contributorId][i];
       ContributionData memory c = contributions[cId];
-      if (!c.vetoed && (block.number >= c.confirmedAtBlock || !confirmedOnly)) {
+      if (block.number >= c.confirmedAtBlock || !confirmedOnly) {
-        amount += c.amount; // should use safemath
+        count += c.amount; // should use safemath
       }
     }
   }
@@ -193,14 +198,14 @@ contract Contribution is AragonApp {
     require(block.number >= c.confirmedAtBlock, 'NOT_CLAIMABLE');
 
     c.claimed = true;
-    address token = getContract(uint8(Apps.Token));
+    address token = getTokenContract();
     address contributorAccount = getContributorAddressById(c.contributorId);
     uint256 amount = uint256(c.amount);
     IToken(token).mintFor(contributorAccount, amount, contributionId);
     emit ContributionClaimed(contributionId, c.contributorId, c.amount);
   }
 
-  function exists(uint32 contributionId) public view returns (bool) {
+  function exists(uint32 contributionId) view public returns (bool) {
     return contributions[contributionId].exists;
   }
 }

apps/contribution/package.json

@@ -3,20 +3,16 @@
   "version": "1.0.0",
   "description": "",
   "dependencies": {
-    "@aragon/os": "^4.2.0",
+    "@aragon/os": "^4.1.0",
-    "@aragon/cli": "^5.9.6"
+    "@aragon/cli": "^5.5.0"
-  },
-  "devDependencies": {
-    "@aragon/test-helpers": "^2.0.0",
-    "eth-gas-reporter": "^0.2.0",
-    "ganache-cli": "^6.4.3",
-    "solidity-coverage": "^0.5.11"
   },
+  "devDependencies": {},
   "scripts": {
     "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": "",
+    "test": "aragon contracts test",
     "compile": "aragon contracts compile",
     "sync-assets": "",
     "build:app": "",
@@ -25,8 +21,7 @@
     "publish:patch": "aragon apm publish patch",
     "publish:minor": "aragon apm publish minor",
     "publish:major": "aragon apm publish major",
-    "versions": "aragon apm versions",
+    "versions": "aragon apm versions"
-    "test": "aragon contracts test"
   },
   "keywords": []
 }

apps/contributor/arapp.json

@@ -9,7 +9,7 @@
   "environments": {
     "default": {
       "network": "development",
-      "appName": "kredits-contributor.open.aragonpm.eth"
+      "appName": "kredits-contributor.aragonpm.eth"
     },
     "rinkeby": {
       "registry": "0x98df287b6c145399aaa709692c8d308357bc085d",

apps/contributor/contracts/Contributor.sol

@@ -7,7 +7,7 @@ interface ITokenBalance {
   function balanceOf(address contributorAccount) public view returns (uint256);
 }
 interface IContributionBalance {
-  function totalKreditsEarnedByContributor(uint32 contributorId, bool confirmedOnly) public view returns (uint32 amount);
+  function totalKreditsEarnedByContributor(uint32 contributorId, bool confirmedOnly) public view returns (uint256 count);
   function balanceOf(address owner) public view returns (uint256);
 }
 
@@ -21,19 +21,6 @@ contract Contributor is AragonApp {
     uint8 hashFunction;
     uint8 hashSize;
     bool exists;
-    // TODO
-    uint256 claimedBalance;
-  }
-
-  // TODO
-  function withdraw() {
-    // look up contributorId for msg.sender address
-    // require msg.sender is contributor
-    uint256 confirmedKredits = Contribution.totalKreditsEarnedByContributor(contributorId, confirmedOnly=true);
-    uint256 claimableAmount = confirmedKredits - contributor.claimedBalance;
-    // require claimableAmount > 0
-    contributor.claimedBalance += claimableAmount;
-    IToken(token).mintFor(msg.sender, amount);
   }
 
   mapping (address => uint32) public contributorIds;
@@ -54,12 +41,19 @@ contract Contributor is AragonApp {
     initialized();
   }
 
-  function getContract(uint8 appId) public view returns (address) {
+  function getTokenContract() public view returns (address) {
     IKernel k = IKernel(kernel());
-    return k.getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[appId]);
+
+    return k.getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[uint8(Apps.Token)]);
   }
 
-  function coreContributorsCount() public view returns (uint32) {
+  function getContributionContract() public view returns (address) {
+    IKernel k = IKernel(kernel());
+
+    return k.getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[uint8(Apps.Contribution)]);
+  }
+
+  function coreContributorsCount() view public returns (uint32) {
     uint32 count = 0;
     for (uint32 i = 1; i <= contributorsCount; i++) {
       if (isCoreTeam(i)) {
@@ -70,13 +64,10 @@ contract Contributor is AragonApp {
   }
 
   function updateContributorAccount(uint32 id, address oldAccount, address newAccount) public auth(MANAGE_CONTRIBUTORS_ROLE) {
-    require(newAccount != address(0), "invalid new account address");
-    require(getContributorAddressById(id) == oldAccount, "contributor does not exist");
-
     contributorIds[oldAccount] = 0;
     contributorIds[newAccount] = id;
     contributors[id].account = newAccount;
-    emit ContributorAccountUpdated(id, oldAccount, newAccount);
+    ContributorAccountUpdated(id, oldAccount, newAccount);
   }
 
   function updateContributorProfileHash(uint32 id, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize) public isInitialized auth(MANAGE_CONTRIBUTORS_ROLE) {
@@ -137,7 +128,7 @@ contract Contributor is AragonApp {
     return contributors[id];
   }
 
-  function getContributorById(uint32 _id) public view returns (uint32 id, address account, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize, bool isCore, uint256 balance, uint32 totalKreditsEarned, uint256 contributionsCount, bool exists ) {
+  function getContributorById(uint32 _id) public view returns (uint32 id, address account, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize, bool isCore, uint256 balance, uint256 totalKreditsEarned, uint256 contributionsCount, bool exists ) {
     id = _id;
     Contributor storage c = contributors[_id];
     account = c.account;
@@ -145,15 +136,15 @@ contract Contributor is AragonApp {
     hashFunction = c.hashFunction;
     hashSize = c.hashSize;
     isCore = isCoreTeam(id);
-    address token = getContract(uint8(Apps.Token));
+    address token = getTokenContract();
     balance = ITokenBalance(token).balanceOf(c.account);
-    address contribution = getContract(uint8(Apps.Contribution));
+    address contribution = getContributionContract();
     totalKreditsEarned = IContributionBalance(contribution).totalKreditsEarnedByContributor(_id, true);
     contributionsCount = IContributionBalance(contribution).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[] memory _how*/) public returns (bool) {
     address sender = _who;
     if (sender == address(-1)) {
       sender = tx.origin;

apps/contributor/contracts/test/Spoof.sol

@@ -1,16 +0,0 @@
-pragma solidity ^0.4.24;
-
-import "@aragon/os/contracts/acl/ACL.sol";
-import "@aragon/os/contracts/kernel/Kernel.sol";
-import "@aragon/os/contracts/factory/DAOFactory.sol";
-
-// You might think this file is a bit odd, but let me explain.
-// We only use for now those imported contracts in our tests, which
-// means Truffle will not compile them for us, because they are from
-// an external dependency.
-
-
-// solium-disable-next-line no-empty-blocks
-contract Spoof {
-  // ...
-}

apps/contributor/package.json

@@ -3,20 +3,16 @@
   "version": "1.0.0",
   "description": "",
   "dependencies": {
-    "@aragon/os": "^4.2.0",
+    "@aragon/os": "^4.1.0",
-    "@aragon/cli": "^5.9.6"
+    "@aragon/cli": "^5.5.0"
-  },
-  "devDependencies": {
-    "eth-gas-reporter": "^0.2.0",
-    "ganache-cli": "^6.4.3",
-    "solidity-coverage": "^0.5.11",
-    "@aragon/test-helpers": "^2.0.0"
   },
+  "devDependencies": {},
   "scripts": {
     "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": "",
+    "test": "aragon contracts test",
     "compile": "aragon contracts compile",
     "sync-assets": "",
     "build:app": "",
@@ -25,8 +21,7 @@
     "publish:patch": "aragon apm publish patch",
     "publish:minor": "aragon apm publish minor",
     "publish:major": "aragon apm publish major",
-    "versions": "aragon apm versions",
+    "versions": "aragon apm versions"
-    "test": "aragon contracts test"
   },
   "keywords": []
 }

apps/contributor/test/app.js

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

apps/contributor/test/contributor.js

@@ -1,170 +0,0 @@
-const namehash = require('ethers').utils.namehash;
-
-// eslint-disable-next-line no-undef
-const Contributor = artifacts.require("Contributor.sol");
-
-// eslint-disable-next-line no-undef
-const getContract = name => artifacts.require(name);
-const { assertRevert } = require('@aragon/test-helpers/assertThrow');
-
-const ZERO_ADDR = '0x0000000000000000000000000000000000000000';
-
-contract('Contributor app', (accounts) => {
-  let kernelBase, aclBase, daoFactory, r, dao, acl, contributor;
-
-  const root = accounts[0];
-  const member1 = accounts[1];
-
-  // eslint-disable-next-line no-undef
-  before(async () => {
-    kernelBase = await getContract('Kernel').new(true); // petrify immediately
-    aclBase = await getContract('ACL').new();
-    daoFactory = await getContract('DAOFactory').new(kernelBase.address, aclBase.address, ZERO_ADDR);
-    r = await daoFactory.newDAO(root);
-    dao = getContract('Kernel').at(r.logs.filter(l => l.event == 'DeployDAO')[0].args.dao);
-    acl = getContract('ACL').at(await dao.acl());
-
-    //create dao mamnager permission for coin owner
-    await acl.createPermission(
-      root,
-      dao.address,
-      await dao.APP_MANAGER_ROLE(),
-      root,
-      { from: root }
-    );
-
-    //get new app instance from DAO
-    const receipt = await dao.newAppInstance(
-      '0x1234',
-      (await Contributor.new()).address,
-      0x0,
-      false,
-      { from: root }
-    );
-    contributor = Contributor.at(
-      receipt.logs.filter(l => l.event == 'NewAppProxy')[0].args.proxy
-    );
-
-    //apps id
-    let appsId = [];
-    appsId[0] = namehash("kredits-contribution");
-    appsId[1] = namehash("kredits-contributor");
-    appsId[2] = namehash("kredits-proposal");
-    appsId[3] = namehash("kredits-token");
-
-    //init contributor (app)
-    await contributor.initialize(root, appsId);
-
-    //create manage contributors role
-    await acl.createPermission(
-      root,
-      contributor.address,
-      await contributor.MANAGE_CONTRIBUTORS_ROLE(),
-      root,
-      { from: root }
-    );
-  
-  });
-
-  describe("Owner default permissions", async () => {
-    it('check owner is contributors manager', async () => {
-      let manageContributorPermission = await acl.hasPermission(root, contributor.address, await contributor.MANAGE_CONTRIBUTORS_ROLE());
-      // eslint-disable-next-line no-undef
-      assert.equal(manageContributorPermission, true);
-    });  
-  });
-
-  describe("Add contributor", async () => {
-    let account = root;
-    let hashDigest = '0x0';
-    let hashFunction = 0;
-    let hashSize = 0;
-
-    it("should revert when add contributor from an address that does not have permission", async () => {
-      return assertRevert(async () => {
-        await contributor.addContributor(account, hashDigest, hashFunction, hashSize, { from: member1});
-        'sender does not have permission';
-      });
-    });
-
-    it('add contributor', async () => {
-      let contributorCount = await contributor.coreContributorsCount();
-      await contributor.addContributor(account, hashDigest, hashFunction, hashSize);
-      // eslint-disable-next-line no-undef
-      assert.equal(await contributor.addressExists(account), true);
-      let contributorCountAfter = await contributor.coreContributorsCount();
-      // eslint-disable-next-line no-undef
-      assert.equal(await contributorCountAfter.toNumber(), parseInt(contributorCount)+1);
-    });
-
-    it("should revert when add contributor with an address that already exist", async () => {
-      return assertRevert(async () => {
-        await contributor.addContributor(account, hashDigest, hashFunction, hashSize, { from: member1});
-        'address already exist';
-      });
-    });
-  });
-
-  describe("Update contributor", async () => {
-    let id;
-    let oldAccount;
-    let newAccount;
-    let hashDigest;
-    let hashFunction;
-    let hashSize;
-
-    // eslint-disable-next-line no-undef
-    before(async () =>  {
-      id = await contributor.coreContributorsCount();
-      oldAccount = root;
-      newAccount = member1;
-      hashDigest = '0x1000000000000000000000000000000000000000000000000000000000000000';
-      hashFunction = 1;
-      hashSize = 1;
-    });
-
-    it('update contributor account', async () => {
-      await contributor.updateContributorAccount(id.toNumber(), oldAccount, newAccount);
-      let contributorId = await contributor.getContributorIdByAddress(oldAccount);
-      // eslint-disable-next-line no-undef
-      assert.equal(contributorId.toNumber(), 0);
-    });
-
-    it("should revert when update contributor account from address that does not have permission", async () => {
-      return assertRevert(async () => {
-        await contributor.updateContributorAccount(id.toNumber(), oldAccount, newAccount, {from: member1});
-        'sender does not have permission';
-      });
-    });
-
-    it("should revert when update contributor account that does not exist", async () => {
-      return assertRevert(async () => {
-        await contributor.updateContributorAccount(id.toNumber(), accounts[3], newAccount);
-        'contributor does not exist';
-      });
-    });
-
-    it("should revert when update contributor account with address(0)", async () => {
-      return assertRevert(async () => {
-        await contributor.updateContributorAccount(id.toNumber(), oldAccount, ZERO_ADDR);
-        'contributor does not exist';
-      });
-    });
-
-    it('update contributor profile hash', async () => {
-      await contributor.updateContributorProfileHash(id.toNumber(), hashDigest, hashFunction, hashSize);
-      let contributorProfile = await contributor.contributors(id.toNumber());
-      assert.equal(hashDigest, contributorProfile[1]);    // eslint-disable-line no-undef
-      assert.equal(hashFunction, contributorProfile[2].toNumber());   // eslint-disable-line no-undef
-      assert.equal(hashSize, contributorProfile[3].toNumber());   // eslint-disable-line no-undef
-    });
-
-    it("should revert when update contributor profile hash from address that does not have permission", async () => {
-      return assertRevert(async () => {
-        await contributor.updateContributorProfileHash(id.toNumber(), hashDigest, hashFunction, hashSize, {from: member1});
-        'sender does not have permission';
-      });
-    });
-
-  });
-});

apps/proposal/arapp.json

@@ -14,7 +14,7 @@
   "environments": {
     "default": {
       "network": "development",
-      "appName": "kredits-proposal.open.aragonpm.eth"
+      "appName": "kredits-proposal.aragonpm.eth"
     },
     "rinkeby": {
       "registry": "0x98df287b6c145399aaa709692c8d308357bc085d",

apps/proposal/contracts/Proposal.sol

@@ -51,13 +51,16 @@ contract Proposal is AragonApp {
     initialized();
   }
 
-  function getContract(uint8 appId) public view returns (address) {
+  function getContributorContract() public view returns (address) {
-    IKernel k = IKernel(kernel());
+    return IKernel(kernel()).getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[uint8(Apps.Contributor)]);
-    return k.getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[appId]);
+  }
+
+  function getContributionContract() public view returns (address) {
+    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) {
-    require(IContributor(getContract(uint8(Apps.Contributor))).exists(contributorId), 'CONTRIBUTOR_NOT_FOUND');
+    require(IContributor(getContributorContract()).exists(contributorId), 'CONTRIBUTOR_NOT_FOUND');
 
     uint32 proposalId = proposalsCount + 1;
     uint16 _votesNeeded = 1; //contributorsContract().coreContributorsCount() / 100 * 75;
@@ -66,10 +69,10 @@ contract Proposal is AragonApp {
     p.creatorAccount = msg.sender;
     p.contributorId = contributorId;
     p.amount = amount;
-    p.hashDigest = hashDigest;
+    p.hashDigest  = hashDigest;
     p.hashFunction = hashFunction;
-    p.hashSize = hashSize;
+    p.hashSize =  hashSize;
-    p.votesCount = 0;
+    p.votesCount =  0;
     p.votesNeeded = _votesNeeded;
     p.exists = true;
 
@@ -99,7 +102,7 @@ contract Proposal is AragonApp {
   function vote(uint32 proposalId) public isInitialized auth(VOTE_PROPOSAL_ROLE) {
     Proposal storage p = proposals[proposalId];
     require(!p.executed, 'ALREADY_EXECUTED');
-    uint32 voterId = IContributor(getContract(uint8(Apps.Contributor))).getContributorIdByAddress(msg.sender);
+    uint32 voterId = IContributor(getContributorContract()).getContributorIdByAddress(msg.sender);
     require(p.votes[voterId] != true, 'ALREADY_VOTED');
     p.voterIds.push(voterId);
     p.votes[voterId] = true;
@@ -123,7 +126,7 @@ contract Proposal is AragonApp {
     require(p.votesCount >= p.votesNeeded, 'MISSING_VOTES');
 
     p.executed = true;
-    IContribution(getContract(uint8(Apps.Contribution))).add(p.amount, p.contributorId, p.hashDigest, p.hashFunction, p.hashSize);
+    IContribution(getContributionContract()).add(p.amount, p.contributorId, p.hashDigest, p.hashFunction, p.hashSize);
     emit ProposalExecuted(proposalId, p.contributorId, p.amount);
   }
 

apps/proposal/package.json

@@ -3,20 +3,16 @@
   "version": "1.0.0",
   "description": "",
   "dependencies": {
-    "@aragon/os": "^4.2.0",
+    "@aragon/os": "^4.1.0",
-    "@aragon/cli": "^5.9.6"
+    "@aragon/cli": "^5.5.0"
-  },
-  "devDependencies": {
-    "@aragon/test-helpers": "^2.0.0",
-    "eth-gas-reporter": "^0.2.0",
-    "ganache-cli": "^6.4.3",
-    "solidity-coverage": "^0.5.11"
   },
+  "devDependencies": {},
   "scripts": {
     "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": "",
+    "test": "aragon contracts test",
     "compile": "aragon contracts compile",
     "sync-assets": "",
     "build:app": "",
@@ -25,8 +21,7 @@
     "publish:patch": "aragon apm publish patch",
     "publish:minor": "aragon apm publish minor",
     "publish:major": "aragon apm publish major",
-    "versions": "aragon apm versions",
+    "versions": "aragon apm versions"
-    "test": "aragon contracts test"
   },
   "keywords": []
 }

apps/token/arapp.json

@@ -9,7 +9,7 @@
   "environments": {
     "default": {
       "network": "development",
-      "appName": "kredits-token.open.aragonpm.eth"
+      "appName": "kredits-token.aragonpm.eth"
     },
     "rinkeby": {
       "registry": "0x98df287b6c145399aaa709692c8d308357bc085d",

apps/token/contracts/Token.sol

@@ -21,8 +21,6 @@ contract Token is ERC20Token, AragonApp {
   }
 
   function mintFor(address contributorAccount, uint256 amount, uint32 contributionId) public isInitialized auth(MINT_TOKEN_ROLE) {
-    require(amount > 0, "INVALID_AMOUNT");
-
     uint256 amountInWei = amount.mul(1 ether);
     _mint(contributorAccount, amountInWei);
     emit LogMint(contributorAccount, amount, contributionId);

apps/token/contracts/test/Spoof.sol

@@ -1,16 +0,0 @@
-pragma solidity ^0.4.24;
-
-import "@aragon/os/contracts/acl/ACL.sol";
-import "@aragon/os/contracts/kernel/Kernel.sol";
-import "@aragon/os/contracts/factory/DAOFactory.sol";
-
-// You might think this file is a bit odd, but let me explain.
-// We only use for now those imported contracts in our tests, which
-// means Truffle will not compile them for us, because they are from
-// an external dependency.
-
-
-// solium-disable-next-line no-empty-blocks
-contract Spoof {
-  // ...
-}

apps/token/package.json

@@ -3,20 +3,16 @@
   "version": "1.0.0",
   "description": "",
   "dependencies": {
-    "@aragon/os": "^4.2.0",
+    "@aragon/os": "^4.1.0",
-    "@aragon/cli": "^5.9.6"
+    "@aragon/cli": "^5.5.0"
-  },
-  "devDependencies": {
-    "@aragon/test-helpers": "^2.0.0",
-    "eth-gas-reporter": "^0.2.0",
-    "ganache-cli": "^6.4.3",
-    "solidity-coverage": "^0.5.11"
   },
+  "devDependencies": {},
   "scripts": {
     "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": "",
+    "test": "aragon contracts test",
     "compile": "aragon contracts compile",
     "sync-assets": "",
     "build:app": "",
@@ -25,8 +21,7 @@
     "publish:patch": "aragon apm publish patch",
     "publish:minor": "aragon apm publish minor",
     "publish:major": "aragon apm publish major",
-    "versions": "aragon apm versions",
+    "versions": "aragon apm versions"
-    "test": "aragon contracts test"
   },
   "keywords": []
 }

apps/token/test/app.js

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

apps/token/test/token.js

@@ -1,123 +0,0 @@
-const namehash = require('ethers').utils.namehash;
-
-// eslint-disable-next-line no-undef
-const Token = artifacts.require("Token.sol");
-
-// eslint-disable-next-line no-undef
-const getContract = name => artifacts.require(name);
-const { assertRevert } = require('@aragon/test-helpers/assertThrow');
-
-const ZERO_ADDR = '0x0000000000000000000000000000000000000000';
-
-contract('Token app', (accounts) => {
-  let kernelBase, aclBase, daoFactory, dao, r, acl, token;
-
-  const root = accounts[0];
-  const member1 = accounts[1];
-
-  // eslint-disable-next-line no-undef
-  before(async () => {
-    kernelBase = await getContract('Kernel').new(true); // petrify immediately
-    aclBase = await getContract('ACL').new();
-    daoFactory = await getContract('DAOFactory').new(kernelBase.address, aclBase.address, ZERO_ADDR);
-    r = await daoFactory.newDAO(root);
-    dao = getContract('Kernel').at(r.logs.filter(l => l.event == 'DeployDAO')[0].args.dao);
-    acl = getContract('ACL').at(await dao.acl());
-
-    //create dao mamnager permission for coin owner
-    await acl.createPermission(
-      root,
-      dao.address,
-      await dao.APP_MANAGER_ROLE(),
-      root,
-      { from: root }
-    );
-
-    //get new app instance from DAO
-    const receipt = await dao.newAppInstance(
-      '0x1234',
-      (await Token.new()).address,
-      0x0,
-      false,
-      { from: root }
-    );
-    token = Token.at(
-      receipt.logs.filter(l => l.event == 'NewAppProxy')[0].args.proxy
-    );
-
-    //apps id
-    let appsId = [];
-    appsId[0] = namehash("kredits-contribution");
-    appsId[1] = namehash("kredits-contributor");
-    appsId[2] = namehash("kredits-proposal");
-    appsId[3] = namehash("kredits-token");
-
-    //init token (app)
-    await token.initialize(appsId);
-
-    //create token mint permission for coin owner
-    await acl.createPermission(
-      root,
-      token.address,
-      await token.MINT_TOKEN_ROLE(),
-      root,
-      { from: root }
-    );
-  
-  });
-
-  describe("Owner default space permissions", async () => {
-    it('check owner is token issuer', async () => {
-      let tokenIssuerPermission = await acl.hasPermission(root, token.address, await token.MINT_TOKEN_ROLE());
-      // eslint-disable-next-line no-undef
-      assert.equal(tokenIssuerPermission, true);
-    });  
-  });
-
-  describe("Token issuing", async () => {
-    let name = "Kredits";
-    let symbol = "₭S";
-    let decimals = 18;
-
-    it("check token properties", async () => {
-      assert.equal(await token.name(), name); // eslint-disable-line no-undef
-      assert.equal(await token.symbol(), symbol); // eslint-disable-line no-undef
-      assert.equal(await token.decimals(), decimals); // eslint-disable-line no-undef
-    });
-
-  });
-
-  describe("Token minting", async () => {
-    let tokenToMint = 250;
-    let ether = 1000000000000000000;
-
-    it("should revert when mint tokens from an address that does not have minting permission", async () => {
-      return assertRevert(async () => {
-        await token.mintFor(root, tokenToMint, 1, { from: member1});
-        'address does not have permission to mint tokens';
-      });
-    });
-
-    it("should revert when mint tokens to address(0)", async () => {
-      return assertRevert(async () => {
-        await token.mintFor(ZERO_ADDR, tokenToMint, 1, { from: root});
-        'invalid contributor address';
-      });
-    });
-
-    it("should revert when mint amount of tokens equal to 0", async () => {
-      return assertRevert(async () => {
-        await token.mintFor(root, 0, 1, { from: root});
-        'amount to mint should be greater than zero';
-      });
-    });
-
-    it("mint tokens", async () => {
-      await token.mintFor(root, tokenToMint, 1, { from: root });
-      let ownerBalance = await token.balanceOf(root);
-      let totalSupply = await token.totalSupply();
-      assert.equal(ownerBalance.toNumber(), tokenToMint*ether); // eslint-disable-line no-undef
-      assert.equal(totalSupply.toNumber(), tokenToMint*ether);  // eslint-disable-line no-undef
-    });
-  });
-});

arapp.json

@@ -34,9 +34,9 @@
   "environments": {
     "development": {
       "network": "development",
-      "apm": "open.aragonpm.eth",
+      "apm": "aragonpm.eth",
       "registry": "0x5f6f7e8cc7346a11ca2def8f827b7a0b612c56a1",
-      "appName": "dummy.open.aragonpm.eth"
+      "appName": "dummy.aragonpm.eth"
     },
     "rinkeby": {
       "network": "rinkeby",

config/seeds.js

@@ -7,7 +7,7 @@ const contractCalls = [
     github_username: 'bumi',
     github_uid: 318,
     gitea_username: 'bumi',
-    wiki_username: 'Bumi',
+    wiki_username: 'Bumi'
   }, { gasLimit: 200000 }]],
 
   ['Contributor', 'add', [{
@@ -18,7 +18,7 @@ const contractCalls = [
     github_username: 'skddc',
     github_uid: 842,
     gitea_username: 'raucao',
-    wiki_username: 'Basti',
+    wiki_username: 'Basti'
   }, { gasLimit: 200000 }]],
 
   ['Contributor', 'add', [{
@@ -28,21 +28,21 @@ const contractCalls = [
     url: '',
     github_username: 'fsmanuel',
     github_uid: 54812,
-    wiki_username: 'Manuel',
+    wiki_username: 'Manuel'
   }, { gasLimit: 200000 }]],
 
-  ['Proposal', 'add', [{ 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: 1, contributorIpfsHash: 'QmWKCYGr2rSf6abUPaTYqf98urvoZxGrb7dbspFZA6oyVF', date: '2019-04-09', amount: 500, kind: 'dev', description: '[67P/kredits-contracts] Ran the seeds', url: '' }, { gasLimit: 350000 }]],
-  ['Proposal', 'add', [{ 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: 2, contributorIpfsHash: 'QmcHzEeAM26HV2zHTf5HnZrCtCtGdEccL5kUtDakAB7ozB', date: '2019-04-10', amount: 500, kind: 'dev', description: '[67P/kredits-contracts] Ran the seeds', url: '' }, { gasLimit: 350000 }]],
-  ['Proposal', 'add', [{ 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: 2, contributorIpfsHash: 'QmcHzEeAM26HV2zHTf5HnZrCtCtGdEccL5kUtDakAB7ozB', date: '2019-04-11', amount: 500, kind: 'dev', description: '[67P/kredits-contracts] Hacked on kredits', url: '' }, { gasLimit: 350000 }]],
   ['Proposal', 'vote', [1, { gasLimit: 550000 }]],
-  ['Contribution', 'add', [{ contributorId: 1, contributorIpfsHash: 'QmWKCYGr2rSf6abUPaTYqf98urvoZxGrb7dbspFZA6oyVF', date: '2019-04-11', amount: 5000, kind: 'dev', description: '[67P/kredits-contracts] Introduce contribution token', url: '' }, { gasLimit: 350000 }]],
+  ['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', 'add', [{ contributorId: 2, contributorIpfsHash: 'QmcHzEeAM26HV2zHTf5HnZrCtCtGdEccL5kUtDakAB7ozB', date: '2019-04-11', amount: 1500, kind: 'dev', description: '[67P/kredits-web] Reviewed stuff', 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 }]],
+  ['Contribution', 'claim', [1, { gasLimit: 300000 }]]
 ];
 
 const funds = [
   '0x7e8f313c56f809188313aa274fa67ee58c31515d',
-  '0xa502eb4021f3b9ab62f75b57a94e1cfbf81fd827',
+  '0xa502eb4021f3b9ab62f75b57a94e1cfbf81fd827'
 ];
 
 module.exports = { contractCalls, funds };

deployments/rinkeby/contributor.md

@@ -2,14 +2,7 @@
 
 aragon apm publish major --environment=rinkeby
 
-## 2019-04-25 canPerform fix
+## 2019-04-29 update balances
-
-✔ Successfully published kredits-contributor.open.aragonpm.eth v6.0.0: 
- ℹ Contract address: 0xA5379D49C718845A1BD7720c6BE3872bA69906cc
- ℹ Content (ipfs): QmdennNV6s2FNpe6QNYxrUsUXPVdnQGvh1vCi22Tqs8ojq
- ℹ Transaction hash: 0x51077afeff70a24e87c78bb23ea13bdb9b4445bd43ea7a74a4178fadfeeb6c35
-
-## 2019-04-24 update balances
 
  ✔ Successfully published kredits-contributor.open.aragonpm.eth v5.0.0: 
  ℹ Contract address: 0xadefa3b66b68a127Fe38bEa1813b844EE69CFD86

deployments/rinkeby/dao.md

@@ -1,12 +1,5 @@
 # Kredits deployment
 
-## 2019-04-25 canPerfom fix
-
-aragon dao upgrade 0xc34edf7d11b7f8433d597f0bb0697acdff55ef14 kredits-contributor.open.aragonpm.eth --environment=rinkeby
- ✔ Fetching kredits-contributor.open.aragonpm.eth@latest
- ✔ Upgrading app
- ✔ Successfully executed: "Set the resolving address of 'kredits-contributor.open.aragonpm.eth' in namespace 'App code' to 0xA5379D49C718845A1BD7720c6BE3872bA69906cc"
-
 ## 2019-04-24 upgrade contributor and contribution
 
 aragon dao upgrade 0xc34edf7d11b7f8433d597f0bb0697acdff55ef14 kredits-contributor.open.aragonpm.eth --environment=rinkeby
@@ -15,6 +8,7 @@ eth-provider | Invalid provider preset/location: "local"
  ✔ Upgrading app
  ✔ Successfully executed: "Set the resolving address of 'kredits-contributor.open.aragonpm.eth' in namespace 'App code' to 0xadefa3b66b68a127Fe38bEa1813b844EE69CFD86"
 
+
 aragon dao upgrade 0xc34edf7d11b7f8433d597f0bb0697acdff55ef14 kredits-contribution.open.aragonpm.eth --environment=rinkeby
  ✔ Fetching kredits-contribution.open.aragonpm.eth@latest
  ✔ Upgrading app

lib/abis/KreditsKit.json

@@ -1 +0,0 @@
-[{"constant":true,"inputs":[],"name":"ens","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"fac","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"appId","type":"bytes32"}],"name":"latestVersionAppBase","outputs":[{"name":"base","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"appIds","outputs":[{"name":"","type":"bytes32"}],"payable":false,"stateMutability":"view","type":"function"},{"inputs":[{"name":"_fac","type":"address"},{"name":"_ens","type":"address"},{"name":"_appIds","type":"bytes32[4]"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"dao","type":"address"}],"name":"DeployInstance","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"dao","type":"address"},{"indexed":false,"name":"appProxy","type":"address"},{"indexed":false,"name":"appId","type":"bytes32"}],"name":"InstalledApp","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"appProxy","type":"address"},{"indexed":false,"name":"appId","type":"bytes32"}],"name":"InstalledApp","type":"event"},{"constant":false,"inputs":[],"name":"newInstance","outputs":[{"name":"dao","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"function"}]

lib/contracts/base.js

@@ -7,10 +7,6 @@ class Base {
     return this.contract.functions;
   }
 
-  get address () {
-    return this.contract.address;
-  }
-
   get ipfs () {
     if (!this._ipfsAPI) { throw new Error('IPFS API not configured; please set an ipfs instance'); }
     return this._ipfsAPI;

lib/contracts/contribution.js

@@ -1,6 +1,5 @@
 const Record = require('./record');
 const ContributionSerializer = require('../serializers/contribution');
-const deprecate = require('../utils/deprecate');
 
 class Contribution extends Record {
   get count () {
@@ -14,10 +13,6 @@ class Contribution extends Record {
       });
   }
 
-  getData (id) {
-    return this.functions.getContribution(id);
-  }
-
   getByContributorId (contributorId) {
     return this.functions.getContributorAddressById(contributorId)
       .then(address => this.getByContributorAddress(address));
@@ -39,7 +34,7 @@ class Contribution extends Record {
       });
   }
 
-  async add (contributionAttr, callOptions = {}) {
+  async addContribution (contributionAttr, callOptions = {}) {
     const contribution = new ContributionSerializer(contributionAttr);
 
     try { await contribution.validate(); }
@@ -61,12 +56,6 @@ class Contribution extends Record {
         return this.functions.add(...contribution, callOptions);
       });
   }
-
-  addContribution () {
-    deprecate('The function `addContribution()` is deprecated and will be removed in the next major version. Use `add()` instead');
-    return this.add(...arguments);
-  }
-
 }
 
 module.exports = Contribution;

lib/contracts/contributor.js

@@ -15,10 +15,6 @@ class Contributor extends Record {
       });
   }
 
-  getData (id) {
-    return this.functions.getContributorById(id);
-  }
-
   filterByAccount (search) {
     return this._byAccount(search, 'filter');
   }
@@ -88,7 +84,6 @@ class Contributor extends Record {
         });
     });
   }
-
 }
 
 module.exports = Contributor;

lib/contracts/kernel.js

@@ -6,7 +6,7 @@ const KERNEL_APP_ADDR_NAMESPACE = '0xd6f028ca0e8edb4a8c9757ca4fdccab25fa1e0317da
 class Kernel extends Base {
   constructor (contract) {
     super(contract);
-    this.apm = 'open.aragonpm.eth'; // can be overwritten if needed
+    this.apm = 'aragonpm.eth'; // can be overwritten if needed
   }
 
   getApp (appName) {

lib/contracts/proposal.js

@@ -1,6 +1,5 @@
 const Record = require('./record');
 const ContributionSerializer = require('../serializers/contribution');
-const deprecate = require('../utils/deprecate');
 
 class Proposal extends Record {
   get count () {
@@ -14,7 +13,7 @@ class Proposal extends Record {
       });
   }
 
-  async add (proposalAttr, callOptions = {}) {
+  async addProposal (proposalAttr, callOptions = {}) {
     const contribution = new ContributionSerializer(proposalAttr);
 
     try { await contribution.validate(); }
@@ -36,11 +35,6 @@ class Proposal extends Record {
         return this.functions.addProposal(...proposal, callOptions);
       });
   }
-
-  addProposal () {
-    deprecate('The function `addProposal()` is deprecated and will be removed in the next major version. Use `add()` instead');
-    return this.add(...arguments);
-  }
 }
 
 module.exports = Proposal;

lib/kredits.js

@@ -41,12 +41,15 @@ class Kredits {
     this.abis = abis || ABIS;
     this.ipfs = new IPFS(ipfsConfig);
     this.contracts = {};
+    this.networkId = null;
   }
 
   init (names) {
     let contractsToLoad = names || APP_CONTRACTS;
     return this.provider.getNetwork().then(network => {
-      this.addresses['Kernel'] = this.addresses['Kernel'] || DaoAddresses[network.chainId.toString()];
+      this.networkId = network.chainId.toString();
+      this.addresses['Kernel'] = this.addresses['Kernel'] || DaoAddresses[this.networkId];
+
       let addressPromises = contractsToLoad.map((contractName) => {
         return this.Kernel.getApp(contractName).then((address) => {
           this.addresses[contractName] = address;
@@ -66,27 +69,6 @@ class Kredits {
     return new Kredits(provider, signer, { ipfsConfig: ipfsConfig }).init();
   }
 
-  static for (connectionOptions, kreditsOptions) {
-    let { network, rpcUrl, wallet } = connectionOptions;
-    if (!rpcUrl && network === 'local') { rpcUrl = 'http://localhost:8545'; }
-    let ethProvider, signer;
-    if (rpcUrl) {
-      ethProvider = new ethers.providers.JsonRpcProvider(rpcUrl);
-    } else {
-      ethProvider = new ethers.getDefaultProvider(network);
-    }
-    if (wallet) {
-      signer = wallet.connect(ethProvider);
-    } else if (ethProvider.getSigner) {
-      signer = ethProvider.getSigner();
-    }
-    return new Kredits(ethProvider, signer, kreditsOptions);
-  }
-
-  static availableNetworks () {
-    return Object.keys(DaoAddresses);
-  }
-
   get Kernel () {
     let k = this.contractFor('Kernel');
     // in case we want to use a special apm (e.g. development vs. production)

lib/kreditskit.js

@@ -1,49 +0,0 @@
-const ethers = require('ethers');
-
-const ABI = require('./abis/KreditsKit.json');
-const Addresses = require('./addresses/KreditsKit.json');
-
-class KreditsKit {
-
-  constructor (provider, signer, options = {}) {
-    let { address, abi } = options;
-
-    this.provider = provider;
-    this.signer = signer;
-    this.options = options;
-    this.address = address;
-    this.abi = abi || ABI;
-  }
-
-  init () {
-    return this.provider.getNetwork().then((network) => {
-      this.address = this.address || Addresses[network.chainId.toString()];
-      this.contract = new ethers.Contract(
-        this.address,
-        this.abi,
-        (this.signer || this.provider)
-      );
-      return this;
-    });
-  }
-
-  appIdFor (contractName) {
-    // see appIds in KreditsKit.sol for more details
-    const knownContracts = ['Contribution', 'Contributor', 'Proposal', 'Token'];
-    return this.contract.functions.appIds(knownContracts.indexOf(contractName));
-  }
-
-  newDAO (options = {}) {
-    return this.contract.functions.newInstance(options).then(transaction => {
-      return transaction.wait().then(result => {
-        const deployEvent = result.events.find(e => e.event === 'DeployInstance');
-        return {
-          daoAddress: deployEvent.args.dao,
-          transactionHash: transaction.hash,
-        };
-      });
-    });
-  }
-}
-
-module.exports = KreditsKit;

lib/serializers/contributor.js

@@ -13,7 +13,7 @@ class Contributor {
     Object.keys(attrs).forEach(a => this[a] = attrs[a]);
   }
 
-  /**
+ /**
   * Serialize object to JSON
   *
   * @method
@@ -28,7 +28,6 @@ class Contributor {
       github_username,
       gitea_username,
       wiki_username,
-      zoom_display_name,
     } = this;
 
     let data = {
@@ -36,7 +35,7 @@ class Contributor {
       '@type': 'Contributor',
       kind,
       name,
-      accounts: [],
+      'accounts': [],
     };
 
     if (url) {
@@ -68,13 +67,6 @@ class Contributor {
       });
     }
 
-    if (zoom_display_name) {
-      data.accounts.push({
-        'site': 'zoom.us',
-        'username': zoom_display_name,
-      });
-    }
-
     // Write it pretty to ipfs
     return JSON.stringify(data, null, 2);
   }
@@ -104,11 +96,10 @@ class Contributor {
       accounts,
     } = JSON.parse(serialized.toString('utf8'));
 
-    let github_username, github_uid, gitea_username, wiki_username, zoom_display_name;
+    let github_username, github_uid, gitea_username, wiki_username;
     let github = accounts.find(a => a.site === 'github.com');
     let gitea  = accounts.find(a => a.site === 'gitea.kosmos.org');
     let wiki   = accounts.find(a => a.site === 'wiki.kosmos.org');
-    let zoom   = accounts.find(a => a.site === 'zoom.us');
 
     if (github) {
       (({ username: github_username, uid: github_uid} = github));
@@ -119,9 +110,6 @@ class Contributor {
     if (wiki) {
       (({ username: wiki_username } = wiki));
     }
-    if (zoom) {
-      (({ username: zoom_display_name } = zoom));
-    }
 
     return {
       name,
@@ -132,7 +120,6 @@ class Contributor {
       github_username,
       gitea_username,
       wiki_username,
-      zoom_display_name,
       ipfsData: serialized,
     };
   }

lib/utils/ipfs.js

@@ -1,14 +1,21 @@
 const ipfsClient = require('ipfs-http-client');
 const multihashes = require('multihashes');
-const fetch = require('node-fetch');
 
 class IPFS {
   constructor (config) {
     if (!config) {
       config = { host: 'localhost', port: '5001', protocol: 'http' };
     }
-    this._config = config;
     this._ipfsAPI = ipfsClient(config);
+    this._config = config;
+  }
+
+  get config () {
+    return this._config;
+  }
+
+  get peerId () {
+    return this._ipfsAPI.id();
   }
 
   catAndMerge (data, deserialize) {
@@ -39,19 +46,7 @@ class IPFS {
     if (hashData.hasOwnProperty('hashSize')) {
       ipfsHash = this.encodeHash(hashData);
     }
-    if (this._config['gatewayUrl']) {
+    return this._ipfsAPI.cat(ipfsHash);
-      return fetch(`${this._config['gatewayUrl']}/${ipfsHash}`).then(r => r.text());
-    } else {
-      return this._ipfsAPI.cat(ipfsHash);
-    }
-  }
-
-  pin (hashData) {
-    let ipfsHash = hashData; // default - if it is a string
-    if (hashData.hasOwnProperty('hashSize')) {
-      ipfsHash = this.encodeHash(hashData);
-    }
-    return this._ipfsAPI.pin.add(multihashes.toB58String(ipfsHash));
   }
 
   decodeHash (ipfsHash) {

lib/utils/pagination.js

@@ -4,8 +4,8 @@ function pageNumber (number, size, recordCount) {
   number = parseInt(number) || 1;
 
   // Ensure page number is in range
-  number = number > numberOfPages ? numberOfPages : number;
   number = number < 1 ? 1 : number;
+  number = number > numberOfPages ? numberOfPages : number;
 
   return number;
 }

lib/utils/preflight.js

@@ -4,22 +4,28 @@ class Preflight {
   }
 
   check () {
-    return this.kredits.ipfs._ipfsAPI.id()
+    return this.kredits.ipfs.peerId()
       .catch((error) => {
-        throw new Error(`IPFS node not available; config: ${JSON.stringify(this.kredits.ipfs.config)} - ${error.message}`);
+        const ipfsConfig = JSON.stringify(this.kredits.ipfs.config);
+        throw new Error(`IPFS node not available; config: ${ipfsConfig} - ${error.message}`);
       })
       .then(() => {
         let promises = Object.keys(this.kredits.contracts).map((name) => {
-          let contractWrapper = this.kredits.contracts[name];
+          let address = this.kredits.contracts[name].contract.address;
-          return this.kredits.provider.getCode(contractWrapper.contract.address).then((code) => {
+
+          // TODO: I think this throws the error: Error: contract not deployed
+          // I guess we don't need that if check anymore...
+          return this.kredits.provider.getCode(address).then((code) => {
             // not sure if we always get the same return value if the code is not available
             // so checking if it is < 5 long
             if (code === '0x00' || code.length < 5) {
-              throw new Error(`Contract for: ${name} not found at ${contractWrapper.contract.address} on network ${this.kredits.provider.chainId}`);
+              throw new Error(`Contract for: ${name} not found at ${address} on network ${this.kredits.networkId}`);
             }
+
             return true;
           });
         });
+
         return Promise.all(promises);
       });
   }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kredits-contracts",
-  "version": "5.4.0",
+  "version": "5.3.0",
   "description": "Ethereum contracts and npm wrapper for Kredits",
   "main": "./lib/kredits.js",
   "directories": {
@@ -8,28 +8,22 @@
   },
   "scripts": {
     "install-all": "./scripts/every-app.sh \"npm install\"",
-    "postshrinkwrap": "node scripts/fix-package-lock.js &>/dev/null || true",
     "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": "truffle compile --all",
+    "compile-contracts": "aragon contracts compile --all",
     "bootstrap": "npm run reset:hard && npm run seeds",
     "reset": "npm run deploy:kit && npm run deploy:dao",
     "reset:hard": "npm run deploy:apps && npm run reset",
-    "deploy:kit": "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 --propagate-content=false --build=false --prepublish=false --skip-confirmation\"",
+    "deploy:apps": "./scripts/every-app.sh \"aragon apm publish major\"",
     "devchain": "aragon devchain --port 7545",
     "dao:address": "truffle exec scripts/current-address.js",
     "lint:contracts": "solhint \"contracts/**/*.sol\" \"apps/*/contracts/**/*.sol\"",
     "lint:contract-tests": "eslint apps/*/test",
     "lint:wrapper": "eslint lib/",
-    "test": "npm run test:token && npm run test:contributor && npm run test:contribution && npm run test:proposal",
+    "test": "echo \"Error: no test specified\" && exit 1"
-    "test:token": "cd apps/token && npm run test",
-    "test:contributor": "cd apps/contributor && npm run test",
-    "test:contribution": "cd apps/contribution && npm run test",
-    "test:proposal": "cd apps/proposal && npm run test",
-    "setup-git-hooks": "sh scripts/git-hooks/install"
   },
   "repository": {
     "type": "git",
@@ -42,25 +36,24 @@
   },
   "homepage": "https://github.com/67P/truffle-kredits#readme",
   "devDependencies": {
+    "@aragon/cli": "^5.5.0",
     "@aragon/kits-base": "^1.0.0",
-    "@aragon/os": "^4.2.0",
+    "@aragon/os": "^4.1.0",
     "async-each-series": "^1.1.0",
-    "cli-table": "^0.3.1",
     "eslint": "^5.16.0",
-    "eslint-plugin-import": "^2.17.3",
+    "eslint-plugin-import": "^2.16.0",
     "eslint-plugin-node": "^8.0.1",
     "eslint-plugin-promise": "^4.1.1",
     "eth-provider": "^0.2.2",
+    "openzeppelin-solidity": "^2.2.0",
     "promptly": "^3.0.3",
-    "solc": "^0.4.26",
+    "solc": "^0.4.25",
-    "solhint": "^2.1.0",
+    "solhint": "^2.0.0"
-    "yargs": "^12.0.0"
   },
   "dependencies": {
-    "ethers": "^4.0.29",
+    "ethers": "^4.0.27",
-    "ipfs-http-client": "^30.1.3",
+    "ipfs-http-client": "^30.1.1",
-    "kosmos-schemas": "^2.1.0",
+    "kosmos-schemas": "^2.0.0",
-    "node-fetch": "^2.6.0",
     "tv4": "^1.3.0"
   },
   "keywords": [

scripts/claim-contributions.js

@@ -1,53 +0,0 @@
-const promptly = require('promptly');
-const Table = require('cli-table');
-
-const initKredits = require('./helpers/init_kredits.js');
-
-module.exports = async function(callback) {
-  let kredits;
-  try {
-    kredits = await initKredits(web3);
-  } catch(e) {
-    callback(e);
-    return;
-  }
-
-  console.log(`Using Contribution at: ${kredits.Contribution.contract.address}`);
-
-  let recipient = await promptly.prompt('Contributor ID: ');
-  recipient = parseInt(recipient);
-
-  const table = new Table({
-    head: ['ID', 'Description', 'Amount', 'Claim Transaction'],
-  });
-
-  try {
-    let blockNumber = await kredits.provider.getBlockNumber();
-    let contributions = await kredits.Contribution.all({page: {size: 200}});
-
-    console.log(`Current block number: ${blockNumber}`);
-    let claimPromises = contributions.map(async (c) => {
-      const confirmed = c.confirmedAtBlock <= blockNumber;
-
-      if (c.contributorId === recipient && confirmed && !c.vetoed && !c.claimed) {
-        console.log(`Claiming contribution ID=${c.id}`);
-        return kredits.Contribution.functions.claim(c.id, { gasLimit: 500000 }).then(tx => {
-          table.push([
-            c.id.toString(),
-            `${c.description}`,
-            c.amount.toString(),
-            tx.hash,
-          ]);
-        });
-      }
-    });
-
-    Promise.all(claimPromises).then(_ => {
-      console.log(table.toString());
-      callback();
-    });
-  } catch (err) {
-    console.log(err);
-    callback();
-  }
-};

scripts/deploy-kit.js

@@ -35,9 +35,7 @@ module.exports = async function(callback) {
   }
   console.log(`Using DAOFactory at: ${daoFactory.address}`)
 
-  const apps = fs.readdirSync('./apps', { withFileTypes: true })
+  const apps = fs.readdirSync('./apps')
-                 .filter(e => e.isDirectory())
-                 .map(e => e.name);
   console.log(`Found apps: [${apps}].${apm}`)
   let appIds = {}
   apps.sort().forEach((app) => {

scripts/fix-package-lock.js

@@ -1,47 +0,0 @@
-#!/usr/bin/env node
-
-// whatever npm does?! and for whatever this is needed..
-// https://github.com/aragon/aragon-cli/blob/master/packages/aragon-cli/scripts/fix-lockfile
-// https://github.com/aragon/aragon-cli/blob/master/docs-internal/Dependencies.md#regenerate-the-lockfiles
-
-const fs = require('fs')
-const path = require('path')
-
-function replaceAll(string, mapObject) {
-  const regex = new RegExp(Object.keys(mapObject).join('|'), 'gi')
-  let occurrences = 0
-  const result = string.replace(regex, matched => {
-    occurrences++
-    return mapObject[matched]
-  })
-  console.log(`[fix-lockfile] Replaced ${occurrences} occurrences.`)
-  return result
-}
-async function fixLockfile(path, replacementMap) {
-  const originalJson = require(path)
-  const originalText = JSON.stringify(originalJson, null, 2)
-  const fixedText = replaceAll(originalText, replacementMap)
-  const fixedJson = JSON.parse(fixedText)
-  console.log('writing file', path);
-  await fs.writeFileSync(path, JSON.stringify(fixedJson, null, 2))
-}
-//
-
-const LOCKFILE_PATH = path.join(__dirname, '..', 'package-lock.json')
-
-const replacementMap = {
-  //
-  '"version": "github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c"':
-    '"version": "0.2.3"',
-  //
-  '"from": "github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c"':
-    '"resolved": "github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c"',
-  //
-  '"from": "async-eventemitter@github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c"':
-    '"resolved": "github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c"',
-  //
-  '"async-eventemitter": "async-eventemitter@github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c"':
-    '"async-eventemitter": "github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c"',
-}
-
-fixLockfile(LOCKFILE_PATH, replacementMap)

scripts/git-hooks/install

@@ -1,2 +0,0 @@
-#!/bin/sh
-cp -f scripts/git-hooks/pre-commit .git/hooks

scripts/git-hooks/pre-commit

@@ -1,17 +0,0 @@
-#!/bin/sh
-#
-# Run appropriate linter against staged files
-#
-if [ $(git diff --name-only --cached lib/ | wc -l) != 0 ]; then
-  ./node_modules/.bin/eslint lib/
-  if [ $? != 0 ]; then
-    exit 1
-  fi
-fi
-# TODO master not linted yet, uncomment this when ready
-# if [ $(git diff --name-only --cached contracts/ | wc -l) != 0 ]; then
-#   solhint contracts/**/*.sol && apps/*/contracts/**/*.sol
-#   if [ $? != 0 ]; then
-#     exit 1
-#   fi
-# fi

scripts/list-contributions.js

@@ -20,9 +20,8 @@ module.exports = async function(callback) {
 
   try {
     let blockNumber = await kredits.provider.getBlockNumber();
-    let contributions = await kredits.Contribution.all({page: {size: 1000}});
+    let contributions = await kredits.Contribution.all();
 
-    let kreditsSum = 0;
     console.log(`Current block number: ${blockNumber}`);
     contributions.forEach((c) => {
       const confirmed = c.confirmedAtBlock <= blockNumber;
@@ -41,9 +40,8 @@ module.exports = async function(callback) {
 
     console.log(table.toString());
 
-    let totalKreditsEarnedUnConfirmed = await kredits.Contribution.functions.totalKreditsEarned(false);
+    let totalKreditsEarned = await kredits.Contribution.functions.totalKreditsEarned(true);
-    let totalKreditsEarnedConfirmed = await kredits.Contribution.functions.totalKreditsEarned(true);
+    console.log(`Total confirmed kredits: ${totalKreditsEarned}`);
-    console.log(`Total Kredits: ${totalKreditsEarnedConfirmed} (confirmed) | ${totalKreditsEarnedUnConfirmed} (including unconfirmed)`);
   } catch (err) {
     console.log(err);
   }

scripts/new-dao.js

@@ -1,13 +1,13 @@
 const fs = require('fs');
 const path = require('path');
 
-const ethers = require('ethers');
 const fileInject = require('./helpers/file_inject.js');
 const getNetworkId = require('./helpers/networkid.js');
-const KreditsKit = require('../lib/kreditskit');
 
 const addressesPath = path.join(__dirname, '..', 'lib/addresses');
 
+const KreditsKit = artifacts.require('KreditsKit')
+
 module.exports = async function(callback) {
   const networkId = await getNetworkId(web3)
   console.log(`Deploying to networkId: ${networkId}`)
@@ -20,21 +20,25 @@ module.exports = async function(callback) {
   }
   console.log(`Using KreditsKit at: ${kreditsKitAddress}`);
 
-  const provider = new ethers.providers.Web3Provider(web3.currentProvider);
+  let kreditsKit = KreditsKit.at(kreditsKitAddress)
-  let signer = provider.getSigner();
 
-  let kit = await new KreditsKit(provider, signer).init()
+  kreditsKit.newInstance().then((ret) => {
+    console.log(ret.logs);
+    const installedEvents = ret.logs.filter(log => log.event === 'InstalledApp').map(log => log.args)
+    const deployEvents = ret.logs.filter(log => log.event === 'DeployInstance').map(log => log.args)
 
-  // TODO: get rid of the hard coded gas limit
+    if (deployEvents.length > 1) {
-  kit.newDAO({ gasLimit: 10000000 }).then(result => {
+      callback(new Error("More than one DAO was deployed. Something is wrong"))
-    console.log(result);
+    }
-    fileInject(path.join(addressesPath, 'dao.json'), networkId, result.daoAddress)
+    const daoAddress = deployEvents[0].dao;
 
-    console.log(`\n\nCreated new DAO at: ${result.daoAddress}`)
+    fileInject(path.join(addressesPath, 'dao.json'), networkId, daoAddress)
+
+    console.log(`\n\nCreated new DAO at: ${daoAddress}`)
 
     callback();
   }).catch((err) => {
-    console.log('failed to create a new DAO')
+    console.log('failed to create a new instance')
     callback(err)
   })
 }

scripts/seeds.js

@@ -17,18 +17,13 @@ module.exports = async function(callback) {
   let fundingAmount = 2;
   each(seeds.funds, (address, next) => {
     console.log(`funding ${address} with 2 ETH`);
-    try {
+    web3.eth.sendTransaction({
-      web3.eth.personal.getAccounts().then(accounts => {
+      to: address,
-        web3.eth.personal.sendTransaction({
+      value: web3.toWei(fundingAmount),
-          to: address,
+      from: web3.eth.accounts[0]
-          from: accounts[0],
+    },
-          value: web3.utils.toWei(new web3.utils.BN(fundingAmount))
+    (result) => { next(); }
-        });
+    )
-      });
-    } catch(e) {
-      console.log('FAILED:', e);
-    }
-    next();
   });
 
   each(seeds.contractCalls, (call, next) => {

scripts/send-funds.js

@@ -5,8 +5,7 @@ module.exports = async function(callback) {
   let amount = await promptly.prompt('Amount: ', {default: '1'});
   amount = parseInt(amount);
 
-  const accounts = await web3.eth.personal.getAccounts();
+  let fromAccount = web3.eth.accounts[0];
-  let fromAccount = accounts[0];
   let fromBalance = await web3.eth.getBalance(fromAccount);
   let recipientBalance = await web3.eth.getBalance(recipient);
 
@@ -14,11 +13,11 @@ module.exports = async function(callback) {
   console.log(`sender account balance ${fromAccount}: ${fromBalance}`);
   console.log(`recipient account balance ${recipient}: ${recipientBalance}`);
 
-  console.log(`\nsending ${amount} ETH from ${accounts[0]} to ${recipient}`);
+  console.log(`\nsending ${amount} ETH from ${web3.eth.accounts[0]} to ${recipient}`);
 
-  let transaction = await web3.eth.sendTransaction({to: recipient, value: web3.utils.toWei(new web3.utils.BN(amount)), from: accounts[0]});
+  let transaction = await web3.eth.sendTransaction({to: recipient, value: web3.toWei(amount), from: web3.eth.accounts[0]});
 
-  console.log(`transaction id: ${transaction.transactionHash}`);
+  console.log(`transaction id: ${transaction}`);
 
   recipientBalance = await web3.eth.getBalance(recipient);
   console.log(`\nnew recipient account balance ${recipient}: ${recipientBalance}`);

scripts/veto-contribution.js

@@ -1,32 +0,0 @@
-const promptly = require('promptly');
-const { inspect } = require('util');
-
-const initKredits = require('./helpers/init_kredits.js');
-
-module.exports = async function(callback) {
-  let kredits;
-  try { kredits = await initKredits(web3);
-  } catch(e) { callback(e); return; }
-
-  console.log(`Using Contributions at: ${kredits.Contribution.contract.address}\n`);
-
-  let contributionId = await promptly.prompt('Contribution ID: ');
-
-  console.log(`Recording a veto for contribution #${contributionId}`);
-
-  try {
-    kredits.Contribution.functions.veto(contributionId, { gasLimit: 300000 })
-      .then(result => {
-        console.log("\n\nResult:");
-        console.log(result);
-        callback();
-      })
-      .catch(error => {
-        console.log('Failed to veto contribution');
-        callback(inspect(error));
-      });
-  } catch(err) {
-    console.log('Failed to veto contribution');
-    callback(inspect(err));
-  }
-}