5.5.0

2019-09-20 10:55:22 +02:00
76 changed files with 99523 additions and 50229 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-data
 build
 flattened_contracts
 node_modules
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +0,0 @@
-12
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 ---
 language: node_js
 node_js:
-  - "12"
+  - "lts/*"

 sudo: false
 dist: xenial
@@ -22,16 +22,11 @@ install:

 before_script:
  - npm run devchain &
-  - sleep 10

 script:
  - npm run lint:wrapper
  - npm run lint:contract-tests
-  # FIXME Fix tests
-  # - npm run test:token
-  # - npm run test:contributor
-  # - npm run test:contribution
-  # - npm run test:proposal
+  - npm run test

 branches:
  only:
--- a/README.md
+++ b/README.md
@@ -34,9 +34,6 @@ Aragon CLI and Truffle need to be installed on your sytem as well:
    npm install -g @aragon/cli
    npm install -g truffle

-_Note: `@aragon/cli` currently fails to install on node.js 14. Please use
-node.js 12 until the issue has been resolved upstream._
-
 ### Local development chain

 For local development it is recommended to use
@@ -66,26 +63,21 @@ if you want to increase the block time to 10 seconds you can add
        $ npm run devchain
        $ ipfs daemon

-2. Compile contracts
-
-        (compiled contracts will be in `/build`)
-        $ npm run compile-contracts
-
-3. Deploy each app to the devchain
+2. Deploy each app to the devchain

        (make sure you've run `npm install` for every app - see installation)
        $ npm run deploy:apps

-4. Deploy a new KreditsKit and create a new DAO with the latest app versions
+3. Deploy a new KreditsKit and create a new DAO with the latest app versions

        $ npm run deploy:kit
        $ npm run deploy:dao

-5. Execute seeds to create demo contributors, contributions, etc. (optional)
+4. Execute seeds to create demo contributors, contributions, etc. (optional)

        $ npm run seeds

-**Step 2-5 is also summarized in `npm run bootstrap`**
+**Step 2-4 is also summarized in `npm run bootstrap`**

 If you want to reset your local setup:

@@ -173,14 +165,8 @@ Deploys a new KreditsKit that allows to create a new DAO
    or
    $ npm run deploy:kit

-#### Kredits configuration options:
-
-Configuration options can be set in an environment specific `kredits` object in the `arapp.json` or using a CLI parameter.
-
-* daoFactory: Ethereum address of the used DAO Factory. On public networks we use [official aragon factories](https://github.com/aragon/deployments/tree/master/environments/)
-* apmDomain: the ENS domain of the aragonPM (normally `open.aragonpm.eth`)
-
-(please also see the [arapp.json related configuration options](https://hack.aragon.org/docs/cli-global-confg#the-arappjson-file))
+`ENS` address is required as environment variable.
+`DAO_FACTORY` can optionally be set as environment variable. (see aragon)

 ### new-dao.js

--- a/apps/contribution/contracts/Contribution.sol
+++ b/apps/contribution/contracts/Contribution.sol
@@ -21,8 +21,8 @@ contract Contribution is AragonApp {
  bytes32 public constant KERNEL_APP_ADDR_NAMESPACE = 0xd6f028ca0e8edb4a8c9757ca4fdccab25fa1e0317da1188108f7d2dee14902fb;

  // ensure alphabetic order
-  enum Apps { Contribution, Contributor, Proposal, Reimbursement, Token }
-  bytes32[5] public appIds;
+  enum Apps { Contribution, Contributor, Proposal, Token }
+  bytes32[4] public appIds;

  struct ContributionData {
    uint32 contributorId;
@@ -54,7 +54,7 @@ contract Contribution is AragonApp {
  event ContributionClaimed(uint32 id, uint32 indexed contributorId, uint32 amount);
  event ContributionVetoed(uint32 id, address vetoedByAccount);

-  function initialize(bytes32[5] _appIds) public onlyInit {
+  function initialize(bytes32[4] _appIds) public onlyInit {
    appIds = _appIds;
    blocksToWait = 40320; // 7 days; 15 seconds block time
    initialized();
@@ -66,13 +66,13 @@ contract Contribution is AragonApp {
  }

  function getContributorIdByAddress(address contributorAccount) public view returns (uint32) {
-    address contributorContract = getContract(uint8(Apps.Contributor));
-    return ContributorInterface(contributorContract).getContributorIdByAddress(contributorAccount);
+    address contributor = getContract(uint8(Apps.Contributor));
+    return ContributorInterface(contributor).getContributorIdByAddress(contributorAccount);
  }

  function getContributorAddressById(uint32 contributorId) public view returns (address) {
-    address contributorContract = getContract(uint8(Apps.Contributor));
-    return ContributorInterface(contributorContract).getContributorAddressById(contributorId);
+    address contributor = getContract(uint8(Apps.Contributor));
+    return ContributorInterface(contributor).getContributorAddressById(contributorId);
  }

  //
@@ -164,7 +164,7 @@ contract Contribution is AragonApp {
    if (contributionId < 10) {
      c.confirmedAtBlock = block.number;
    } else {
-      c.confirmedAtBlock = block.number + 1 + blocksToWait;
+      c.confirmedAtBlock = block.number + blocksToWait;
    }

    contributionsCount++;
@@ -193,10 +193,10 @@ contract Contribution is AragonApp {
    require(block.number >= c.confirmedAtBlock, 'NOT_CLAIMABLE');

    c.claimed = true;
-    address tokenContract = getContract(uint8(Apps.Token));
+    address token = getContract(uint8(Apps.Token));
    address contributorAccount = getContributorAddressById(c.contributorId);
    uint256 amount = uint256(c.amount);
-    IToken(tokenContract).mintFor(contributorAccount, amount, contributionId);
+    IToken(token).mintFor(contributorAccount, amount, contributionId);
    emit ContributionClaimed(contributionId, c.contributorId, c.amount);
  }

--- a/apps/contribution/package-lock.json
+++ b/apps/contribution/package-lock.json
--- a/apps/contribution/package.json
+++ b/apps/contribution/package.json
@@ -3,12 +3,13 @@
  "version": "1.0.0",
  "description": "",
  "dependencies": {
-    "@aragon/os": "^4.4.0"
+    "@aragon/os": "^4.2.0",
+    "@aragon/cli": "^5.9.6"
  },
  "devDependencies": {
-    "@aragon/test-helpers": "^2.1.0",
-    "eth-gas-reporter": "^0.2.17",
-    "ganache-cli": "^6.9.1",
+    "@aragon/test-helpers": "^2.0.0",
+    "eth-gas-reporter": "^0.2.0",
+    "ganache-cli": "^6.4.3",
    "solidity-coverage": "^0.5.11"
  },
  "scripts": {
@@ -25,7 +26,7 @@
    "publish:minor": "aragon apm publish minor",
    "publish:major": "aragon apm publish major",
    "versions": "aragon apm versions",
-    "test": "truffle test"
+    "test": "aragon contracts test"
  },
  "keywords": []
 }
--- a/apps/contributor/contracts/Contributor.sol
+++ b/apps/contributor/contracts/Contributor.sol
@@ -28,14 +28,14 @@ contract Contributor is AragonApp {
  uint32 public contributorsCount;

  // ensure alphabetic order
-  enum Apps { Contribution, Contributor, Proposal, Reimbursement, Token }
-  bytes32[5] public appIds;
+  enum Apps { Contribution, Contributor, Proposal, Token }
+  bytes32[4] public appIds;

  event ContributorProfileUpdated(uint32 id, bytes32 oldHashDigest, bytes32 newHashDigest); // what should be logged
  event ContributorAccountUpdated(uint32 id, address oldAccount, address newAccount);
  event ContributorAdded(uint32 id, address account);

-  function initialize(address root, bytes32[5] _appIds) public onlyInit {
+  function initialize(address root,bytes32[4] _appIds) public onlyInit {
    appIds = _appIds;

    initialized();
--- a/apps/contributor/package-lock.json
+++ b/apps/contributor/package-lock.json
--- a/apps/contributor/package.json
+++ b/apps/contributor/package.json
@@ -3,13 +3,14 @@
  "version": "1.0.0",
  "description": "",
  "dependencies": {
-    "@aragon/os": "^4.4.0"
+    "@aragon/os": "^4.2.0",
+    "@aragon/cli": "^5.9.6"
  },
  "devDependencies": {
-    "@aragon/test-helpers": "^2.1.0",
-    "eth-gas-reporter": "^0.2.17",
-    "ganache-cli": "^6.9.1",
-    "solidity-coverage": "^0.5.11"
+    "eth-gas-reporter": "^0.2.0",
+    "ganache-cli": "^6.4.3",
+    "solidity-coverage": "^0.5.11",
+    "@aragon/test-helpers": "^2.0.0"
  },
  "scripts": {
    "start": "npm run start:aragon:ipfs",
@@ -25,7 +26,7 @@
    "publish:minor": "aragon apm publish minor",
    "publish:major": "aragon apm publish major",
    "versions": "aragon apm versions",
-    "test": "truffle test"
+    "test": "aragon contracts test"
  },
  "keywords": []
 }
--- a/apps/contributor/test/contributor.js
+++ b/apps/contributor/test/contributor.js
@@ -21,8 +21,8 @@ contract('Contributor app', (accounts) => {
    aclBase = await getContract('ACL').new();
    daoFactory = await getContract('DAOFactory').new(kernelBase.address, aclBase.address, ZERO_ADDR);
    r = await daoFactory.newDAO(root);
-    dao = await getContract('Kernel').at(r.logs.filter(l => l.event == 'DeployDAO')[0].args.dao);
-    acl = await getContract('ACL').at(await dao.acl());
+    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(
@@ -63,7 +63,7 @@ contract('Contributor app', (accounts) => {
      root,
      { from: root }
    );
-
+  
  });

  describe("Owner default permissions", async () => {
@@ -71,7 +71,7 @@ contract('Contributor app', (accounts) => {
      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 () => {
--- a/apps/proposal/contracts/Proposal.sol
+++ b/apps/proposal/contracts/Proposal.sol
@@ -20,8 +20,8 @@ contract Proposal is AragonApp {

  bytes32 public constant KERNEL_APP_ADDR_NAMESPACE = 0xd6f028ca0e8edb4a8c9757ca4fdccab25fa1e0317da1188108f7d2dee14902fb;
  // ensure alphabetic order
-  enum Apps { Contribution, Contributor, Proposal, Reimbursement, Token }
-  bytes32[5] public appIds;
+  enum Apps { Contribution, Contributor, Proposal, Token }
+  bytes32[4] public appIds;

  struct Proposal {
    address creatorAccount;
@@ -46,7 +46,7 @@ contract Proposal is AragonApp {
  event ProposalVoted(uint32 id, uint32 voterId, uint16 totalVotes);
  event ProposalExecuted(uint32 id, uint32 contributorId, uint32 amount);

-  function initialize(bytes32[5] _appIds) public onlyInit {
+  function initialize(bytes32[4] _appIds) public onlyInit {
    appIds = _appIds;
    initialized();
  }
--- a/apps/proposal/package-lock.json
+++ b/apps/proposal/package-lock.json
--- a/apps/proposal/package.json
+++ b/apps/proposal/package.json
@@ -3,12 +3,13 @@
  "version": "1.0.0",
  "description": "",
  "dependencies": {
-    "@aragon/os": "^4.4.0"
+    "@aragon/os": "^4.2.0",
+    "@aragon/cli": "^5.9.6"
  },
  "devDependencies": {
-    "@aragon/test-helpers": "^2.1.0",
-    "eth-gas-reporter": "^0.2.17",
-    "ganache-cli": "^6.9.1",
+    "@aragon/test-helpers": "^2.0.0",
+    "eth-gas-reporter": "^0.2.0",
+    "ganache-cli": "^6.4.3",
    "solidity-coverage": "^0.5.11"
  },
  "scripts": {
@@ -25,7 +26,7 @@
    "publish:minor": "aragon apm publish minor",
    "publish:major": "aragon apm publish major",
    "versions": "aragon apm versions",
-    "test": "truffle test"
+    "test": "aragon contracts test"
  },
  "keywords": []
 }
--- a/apps/reimbursement/.gitattributes
+++ b/apps/reimbursement/.gitattributes
@@ -1 +0,0 @@
-*.sol linguist-language=Solidity
--- a/apps/reimbursement/.gitignore
+++ b/apps/reimbursement/.gitignore
@@ -1,7 +0,0 @@
-node_modules
-artifacts
-.cache
-cache
-dist
-ipfs.cmd
-package-lock.json
--- a/apps/reimbursement/arapp.json
+++ b/apps/reimbursement/arapp.json
@@ -1,34 +0,0 @@
-{
-  "roles": [
-    {
-      "name": "Add reimursements",
-      "id": "ADD_REIMBURSEMENT_ROLE",
-      "params": []
-    },
-    {
-      "name": "Veto reimbursement",
-      "id": "VETO_REIMBURSEMENT_ROLE",
-      "params": []
-    }
-  ],
-  "environments": {
-    "default": {
-      "network": "development",
-      "appName": "kredits-reimbursement.open.aragonpm.eth"
-    },
-    "rinkeby": {
-      "registry": "0x98df287b6c145399aaa709692c8d308357bc085d",
-      "appName": "kredits-reimbursement.open.aragonpm.eth",
-      "wsRPC": "wss://rinkeby.eth.aragon.network/ws",
-      "network": "rinkeby"
-    },
-    "production": {
-      "registry": "0x314159265dd8dbb310642f98f50c066173c1259b",
-      "appName": "kredits-reimbursement.aragonpm.eth",
-      "wsRPC": "wss://mainnet.eth.aragon.network/ws",
-      "network": "mainnet"
-    }
-  },
-  "appName": "kredits-reimbursement.aragonpm.eth",
-  "path": "contracts/Reimbursement.sol"
-}
--- a/apps/reimbursement/buidler.config.js
+++ b/apps/reimbursement/buidler.config.js
@@ -1,34 +0,0 @@
-const { usePlugin } = require('@nomiclabs/buidler/config')
-const hooks = require('./scripts/buidler-hooks')
-
-usePlugin('@aragon/buidler-aragon')
-
-module.exports = {
-  // Default Buidler configurations. Read more about it at https://buidler.dev/config/
-  defaultNetwork: 'localhost',
-  networks: {
-    localhost: {
-      url: 'http://localhost:8545',
-    },
-  },
-  solc: {
-    version: '0.4.24',
-    optimizer: {
-      enabled: true,
-      runs: 10000,
-    },
-  },
-  // Etherscan plugin configuration. Learn more at https://github.com/nomiclabs/buidler/tree/master/packages/buidler-etherscan
-  etherscan: {
-    apiKey: '', // API Key for smart contract verification. Get yours at https://etherscan.io/apis
-  },
-  // Aragon plugin configuration
-  aragon: {
-    appServePort: 8001,
-    clientServePort: 3000,
-    appSrcPath: 'app/',
-    appBuildOutputPath: 'dist/',
-    appName: 'expenses',
-    hooks, // Path to script hooks
-  },
-}
--- a/apps/reimbursement/contracts/Reimbursement.sol
+++ b/apps/reimbursement/contracts/Reimbursement.sol
@@ -1,94 +0,0 @@
-pragma solidity ^0.4.24;
-
-import "@aragon/os/contracts/apps/AragonApp.sol";
-import "@aragon/os/contracts/kernel/IKernel.sol";
-
-contract Reimbursement is AragonApp {
-  bytes32 public constant ADD_REIMBURSEMENT_ROLE = keccak256("ADD_REIMBURSEMENT_ROLE");
-  bytes32 public constant VETO_REIMBURSEMENT_ROLE = keccak256("VETO_REIMBURSEMENT_ROLE");
-  // bytes32 public constant MANAGE_APPS_ROLE = keccak256("MANAGE_APPS_ROLE");
-
-  struct ReimbursementData {
-    uint32 recipientId;
-    uint256 amount;
-    address token;
-    bytes32 hashDigest;
-    uint8 hashFunction;
-    uint8 hashSize;
-    uint256 confirmedAtBlock;
-    bool vetoed;
-    bool exists;
-  }
-
-  mapping(uint32 => ReimbursementData) public reimbursements;
-  uint32 public reimbursementsCount;
-
-  uint32 public blocksToWait;
-
-  event ReimbursementAdded(uint32 id, address indexed addedByAccount, uint256 amount);
-  event ReimbursementVetoed(uint32 id, address vetoedByAccount);
-
-  function initialize() public onlyInit {
-    blocksToWait = 40320; // 7 days; 15 seconds block time
-    initialized();
-  }
-
-  // function setApps() public isInitialized auth(MANAGE_APPS_ROLE) {
-  // }
-
-  function totalAmount(bool confirmedOnly) public view returns (uint256 amount) {
-    for (uint32 i = 1; i <= reimbursementsCount; i++) {
-      ReimbursementData memory r = reimbursements[i];
-      if (!r.vetoed && (block.number >= r.confirmedAtBlock || !confirmedOnly)) {
-        amount += r.amount; // should use safemath
-      }
-    }
-  }
-
-  function get(uint32 reimbursementId) public view returns (uint32 id, uint32 recipientId, uint256 amount, address token, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize, uint256 confirmedAtBlock, bool exists, bool vetoed) {
-    id = reimbursementId;
-    ReimbursementData storage r = reimbursements[id];
-    return (
-      id,
-      r.recipientId,
-      r.amount,
-      r.token,
-      r.hashDigest,
-      r.hashFunction,
-      r.hashSize,
-      r.confirmedAtBlock,
-      r.exists,
-      r.vetoed
-    );
-  }
-
-  function add(uint256 amount, address token, uint32 recipientId, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize) public isInitialized auth(ADD_REIMBURSEMENT_ROLE) {
-    uint32 reimbursementId = reimbursementsCount + 1;
-    ReimbursementData storage r = reimbursements[reimbursementId];
-    r.exists = true;
-    r.amount = amount;
-    r.token = token;
-    r.recipientId = recipientId;
-    r.hashDigest = hashDigest;
-    r.hashFunction = hashFunction;
-    r.hashSize = hashSize;
-    r.confirmedAtBlock = block.number + blocksToWait;
-
-    reimbursementsCount++;
-
-    emit ReimbursementAdded(reimbursementId, msg.sender, amount);
-  }
-
-  function veto(uint32 reimbursementId) public isInitialized auth(VETO_REIMBURSEMENT_ROLE) {
-    ReimbursementData storage r = reimbursements[reimbursementId];
-    require(r.exists, 'NOT_FOUND');
-    require(block.number < r.confirmedAtBlock, 'VETO_PERIOD_ENDED');
-    r.vetoed = true;
-
-    emit ReimbursementVetoed(reimbursementId, msg.sender);
-  }
-
-  function exists(uint32 reimbursementId) public view returns (bool) {
-    return reimbursements[reimbursementId].exists;
-  }
-}
--- a/apps/reimbursement/manifest.json
+++ b/apps/reimbursement/manifest.json
@@ -1,16 +0,0 @@
-{
-  "name": "kredits Reimbursement",
-  "author": "Placeholder-author",
-  "description": "An application for Aragon",
-  "details_url": "/meta/details.md",
-  "source_url": "https://<placeholder-repository-url>",
-  "icons": [
-    {
-      "src": "/meta/icon.svg",
-      "sizes": "56x56"
-    }
-  ],
-  "screenshots": [{ "src": "/meta/screenshot-1.png" }],
-  "start_url": "/index.html",
-  "script": "/script.js"
-}
--- a/apps/reimbursement/package.json
+++ b/apps/reimbursement/package.json
@@ -1,30 +0,0 @@
-{
-  "name": "kredits-reimbursement",
-  "version": "1.0.0",
-  "description": "",
-  "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": "",
-    "compile": "aragon contracts compile",
-    "sync-assets": "",
-    "build:app": "",
-    "build:script": "",
-    "build": "",
-    "publish:patch": "aragon apm publish patch",
-    "publish:minor": "aragon apm publish minor",
-    "publish:major": "aragon apm publish major",
-    "versions": "aragon apm versions",
-    "test": "truffle test"
-  },
-  "dependencies": {
-    "@aragon/os": "^4.4.0"
-  },
-  "devDependencies": {
-    "@aragon/test-helpers": "^2.1.0",
-    "eth-gas-reporter": "^0.2.17",
-    "ganache-cli": "^6.9.1",
-    "solidity-coverage": "^0.5.11"
-  }
-}
--- a/apps/reimbursement/test/helpers/dao.js
+++ b/apps/reimbursement/test/helpers/dao.js
@@ -1,65 +0,0 @@
-/*
-
-const { hash } = require('eth-ens-namehash')
-const { getEventArgument } = require('@aragon/contract-test-helpers/events')
-const Kernel = artifacts.require('@aragon/os/build/contracts/kernel/Kernel')
-const ACL = artifacts.require('@aragon/os/build/contracts/acl/ACL')
-const EVMScriptRegistryFactory = artifacts.require(
-  '@aragon/os/build/contracts/factory/EVMScriptRegistryFactory'
-)
-const DAOFactory = artifacts.require(
-  '@aragon/os/build/contracts/factory/DAOFactory'
-)
-
-const newDao = async (rootAccount) => {
-  // Deploy a DAOFactory.
-  const kernelBase = await Kernel.new(true)
-  const aclBase = await ACL.new()
-  const registryFactory = await EVMScriptRegistryFactory.new()
-  const daoFactory = await DAOFactory.new(
-    kernelBase.address,
-    aclBase.address,
-    registryFactory.address
-  )
-
-  // Create a DAO instance.
-  const daoReceipt = await daoFactory.newDAO(rootAccount)
-  const dao = await Kernel.at(getEventArgument(daoReceipt, 'DeployDAO', 'dao'))
-
-  // Grant the rootAccount address permission to install apps in the DAO.
-  const acl = await ACL.at(await dao.acl())
-  const APP_MANAGER_ROLE = await kernelBase.APP_MANAGER_ROLE()
-  await acl.createPermission(
-    rootAccount,
-    dao.address,
-    APP_MANAGER_ROLE,
-    rootAccount,
-    { from: rootAccount }
-  )
-
-  return { dao, acl }
-}
-
-const newApp = async (dao, appName, baseAppAddress, rootAccount) => {
-  const receipt = await dao.newAppInstance(
-    hash(`${appName}.aragonpm.test`), // appId - Unique identifier for each app installed in the DAO; can be any bytes32 string in the tests.
-    baseAppAddress, // appBase - Location of the app's base implementation.
-    '0x', // initializePayload - Used to instantiate and initialize the proxy in the same call (if given a non-empty bytes string).
-    false, // setDefault - Whether the app proxy is the default proxy.
-    { from: rootAccount }
-  )
-
-  // Find the deployed proxy address in the tx logs.
-  const logs = receipt.logs
-  const log = logs.find((l) => l.event === 'NewAppProxy')
-  const proxyAddress = log.args.proxy
-
-  return proxyAddress
-}
-
-module.exports = {
-  newDao,
-  newApp,
-}
-
-*/
--- a/apps/reimbursement/test/helpers/permissions.js
+++ b/apps/reimbursement/test/helpers/permissions.js
@@ -1,21 +0,0 @@
-/*
-
-const ANY_ADDRESS = '0xffffffffffffffffffffffffffffffffffffffff'
-
-const setOpenPermission = async (acl, appAddress, role, rootAddress) => {
-  // Note: Setting a permission to 0xffffffffffffffffffffffffffffffffffffffff
-  // is interpreted by aragonOS as allowing the role for any address.
-  await acl.createPermission(
-    ANY_ADDRESS, // entity (who?) - The entity or address that will have the permission.
-    appAddress, // app (where?) - The app that holds the role involved in this permission.
-    role, // role (what?) - The particular role that the entity is being assigned to in this permission.
-    rootAddress, // manager - Can grant/revoke further permissions for this role.
-    { from: rootAddress}
-  )
-}
-
-module.exports = {
-  setOpenPermission
-}
-
-*/
--- a/apps/reimbursement/truffle.js
+++ b/apps/reimbursement/truffle.js
@@ -1 +0,0 @@
-module.exports = require("../../truffle.js");
--- a/apps/reimbursement/yarn.lock
+++ b/apps/reimbursement/yarn.lock
--- a/apps/token/contracts/Token.sol
+++ b/apps/token/contracts/Token.sol
@@ -7,12 +7,12 @@ contract Token is ERC20Token, AragonApp {
  bytes32 public constant MINT_TOKEN_ROLE = keccak256("MINT_TOKEN_ROLE");

  // ensure alphabetic order
-  enum Apps { Contribution, Contributor, Proposal, Reimbursement, Token }
-  bytes32[5] public appIds;
+  enum Apps { Contribution, Contributor, Proposal, Token }
+  bytes32[4] public appIds;

  event LogMint(address indexed recipient, uint256 amount, uint32 contributionId);

-  function initialize(bytes32[5] _appIds) public onlyInit {
+  function initialize(bytes32[4] _appIds) public onlyInit {
    appIds = _appIds;
    name = 'Kredits';
    symbol = '₭S';
--- a/apps/token/package-lock.json
+++ b/apps/token/package-lock.json
--- a/apps/token/package.json
+++ b/apps/token/package.json
@@ -3,12 +3,13 @@
  "version": "1.0.0",
  "description": "",
  "dependencies": {
-    "@aragon/os": "^4.4.0"
+    "@aragon/os": "^4.2.0",
+    "@aragon/cli": "^5.9.6"
  },
  "devDependencies": {
-    "@aragon/test-helpers": "^2.1.0",
-    "eth-gas-reporter": "^0.2.17",
-    "ganache-cli": "^6.9.1",
+    "@aragon/test-helpers": "^2.0.0",
+    "eth-gas-reporter": "^0.2.0",
+    "ganache-cli": "^6.4.3",
    "solidity-coverage": "^0.5.11"
  },
  "scripts": {
@@ -25,7 +26,7 @@
    "publish:minor": "aragon apm publish minor",
    "publish:major": "aragon apm publish major",
    "versions": "aragon apm versions",
-    "test": "truffle test"
+    "test": "aragon contracts test"
  },
  "keywords": []
 }
--- a/apps/token/test/token.js
+++ b/apps/token/test/token.js
@@ -21,8 +21,8 @@ contract('Token app', (accounts) => {
    aclBase = await getContract('ACL').new();
    daoFactory = await getContract('DAOFactory').new(kernelBase.address, aclBase.address, ZERO_ADDR);
    r = await daoFactory.newDAO(root);
-    dao = await getContract('Kernel').at(r.logs.filter(l => l.event == 'DeployDAO')[0].args.dao);
-    acl = await getContract('ACL').at(await dao.acl());
+    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(
@@ -63,7 +63,7 @@ contract('Token app', (accounts) => {
      root,
      { from: root }
    );
-
+  
  });

  describe("Owner default space permissions", async () => {
@@ -71,7 +71,7 @@ contract('Token app', (accounts) => {
      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 () => {
--- a/arapp.json
+++ b/arapp.json
@@ -34,6 +34,7 @@
  "environments": {
    "development": {
      "network": "development",
+      "apm": "open.aragonpm.eth",
      "registry": "0x5f6f7e8cc7346a11ca2def8f827b7a0b612c56a1",
      "appName": "dummy.open.aragonpm.eth"
    },
@@ -41,10 +42,9 @@
      "network": "rinkeby",
      "registry": "0x98Df287B6C145399Aaa709692c8D308357bC085D",
      "wsRPC": "wss://rinkeby.eth.aragon.network/ws",
+      "daoFactory": "0x2298d27a9b847c681d2b2c2828ab9d79013f5f1d",
      "appName": "dummy.open.aragonpm.eth",
-      "kredits": {
-        "daoFactory": "0x2298d27a9b847c681d2b2c2828ab9d79013f5f1d"
-      }
+      "apm": "open.aragonpm.eth"
    },
    "kovan": {
      "network": "kovan",
@@ -52,7 +52,8 @@
    },
    "default": {
      "network": "development",
-      "appName": "dummy.aragonpm.eth"
+      "appName": "dummy.aragonpm.eth",
+      "apm": "open.aragonpm.eth"
    }
  },
  "path": "contracts/misc/DummyApp.sol"
--- a/config/seeds.js
+++ b/config/seeds.js
@@ -31,19 +31,13 @@ const contractCalls = [
    wiki_username: 'Manuel',
  }, { gasLimit: 200000 }]],

-  ['Contribution', 'add', [{ contributorId: 1, contributorIpfsHash: 'QmWKCYGr2rSf6abUPaTYqf98urvoZxGrb7dbspFZA6oyVF', date: '2019-04-11', amount: 500, kind: 'dev', description: '[67P/kredits-contracts] Test this thing', url: '' }, { gasLimit: 350000 }]],
+  ['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', 'add', [{ 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', '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', 'add', [{ contributorId: 2, contributorIpfsHash: 'QmcHzEeAM26HV2zHTf5HnZrCtCtGdEccL5kUtDakAB7ozB', date: '2019-04-11', amount: 1500, kind: 'dev', description: '[67P/kredits-web] Reviewed stuff', url: '' }, { gasLimit: 350000 }]],
-  ['Contribution', 'add', [{ contributorId: 1, contributorIpfsHash: 'QmWKCYGr2rSf6abUPaTYqf98urvoZxGrb7dbspFZA6oyVF', date: '2019-04-11', amount: 1500, kind: 'dev', description: '[67P/kredits-contracts] Add tests', url: '' }, { gasLimit: 350000 }]],
-  ['Contribution', 'add', [{ contributorId: 1, contributorIpfsHash: 'QmWKCYGr2rSf6abUPaTYqf98urvoZxGrb7dbspFZA6oyVF', date: '2019-04-11', amount: 1500, kind: 'dev', description: '[67P/kredits-contracts] Introduce contribution token', url: '' }, { gasLimit: 350000 }]],
-  ['Contribution', 'add', [{ contributorId: 2, contributorIpfsHash: 'QmcHzEeAM26HV2zHTf5HnZrCtCtGdEccL5kUtDakAB7ozB', date: '2019-04-11', amount: 5000, kind: 'dev', description: '[67P/kredits-web] Expense UI, first draft', url: '' }, { gasLimit: 350000 }]],
-
-  ['Reimbursement', 'add', [{amount: 1116000, recipientId: 1, token: '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599', expenses: [
-    { title: 'Server rent', description: 'Dedicated server: andromeda.kosmos.org, April 2020', amount: 61, currency: 'EUR', date: '2020-05-28' },
-    { title: 'Server rent', description: 'Dedicated server: centaurus.kosmos.org, April 2020', amount: 32, currency: 'EUR', date: '2020-05-28' }
-  ]}, { gasLimit: 300000 }]],
-  ['Reimbursement', 'add', [{amount: 166800, recipientId: 2, token: '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599', expenses: [
-    { title: 'Domain kosmos.chat', description: 'Yearly registration fee for domain kosmos.chat', amount: 13.90, currency: 'EUR', date: '2020-05-30' }
-  ]}, { gasLimit: 300000 }]],
+  ['Contribution', 'claim', [1, { gasLimit: 300000 }]],
 ];

 const funds = [
--- a/contracts/KreditsKit.sol
+++ b/contracts/KreditsKit.sol
@@ -10,18 +10,17 @@ import "../apps/contribution/contracts/Contribution.sol";
 import "../apps/contributor/contracts/Contributor.sol";
 import "../apps/token/contracts/Token.sol";
 import "../apps/proposal/contracts/Proposal.sol";
-import "../apps/reimbursement/contracts/Reimbursement.sol";

 contract KreditsKit is KitBase  {

    // ensure alphabetic order
-    enum Apps { Contribution, Contributor, Proposal, Reimbursement, Token }
-    bytes32[5] public appIds;
+    enum Apps { Contribution, Contributor, Proposal, Token }
+    bytes32[4] public appIds;

    event DeployInstance(address dao);
    event InstalledApp(address dao, address appProxy, bytes32 appId);

-    constructor (DAOFactory _fac, ENS _ens, bytes32[5] _appIds) public KitBase(_fac, _ens) {
+    constructor (DAOFactory _fac, ENS _ens, bytes32[4] _appIds) public KitBase(_fac, _ens) {
      appIds = _appIds;
    }

@@ -42,24 +41,18 @@ contract KreditsKit is KitBase  {
        Contribution contribution = Contribution(_installApp(dao, appIds[uint8(Apps.Contribution)]));
        contribution.initialize(appIds);

-        acl.createPermission(root, contribution, contribution.ADD_CONTRIBUTION_ROLE(), this);
-        acl.createPermission(root, contribution, contribution.VETO_CONTRIBUTION_ROLE(), this);
-        acl.grantPermission(proposal, contribution, contribution.ADD_CONTRIBUTION_ROLE());
-
        Proposal proposal = Proposal(_installApp(dao, appIds[uint8(Apps.Proposal)]));
        proposal.initialize(appIds);

-        Reimbursement reimbursement = Reimbursement(_installApp(dao, appIds[uint8(Apps.Reimbursement)]));
-        reimbursement.initialize();
-        acl.createPermission(root, reimbursement, reimbursement.ADD_REIMBURSEMENT_ROLE(), this);
-        acl.createPermission(root, reimbursement, reimbursement.VETO_REIMBURSEMENT_ROLE(), this);
+        acl.createPermission(root, contribution, contribution.ADD_CONTRIBUTION_ROLE(), this);
+        acl.createPermission(root, contribution, contribution.VETO_CONTRIBUTION_ROLE(), this);
+        acl.grantPermission(proposal, contribution, contribution.ADD_CONTRIBUTION_ROLE());

        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(acl.ANY_ENTITY(), contribution, contribution.VETO_CONTRIBUTION_ROLE(), params);
        acl.grantPermissionP(acl.ANY_ENTITY(), contributor, contributor.MANAGE_CONTRIBUTORS_ROLE(), params);
-        acl.grantPermissionP(acl.ANY_ENTITY(), reimbursement, reimbursement.ADD_REIMBURSEMENT_ROLE(), params);

        //acl.setPermissionManager(this, proposal, proposal.VOTE_PROPOSAL_ROLE();
        acl.createPermission(root, proposal, proposal.VOTE_PROPOSAL_ROLE(), this);
@@ -74,8 +67,6 @@ contract KreditsKit is KitBase  {
        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.setPermissionManager(root, reimbursement, reimbursement.ADD_REIMBURSEMENT_ROLE());
-        acl.setPermissionManager(root, reimbursement, reimbursement.VETO_REIMBURSEMENT_ROLE());

        acl.createPermission(root, token, token.MINT_TOKEN_ROLE(), this);
        acl.grantPermission(contribution, token, token.MINT_TOKEN_ROLE());
--- a/data/contributions.json
+++ b/data/contributions.json
--- a/data/contributors.json
+++ b/data/contributors.json
@@ -1,121 +0,0 @@
-{
-  "1": {
-    "account": "0x7E8f313C56F809188313aa274Fa67EE58c31515d",
-    "hashDigest": "0x99b8afd7b266e19990924a8be9099e81054b70c36b20937228a77a5cf75723b8",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 1
-  },
-  "2": {
-    "account": "0x49575f3DD9a0d60aE661BC992f72D837A77f05Bc",
-    "hashDigest": "0xeb78574922d8606419b714174b31961007afefe313111c9db817aa9d3f82e157",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 2
-  },
-  "3": {
-    "account": "0xF722709ECC3B05c19d02E82a2a4A4021B8F48C62",
-    "hashDigest": "0x7acd73632c7cc8d317fa9e72e925eaef1d700e69f185b84e3f0168471e17cf2d",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 3
-  },
-  "4": {
-    "account": "0xD4a64570B12dA659Ee4BBd41c3509B7b1F9c51AC",
-    "hashDigest": "0x4d394c58e4b0534446be10a9b7f8b50e5478258719c23a3e158a5ea9fca14bdd",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 4
-  },
-  "5": {
-    "account": "0x35d9e68a5F7A935C64b08221d5DC7f161a415184",
-    "hashDigest": "0xd6f726f37ad52998b8341b7021cb5d9f4dcf7ce09af575358505a2a7c2f81edb",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 5
-  },
-  "6": {
-    "account": "0x8345E84D848792bf750A1d032d76f20f00aeC1a7",
-    "hashDigest": "0x1acdc784e20f62c44ec222552531bf89daafaaca1893a68057a9ada920ea0984",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 6
-  },
-  "7": {
-    "account": "0x4D99d767477Fbb2B47EFeb17E2a78970AD22CCc1",
-    "hashDigest": "0xd6d16bde5ee3d3374dd5981dab0296938b24e3c812e72ba4fa3d38011b6fab24",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 7
-  },
-  "8": {
-    "account": "0x6a6cD99ab0335C92E55fbb4403D67A4f4B52AfEc",
-    "hashDigest": "0xec30c91b31a85eef2af7afce0ba66b0636f1d61a75a12d8ca188a2d9e1626cf2",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 8
-  },
-  "9": {
-    "account": "0x21aB0B3527326dcA4467245654Cf881F5F7a8c5e",
-    "hashDigest": "0xd6c8b0f285e614b12f700d6e66e2e67901c16c420308625f844357283bd555ba",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 9
-  },
-  "10": {
-    "account": "0x150A69bAfA216FD55C7CeF8eA2002cd582dc5982",
-    "hashDigest": "0x7490aabadf995751211686b3b9f4b8cfee3354947df23cec043c15bfb519c817",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 10
-  },
-  "11": {
-    "account": "0x2f65679cAf0c3abCbF77fC68fA56759f4D96C73c",
-    "hashDigest": "0xd147d2d26f7eb1cbe1c5da53c345565df2d3c6c33a8a3e3331952d4b878b2bb0",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 11
-  },
-  "12": {
-    "account": "0x13a24319Abb4e00c383D8a80dACb20690699Ac8C",
-    "hashDigest": "0x84c63c2d3f9510f87717e54a2cecb41f88dce6a41ae6392480ebf6561e30670e",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 12
-  },
-  "13": {
-    "account": "0x0e0F02508b80e401C26F584fF02eE80Ab094CdF9",
-    "hashDigest": "0xe4c34e15b87114e9edd599fa1bbd6d4b1bf45c3b0163d0772158fb93503c1fe1",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 13
-  },
-  "14": {
-    "account": "0x49750D74930b20b2937DDF77A6C30d81882d888E",
-    "hashDigest": "0xa1f18c54e77d1e8f0fa106463b3f66a34a6287bcd9b643febea0ab2e97009665",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 14
-  },
-  "15": {
-    "account": "0x608FD4b95116Ea616990Aaeb1d4f1ce07612f261",
-    "hashDigest": "0x1d9de6de5c72eedca6d7a5e8a9159e2f5fe676506aece3000acefcc821723429",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 15
-  },
-  "16": {
-    "account": "0xCaBba4560c96FADe3Dd6C29cF24Cfb16a228bC1c",
-    "hashDigest": "0x0c81914b8a332808879b06b1a68398edccea7e7facb50767e4116c33914d2c64",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 16
-  },
-  "17": {
-    "account": "0x765E88b4F9a59C3a3b300C6eFF9E6E9fDDf9FbD9",
-    "hashDigest": "0xcfbeeadc244dfdc55bbad50d431871439df067970db84c73023956c96a6f5df2",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 17
-  }
-}
--- a/deployments/rinkeby/contribution.md
+++ b/deployments/rinkeby/contribution.md
@@ -2,36 +2,6 @@

 aragon apm publish major --environment=rinkeby"

-## 20212-01-14 
-
-apps/contribution@master  » aragon apm publish major --environment=rinkeby
-eth-provider | Invalid provider preset/location: "local"
-  ✔ Start IPFS
-  ✔ Applying version bump (major)
-  ↓ Building frontend [skipped]
-    → build script not defined in package.json
-  ✔ Deploy contract
-  ✔ Determine contract address for version
-  ✔ Prepare files for publishing
-  ✔ Generate application artifact
-  ✔ Publish intent
-
-⚠ Publishing files from the project's root folder is not recommended. Consider using the distribution folder of your project: "--files <folder>".
-
- The following information will be published:
- Contract address: 0x914Da982ef17B56D2e868E3a67E923EbED1aE017
- Content (ipfs): QmdVrY2R48NFqwLopd8ix1anAK1d6WafDGauou3ZJrB9gf
-
-? Publish to kredits-contribution.open.aragonpm.eth repo Yes
-
-  ✔ Publish kredits-contribution.open.aragonpm.eth
-
- Successfully published kredits-contribution.open.aragonpm.eth v7.0.0 :
-
-Transaction hash: 0xb817b2e80e90a6be60b45dd39987498e3132c9962c0501feb7549ad30186c6d5
-
-
-
 ## 2019-04-24 update balances

 ✔ Successfully published kredits-contribution.open.aragonpm.eth v6.0.0: 
--- a/deployments/rinkeby/dao.md
+++ b/deployments/rinkeby/dao.md
@@ -1,16 +1,5 @@
 # Kredits deployment

-
-## 2021-01-14
-
-apps/contribution@master  » aragon dao upgrade 0xc34edf7d11b7f8433d597f0bb0697acdff55ef14 kredits-contribution.open.aragonpm.eth --environment=rinkeby
-eth-provider | Invalid provider preset/location: "local"
-  ✔ Fetching kredits-contribution.open.aragonpm.eth@latest
-  ✔ Fetching kredits-contribution.open.aragonpm.eth@latest
-  ✔ Upgrading app
-
-✔ Successfully executed: "Upgrade 'kredits-contribution.open.aragonpm.eth' app instances to v7.0.0"
-
 ## 2019-04-25 canPerfom fix

 aragon dao upgrade 0xc34edf7d11b7f8433d597f0bb0697acdff55ef14 kredits-contributor.open.aragonpm.eth --environment=rinkeby
--- a/lib/abis/Contribution.json
+++ b/lib/abis/Contribution.json
--- a/lib/abis/Contributor.json
+++ b/lib/abis/Contributor.json
--- a/lib/abis/Proposal.json
+++ b/lib/abis/Proposal.json
--- a/lib/abis/Reimbursement.json
+++ b/lib/abis/Reimbursement.json
--- a/lib/abis/Token.json
+++ b/lib/abis/Token.json
--- a/lib/contracts/acl.js
+++ b/lib/contracts/acl.js
@@ -5,7 +5,7 @@ class Acl extends Base {
  hasPermission (fromAddress, contractAddress, roleID, params = null) {
    let roleHash = EthersUtils.keccak256(EthersUtils.toUtf8Bytes(roleID));

-    return this.hasPermission(
+    return this.functions.hasPermission(
      fromAddress,
      contractAddress,
      roleHash,
--- a/lib/contracts/base.js
+++ b/lib/contracts/base.js
@@ -1,13 +1,10 @@
-const deprecate = require('../utils/deprecate');
-
 class Base {
  constructor (contract) {
    this.contract = contract;
  }

  get functions () {
-    deprecate('The property `functions` is deprecated. contract functions are now directly defined on the ethers contract object. https://github.com/ethers-io/ethers.js/issues/920#issuecomment-650836642');
-    return this.contract;
+    return this.contract.functions;
  }

  get address () {
--- a/lib/contracts/contribution.js
+++ b/lib/contracts/contribution.js
@@ -4,33 +4,33 @@ const deprecate = require('../utils/deprecate');

 class Contribution extends Record {
  get count () {
-    return this.contract.contributionsCount();
+    return this.functions.contributionsCount();
  }

  getById (id) {
-    return this.contract.getContribution(id)
+    return this.functions.getContribution(id)
      .then(data => {
        return this.ipfs.catAndMerge(data, ContributionSerializer.deserialize);
      });
  }

  getData (id) {
-    return this.contract.getContribution(id);
+    return this.functions.getContribution(id);
  }

  getByContributorId (contributorId) {
-    return this.contract.getContributorAddressById(contributorId)
+    return this.functions.getContributorAddressById(contributorId)
      .then(address => this.getByContributorAddress(address));
  }

  getByContributorAddress (address) {
-    return this.contract.balanceOf(address)
+    return this.functions.balanceOf(address)
      .then(async (balance) => {
        const count = balance.toNumber();
        const contributions = [];

        for (let index = 0; index < count; index++) {
-          const id = await this.contract.tokenOfOwnerByIndex(address, index);
+          const id = await this.functions.tokenOfOwnerByIndex(address, index);
          const contribution = await this.getById(id);
          contributions.push(contribution);
        }
@@ -58,7 +58,7 @@ class Contribution extends Record {
          ipfsHashAttr.hashSize,
        ];

-        return this.contract.add(...contribution, callOptions);
+        return this.functions.add(...contribution, callOptions);
      });
  }

--- a/lib/contracts/contributor.js
+++ b/lib/contracts/contributor.js
@@ -4,20 +4,19 @@ const formatKredits = require('../utils/format-kredits');

 class Contributor extends Record {
  get count () {
-    return this.contract.contributorsCount();
+    return this.functions.contributorsCount();
  }

  getById (id) {
-    return this.contract.getContributorById(id)
-      .then(contractData => {
-        let data = {...contractData};
+    return this.functions.getContributorById(id)
+      .then(data => {
        data.balanceInt = formatKredits(data.balance);
        return this.ipfs.catAndMerge(data, ContributorSerializer.deserialize);
      });
  }

  getData (id) {
-    return this.contract.getContributorById(id);
+    return this.functions.getContributorById(id);
  }

  filterByAccount (search) {
@@ -62,7 +61,7 @@ class Contributor extends Record {
          ipfsHashAttr.hashSize,
        ];

-        return this.contract.addContributor(...contributor, callOptions);
+        return this.functions.addContributor(...contributor, callOptions);
      });
  }

@@ -79,7 +78,7 @@ class Contributor extends Record {
      return this.ipfs
        .add(jsonStr)
        .then(ipfsHashAttr => {
-          return this.contract.updateContributorProfileHash(
+          return this.functions.updateContributorProfileHash(
            contributorId,
            ipfsHashAttr.hashDigest,
            ipfsHashAttr.hashFunction,
--- a/lib/contracts/index.js
+++ b/lib/contracts/index.js
@@ -3,7 +3,6 @@ module.exports = {
  Contribution: require('./contribution'),
  Proposal: require('./proposal'),
  Token: require('./token'),
-  Reimbursement: require('./reimbursement'),
  Kernel: require('./kernel'),
  Acl: require('./acl'),
 };
--- a/lib/contracts/kernel.js
+++ b/lib/contracts/kernel.js
@@ -11,9 +11,9 @@ class Kernel extends Base {

  getApp (appName) {
    if (appName === 'Acl') {
-      return this.contract.acl();
+      return this.functions.acl();
    }
-    return this.contract.getApp(KERNEL_APP_ADDR_NAMESPACE, this.appNamehash(appName));
+    return this.functions.getApp(KERNEL_APP_ADDR_NAMESPACE, this.appNamehash(appName));
  }

  appNamehash (appName) {
--- a/lib/contracts/proposal.js
+++ b/lib/contracts/proposal.js
@@ -4,11 +4,11 @@ const deprecate = require('../utils/deprecate');

 class Proposal extends Record {
  get count () {
-    return this.contract.proposalsCount();
+    return this.functions.proposalsCount();
  }

  getById (id) {
-    return this.contract.getProposal(id)
+    return this.functions.getProposal(id)
      .then(data => {
        return this.ipfs.catAndMerge(data, ContributionSerializer.deserialize);
      });
@@ -33,7 +33,7 @@ class Proposal extends Record {
          ipfsHashAttr.hashSize,
        ];

-        return this.contract.addProposal(...proposal, callOptions);
+        return this.functions.addProposal(...proposal, callOptions);
      });
  }

--- a/lib/contracts/reimbursement.js
+++ b/lib/contracts/reimbursement.js
@@ -1,65 +0,0 @@
-const Record = require('./record');
-const ExpenseSerializer = require('../serializers/expense');
-
-class Reimbursement extends Record {
-  get count () {
-    return this.functions.reimbursementsCount();
-  }
-
-  getById (id) {
-    return this.functions.get(id)
-      .then(data => {
-        return this.ipfs.catAndMerge(data, (ipfsDocument) => {
-          const expenses = JSON.parse(ipfsDocument);
-          return { expenses };
-        });
-      });
-  }
-
-  getData (id) {
-    return this.functions.getReimbursement(id);
-  }
-
-  async add (attrs, callOptions = {}) {
-    const amount = parseInt(attrs.amount);
-    const token = attrs.token;
-    const recipientId = attrs.recipientId;
-    const expenses = attrs.expenses.map( e => new ExpenseSerializer(e) );
-    let errorMessage;
-
-    if (typeof amount !== 'number' || amount <= 0) {
-      errorMessage = 'Invalid data: amount must be a positive number.';
-    }
-    if (!token || token === '') {
-      errorMessage = 'Invalid data: token must be a token address.';
-    }
-    if (!recipientId || recipientId === '') {
-      errorMessage = 'Invalid data: recipientId is required.';
-    }
-    if (expenses.length === 0) {
-      errorMessage = 'Invalid data: at least one expense item is required.';
-    }
-    if (errorMessage) { return Promise.reject(new Error(errorMessage)); }
-
-    return Promise.all(expenses.map(e => e.validate()))
-      .then(() => {
-        const jsonStr = JSON.stringify(expenses.map(e => e.data), null, 2);
-        return this.ipfs
-          .add(jsonStr)
-          .then(ipfsHashAttr => {
-            const reimbursement = [
-              amount,
-              token,
-              parseInt(recipientId),
-              ipfsHashAttr.hashDigest,
-              ipfsHashAttr.hashFunction,
-              ipfsHashAttr.hashSize,
-            ];
-
-            return this.functions.add(...reimbursement, callOptions);
-          });
-      });
-  }
-}
-
-module.exports = Reimbursement;
--- a/lib/kredits.js
+++ b/lib/kredits.js
@@ -6,7 +6,6 @@ const deprecate = require('./utils/deprecate');
 const ABIS = {
  Contributor: require('./abis/Contributor.json'),
  Contribution: require('./abis/Contribution.json'),
-  Reimbursement: require('./abis/Reimbursement.json'),
  Token: require('./abis/Token.json'),
  Proposal: require('./abis/Proposal.json'),
  Kernel: require('./abis/Kernel.json'),
@@ -17,7 +16,6 @@ const APP_CONTRACTS = [
  'Contribution',
  'Token',
  'Proposal',
-  'Reimbursement',
  'Acl',
 ];
 const DaoAddresses = require('./addresses/dao.json');
@@ -123,10 +121,6 @@ class Kredits {
    return this.contractFor('Contribution');
  }

-  get Reimbursement () {
-    return this.contractFor('Reimbursement');
-  }
-
  get Acl () {
    return this.contractFor('Acl');
  }
--- a/lib/kreditskit.js
+++ b/lib/kreditskit.js
@@ -29,12 +29,12 @@ class KreditsKit {

  appIdFor (contractName) {
    // see appIds in KreditsKit.sol for more details
-    const knownContracts = ['Contribution', 'Contributor', 'Proposal', 'Reimbursement', 'Token'];
-    return this.contract.appIds(knownContracts.indexOf(contractName));
+    const knownContracts = ['Contribution', 'Contributor', 'Proposal', 'Token'];
+    return this.contract.functions.appIds(knownContracts.indexOf(contractName));
  }

  newDAO (options = {}) {
-    return this.contract.newInstance(options).then(transaction => {
+    return this.contract.functions.newInstance(options).then(transaction => {
      return transaction.wait().then(result => {
        const deployEvent = result.events.find(e => e.event === 'DeployInstance');
        return {
--- a/lib/serializers/contribution.js
+++ b/lib/serializers/contribution.js
@@ -1,4 +1,4 @@
-const schemas = require('@kosmos/schemas');
+const schemas = require('kosmos-schemas');
 const validator = require('../utils/validator');

 /**
--- a/lib/serializers/contributor.js
+++ b/lib/serializers/contributor.js
@@ -1,4 +1,4 @@
-const schemas = require('@kosmos/schemas');
+const schemas = require('kosmos-schemas');
 const validator = require('../utils/validator');
 /**
 * Handle serialization for JSON-LD object of the contributor, according to
--- a/lib/serializers/expense.js
+++ b/lib/serializers/expense.js
@@ -1,100 +0,0 @@
-const schemas = require('@kosmos/schemas');
-const validator = require('../utils/validator');
-
-/**
- * Serialization and validation for JSON-LD document of the Expense
- *
- * @class
- * @public
- */
-class ExpenseSerializer {
-
-  constructor (attrs) {
-    Object.keys(attrs).forEach(a => this[a] = attrs[a]);
-  }
-
-  /**
-   * Serialize object to JSON
-   *
-   * @public
-   */
-  serialize () {
-    // Write it pretty to ipfs
-    return JSON.stringify(this.data, null, 2);
-  }
-
-  get data () {
-    const {
-      title,
-      description,
-      currency,
-      amount,
-      date,
-      url,
-      tags,
-      details,
-    } = this;
-
-    const data = {
-      '@context': 'https://schema.kosmos.org',
-      '@type': 'Expense',
-      title,
-      description,
-      currency,
-      amount,
-      date,
-      'tags': tags || [],
-      'details': details || {},
-    };
-
-    if (url) {
-      data['url'] = url;
-    }
-
-    return data;
-  }
-
-  /**
-   * Validate serialized data against schema
-   *
-   * @public
-   */
-  validate () {
-    const serialized = JSON.parse(this.serialize());
-    const valid = validator.validate(serialized, schemas['expense']);
-    return valid ? Promise.resolve() : Promise.reject(validator.error);
-  }
-
-  /**
-   * Deserialize JSON to object
-   *
-   * @public
-   */
-  static deserialize (serialized) {
-    const {
-      title,
-      description,
-      currency,
-      amount,
-      date,
-      url,
-      tags,
-      details,
-    } = JSON.parse(serialized.toString('utf8'));
-
-    return {
-      title,
-      description,
-      currency,
-      amount,
-      date,
-      url,
-      tags,
-      details,
-      ipfsData: serialized,
-    };
-  }
-
-}
-
-module.exports = ExpenseSerializer;
--- a/lib/utils/ipfs.js
+++ b/lib/utils/ipfs.js
@@ -11,8 +11,7 @@ class IPFS {
    this._ipfsAPI = ipfsClient(config);
  }

-  catAndMerge (contractData, deserialize) {
-    let data = {...contractData}; // data from ethers.js is not extensible. this copy the attributes in a new object
+  catAndMerge (data, deserialize) {
    // if no hash details are found simply return the data; nothing to merge
    if (!data.hashSize || data.hashSize === 0) {
      return data;
@@ -37,7 +36,7 @@ class IPFS {

  cat (hashData) {
    let ipfsHash = hashData; // default - if it is a string
-    if (Object.prototype.hasOwnProperty.call(hashData, 'hashSize')) {
+    if (hashData.hasOwnProperty('hashSize')) {
      ipfsHash = this.encodeHash(hashData);
    }
    if (this._config['gatewayUrl']) {
@@ -49,7 +48,7 @@ class IPFS {

  pin (hashData) {
    let ipfsHash = hashData; // default - if it is a string
-    if (Object.prototype.hasOwnProperty.call(hashData, 'hashSize')) {
+    if (hashData.hasOwnProperty('hashSize')) {
      ipfsHash = this.encodeHash(hashData);
    }
    return this._ipfsAPI.pin.add(multihashes.toB58String(ipfsHash));
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "kredits-contracts",
-  "version": "6.0.0",
+  "version": "5.5.0",
  "description": "Ethereum contracts and npm wrapper for Kredits",
  "main": "./lib/kredits.js",
  "directories": {
@@ -15,9 +15,9 @@
    "compile-contracts": "truffle compile --all",
    "bootstrap": "npm run reset:hard && npm run seeds",
    "reset": "npm run deploy:kit && npm run deploy:dao",
-    "reset:hard": "npm run compile-contracts && npm run deploy:apps && npm run reset",
-    "deploy:kit": "truffle exec scripts/deploy-kit.js",
-    "deploy:dao": "truffle exec scripts/new-dao.js",
+    "reset:hard": "npm run deploy:apps && npm run reset",
+    "deploy:kit": "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\"",
    "devchain": "aragon devchain --port 7545",
    "dao:address": "truffle exec scripts/current-address.js",
@@ -43,27 +43,23 @@
  "homepage": "https://github.com/67P/truffle-kredits#readme",
  "devDependencies": {
    "@aragon/kits-base": "^1.0.0",
-    "@aragon/os": "^4.4.0",
+    "@aragon/os": "^4.2.0",
    "async-each-series": "^1.1.0",
    "cli-table": "^0.3.1",
-    "eslint": "^7.1.0",
-    "eslint-plugin-import": "^2.20.2",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^4.2.1",
-    "eth-provider": "^0.2.5",
-    "ethereum-block-by-date": "^1.4.0",
-    "homedir": "^0.6.0",
+    "eslint": "^5.16.0",
+    "eslint-plugin-import": "^2.17.3",
+    "eslint-plugin-node": "^8.0.1",
+    "eslint-plugin-promise": "^4.1.1",
+    "eth-provider": "^0.2.2",
    "promptly": "^3.0.3",
-    "solc": "^0.6.8",
-    "solhint": "^2.3.1",
-    "truffle-hdwallet-provider": "^1.0.17",
-    "truffle-hdwallet-provider-privkey": "^0.3.0",
-    "yargs": "^15.0.0"
+    "solc": "^0.4.26",
+    "solhint": "^2.1.0",
+    "yargs": "^12.0.0"
  },
  "dependencies": {
-    "ethers": "^5.0.2",
-    "ipfs-http-client": "^41.0.1",
-    "@kosmos/schemas": "^3.0.0",
+    "ethers": "^4.0.29",
+    "ipfs-http-client": "^30.1.3",
+    "kosmos-schemas": "^2.1.0",
    "node-fetch": "^2.6.0",
    "tv4": "^1.3.0"
  },
--- a/scripts/add-contribution.js
+++ b/scripts/add-contribution.js
@@ -19,10 +19,10 @@ module.exports = async function(callback) {
  let contributorAccount;
  if (contributor.length < 5) {
    contributorId = contributor;
-    contributorAccount = await kredits.Contributor.contract.getContributorAddressById(contributor);
+    contributorAccount = await kredits.Contributor.functions.getContributorAddressById(contributor);
  } else {
    contributorAccount = contributor;
-    contributorId = await kredits.Contributor.contract.getContributorIdByAddress(contributor);
+    contributorId = await kredits.Contributor.functions.getContributorIdByAddress(contributor);
  }

  console.log(`Creating a contribution for contributor account ${contributorAccount} ID: ${contributorId}`);
@@ -45,7 +45,7 @@ module.exports = async function(callback) {
  console.log("\nAdding contribution:");
  console.log(contributionAttributes);

-  kredits.Contribution.add(contributionAttributes, { gasLimit: 300000 })
+  kredits.Contribution.addContribution(contributionAttributes, { gasLimit: 300000 })
    .then(result => {
      console.log("\n\nResult:");
      console.log(result);
--- a/scripts/add-proposal.js
+++ b/scripts/add-proposal.js
@@ -19,10 +19,10 @@ module.exports = async function(callback) {
  let contributorAccount;
  if (contributor.length < 5) {
    contributorId = contributor;
-    contributorAccount = await kredits.Contributor.contract.getContributorAddressById(contributor);
+    contributorAccount = await kredits.Contributor.functions.getContributorAddressById(contributor);
  } else {
    contributorAccount = contributor;
-    contributorId = await kredits.Contributor.contract.getContributorIdByAddress(contributor);
+    contributorId = await kredits.Contributor.functions.getContributorIdByAddress(contributor);
  }
  console.log(`Creating a proposal for contributor ID #${contributorId} account: ${contributorAccount}`);

--- a/scripts/build-json.js
+++ b/scripts/build-json.js
@@ -11,7 +11,6 @@ const files = [
  'Kernel',
  'Proposal',
  'Token',
-  'Reimbursement',
  'ACL'
 ];

--- a/scripts/claim-contributions.js
+++ b/scripts/claim-contributions.js
@@ -31,7 +31,7 @@ module.exports = async function(callback) {

      if (c.contributorId === recipient && confirmed && !c.vetoed && !c.claimed) {
        console.log(`Claiming contribution ID=${c.id}`);
-        return kredits.Contribution.contract.claim(c.id, { gasLimit: 500000 }).then(tx => {
+        return kredits.Contribution.functions.claim(c.id, { gasLimit: 500000 }).then(tx => {
          table.push([
            c.id.toString(),
            `${c.description}`,
--- a/scripts/cli.js
+++ b/scripts/cli.js
@@ -17,7 +17,7 @@ module.exports = async function(callback) {

      method = await promptly.prompt('Function: ');
    }
-    if (!contractWrapper[method] && !contractWrapper.contract[method]) {
+    if (!contractWrapper[method] && !contractWrapper.functions[method]) {
      callback(new Error(`Method ${method} is not defined on ${contractName}`));
      return;
    }
@@ -33,7 +33,7 @@ module.exports = async function(callback) {
    if (contractWrapper[method]) {
      func = contractWrapper[method];
    } else {
-      func = contractWrapper.contract[method];
+      func = contractWrapper.functions[method];
    }
    func.apply(contractWrapper, args).then((result) => {
      console.log("\nResult:");
--- a/scripts/current-address.js
+++ b/scripts/current-address.js
@@ -1,12 +1,9 @@
 const knownDAOAddresses = require('../lib/addresses/dao.json');
 const knownKreditsKitAddresses = require('../lib/addresses/KreditsKit.json');
 const getNetworkId = require('./helpers/networkid.js')
-const ethers = require('ethers');

 module.exports = async function(callback) {
-  const provider = new ethers.providers.Web3Provider(web3.currentProvider);
-  let network = await provider.getNetwork();
-  let networkId = network.chainId;
+  const networkId = await getNetworkId(web3)

  console.log('# All known DAO addresses');
  Object.keys(knownDAOAddresses).forEach((networkId) => {
--- a/scripts/deploy-kit.js
+++ b/scripts/deploy-kit.js
@@ -3,33 +3,23 @@ const deployDAOFactory = require('@aragon/os/scripts/deploy-daofactory.js')
 const fs = require('fs');
 const path = require('path');
 const argv = require('yargs').argv
-const ethers = require('ethers');
-const namehash = ethers.utils.namehash;
+const namehash = require('ethers').utils.namehash;

 const fileInject = require('./helpers/file_inject.js')
+const getNetworkId = require('./helpers/networkid.js')

 const DAOFactory = artifacts.require('DAOFactory')
 const KreditsKit = artifacts.require('KreditsKit')

 const arapp = require('../arapp.json')
 const environment = argv['network'] || argv['environment'] || 'development'
+const apm = arapp.environments[environment].apm
+const ensAddr = arapp.environments[environment].registry || process.env.ENS
+const daoFactoryAddress = arapp.environments[environment].daoFactory || process.env.DAO_FACTORY

-const kreditsArappConfig = arapp.environments[environment].kredits || {}
-
-// typically we use the open.aragonpm.eth aragonpm.
-const apm = kreditsArappConfig.apmDomain || argv['apmDomain'] || 'open.aragonpm.eth'
-
-// daoFactory is environment specific.
-// See https://github.com/aragon/deployments/tree/master/environments/ for the official daoFactory
-// Locally we deploy our own daoFactory and no daoFactory is required (`daoFactoryAddress` is null).
-const daoFactoryAddress = kreditsArappConfig.daoFactory || argv['daoFactory']
-
-const ensAddr = arapp.environments[environment].registry || argv['ensAddress']

 module.exports = async function(callback) {
-  const provider = new ethers.providers.Web3Provider(web3.currentProvider);
-  const network = await provider.getNetwork();
-  const networkId = network.chainId;
+  const networkId = await getNetworkId(web3)
  console.log(`Deploying to networkId: ${networkId}`)

  if (!ensAddr) {
--- a/scripts/export/contributions.js
+++ b/scripts/export/contributions.js
@@ -1,49 +0,0 @@
-const fs = require('fs');
-const ethers = require('ethers');
-const Kredits = require('../../lib/kredits');
-const provider = new ethers.providers.JsonRpcProvider('https://rpc.ankr.com/eth_rinkeby');
-
-const arapp = require('../../arapp.json');
-const apm = arapp.environments['rinkeby'].apm;
-
-async function main() {
-  const kredits = await new Kredits(provider, null, { apm });
-  //kredits = new Kredits(hre.ethers.provider, hre.ethers.provider.getSigner())
-  await kredits.init();
-
-  console.log(`Using Contribution at: ${kredits.Contribution.contract.address}`);
-
-  const count = await kredits.Contribution.count;
-  const currentBlockHeight = await provider.getBlockNumber();
-
-  const backup = {};
-  const promises = [];
-  for (let i = 1; i <= count; i++) {
-    promises.push(new Promise((resolve, reject) => {
-      setTimeout(async () => {
-        console.log(`Loading contribution #${i}`);
-        await kredits.Contribution.contract.getContribution(i).then(contractData => {
-          backup[i] = {
-            amount: contractData.amount,
-            contributorId: contractData.contributorId,
-            hashDigest: contractData.hashDigest,
-            hashFunction: contractData.hashFunction,
-            hashSize: contractData.hashSize,
-            confirmedAtBlock: contractData.confirmedAtBlock,
-            confirmed: contractData.confirmedAtBlock <= currentBlockHeight,
-            vetoed: contractData.vetoed,
-            id: contractData.id,
-          }
-          resolve();
-        });
-      }, 100 * i);
-    }));
-  }
-
-  await Promise.all(promises).then(() => {
-    fs.writeFileSync("./data/contributions.json", JSON.stringify(backup, null, 2));
-    console.log("Exported");
-  });
-}
-
-main();
--- a/scripts/export/contributors.js
+++ b/scripts/export/contributors.js
@@ -1,44 +0,0 @@
-const fs = require('fs');
-const ethers = require('ethers');
-const Kredits = require('../../lib/kredits');
-const provider = new ethers.providers.JsonRpcProvider('https://rpc.ankr.com/eth_rinkeby');
-
-const arapp = require('../../arapp.json');
-const apm = arapp.environments['rinkeby'].apm;
-
-async function main() {
-  const kredits = await new Kredits(provider, null, { apm });
-  //kredits = new Kredits(hre.ethers.provider, hre.ethers.provider.getSigner())
-  await kredits.init();
-
-  console.log(`Using Contributor at: ${kredits.Contributor.contract.address}`);
-
-  const count = await kredits.Contributor.count;
-
-  const backup = {};
-  const promises = [];
-  for (let i = 1; i <= count; i++) {
-    promises.push(new Promise((resolve, reject) => {
-      setTimeout(async () => {
-        console.log(`Loading contributor #${i}`);
-        await kredits.Contributor.contract.getContributorById(i).then(contractData => {
-          backup[i] = {
-            account: contractData.account,
-            hashDigest: contractData.hashDigest,
-            hashFunction: contractData.hashFunction,
-            hashSize: contractData.hashSize,
-            id: contractData.id,
-          }
-          resolve();
-        });
-      }, 100 * i);
-    }));
-  }
-
-  await Promise.all(promises).then(() => {
-    fs.writeFileSync("./data/contributors.json", JSON.stringify(backup, null, 2));
-    console.log("Exported");
-  });
-}
-
-main();
--- a/scripts/find-block-for-date.js
+++ b/scripts/find-block-for-date.js
@@ -1,19 +0,0 @@
-const promptly = require('promptly');
-const EthDater = require('ethereum-block-by-date');
-const initKredits = require('./helpers/init_kredits.js');
-
-module.exports = async function(callback) {
-  let kredits;
-  try { kredits = await initKredits(web3); } catch(e) { callback(e); return; }
-
-  const dater     = new EthDater(kredits.provider);
-  const dateStr   = await promptly.prompt('Specify a date and time (e.g. 2021-05-07T14:00:40Z): ');
-  const blockData = await dater.getDate(dateStr, true);
-
-  console.log(`
-The closest block is #${blockData.block}:
-https://rinkeby.etherscan.io/block/${blockData.block}
-`);
-
-  callback();
-}
--- a/scripts/helpers/init_kredits.js
+++ b/scripts/helpers/init_kredits.js
@@ -1,5 +1,6 @@
 const argv = require('yargs').argv;
 const ethers = require('ethers');
+const getNetworkId = require('./networkid.js');
 const Kredits = require('../../lib/kredits');

 const arapp = require('../../arapp.json');
@@ -9,7 +10,7 @@ const apm = arapp.environments[environment].apm;
 module.exports = async function(web3) {
  return new Promise((resolve, reject) => {
    const provider = new ethers.providers.Web3Provider(web3.currentProvider);
-    const signer = provider.getSigner();
+    let signer = provider.getSigner();
    // checking if siner supports signing transactions
    signer.getAddress().then(_ => {
      new Kredits(provider, signer, { apm }).init().then(kredits => {
--- a/scripts/helpers/networkid.js
+++ b/scripts/helpers/networkid.js
@@ -0,0 +1,17 @@
+module.exports = function(web3) {
+  return new Promise((resolve, reject) => {
+    let func;
+    if (web3.version.getNetwork) {
+      func = web3.version.getNetwork;
+    } else {
+      func = web3.eth.net.getId;
+    }
+    func((err, network) => {
+      if (err) {
+        reject(err);
+      } else {
+        resolve(network);
+      }
+    })
+  })
+}
--- a/scripts/helpers/update_local_networkid.js
+++ b/scripts/helpers/update_local_networkid.js
@@ -1,14 +1,12 @@
 const fs = require('fs');
-const ethers = require('ethers');
+const getNetworkId = require('./networkid.js');

 module.exports = async function(callback) {
  const daoAddressPath = 'lib/addresses/dao.json';

  // TODO maybe do the same for KreditsKit address file
  try {
-    const provider = new ethers.providers.Web3Provider(web3.currentProvider);
-    const network = await provider.getNetwork();
-    const networkId = network.chainId;
+    const networkId = await getNetworkId(web3);
    const daoAddresses = JSON.parse(fs.readFileSync(daoAddressPath));
    const oldNetworkId = Math.max(...Object.keys(daoAddresses).map(a => parseInt(a)));
    const localDaoAddress = daoAddresses[oldNetworkId];
--- a/scripts/list-contributions-per-contributor.js
+++ b/scripts/list-contributions-per-contributor.js
@@ -1,76 +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}`);
-
-  const table = new Table({
-    head: ['ID', 'Name', 'Kredits']
-  })
-
-  try {
-    let currentBlockNumber = await kredits.provider.getBlockNumber();
-    console.log(`Current block number: ${currentBlockNumber}`);
-
-    let confirmedBeforeBlock = await promptly.prompt('Before block: ');
-    let confirmedAfterBlock = await promptly.prompt('After block: ');
-
-    let tokens = {};
-    let contributors = await kredits.Contributor.all();
-    contributors.forEach(c => {
-      tokens[c.id] = { amount: 0, contributor: c };
-    });
-
-    let contributionId = await kredits.Contribution.contract.contributionsCount();
-    let nextContribution = true;
-
-    while (nextContribution) {
-      console.log(`Getting contribution: ${contributionId}`);
-      let contribution = await kredits.Contribution.getById(contributionId);
-      contributionId = contributionId - 1;
-
-      // if no conribution is found
-      if (!contribution.exists) {
-        nextContribution = false;
-        break;
-      }
-      // check if the contribution is older
-      // in that case we assume all other contributions now are older
-      if (contribution.confirmedAtBlock < confirmedAfterBlock) {
-        nextContribution = false;
-      }
-
-      // if the contribution is within the range count it
-      if (!contribution.vetoed && contribution.confirmedAtBlock < confirmedBeforeBlock && contribution.confirmedAtBlock > confirmedAfterBlock) {
-        // init
-        tokens[contribution.contributorId].amount = tokens[contribution.contributorId].amount + contribution.amount;
-      }
-    }
-
-    Object.keys(tokens).forEach((contributorId) => {
-      table.push([
-        contributorId,
-        `${tokens[contributorId].contributor.name}`,
-        `${tokens[contributorId].amount}`
-      ]);
-    });
-
-    const total = Object.keys(tokens).map(cid => { return tokens[cid].amount}).reduce((a,b) => { return a+b }, 0);
-    console.log(`Total confirmed Kredits: ${total} between block ${confirmedAfterBlock} and ${confirmedBeforeBlock}`);
-    console.log(table.toString());
-  } catch (err) {
-    console.log(err);
-  }
-
-  callback();
-}
--- a/scripts/list-contributions.js
+++ b/scripts/list-contributions.js
@@ -41,8 +41,8 @@ module.exports = async function(callback) {

    console.log(table.toString());

-    let totalKreditsEarnedUnConfirmed = await kredits.Contribution.contract.totalKreditsEarned(false);
-    let totalKreditsEarnedConfirmed = await kredits.Contribution.contract.totalKreditsEarned(true);
+    let totalKreditsEarnedUnConfirmed = await kredits.Contribution.functions.totalKreditsEarned(false);
+    let totalKreditsEarnedConfirmed = await kredits.Contribution.functions.totalKreditsEarned(true);
    console.log(`Total Kredits: ${totalKreditsEarnedConfirmed} (confirmed) | ${totalKreditsEarnedUnConfirmed} (including unconfirmed)`);
  } catch (err) {
    console.log(err);
--- a/scripts/list-reimbursements.js
+++ b/scripts/list-reimbursements.js
@@ -1,52 +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 Reimbursement at: ${kredits.Reimbursement.contract.address}`);
-
-  const table = new Table({
-    head: ['ID', 'Amount', 'Token', 'recipientId', 'Confirmed?', 'Vetoed?', 'IPFS', 'Expenses']
-  })
-
-  try {
-    let blockNumber = await kredits.provider.getBlockNumber();
-    let reimbursements = await kredits.Reimbursement.all({page: {size: 1000}});
-
-    let kreditsSum = 0;
-    console.log(`Current block number: ${blockNumber}`);
-    reimbursements.forEach(r => {
-      const confirmed = r.confirmedAtBlock <= blockNumber;
-
-      table.push([
-        r.id.toString(),
-        r.amount.toString(),
-        `${r.token}`,
-        `${r.recipientId}`,
-        `${confirmed}`,
-        `${r.vetoed}`,
-        `${r.ipfsHash}`,
-        `${r.expenses.length}`
-      ]);
-    });
-
-    console.log(table.toString());
-
-    let totalAmountUnconfirmed = await kredits.Reimbursement.functions.totalAmount(false);
-    let totalAmountConfirmed = await kredits.Reimbursement.functions.totalAmount(true);
-    console.log(`Total: ${totalAmountConfirmed} (confirmed) | ${totalAmountUnconfirmed} (including unconfirmed)`);
-  } catch (err) {
-    console.log(err);
-  }
-
-  callback();
-}
--- a/scripts/new-dao.js
+++ b/scripts/new-dao.js
@@ -3,15 +3,13 @@ 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');

 module.exports = async function(callback) {
-  const provider = new ethers.providers.Web3Provider(web3.currentProvider);
-  const signer = provider.getSigner();
-  const network = await provider.getNetwork();
-  const networkId = network.chainId;
+  const networkId = await getNetworkId(web3)
  console.log(`Deploying to networkId: ${networkId}`)

  let kitAddresseFile = path.join(addressesPath, 'KreditsKit.json');
@@ -22,6 +20,9 @@ module.exports = async function(callback) {
  }
  console.log(`Using KreditsKit at: ${kreditsKitAddress}`);

+  const provider = new ethers.providers.Web3Provider(web3.currentProvider);
+  let signer = provider.getSigner();
+
  let kit = await new KreditsKit(provider, signer).init()

  // TODO: get rid of the hard coded gas limit
--- a/scripts/seeds.js
+++ b/scripts/seeds.js
@@ -38,7 +38,7 @@ module.exports = async function(callback) {
    if (contractWrapper[method]) {
      func = contractWrapper[method];
    } else {
-      func = contractWrapper.contract[method];
+      func = contractWrapper.functions[method];
    }
    func.apply(contractWrapper, args).then((result) => {
      console.log(`[OK] kredits.${contractName}.${method}(${JSON.stringify(args)}) => ${result.hash}`);
--- a/scripts/veto-contribution.js
+++ b/scripts/veto-contribution.js
@@ -15,7 +15,7 @@ module.exports = async function(callback) {
  console.log(`Recording a veto for contribution #${contributionId}`);

  try {
-    kredits.Contribution.contract.veto(contributionId, { gasLimit: 300000 })
+    kredits.Contribution.functions.veto(contributionId, { gasLimit: 300000 })
      .then(result => {
        console.log("\n\nResult:");
        console.log(result);
				`@@ -1 +0,0 @@`
				`module.exports = require("../../truffle.js");`