package-lock changes

2019-04-10 13:16:56 +02:00
49 changed files with 2104 additions and 42442 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,3 @@ node_modules
 **/node_modules
 .ganache-db
 .tm_properties
-yarn-error.log
-.DS_Store
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ development ganache.

    $ npm run devchain (or aragon devchain --port 7545)

-To clear/reset the chain use (e.g. if you run out of funds on your devchain)
+To clear/reset the chain use:

    $ npm run devchain -- --reset (or aragon devchain --port 7545 --reset)

@@ -79,9 +79,9 @@ Kredits DAO independently.

 ![](docs/kredits-diagram.png)

-A DAO can be deployed using the `scripts/deploy-kit.js` script or with the
-`npm run deploy:dao` command. This deploys a new Kredits DAO, installs the
-latest app versions and sets the required permissions.
+A DAO can be deployed using the `scripts/deploy-kit.js` script or with the `npm
+run deploy:dao` command. This deploys a new Kredits DAO, installs the latest
+app versions and sets the required permissions.

 See each app in `/apps/*` for details.

@@ -115,11 +115,11 @@ Script to add a new entries to the contracts using the JS wrapper

    $ truffle exec scripts/add-{contributor, contribution, proposal}.js

-### list-{contributors, contributions, proposals}.js
+### list-{contributor, contribution, proposal}.js

 List contract entries

-    $ truffle exec scripts/list-{contributors, contributions, proposals}.js
+    $ truffle exec scripts/list-{contributor, contribution, proposal}.js

 ### send-funds.js

@@ -174,26 +174,6 @@ Runs `npm install` for each app and publishes a new version.
    or
    $ npm run deploy:apps

-## Deployment
-
-### Apps deployment
-
-To deploy a new app version run:
-
-    $ aragon apm publish major --environment=NETWORK_TO_DEPLOY
-
-### KreditsKit
-
-deploy the KreditsKit as Kit to create new DAOs
-
-    $ truffle exec scripts/deploy-kit.js --network=NETWORK_TO_DEPLOY
-
-### Creating a new DAO
-
-make sure all apps and the KreditsKit are deployed, then create a new DAO:
-
-    $ truffle exec scripts/new-dao.js --network=NETWORK_TO_DEPLOY
-
 ## ACL / Permissions

 ## Upgradeable contracts
--- a/apps/contribution/contracts/Contribution.sol
+++ b/apps/contribution/contracts/Contribution.sol
@@ -118,26 +118,6 @@ contract Contribution is AragonApp {
  // Custom functions
  //

-  function totalKreditsEarned(bool confirmedOnly) public view returns (uint256 count) {
-    for (uint32 i = 1; i <= contributionsCount; i++) {
-      ContributionData memory c = contributions[i];
-      if (block.number >= c.confirmedAtBlock || !confirmedOnly) {
-        count += c.amount; // should use safemath
-      }
-    }
-  }
-
-  function totalKreditsEarnedByContributor(uint32 contributorId, bool confirmedOnly) public view returns (uint256 count) {
-    uint256 tokenBalance = ownedContributions[contributorId].length;
-    for (uint256 i = 0; i < tokenBalance; i++) {
-      uint32 cId = ownedContributions[contributorId][i];
-      ContributionData memory c = contributions[cId];
-      if (block.number >= c.confirmedAtBlock || !confirmedOnly) {
-        count += c.amount; // should use safemath
-      }
-    }
-  }
-
  function getContribution(uint32 contributionId) public view returns (uint32 id, uint32 contributorId, uint32 amount, bool claimed, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize, uint256 confirmedAtBlock, bool exists, bool vetoed) {
    id = contributionId;
    ContributionData storage c = contributions[id];
--- a/apps/contribution/package-lock.json
+++ b/apps/contribution/package-lock.json
@@ -306,9 +306,9 @@
      }
    },
    "@babel/polyfill": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.4.0.tgz",
-      "integrity": "sha512-bVsjsrtsDflIHp5I6caaAa2V25Kzn50HKPL6g3X0P0ni1ks+58cPB8Mz6AOKVuRPgaVdq/OwEUc/1vKqX+Mo4A==",
+      "version": "7.4.3",
+      "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.4.3.tgz",
+      "integrity": "sha512-rkv8WIvJshA5Ev8iNMGgz5WZkRtgtiPexiT7w5qevGTuT7ZBfM3de9ox1y9JR5/OXb/sWGBbWlHNa7vQKqku3Q==",
      "requires": {
        "core-js": "^2.6.5",
        "regenerator-runtime": "^0.13.2"
@@ -322,9 +322,9 @@
      }
    },
    "@babel/runtime": {
-      "version": "7.4.2",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.2.tgz",
-      "integrity": "sha512-7Bl2rALb7HpvXFL7TETNzKSAeBVCPHELzc0C//9FCxN8nsiueWSJBqaF+2oIJScyILStASR/Cx5WMkXGYTiJFA==",
+      "version": "7.4.3",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.3.tgz",
+      "integrity": "sha512-9lsJwJLxDh/T3Q3SZszfWOTkk3pHbkmH+3KY+zwIDmsNlxsumuhS2TH3NIpktU4kNvfzy+k3eLT7aTJSPTo0OA==",
      "requires": {
        "regenerator-runtime": "^0.13.2"
      },
@@ -1266,9 +1266,9 @@
      }
    },
    "bluebird": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz",
-      "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw=="
+      "version": "3.5.4",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz",
+      "integrity": "sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw=="
    },
    "bn.js": {
      "version": "4.11.8",
@@ -1320,9 +1320,9 @@
          "integrity": "sha512-QD46ppGintwPGuL1KqmwhR0O+N2cZUg8JG/VzwI2e28sM9TqHjQB10lI4QAaMHVbLzwVLLAwEglpKPViWX+5NQ=="
        },
        "commander": {
-          "version": "2.19.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
-          "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg=="
+          "version": "2.20.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
+          "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="
        }
      }
    },
@@ -1539,9 +1539,9 @@
      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
    },
    "caniuse-lite": {
-      "version": "1.0.30000955",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000955.tgz",
-      "integrity": "sha512-6AwmIKgqCYfDWWadRkAuZSHMQP4Mmy96xAXEdRBlN/luQhlRYOKgwOlZ9plpCOsVbBuqbTmGqDK3JUM/nlr8CA=="
+      "version": "1.0.30000957",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000957.tgz",
+      "integrity": "sha512-8wxNrjAzyiHcLXN/iunskqQnJquQQ6VX8JHfW5kLgAPRSiSuKZiNfmIkP5j7jgyXqAQBSoXyJxfnbCFS0ThSiQ=="
    },
    "caseless": {
      "version": "0.12.0",
@@ -2018,9 +2018,9 @@
      },
      "dependencies": {
        "object-keys": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz",
-          "integrity": "sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg=="
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+          "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
        }
      }
    },
@@ -2145,9 +2145,9 @@
      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
    },
    "electron-to-chromium": {
-      "version": "1.3.122",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.122.tgz",
-      "integrity": "sha512-3RKoIyCN4DhP2dsmleuFvpJAIDOseWH88wFYBzb22CSwoFDSWRc4UAMfrtc9h8nBdJjTNIN3rogChgOy6eFInw=="
+      "version": "1.3.124",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz",
+      "integrity": "sha512-glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w=="
    },
    "elegant-spinner": {
      "version": "1.0.1",
@@ -2224,9 +2224,9 @@
      },
      "dependencies": {
        "object-keys": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz",
-          "integrity": "sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg=="
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+          "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
        }
      }
    },
@@ -4917,8 +4917,43 @@
              "resolved": "https://registry.npmjs.org/eth-sig-util/-/eth-sig-util-1.4.2.tgz",
              "integrity": "sha1-jZWCAsftuq6Dlwf7pvCf8ydgYhA=",
              "requires": {
-                "ethereumjs-abi": "ethereumjs-abi@git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7",
+                "ethereumjs-abi": "git+https://github.com/ethereumjs/ethereumjs-abi.git",
                "ethereumjs-util": "^5.1.1"
+              },
+              "dependencies": {
+                "ethereumjs-abi": {
+                  "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#572d4bafe08a8a231137e1f9daeb0f8a23f197d2",
+                  "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git",
+                  "requires": {
+                    "bn.js": "^4.11.8",
+                    "ethereumjs-util": "^6.0.0"
+                  },
+                  "dependencies": {
+                    "ethereumjs-util": {
+                      "version": "6.1.0",
+                      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz",
+                      "integrity": "sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q==",
+                      "requires": {
+                        "bn.js": "^4.11.0",
+                        "create-hash": "^1.1.2",
+                        "ethjs-util": "0.1.6",
+                        "keccak": "^1.0.2",
+                        "rlp": "^2.0.0",
+                        "safe-buffer": "^5.1.1",
+                        "secp256k1": "^3.0.1"
+                      }
+                    }
+                  }
+                },
+                "ethjs-util": {
+                  "version": "0.1.6",
+                  "resolved": "https://registry.npmjs.org/ethjs-util/-/ethjs-util-0.1.6.tgz",
+                  "integrity": "sha512-CUnVOQq7gSpDHZVVrQW8ExxUETWrnrvXYvYz55wOU8Uj4VCgw56XC2B/fVqQN+f7gmrnRHSLVnFAwsCuNwji8w==",
+                  "requires": {
+                    "is-hex-prefixed": "1.0.0",
+                    "strip-hex-prefix": "1.0.0"
+                  }
+                }
              }
            },
            "ethereum-common": {
@@ -8151,8 +8186,39 @@
              "resolved": "https://registry.npmjs.org/eth-sig-util/-/eth-sig-util-1.4.2.tgz",
              "integrity": "sha1-jZWCAsftuq6Dlwf7pvCf8ydgYhA=",
              "requires": {
-                "ethereumjs-abi": "ethereumjs-abi@git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7",
+                "ethereumjs-abi": "git+https://github.com/ethereumjs/ethereumjs-abi.git",
                "ethereumjs-util": "^5.1.1"
+              },
+              "dependencies": {
+                "bn.js": {
+                  "version": "4.11.8",
+                  "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
+                  "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="
+                },
+                "ethereumjs-abi": {
+                  "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#572d4bafe08a8a231137e1f9daeb0f8a23f197d2",
+                  "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git",
+                  "requires": {
+                    "bn.js": "^4.11.8",
+                    "ethereumjs-util": "^6.0.0"
+                  },
+                  "dependencies": {
+                    "ethereumjs-util": {
+                      "version": "6.1.0",
+                      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz",
+                      "integrity": "sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q==",
+                      "requires": {
+                        "bn.js": "^4.11.0",
+                        "create-hash": "^1.1.2",
+                        "ethjs-util": "0.1.6",
+                        "keccak": "^1.0.2",
+                        "rlp": "^2.0.0",
+                        "safe-buffer": "^5.1.1",
+                        "secp256k1": "^3.0.1"
+                      }
+                    }
+                  }
+                }
              }
            },
            "ethereumjs-abi": {
@@ -8163,6 +8229,15 @@
                "ethereumjs-util": "^5.0.0"
              }
            },
+            "ethjs-util": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/ethjs-util/-/ethjs-util-0.1.6.tgz",
+              "integrity": "sha512-CUnVOQq7gSpDHZVVrQW8ExxUETWrnrvXYvYz55wOU8Uj4VCgw56XC2B/fVqQN+f7gmrnRHSLVnFAwsCuNwji8w==",
+              "requires": {
+                "is-hex-prefixed": "1.0.0",
+                "strip-hex-prefix": "1.0.0"
+              }
+            },
            "ws": {
              "version": "5.2.0",
              "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.0.tgz",
@@ -8199,12 +8274,12 @@
          "requires": {
            "underscore": "1.8.3",
            "web3-core-helpers": "1.0.0-beta.34",
-            "websocket": "websocket@git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2"
+            "websocket": "git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible"
          },
          "dependencies": {
            "websocket": {
              "version": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2",
-              "from": "websocket@git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2",
+              "from": "git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible",
              "requires": {
                "debug": "^2.2.0",
                "nan": "^2.3.3",
@@ -9144,9 +9219,9 @@
      }
    },
    "ipfs-http-client": {
-      "version": "30.1.1",
-      "resolved": "https://registry.npmjs.org/ipfs-http-client/-/ipfs-http-client-30.1.1.tgz",
-      "integrity": "sha512-tMqSwEhW57VnjHDBLjKKlgtAvlhkqVSR3oIFC0IiGnaM1nzcw7pbFBoHaFzl0PKIuXm40a5bJt85Rm2trYx+Ag==",
+      "version": "30.1.2",
+      "resolved": "https://registry.npmjs.org/ipfs-http-client/-/ipfs-http-client-30.1.2.tgz",
+      "integrity": "sha512-WhK9kzUw8+mYgZoidplxUAy5C3XJNfrfDsWREg11PT+XFeyROsMByRlcKkW/xDwOZsu0+wBuFGRkIKBoETTdLg==",
      "requires": {
        "async": "^2.6.1",
        "bignumber.js": "^8.0.2",
@@ -9166,7 +9241,7 @@
        "is-ipfs": "~0.6.0",
        "is-pull-stream": "0.0.0",
        "is-stream": "^1.1.0",
-        "iso-stream-http": "~0.1.1",
+        "iso-stream-http": "~0.1.2",
        "iso-url": "~0.4.6",
        "just-kebab-case": "^1.1.0",
        "just-map-keys": "^1.1.0",
@@ -11069,9 +11144,9 @@
      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
    },
    "p-is-promise": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.0.0.tgz",
-      "integrity": "sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg=="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="
    },
    "p-limit": {
      "version": "1.3.0",
@@ -12155,9 +12230,9 @@
      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
    },
    "source-map-support": {
-      "version": "0.5.11",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz",
-      "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==",
+      "version": "0.5.12",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz",
+      "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
      "requires": {
        "buffer-from": "^1.0.0",
        "source-map": "^0.6.0"
@@ -12194,9 +12269,9 @@
      }
    },
    "spdx-license-ids": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz",
-      "integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g=="
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz",
+      "integrity": "sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA=="
    },
    "split2": {
      "version": "2.2.0",
@@ -13806,9 +13881,9 @@
          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
        },
        "camelcase": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.0.tgz",
-          "integrity": "sha512-Y05ICatFYPAfykDIB7VdwSJ0LUl1yq/BwO2OpyGGLjiRe1fgzTwVypPiWnzkGFOVFHXrCXUNBl86bpjBhZWSJg=="
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
        },
        "cliui": {
          "version": "4.1.0",
--- a/apps/contribution/package.json
+++ b/apps/contribution/package.json
@@ -11,10 +11,10 @@
    "start": "npm run start:aragon:ipfs",
    "start:aragon:ipfs": "aragon run",
    "start:aragon:http": "aragon run --http localhost:8001 --http-served-from ./dist",
-    "start:app": "",
+    "start:app": "npm run sync-assets && npm run build:script -- --no-minify && parcel serve app/index.html -p 8001 --out-dir dist/ --no-cache",
    "test": "aragon contracts test",
    "compile": "aragon contracts compile",
-    "sync-assets": "",
+    "sync-assets": "copy-aragon-ui-assets -n aragon-ui ./dist",
    "build:app": "",
    "build:script": "",
    "build": "",
--- a/apps/contribution/test/app.js
+++ b/apps/contribution/test/app.js
@@ -1,4 +1,4 @@
-const Contribution = artifacts.require('Contribution.sol')
+const CounterApp = artifacts.require('Contribution.sol')

 contract('Contribution', (accounts) => {
  it('should be tested')
--- a/apps/contribution/yarn.lock
+++ b/apps/contribution/yarn.lock
--- a/apps/contributor/contracts/Contributor.sol
+++ b/apps/contributor/contracts/Contributor.sol
@@ -6,10 +6,6 @@ import "@aragon/os/contracts/kernel/IKernel.sol";
 interface ITokenBalance {
  function balanceOf(address contributorAccount) public view returns (uint256);
 }
-interface IContributionBalance {
-  function totalKreditsEarnedByContributor(uint32 contributorId, bool confirmedOnly) public view returns (uint256 count);
-  function balanceOf(address owner) public view returns (uint256);
-}

 contract Contributor is AragonApp {
  bytes32 public constant KERNEL_APP_ADDR_NAMESPACE = 0xd6f028ca0e8edb4a8c9757ca4fdccab25fa1e0317da1188108f7d2dee14902fb;
@@ -47,12 +43,6 @@ contract Contributor is AragonApp {
    return k.getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[uint8(Apps.Token)]);
  }

-  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++) {
@@ -128,7 +118,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, uint256 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, bool exists ) {
    id = _id;
    Contributor storage c = contributors[_id];
    account = c.account;
@@ -138,9 +128,6 @@ contract Contributor is AragonApp {
    isCore = isCoreTeam(id);
    address token = getTokenContract();
    balance = ITokenBalance(token).balanceOf(c.account);
-    address contribution = getContributionContract();
-    totalKreditsEarned = IContributionBalance(contribution).totalKreditsEarnedByContributor(_id, true);
-    contributionsCount = IContributionBalance(contribution).balanceOf(c.account);
    exists = c.exists;
  }

--- a/apps/contributor/package-lock.json
+++ b/apps/contributor/package-lock.json
@@ -306,9 +306,9 @@
      }
    },
    "@babel/polyfill": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.4.0.tgz",
-      "integrity": "sha512-bVsjsrtsDflIHp5I6caaAa2V25Kzn50HKPL6g3X0P0ni1ks+58cPB8Mz6AOKVuRPgaVdq/OwEUc/1vKqX+Mo4A==",
+      "version": "7.4.3",
+      "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.4.3.tgz",
+      "integrity": "sha512-rkv8WIvJshA5Ev8iNMGgz5WZkRtgtiPexiT7w5qevGTuT7ZBfM3de9ox1y9JR5/OXb/sWGBbWlHNa7vQKqku3Q==",
      "requires": {
        "core-js": "^2.6.5",
        "regenerator-runtime": "^0.13.2"
@@ -322,9 +322,9 @@
      }
    },
    "@babel/runtime": {
-      "version": "7.4.2",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.2.tgz",
-      "integrity": "sha512-7Bl2rALb7HpvXFL7TETNzKSAeBVCPHELzc0C//9FCxN8nsiueWSJBqaF+2oIJScyILStASR/Cx5WMkXGYTiJFA==",
+      "version": "7.4.3",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.3.tgz",
+      "integrity": "sha512-9lsJwJLxDh/T3Q3SZszfWOTkk3pHbkmH+3KY+zwIDmsNlxsumuhS2TH3NIpktU4kNvfzy+k3eLT7aTJSPTo0OA==",
      "requires": {
        "regenerator-runtime": "^0.13.2"
      },
@@ -1266,9 +1266,9 @@
      }
    },
    "bluebird": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz",
-      "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw=="
+      "version": "3.5.4",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz",
+      "integrity": "sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw=="
    },
    "bn.js": {
      "version": "4.11.8",
@@ -1320,9 +1320,9 @@
          "integrity": "sha512-QD46ppGintwPGuL1KqmwhR0O+N2cZUg8JG/VzwI2e28sM9TqHjQB10lI4QAaMHVbLzwVLLAwEglpKPViWX+5NQ=="
        },
        "commander": {
-          "version": "2.19.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
-          "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg=="
+          "version": "2.20.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
+          "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="
        }
      }
    },
@@ -1539,9 +1539,9 @@
      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
    },
    "caniuse-lite": {
-      "version": "1.0.30000955",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000955.tgz",
-      "integrity": "sha512-6AwmIKgqCYfDWWadRkAuZSHMQP4Mmy96xAXEdRBlN/luQhlRYOKgwOlZ9plpCOsVbBuqbTmGqDK3JUM/nlr8CA=="
+      "version": "1.0.30000957",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000957.tgz",
+      "integrity": "sha512-8wxNrjAzyiHcLXN/iunskqQnJquQQ6VX8JHfW5kLgAPRSiSuKZiNfmIkP5j7jgyXqAQBSoXyJxfnbCFS0ThSiQ=="
    },
    "caseless": {
      "version": "0.12.0",
@@ -2018,9 +2018,9 @@
      },
      "dependencies": {
        "object-keys": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz",
-          "integrity": "sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg=="
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+          "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
        }
      }
    },
@@ -2145,9 +2145,9 @@
      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
    },
    "electron-to-chromium": {
-      "version": "1.3.122",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.122.tgz",
-      "integrity": "sha512-3RKoIyCN4DhP2dsmleuFvpJAIDOseWH88wFYBzb22CSwoFDSWRc4UAMfrtc9h8nBdJjTNIN3rogChgOy6eFInw=="
+      "version": "1.3.124",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz",
+      "integrity": "sha512-glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w=="
    },
    "elegant-spinner": {
      "version": "1.0.1",
@@ -2224,9 +2224,9 @@
      },
      "dependencies": {
        "object-keys": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz",
-          "integrity": "sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg=="
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+          "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
        }
      }
    },
@@ -9144,9 +9144,9 @@
      }
    },
    "ipfs-http-client": {
-      "version": "30.1.1",
-      "resolved": "https://registry.npmjs.org/ipfs-http-client/-/ipfs-http-client-30.1.1.tgz",
-      "integrity": "sha512-tMqSwEhW57VnjHDBLjKKlgtAvlhkqVSR3oIFC0IiGnaM1nzcw7pbFBoHaFzl0PKIuXm40a5bJt85Rm2trYx+Ag==",
+      "version": "30.1.2",
+      "resolved": "https://registry.npmjs.org/ipfs-http-client/-/ipfs-http-client-30.1.2.tgz",
+      "integrity": "sha512-WhK9kzUw8+mYgZoidplxUAy5C3XJNfrfDsWREg11PT+XFeyROsMByRlcKkW/xDwOZsu0+wBuFGRkIKBoETTdLg==",
      "requires": {
        "async": "^2.6.1",
        "bignumber.js": "^8.0.2",
@@ -9166,7 +9166,7 @@
        "is-ipfs": "~0.6.0",
        "is-pull-stream": "0.0.0",
        "is-stream": "^1.1.0",
-        "iso-stream-http": "~0.1.1",
+        "iso-stream-http": "~0.1.2",
        "iso-url": "~0.4.6",
        "just-kebab-case": "^1.1.0",
        "just-map-keys": "^1.1.0",
@@ -11069,9 +11069,9 @@
      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
    },
    "p-is-promise": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.0.0.tgz",
-      "integrity": "sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg=="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="
    },
    "p-limit": {
      "version": "1.3.0",
@@ -12155,9 +12155,9 @@
      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
    },
    "source-map-support": {
-      "version": "0.5.11",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz",
-      "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==",
+      "version": "0.5.12",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz",
+      "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
      "requires": {
        "buffer-from": "^1.0.0",
        "source-map": "^0.6.0"
@@ -12194,9 +12194,9 @@
      }
    },
    "spdx-license-ids": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz",
-      "integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g=="
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz",
+      "integrity": "sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA=="
    },
    "split2": {
      "version": "2.2.0",
@@ -13806,9 +13806,9 @@
          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
        },
        "camelcase": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.0.tgz",
-          "integrity": "sha512-Y05ICatFYPAfykDIB7VdwSJ0LUl1yq/BwO2OpyGGLjiRe1fgzTwVypPiWnzkGFOVFHXrCXUNBl86bpjBhZWSJg=="
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
        },
        "cliui": {
          "version": "4.1.0",
--- a/apps/contributor/test/app.js
+++ b/apps/contributor/test/app.js
@@ -1,5 +1,5 @@
-const Contributor = artifacts.require('Contributor.sol')
+const CounterApp = artifacts.require('CounterApp.sol')

-contract('Contributor', (accounts) => {
+contract('CounterApp', (accounts) => {
  it('should be tested')
 })
--- a/apps/contributor/yarn.lock
+++ b/apps/contributor/yarn.lock
--- a/apps/proposal/manifest.json
+++ b/apps/proposal/manifest.json
@@ -1,4 +1,4 @@
 {
  "name": "Proposal",
-  "description": "Kredits Proposal app"
+  "description": "Kredits proposal app"
 }
--- a/apps/proposal/package-lock.json
+++ b/apps/proposal/package-lock.json
@@ -306,9 +306,9 @@
      }
    },
    "@babel/polyfill": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.4.0.tgz",
-      "integrity": "sha512-bVsjsrtsDflIHp5I6caaAa2V25Kzn50HKPL6g3X0P0ni1ks+58cPB8Mz6AOKVuRPgaVdq/OwEUc/1vKqX+Mo4A==",
+      "version": "7.4.3",
+      "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.4.3.tgz",
+      "integrity": "sha512-rkv8WIvJshA5Ev8iNMGgz5WZkRtgtiPexiT7w5qevGTuT7ZBfM3de9ox1y9JR5/OXb/sWGBbWlHNa7vQKqku3Q==",
      "requires": {
        "core-js": "^2.6.5",
        "regenerator-runtime": "^0.13.2"
@@ -322,9 +322,9 @@
      }
    },
    "@babel/runtime": {
-      "version": "7.4.2",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.2.tgz",
-      "integrity": "sha512-7Bl2rALb7HpvXFL7TETNzKSAeBVCPHELzc0C//9FCxN8nsiueWSJBqaF+2oIJScyILStASR/Cx5WMkXGYTiJFA==",
+      "version": "7.4.3",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.3.tgz",
+      "integrity": "sha512-9lsJwJLxDh/T3Q3SZszfWOTkk3pHbkmH+3KY+zwIDmsNlxsumuhS2TH3NIpktU4kNvfzy+k3eLT7aTJSPTo0OA==",
      "requires": {
        "regenerator-runtime": "^0.13.2"
      },
@@ -1266,9 +1266,9 @@
      }
    },
    "bluebird": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz",
-      "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw=="
+      "version": "3.5.4",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz",
+      "integrity": "sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw=="
    },
    "bn.js": {
      "version": "4.11.8",
@@ -1320,9 +1320,9 @@
          "integrity": "sha512-QD46ppGintwPGuL1KqmwhR0O+N2cZUg8JG/VzwI2e28sM9TqHjQB10lI4QAaMHVbLzwVLLAwEglpKPViWX+5NQ=="
        },
        "commander": {
-          "version": "2.19.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
-          "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg=="
+          "version": "2.20.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
+          "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="
        }
      }
    },
@@ -1539,9 +1539,9 @@
      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
    },
    "caniuse-lite": {
-      "version": "1.0.30000955",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000955.tgz",
-      "integrity": "sha512-6AwmIKgqCYfDWWadRkAuZSHMQP4Mmy96xAXEdRBlN/luQhlRYOKgwOlZ9plpCOsVbBuqbTmGqDK3JUM/nlr8CA=="
+      "version": "1.0.30000957",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000957.tgz",
+      "integrity": "sha512-8wxNrjAzyiHcLXN/iunskqQnJquQQ6VX8JHfW5kLgAPRSiSuKZiNfmIkP5j7jgyXqAQBSoXyJxfnbCFS0ThSiQ=="
    },
    "caseless": {
      "version": "0.12.0",
@@ -2018,9 +2018,9 @@
      },
      "dependencies": {
        "object-keys": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz",
-          "integrity": "sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg=="
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+          "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
        }
      }
    },
@@ -2145,9 +2145,9 @@
      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
    },
    "electron-to-chromium": {
-      "version": "1.3.122",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.122.tgz",
-      "integrity": "sha512-3RKoIyCN4DhP2dsmleuFvpJAIDOseWH88wFYBzb22CSwoFDSWRc4UAMfrtc9h8nBdJjTNIN3rogChgOy6eFInw=="
+      "version": "1.3.124",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz",
+      "integrity": "sha512-glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w=="
    },
    "elegant-spinner": {
      "version": "1.0.1",
@@ -2224,9 +2224,9 @@
      },
      "dependencies": {
        "object-keys": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz",
-          "integrity": "sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg=="
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+          "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
        }
      }
    },
@@ -9144,9 +9144,9 @@
      }
    },
    "ipfs-http-client": {
-      "version": "30.1.1",
-      "resolved": "https://registry.npmjs.org/ipfs-http-client/-/ipfs-http-client-30.1.1.tgz",
-      "integrity": "sha512-tMqSwEhW57VnjHDBLjKKlgtAvlhkqVSR3oIFC0IiGnaM1nzcw7pbFBoHaFzl0PKIuXm40a5bJt85Rm2trYx+Ag==",
+      "version": "30.1.2",
+      "resolved": "https://registry.npmjs.org/ipfs-http-client/-/ipfs-http-client-30.1.2.tgz",
+      "integrity": "sha512-WhK9kzUw8+mYgZoidplxUAy5C3XJNfrfDsWREg11PT+XFeyROsMByRlcKkW/xDwOZsu0+wBuFGRkIKBoETTdLg==",
      "requires": {
        "async": "^2.6.1",
        "bignumber.js": "^8.0.2",
@@ -9166,7 +9166,7 @@
        "is-ipfs": "~0.6.0",
        "is-pull-stream": "0.0.0",
        "is-stream": "^1.1.0",
-        "iso-stream-http": "~0.1.1",
+        "iso-stream-http": "~0.1.2",
        "iso-url": "~0.4.6",
        "just-kebab-case": "^1.1.0",
        "just-map-keys": "^1.1.0",
@@ -11069,9 +11069,9 @@
      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
    },
    "p-is-promise": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.0.0.tgz",
-      "integrity": "sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg=="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="
    },
    "p-limit": {
      "version": "1.3.0",
@@ -12155,9 +12155,9 @@
      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
    },
    "source-map-support": {
-      "version": "0.5.11",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz",
-      "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==",
+      "version": "0.5.12",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz",
+      "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
      "requires": {
        "buffer-from": "^1.0.0",
        "source-map": "^0.6.0"
@@ -12194,9 +12194,9 @@
      }
    },
    "spdx-license-ids": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz",
-      "integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g=="
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz",
+      "integrity": "sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA=="
    },
    "split2": {
      "version": "2.2.0",
@@ -13806,9 +13806,9 @@
          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
        },
        "camelcase": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.0.tgz",
-          "integrity": "sha512-Y05ICatFYPAfykDIB7VdwSJ0LUl1yq/BwO2OpyGGLjiRe1fgzTwVypPiWnzkGFOVFHXrCXUNBl86bpjBhZWSJg=="
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
        },
        "cliui": {
          "version": "4.1.0",
--- a/apps/proposal/test/app.js
+++ b/apps/proposal/test/app.js
@@ -1,5 +0,0 @@
-const Proposal = artifacts.require('Proposal.sol')
-
-contract('Proposal', (accounts) => {
-  it('should be tested')
-})
--- a/apps/proposal/yarn.lock
+++ b/apps/proposal/yarn.lock
--- a/apps/token/contracts/Token.sol
+++ b/apps/token/contracts/Token.sol
@@ -14,15 +14,11 @@ contract Token is ERC20Token, AragonApp {

  function initialize(bytes32[4] _appIds) public onlyInit {
    appIds = _appIds;
-    name = 'Kredits';
-    symbol = '₭S';
-    decimals = 18;
    initialized();
  }

  function mintFor(address contributorAccount, uint256 amount, uint32 contributionId) public isInitialized auth(MINT_TOKEN_ROLE) {
-    uint256 amountInWei = amount.mul(1 ether);
-    _mint(contributorAccount, amountInWei);
+    _mint(contributorAccount, amount);
    emit LogMint(contributorAccount, amount, contributionId);
  }

--- a/apps/token/manifest.json
+++ b/apps/token/manifest.json
@@ -1,4 +1,4 @@
 {
  "name": "Token",
-  "description": "Kredits Token app"
+  "description": "Kredits token app"
 }
--- a/apps/token/package-lock.json
+++ b/apps/token/package-lock.json
@@ -306,9 +306,9 @@
      }
    },
    "@babel/polyfill": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.4.0.tgz",
-      "integrity": "sha512-bVsjsrtsDflIHp5I6caaAa2V25Kzn50HKPL6g3X0P0ni1ks+58cPB8Mz6AOKVuRPgaVdq/OwEUc/1vKqX+Mo4A==",
+      "version": "7.4.3",
+      "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.4.3.tgz",
+      "integrity": "sha512-rkv8WIvJshA5Ev8iNMGgz5WZkRtgtiPexiT7w5qevGTuT7ZBfM3de9ox1y9JR5/OXb/sWGBbWlHNa7vQKqku3Q==",
      "requires": {
        "core-js": "^2.6.5",
        "regenerator-runtime": "^0.13.2"
@@ -322,9 +322,9 @@
      }
    },
    "@babel/runtime": {
-      "version": "7.4.2",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.2.tgz",
-      "integrity": "sha512-7Bl2rALb7HpvXFL7TETNzKSAeBVCPHELzc0C//9FCxN8nsiueWSJBqaF+2oIJScyILStASR/Cx5WMkXGYTiJFA==",
+      "version": "7.4.3",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.3.tgz",
+      "integrity": "sha512-9lsJwJLxDh/T3Q3SZszfWOTkk3pHbkmH+3KY+zwIDmsNlxsumuhS2TH3NIpktU4kNvfzy+k3eLT7aTJSPTo0OA==",
      "requires": {
        "regenerator-runtime": "^0.13.2"
      },
@@ -1266,9 +1266,9 @@
      }
    },
    "bluebird": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz",
-      "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw=="
+      "version": "3.5.4",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz",
+      "integrity": "sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw=="
    },
    "bn.js": {
      "version": "4.11.8",
@@ -1320,9 +1320,9 @@
          "integrity": "sha512-QD46ppGintwPGuL1KqmwhR0O+N2cZUg8JG/VzwI2e28sM9TqHjQB10lI4QAaMHVbLzwVLLAwEglpKPViWX+5NQ=="
        },
        "commander": {
-          "version": "2.19.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
-          "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg=="
+          "version": "2.20.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
+          "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="
        }
      }
    },
@@ -1539,9 +1539,9 @@
      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
    },
    "caniuse-lite": {
-      "version": "1.0.30000955",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000955.tgz",
-      "integrity": "sha512-6AwmIKgqCYfDWWadRkAuZSHMQP4Mmy96xAXEdRBlN/luQhlRYOKgwOlZ9plpCOsVbBuqbTmGqDK3JUM/nlr8CA=="
+      "version": "1.0.30000957",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000957.tgz",
+      "integrity": "sha512-8wxNrjAzyiHcLXN/iunskqQnJquQQ6VX8JHfW5kLgAPRSiSuKZiNfmIkP5j7jgyXqAQBSoXyJxfnbCFS0ThSiQ=="
    },
    "caseless": {
      "version": "0.12.0",
@@ -2018,9 +2018,9 @@
      },
      "dependencies": {
        "object-keys": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz",
-          "integrity": "sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg=="
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+          "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
        }
      }
    },
@@ -2145,9 +2145,9 @@
      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
    },
    "electron-to-chromium": {
-      "version": "1.3.122",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.122.tgz",
-      "integrity": "sha512-3RKoIyCN4DhP2dsmleuFvpJAIDOseWH88wFYBzb22CSwoFDSWRc4UAMfrtc9h8nBdJjTNIN3rogChgOy6eFInw=="
+      "version": "1.3.124",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz",
+      "integrity": "sha512-glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w=="
    },
    "elegant-spinner": {
      "version": "1.0.1",
@@ -2224,9 +2224,9 @@
      },
      "dependencies": {
        "object-keys": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz",
-          "integrity": "sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg=="
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+          "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
        }
      }
    },
@@ -9144,9 +9144,9 @@
      }
    },
    "ipfs-http-client": {
-      "version": "30.1.1",
-      "resolved": "https://registry.npmjs.org/ipfs-http-client/-/ipfs-http-client-30.1.1.tgz",
-      "integrity": "sha512-tMqSwEhW57VnjHDBLjKKlgtAvlhkqVSR3oIFC0IiGnaM1nzcw7pbFBoHaFzl0PKIuXm40a5bJt85Rm2trYx+Ag==",
+      "version": "30.1.2",
+      "resolved": "https://registry.npmjs.org/ipfs-http-client/-/ipfs-http-client-30.1.2.tgz",
+      "integrity": "sha512-WhK9kzUw8+mYgZoidplxUAy5C3XJNfrfDsWREg11PT+XFeyROsMByRlcKkW/xDwOZsu0+wBuFGRkIKBoETTdLg==",
      "requires": {
        "async": "^2.6.1",
        "bignumber.js": "^8.0.2",
@@ -9166,7 +9166,7 @@
        "is-ipfs": "~0.6.0",
        "is-pull-stream": "0.0.0",
        "is-stream": "^1.1.0",
-        "iso-stream-http": "~0.1.1",
+        "iso-stream-http": "~0.1.2",
        "iso-url": "~0.4.6",
        "just-kebab-case": "^1.1.0",
        "just-map-keys": "^1.1.0",
@@ -11069,9 +11069,9 @@
      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
    },
    "p-is-promise": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.0.0.tgz",
-      "integrity": "sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg=="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="
    },
    "p-limit": {
      "version": "1.3.0",
@@ -12155,9 +12155,9 @@
      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
    },
    "source-map-support": {
-      "version": "0.5.11",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz",
-      "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==",
+      "version": "0.5.12",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz",
+      "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
      "requires": {
        "buffer-from": "^1.0.0",
        "source-map": "^0.6.0"
@@ -12194,9 +12194,9 @@
      }
    },
    "spdx-license-ids": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz",
-      "integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g=="
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz",
+      "integrity": "sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA=="
    },
    "split2": {
      "version": "2.2.0",
@@ -13806,9 +13806,9 @@
          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
        },
        "camelcase": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.0.tgz",
-          "integrity": "sha512-Y05ICatFYPAfykDIB7VdwSJ0LUl1yq/BwO2OpyGGLjiRe1fgzTwVypPiWnzkGFOVFHXrCXUNBl86bpjBhZWSJg=="
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
        },
        "cliui": {
          "version": "4.1.0",
--- a/apps/token/test/app.js
+++ b/apps/token/test/app.js
@@ -1,5 +1,5 @@
-const Token = artifacts.require('Token.sol')
+const CounterApp = artifacts.require('CounterApp.sol')

-contract('Token', (accounts) => {
+contract('CounterApp', (accounts) => {
  it('should be tested')
 })
--- a/apps/token/yarn.lock
+++ b/apps/token/yarn.lock
--- a/config/seeds.js
+++ b/config/seeds.js
@@ -1,19 +1,16 @@
 const contractCalls = [
-  ['Contributor', 'add', [{ account: '0x7e8f313c56f809188313aa274fa67ee58c31515d', name: 'bumi', kind: 'person', url: '', github_username: 'bumi', github_uid: 318, wiki_username: 'Bumi' }, { gasLimit: 200000 }]],
-  ['Contributor', 'add', [{ account: '0x49575f3DD9a0d60aE661BC992f72D837A77f05Bc', name: 'raucao', kind: 'person', url: '', github_username: 'skddc', github_uid: 842, wiki_username: 'Basti' }, { gasLimit: 200000 }]],
-  ['Contributor', 'add', [{ account: '0xF722709ECC3B05c19d02E82a2a4A4021B8F48C62', name: 'Manuel', kind: 'person', url: '', github_username: 'fsmanuel', github_uid: 54812, wiki_username: 'Manuel' }, { gasLimit: 200000 }]],
-  ['Proposal', 'addProposal', [{ contributorId: 1, contributorIpfsHash: 'QmWKCYGr2rSf6abUPaTYqf98urvoZxGrb7dbspFZA6oyVF', date: '2019-04-09', amount: 500, kind: 'dev', description: '[67P/kredits-contracts] Ran the seeds', url: '' }, { gasLimit: 350000 }]],
-  ['Proposal', 'addProposal', [{ contributorId: 2, 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-11', amount: 500, kind: 'dev', description: '[67P/kredits-contracts] Hacked on kredits', url: '' }, { gasLimit: 350000 }]],
+  ['Contributor', 'add', [{ account: '0x7e8f313c56f809188313aa274fa67ee58c31515d', name: 'bumi', isCore: true, kind: 'person', url: '', github_username: 'bumi', github_uid: 318, wiki_username: 'bumi' }, { gasLimit: 200000 }]],
+  ['Contributor', 'add', [{ account: '0x49575f3DD9a0d60aE661BC992f72D837A77f05Bc', name: 'raucao', isCore: true, kind: 'person', url: '', github_username: 'skddc', github_uid: 842, wiki_username: 'raucau' }, { gasLimit: 200000 }]],
+  ['Proposal', 'addProposal', [{ contributorId: 1, amount: 500, kind: 'code', description: '[67P/kredits-contracts] Ran the seeds', url: '' }, { gasLimit: 350000 }]],
+  ['Proposal', 'addProposal', [{ contributorId: 2, amount: 500, kind: 'code', description: '[67P/kredits-contracts] Ran the seeds', url: '' }, { gasLimit: 350000 }]],
+  ['Proposal', 'addProposal', [{ contributorId: 2, amount: 500, kind: 'code', description: '[67P/kredits-contracts] Hacked on kredits', url: '' }, { gasLimit: 350000 }]],
  ['Proposal', 'vote', [1, { gasLimit: 550000 }]],
-  ['Contribution', 'addContribution', [{ contributorId: 1, contributorIpfsHash: 'QmWKCYGr2rSf6abUPaTYqf98urvoZxGrb7dbspFZA6oyVF', date: '2019-04-11', amount: 5000, kind: 'dev', description: '[67P/kredits-contracts] Introduce contribution token', url: '' }, { gasLimit: 350000 }]],
-  ['Contribution', 'addContribution', [{ contributorId: 2, contributorIpfsHash: 'QmcHzEeAM26HV2zHTf5HnZrCtCtGdEccL5kUtDakAB7ozB', date: '2019-04-11', amount: 1500, kind: 'dev', description: '[67P/kredits-web] Reviewed stuff', url: '' }, { gasLimit: 350000 }]],
+  ['Contribution', 'addContribution', [{ contributorId: 1, amount: 5000, kind: 'dev', description: '[67P/kredits-contracts] Introduce contribution token', url: '' }, { gasLimit: 350000 }]],
+  ['Contribution', 'addContribution', [{ contributorId: 2, amount: 1500, kind: 'dev', description: '[67P/kredits-web] Reviewed stuff', url: '' }, { gasLimit: 350000 }]],
  ['Contribution', 'claim', [1, { gasLimit: 300000 }]]
 ];
-
 const funds = [
  '0x7e8f313c56f809188313aa274fa67ee58c31515d',
  '0xa502eb4021f3b9ab62f75b57a94e1cfbf81fd827'
 ];
-
 module.exports = { contractCalls, funds };
--- a/deployments/rinkeby/contribution.md
+++ b/deployments/rinkeby/contribution.md
@@ -1,13 +1,5 @@
 # Contribution deployments

-## 2019-04-10 - Weltempfänger release
-
-✔ Successfully published kredits-contribution.open.aragonpm.eth v5.0.0: 
- ℹ Contract address: 0xe0f7dB486321b917e3A986Bdb2F2b9d51BA98fa9
- ℹ Content (ipfs): QmU3XEBb4f5jU8MFFEpwaa95C1mhc82UeYLRWLrKsvcQNw
- ℹ Transaction hash: 0xd736ff5f79f8142be3fad1a50580fb40aa468838da397f8630285fd91a445af3
-
-
 ## 2019-04-04

 ✔ Successfully published kredits-contribution.open.aragonpm.eth v4.0.0: 
--- a/deployments/rinkeby/contributor.md
+++ b/deployments/rinkeby/contributor.md
@@ -1,13 +1,5 @@
 # Contributor deployments

-## 2019-04-10 - Weltempfänger release
-
-✔ Successfully published kredits-contributor.open.aragonpm.eth v4.0.0: 
- ℹ Contract address: 0x08a6D4D915FCAA5524F05F5F715a6C17cB6eeA6B
- ℹ Content (ipfs): QmR62PWwe1EzommfkhJDYcTvHoZjbXuv9dTG6vCn5dWCsb
- ℹ Transaction hash: 0xd5317c9e207a413485c55ec3046b09d467d978443680304737a6d7d3db0c90e1
-
-
 ## 2019-04-04

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

-## 2019-04-10 - Weltempfänger release
-
-Using KreditsKit at: 0x76e069b47b79442657eaf0555a32c6b16fa1b8b4
-Created new DAO at: 0xc34edf7d11b7f8433d597f0bb0697acdff55ef14
-
 ## 2019-04-04

 Using KreditsKit at: 0x76e069b47b79442657eaf0555a32c6b16fa1b8b4
--- a/deployments/rinkeby/proposal.md
+++ b/deployments/rinkeby/proposal.md
@@ -1,13 +1,5 @@
 # Proposal deployments

-## 2019-04-10 - Weltempfänger release
-
-✔ Successfully published kredits-proposal.open.aragonpm.eth v5.0.0: 
- ℹ Contract address: 0x4ce5b0286483c66b861e5599a199054687434552
- ℹ Content (ipfs): QmNYXEcmvKTGxYiob7WUf85oZhdmFDCuGiA6TsRrDE9TYb
- ℹ Transaction hash: 0x0482b58a1ba87d494c6391026399d0ac41b45384330d916f3f99ba70e501584b
-
-
 ## 2019-04-04

 ✔ Successfully published kredits-proposal.open.aragonpm.eth v4.0.0: 
--- a/deployments/rinkeby/token.md
+++ b/deployments/rinkeby/token.md
@@ -1,13 +1,5 @@
 # Token deployments

-## 2019-04-10 - Weltempfänger release
-
-✔ Successfully published kredits-token.open.aragonpm.eth v4.0.0: 
- ℹ Contract address: 0x05E0C2bbdA8e5BeE22AC1E20C1457dA4de63aE26
- ℹ Content (ipfs): QmUuYLRMRNZcundUk2pxVaSjMNvtB7hzdf3eyoaUNqDPow
- ℹ Transaction hash: 0x98c28b5ca645904d56eb83c4783682f018c0fcee015b3a3d5fa8bd609223fb89
-
-
 ## 2019-04-04

 ✔ Successfully published kredits-token.open.aragonpm.eth v3.0.0: 
--- a/lib/abis/Contribution.json
+++ b/lib/abis/Contribution.json
--- a/lib/abis/Contributor.json
+++ b/lib/abis/Contributor.json
--- a/lib/addresses/KreditsKit.json
+++ b/lib/addresses/KreditsKit.json
@@ -1,3 +1,4 @@
 {
-  "4": "0x76e069b47b79442657eaf0555a32c6b16fa1b8b4"
+  "4": "0x76e069b47b79442657eaf0555a32c6b16fa1b8b4",
+  "41787949": "0xa35aacdfccac54d3d96e0d29050c773b251c2c83"
 }
--- a/lib/addresses/dao.json
+++ b/lib/addresses/dao.json
@@ -1,3 +1,4 @@
 {
-  "4": "0xc34edf7d11b7f8433d597f0bb0697acdff55ef14"
+  "4": "0xcd75458fbc4aa2231252d5b21f1391fd031e5cb2",
+  "41787949": "0x183af3950364390a266edff2a0e7c4c2f95c0691"
 }
--- a/lib/contracts/base.js
+++ b/lib/contracts/base.js
@@ -20,5 +20,4 @@ class Base {
    return this.contract.on(type, callback);
  }
 }
-
 module.exports = Base;
--- a/lib/contracts/contribution.js
+++ b/lib/contracts/contribution.js
@@ -1,9 +1,21 @@
-const Record = require('./record');
-const ContributionSerializer = require('../serializers/contribution');
+const ethers = require('ethers');

-class Contribution extends Record {
-  get count () {
-    return this.functions.contributionsCount();
+const ContributionSerializer = require('../serializers/contribution');
+const Base = require('./base');
+
+class Contribution extends Base {
+  all() {
+    return this.functions.contributionsCount()
+      .then(async (count) => {
+        let contributions = [];
+
+        for (let id = 1; id <= count; id++) {
+          const contribution = await this.getById(id)
+          contributions.push(contribution);
+        }
+
+        return contributions;
+      });
  }

  getById(id) {
@@ -35,17 +47,13 @@ class Contribution extends Record {
      });
  }

-  async addContribution(contributionAttr, callOptions = {}) {
-    const contribution = new ContributionSerializer(contributionAttr);
-
-    try { await contribution.validate(); }
-    catch (error) { return Promise.reject(error); }
-
-    const jsonStr = contribution.serialize();
+  addContribution(contributionAttr, callOptions = {}) {
+    let json = ContributionSerializer.serialize(contributionAttr);
+    // TODO: validate against schema

    return this.ipfs
-      .add(jsonStr)
-      .then(ipfsHashAttr => {
+      .add(json)
+      .then((ipfsHashAttr) => {
        let contribution = [
          contributionAttr.amount,
          contributionAttr.contributorId,
--- a/lib/contracts/contributor.js
+++ b/lib/contracts/contributor.js
@@ -1,13 +1,26 @@
-const Record = require('./record');
-const ContributorSerializer = require('../serializers/contributor');
+const ethers = require('ethers');
+const RSVP = require('rsvp');

-class Contributor extends Record {
-  get count () {
-    return this.functions.contributorsCount();
+const ContributorSerializer = require('../serializers/contributor');
+const Base = require('./base');
+
+class Contributor extends Base {
+  all() {
+    return this.functions.contributorsCount()
+      .then(count => {
+        let contributors = [];
+
+        for (let id = 1; id <= count; id++) {
+          contributors.push(this.getById(id));
+        }
+
+        return RSVP.all(contributors);
+      });
  }

  getById(id) {
    return this.functions.getContributorById(id)
+      // Fetch IPFS data if available
      .then((data) => {
        return this.ipfs.catAndMerge(data, ContributorSerializer.deserialize);
      });
@@ -37,16 +50,12 @@ class Contributor extends Record {
    });
  }

-  async add(contributorAttr, callOptions = {}) {
-    let contributor = new ContributorSerializer(contributorAttr);
-
-    try { await contributor.validate(); }
-    catch (error) { return Promise.reject(error); }
-
-    const jsonStr = contributor.serialize();
+  add(contributorAttr, callOptions = {}) {
+    let json = ContributorSerializer.serialize(contributorAttr);
+    // TODO: validate against schema

    return this.ipfs
-      .add(jsonStr)
+      .add(json)
      .then((ipfsHashAttr) => {
        let contributor = [
          contributorAttr.account,
@@ -58,30 +67,6 @@ class Contributor extends Record {
        return this.functions.addContributor(...contributor, callOptions);
      });
  }
-
-  updateProfile(contributorId, updateAttr, callOptions = {}) {
-    return this.getById(contributorId).then(async (contributor) => {
-      let updatedContributorAttr = Object.assign(contributor, updateAttr)
-      let updatedContributor = new ContributorSerializer(updatedContributorAttr);
-
-      try { await updatedContributor.validate(); }
-      catch (error) { return Promise.reject(error); }
-
-      const jsonStr = updatedContributor.serialize();
-
-      return this.ipfs
-        .add(jsonStr)
-        .then(ipfsHashAttr => {
-          return this.functions.updateContributorProfileHash(
-            contributorId,
-            ipfsHashAttr.hashDigest,
-            ipfsHashAttr.hashFunction,
-            ipfsHashAttr.hashSize,
-            callOptions
-          );
-        });
-    });
-  }
 }

 module.exports = Contributor;
--- a/lib/contracts/proposal.js
+++ b/lib/contracts/proposal.js
@@ -1,9 +1,21 @@
-const Record = require('./record');
-const ContributionSerializer = require('../serializers/contribution');
+const ethers = require('ethers');
+const RSVP = require('rsvp');

-class Proposal extends Record {
-  get count () {
-    return this.functions.proposalsCount();
+const ContributionSerializer = require('../serializers/contribution');
+const Base = require('./base');
+
+class Proposal extends Base {
+  all() {
+    return this.functions.proposalsCount()
+      .then(count => {
+        let proposals = [];
+
+        for (let id = 1; id <= count; id++) {
+          proposals.push(this.getById(id));
+        }
+
+        return RSVP.all(proposals);
+      });
  }

  getById(id) {
@@ -13,16 +25,12 @@ class Proposal extends Record {
      });
  }

-  async addProposal(proposalAttr, callOptions = {}) {
-    const contribution = new ContributionSerializer(proposalAttr);
-
-    try { await contribution.validate(); }
-    catch (error) { return Promise.reject(error); }
-
-    const jsonStr = contribution.serialize();
+  addProposal(proposalAttr, callOptions = {}) {
+    let json = ContributionSerializer.serialize(proposalAttr);
+    // TODO: validate against schema

    return this.ipfs
-      .add(jsonStr)
+      .add(json)
      .then((ipfsHashAttr) => {
        let proposal = [
          proposalAttr.contributorId,
--- a/lib/contracts/record.js
+++ b/lib/contracts/record.js
@@ -1,14 +0,0 @@
-const Base = require('./base');
-const paged = require('../utils/pagination');
-
-class Record extends Base {
-  all(options = {}) {
-    return this.count
-      .then((count) => {
-        let records = paged(count, options).map((id) => this.getById(id));
-        return Promise.all(records);
-      });
-  }
-}
-
-module.exports = Record
--- a/lib/contracts/token.js
+++ b/lib/contracts/token.js
@@ -4,3 +4,4 @@ class Token extends Base {
 }

 module.exports = Token;
+
--- a/lib/kredits.js
+++ b/lib/kredits.js
@@ -1,4 +1,5 @@
 const ethers = require('ethers');
+const RSVP = require('rsvp');

 const Preflight = require('./utils/preflight');

@@ -56,8 +57,7 @@ class Kredits {
          );
        });
      });
-
-      return Promise.all(addressPromises).then(() => { return this });
+      return RSVP.all(addressPromises).then(() => { return this });
    });
  }

--- a/lib/serializers/contribution.js
+++ b/lib/serializers/contribution.js
@@ -1,33 +1,48 @@
-const schemas = require('kosmos-schemas');
-const validator = require('../utils/validator');
-
 /**
- * Serialization and validation for JSON-LD document of the contribution.
+ * Handle serialization for JSON-LD object of the contribution, according to
+ * https://github.com/67P/kosmos-schemas/blob/master/schemas/contribution.json
 *
 * @class
 * @public
 */
 class Contribution {
+ /**
+  * Deserialize JSON to object
+  *
+  * @method
+  * @public
+  */
+  static deserialize(serialized) {
+    let {
+      kind,
+      description,
+      details,
+      url,
+    } = JSON.parse(serialized.toString('utf8'));

-  constructor(attrs) {
-    Object.keys(attrs).forEach(a => this[a] = attrs[a]);
+    return {
+      kind,
+      description,
+      details,
+      url,
+      ipfsData: serialized,
+    };
  }

 /**
  * Serialize object to JSON
  *
+  * @method
  * @public
  */
-  serialize () {
+  static serialize(deserialized) {
    let {
      contributorIpfsHash,
-      date,
-      time,
      kind,
      description,
      url,
      details
-    } = this;
+    } = deserialized;

    let data = {
      "@context": "https://schema.kosmos.org",
@@ -35,8 +50,6 @@ class Contribution {
      "contributor": {
        "ipfs": contributorIpfsHash
      },
-      date,
-      time,
      kind,
      description,
      "details": details || {}
@@ -49,44 +62,6 @@ class Contribution {
    // Write it pretty to ipfs
    return JSON.stringify(data, null, 2);
  }
-
-  /**
-   * Validate serialized data against schema
-   *
-   * @public
-   */
-  validate () {
-    const serialized = JSON.parse(this.serialize());
-    const valid = validator.validate(serialized, schemas['contribution']);
-    return valid ? Promise.resolve() : Promise.reject(validator.error);
-  }
-
-  /**
-   * Deserialize JSON to object
-   *
-   * @public
-   */
-  static deserialize (serialized) {
-    let {
-      date,
-      time,
-      kind,
-      description,
-      details,
-      url,
-    } = JSON.parse(serialized.toString('utf8'));
-
-    return {
-      date,
-      time,
-      kind,
-      description,
-      details,
-      url,
-      ipfsData: serialized,
-    };
-  }
-
 }

 module.exports = Contribution;
--- a/lib/serializers/contributor.js
+++ b/lib/serializers/contributor.js
@@ -1,5 +1,3 @@
-const schemas = require('kosmos-schemas');
-const validator = require('../utils/validator');
 /**
 * Handle serialization for JSON-LD object of the contributor, according to
 * https://github.com/67P/kosmos-schemas/blob/master/schemas/contributor.json
@@ -8,9 +6,41 @@ const validator = require('../utils/validator');
 * @public
 */
 class Contributor {
+ /**
+  * Deserialize JSON to object
+  *
+  * @method
+  * @public
+  */
+  static deserialize(serialized) {
+    let {
+      name,
+      kind,
+      url,
+      accounts,
+    } = JSON.parse(serialized.toString('utf8'));

-  constructor(attrs) {
-    Object.keys(attrs).forEach(a => this[a] = attrs[a]);
+    let github_username, github_uid, wiki_username;
+    let github = accounts.find((a) => a.site === 'github.com');
+    let wiki   = accounts.find((a) => a.site === 'wiki.kosmos.org');
+
+    if (github) {
+      (({ username: github_username, uid: github_uid} = github));
+    }
+    if (wiki) {
+      (({ username: wiki_username } = wiki));
+    }
+
+    return {
+      name,
+      kind,
+      url,
+      accounts,
+      github_uid,
+      github_username,
+      wiki_username,
+      ipfsData: serialized,
+    };
  }

 /**
@@ -19,7 +49,7 @@ class Contributor {
  * @method
  * @public
  */
-  serialize () {
+  static serialize(deserialized) {
    let {
      name,
      kind,
@@ -27,7 +57,7 @@ class Contributor {
      github_uid,
      github_username,
      wiki_username,
-    } = this;
+    } = deserialized;

    let data = {
      "@context": "https://schema.kosmos.org",
@@ -61,55 +91,6 @@ class Contributor {
    // Write it pretty to ipfs
    return JSON.stringify(data, null, 2);
  }
-
-  /**
-   * Validate serialized data against schema
-   *
-   * @public
-   */
-  validate () {
-    const serialized = JSON.parse(this.serialize());
-    const valid = validator.validate(serialized, schemas['contributor']);
-    return valid ? Promise.resolve() : Promise.reject(validator.error);
-  }
-
-  /**
-  * Deserialize JSON to object
-  *
-  * @method
-  * @public
-  */
-  static deserialize (serialized) {
-    let {
-      name,
-      kind,
-      url,
-      accounts,
-    } = JSON.parse(serialized.toString('utf8'));
-
-    let github_username, github_uid, wiki_username;
-    let github = accounts.find((a) => a.site === 'github.com');
-    let wiki   = accounts.find((a) => a.site === 'wiki.kosmos.org');
-
-    if (github) {
-      (({ username: github_username, uid: github_uid} = github));
-    }
-    if (wiki) {
-      (({ username: wiki_username } = wiki));
-    }
-
-    return {
-      name,
-      kind,
-      url,
-      accounts,
-      github_uid,
-      github_username,
-      wiki_username,
-      ipfsData: serialized,
-    };
-  }
-
 }

 module.exports = Contributor;
--- a/lib/utils/pagination.js
+++ b/lib/utils/pagination.js
@@ -1,46 +0,0 @@
-function pageNumber(number, size, recordCount) {
-  let numberOfPages = Math.ceil(recordCount / size);
-
-  number = parseInt(number) || 1;
-
-  // Ensure page number is in range
-  number = number < 1 ? 1 : number;
-  number = number > numberOfPages ? numberOfPages : number;
-
-  return number;
-}
-
-function buildIds(order, number, size, recordCount) {
-  let offset = size * (number - 1);
-
-  let start;
-  let mapFunction;
-
-  if (order === 'asc') {
-    start = 1 + offset;
-    mapFunction = (_, i) => start + i;
-  } else {
-    start = recordCount - offset;
-    mapFunction = (_, i) => start - i;
-  }
-
-  // Ensure size is in range
-  let end = offset + size;
-  if (end > recordCount) {
-    let diff = end - recordCount;
-    size = size - diff;
-  }
-
-  return Array.from({ length: size }, mapFunction);
-}
-
-module.exports = function paged(recordCount, options = {}) {
-  let { order, page } = options;
-  order = order || 'desc';
-  page = page || {};
-
-  let size = parseInt(page.size) || 25;
-  let number = pageNumber(page.number, size, recordCount);
-
-  return buildIds(order, number, size, recordCount);
-};
--- a/lib/utils/validator.js
+++ b/lib/utils/validator.js
@@ -1,15 +0,0 @@
-const tv4 = require('tv4');
-const validator = tv4.freshApi();
-
-validator.addFormat({
-  'date': function(value) {
-    const dateRegexp = /^[0-9]{4,}-[0-9]{2}-[0-9]{2}$/;
-    return dateRegexp.test(value) ? null : "A valid ISO 8601 full-date string is expected";
-  },
-  'time': function(value) {
-    const timeRegexp = /^([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9]|60)(\.[0-9]+)?(([Zz])|([\+|\-]([01][0-9]|2[0-3]):[0-5][0-9]))$/;
-    return timeRegexp.test(value) ? null : "A valid ISO 8601 full-time string is expected";
-  }
-})
-
-module.exports = validator;
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "kredits-contracts",
-  "version": "5.2.0",
+  "version": "4.0.2",
  "description": "Ethereum contracts and npm wrapper for Kredits",
  "main": "./lib/kredits.js",
  "directories": {
@@ -45,8 +45,7 @@
  "dependencies": {
    "ethers": "^4.0.27",
    "ipfs-http-client": "^30.1.1",
-    "kosmos-schemas": "^2.0.0",
-    "tv4": "^1.3.0"
+    "rsvp": "^4.8.2"
  },
  "keywords": [
    "kosmos",
--- a/scripts/add-contribution.js
+++ b/scripts/add-contribution.js
@@ -1,5 +1,4 @@
 const promptly = require('promptly');
-const { inspect } = require('util');

 const initKredits = require('./helpers/init_kredits.js');

@@ -27,32 +26,23 @@ module.exports = async function(callback) {

  console.log(`Creating a contribution for contributor account ${contributorAccount} ID: ${contributorId}`);

-  [ dateNow, timeNow ] = (new Date()).toISOString().split('T');
-
  let contributionAttributes = {
    contributorId,
-    date: dateNow,
-    time: timeNow,
    amount: await promptly.prompt('Amount: '),
    description: await promptly.prompt('Description: '),
    kind: await promptly.prompt('Kind: ', { default: 'dev' }),
    url: await promptly.prompt('URL: ', { default: '' })
  }

-  const contributorData = await kredits.Contributor.getById(contributorId);
-  contributionAttributes.contributorIpfsHash = contributorData.ipfsHash;
-
  console.log("\nAdding contribution:");
  console.log(contributionAttributes);

-  kredits.Contribution.addContribution(contributionAttributes, { gasLimit: 300000 })
-    .then(result => {
+  kredits.Contribution.addContribution(contributionAttributes, { gasLimit: 300000 }).then((result) => {
    console.log("\n\nResult:");
    console.log(result);
    callback();
-    })
-    .catch(error => {
+  }).catch((error) => {
    console.log('Failed to create contribution');
-      callback(inspect(error));
+    callback(error);
  });
 }
--- a/scripts/add-contributor.js
+++ b/scripts/add-contributor.js
@@ -26,7 +26,7 @@ module.exports = async function(callback) {
    kind: await prompt('Kind (default person): ', {default: 'person'}),
    url: await prompt('URL: '),
    github_username: await prompt('GitHub username: '),
-    github_uid: parseInt(await prompt('GitHub UID: ')),
+    github_uid: await prompt('GitHub UID: '),
    wiki_username: await prompt('Wiki username: '),
  };

--- a/scripts/add-proposal.js
+++ b/scripts/add-proposal.js
@@ -1,5 +1,4 @@
 const promptly = require('promptly');
-const { inspect } = require('util');

 const initKredits = require('./helpers/init_kredits.js');

@@ -26,31 +25,23 @@ module.exports = async function(callback) {
  }
  console.log(`Creating a proposal for contributor ID #${contributorId} account: ${contributorAccount}`);

-  [ dateNow, timeNow ] = (new Date()).toISOString().split('T');
-
  let contributionAttributes = {
    contributorId,
-    date: dateNow,
-    time: timeNow,
    amount: await promptly.prompt('Amount: '),
    description: await promptly.prompt('Description: '),
    kind: await promptly.prompt('Kind: ', { default: 'dev' }),
    url: await promptly.prompt('URL: ', { default: '' })
  }

-  const contributorData = await kredits.Contributor.getById(contributorId);
-  contributionAttributes.contributorIpfsHash = contributorData.ipfsHash;
-
  console.log("\nAdding proposal:");
  console.log(contributionAttributes);

-  kredits.Proposal.addProposal(contributionAttributes, { gasLimit: 300000 })
-    .then((result) => {
+  kredits.Proposal.addProposal(contributionAttributes, { gasLimit: 300000 }).then((result) => {
    console.log("\n\nResult:");
    console.log(result);
    callback();
  }).catch((error) => {
    console.log('Failed to create proposal');
-      callback(inspect(error));
+    callback(error);
  });
 }
--- a/scripts/list-contributions.js
+++ b/scripts/list-contributions.js
@@ -15,14 +15,13 @@ module.exports = async function(callback) {
  console.log(`Using Contribution at: ${kredits.Contribution.contract.address}`);

  const table = new Table({
-    head: ['ID', 'Contributor ID', 'Description', 'Amount', 'Confirmed?', 'Vetoed?', 'Claimed?', 'IPFS']
+    head: ['ID', 'Contributor ID', 'Description', 'Amount', 'Confirmed?', 'Vetoed?', 'Claimed?']
  })

  try {
    let blockNumber = await kredits.provider.getBlockNumber();
    let contributions = await kredits.Contribution.all();

-    console.log(`Current block number: ${blockNumber}`);
    contributions.forEach((c) => {
      const confirmed = c.confirmedAtBlock <= blockNumber;

@@ -31,17 +30,13 @@ module.exports = async function(callback) {
        c.contributorId,
        `${c.description}`,
        c.amount.toString(),
-        `${confirmed} (${c.confirmedAtBlock})`,
+        confirmed,
        c.vetoed,
        c.claimed,
-        c.ipfsHash
      ])
    });

    console.log(table.toString());
-
-    let totalContributionBalances = await kredits.Contribution.functions.totalCount(true);
-    console.log(`Total confirmed balance: ${totalContributionBalances}`);
  } catch (err) {
    console.log(err);
  }
--- a/scripts/list-contributors.js
+++ b/scripts/list-contributors.js
@@ -1,6 +1,5 @@
 const promptly = require('promptly');
 const Table = require('cli-table');
-const ethers = require('ethers');

 const initKredits = require('./helpers/init_kredits.js');

@@ -15,32 +14,23 @@ module.exports = async function(callback) {

  console.log(`Using Contributor at: ${kredits.Contributor.contract.address}`);

+
  const table = new Table({
-    head: ['ID', 'Account', 'Name', 'Core?', 'Balance', 'Kredits earned', 'Contributions count', 'IPFS']
+    head: ['ID', 'Account', 'Core?', 'Name', 'Balance']
  })

-  try {
-    const contributors = await kredits.Contributor.all()
-  } catch(e) {
-    callback(e);
-    return;
-  }
+  let contributors = await kredits.Contributor.all()

  contributors.forEach((c) => {
    table.push([
      c.id.toString(),
      c.account,
-      `${c.name}`,
      c.isCore,
-      ethers.utils.formatEther(c.balance),
-      c.totalKreditsEarned.toString(),
-      c.contributionsCount.toString(),
-      c.ipfsHash
+      `${c.name}`,
+      c.balance.toString()
    ])
  })
-
  console.log(table.toString())
-
  callback()
 }

--- a/yarn.lock
+++ b/yarn.lock