5.3.0

Merge pull request #108 from 67P/feature/kredits-formatter
Add kredits-formatter and additionally format balance
2019-04-24 14:22:53 +01:00 · 2019-04-24 14:20:44 +01:00 · 2019-04-24 13:10:48 +00:00 · 2019-04-24 12:58:44 +00:00 · 2019-04-24 12:57:43 +00:00 · 2019-04-24 14:55:35 +02:00
50 changed files with 42504 additions and 2112 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ 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:
+To clear/reset the chain use (e.g. if you run out of funds on your devchain)

    $ 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-{contributor, contribution, proposal}.js
+### list-{contributors, contributions, proposals}.js

 List contract entries

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

 ### send-funds.js

@@ -152,7 +152,7 @@ Deploys a new KreditsKit that allows to create a new DAO
    or
    $ npm run deploy:kit

-`ENS` address is required as environment variable.  
+`ENS` address is required as environment variable.
 `DAO_FACTORY` can optionally be set as environment variable. (see aragon)

 ### new-dao.js
@@ -174,6 +174,26 @@ 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,6 +118,26 @@ 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.3",
-      "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.4.3.tgz",
-      "integrity": "sha512-rkv8WIvJshA5Ev8iNMGgz5WZkRtgtiPexiT7w5qevGTuT7ZBfM3de9ox1y9JR5/OXb/sWGBbWlHNa7vQKqku3Q==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.4.0.tgz",
+      "integrity": "sha512-bVsjsrtsDflIHp5I6caaAa2V25Kzn50HKPL6g3X0P0ni1ks+58cPB8Mz6AOKVuRPgaVdq/OwEUc/1vKqX+Mo4A==",
      "requires": {
        "core-js": "^2.6.5",
        "regenerator-runtime": "^0.13.2"
@@ -322,9 +322,9 @@
      }
    },
    "@babel/runtime": {
-      "version": "7.4.3",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.3.tgz",
-      "integrity": "sha512-9lsJwJLxDh/T3Q3SZszfWOTkk3pHbkmH+3KY+zwIDmsNlxsumuhS2TH3NIpktU4kNvfzy+k3eLT7aTJSPTo0OA==",
+      "version": "7.4.2",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.2.tgz",
+      "integrity": "sha512-7Bl2rALb7HpvXFL7TETNzKSAeBVCPHELzc0C//9FCxN8nsiueWSJBqaF+2oIJScyILStASR/Cx5WMkXGYTiJFA==",
      "requires": {
        "regenerator-runtime": "^0.13.2"
      },
@@ -1266,9 +1266,9 @@
      }
    },
    "bluebird": {
-      "version": "3.5.4",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz",
-      "integrity": "sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw=="
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz",
+      "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw=="
    },
    "bn.js": {
      "version": "4.11.8",
@@ -1320,9 +1320,9 @@
          "integrity": "sha512-QD46ppGintwPGuL1KqmwhR0O+N2cZUg8JG/VzwI2e28sM9TqHjQB10lI4QAaMHVbLzwVLLAwEglpKPViWX+5NQ=="
        },
        "commander": {
-          "version": "2.20.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
-          "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="
+          "version": "2.19.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
+          "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg=="
        }
      }
    },
@@ -1539,9 +1539,9 @@
      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
    },
    "caniuse-lite": {
-      "version": "1.0.30000957",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000957.tgz",
-      "integrity": "sha512-8wxNrjAzyiHcLXN/iunskqQnJquQQ6VX8JHfW5kLgAPRSiSuKZiNfmIkP5j7jgyXqAQBSoXyJxfnbCFS0ThSiQ=="
+      "version": "1.0.30000955",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000955.tgz",
+      "integrity": "sha512-6AwmIKgqCYfDWWadRkAuZSHMQP4Mmy96xAXEdRBlN/luQhlRYOKgwOlZ9plpCOsVbBuqbTmGqDK3JUM/nlr8CA=="
    },
    "caseless": {
      "version": "0.12.0",
@@ -2018,9 +2018,9 @@
      },
      "dependencies": {
        "object-keys": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-          "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz",
+          "integrity": "sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg=="
        }
      }
    },
@@ -2145,9 +2145,9 @@
      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
    },
    "electron-to-chromium": {
-      "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=="
+      "version": "1.3.122",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.122.tgz",
+      "integrity": "sha512-3RKoIyCN4DhP2dsmleuFvpJAIDOseWH88wFYBzb22CSwoFDSWRc4UAMfrtc9h8nBdJjTNIN3rogChgOy6eFInw=="
    },
    "elegant-spinner": {
      "version": "1.0.1",
@@ -2224,9 +2224,9 @@
      },
      "dependencies": {
        "object-keys": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-          "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz",
+          "integrity": "sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg=="
        }
      }
    },
@@ -4917,43 +4917,8 @@
              "resolved": "https://registry.npmjs.org/eth-sig-util/-/eth-sig-util-1.4.2.tgz",
              "integrity": "sha1-jZWCAsftuq6Dlwf7pvCf8ydgYhA=",
              "requires": {
-                "ethereumjs-abi": "git+https://github.com/ethereumjs/ethereumjs-abi.git",
+                "ethereumjs-abi": "ethereumjs-abi@git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7",
                "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": {
@@ -8186,39 +8151,8 @@
              "resolved": "https://registry.npmjs.org/eth-sig-util/-/eth-sig-util-1.4.2.tgz",
              "integrity": "sha1-jZWCAsftuq6Dlwf7pvCf8ydgYhA=",
              "requires": {
-                "ethereumjs-abi": "git+https://github.com/ethereumjs/ethereumjs-abi.git",
+                "ethereumjs-abi": "ethereumjs-abi@git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7",
                "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": {
@@ -8229,15 +8163,6 @@
                "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",
@@ -8274,12 +8199,12 @@
          "requires": {
            "underscore": "1.8.3",
            "web3-core-helpers": "1.0.0-beta.34",
-            "websocket": "git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible"
+            "websocket": "websocket@git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2"
          },
          "dependencies": {
            "websocket": {
              "version": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2",
-              "from": "git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible",
+              "from": "websocket@git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2",
              "requires": {
                "debug": "^2.2.0",
                "nan": "^2.3.3",
@@ -9219,9 +9144,9 @@
      }
    },
    "ipfs-http-client": {
-      "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==",
+      "version": "30.1.1",
+      "resolved": "https://registry.npmjs.org/ipfs-http-client/-/ipfs-http-client-30.1.1.tgz",
+      "integrity": "sha512-tMqSwEhW57VnjHDBLjKKlgtAvlhkqVSR3oIFC0IiGnaM1nzcw7pbFBoHaFzl0PKIuXm40a5bJt85Rm2trYx+Ag==",
      "requires": {
        "async": "^2.6.1",
        "bignumber.js": "^8.0.2",
@@ -9241,7 +9166,7 @@
        "is-ipfs": "~0.6.0",
        "is-pull-stream": "0.0.0",
        "is-stream": "^1.1.0",
-        "iso-stream-http": "~0.1.2",
+        "iso-stream-http": "~0.1.1",
        "iso-url": "~0.4.6",
        "just-kebab-case": "^1.1.0",
        "just-map-keys": "^1.1.0",
@@ -11144,9 +11069,9 @@
      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
    },
    "p-is-promise": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
-      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.0.0.tgz",
+      "integrity": "sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg=="
    },
    "p-limit": {
      "version": "1.3.0",
@@ -12230,9 +12155,9 @@
      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
    },
    "source-map-support": {
-      "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==",
+      "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==",
      "requires": {
        "buffer-from": "^1.0.0",
        "source-map": "^0.6.0"
@@ -12269,9 +12194,9 @@
      }
    },
    "spdx-license-ids": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz",
-      "integrity": "sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA=="
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz",
+      "integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g=="
    },
    "split2": {
      "version": "2.2.0",
@@ -13881,9 +13806,9 @@
          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
        },
        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.0.tgz",
+          "integrity": "sha512-Y05ICatFYPAfykDIB7VdwSJ0LUl1yq/BwO2OpyGGLjiRe1fgzTwVypPiWnzkGFOVFHXrCXUNBl86bpjBhZWSJg=="
        },
        "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": "npm run sync-assets && npm run build:script -- --no-minify && parcel serve app/index.html -p 8001 --out-dir dist/ --no-cache",
+    "start:app": "",
    "test": "aragon contracts test",
    "compile": "aragon contracts compile",
-    "sync-assets": "copy-aragon-ui-assets -n aragon-ui ./dist",
+    "sync-assets": "",
    "build:app": "",
    "build:script": "",
    "build": "",
--- a/apps/contribution/test/app.js
+++ b/apps/contribution/test/app.js
@@ -1,4 +1,4 @@
-const CounterApp = artifacts.require('Contribution.sol')
+const Contribution = 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,6 +6,10 @@ 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;
@@ -43,6 +47,12 @@ 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++) {
@@ -118,7 +128,7 @@ contract Contributor is AragonApp {
    return contributors[id];
  }

-  function getContributorById(uint32 _id) public view returns (uint32 id, address account, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize, bool isCore, uint256 balance, bool exists ) {
+  function getContributorById(uint32 _id) public view returns (uint32 id, address account, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize, bool isCore, uint256 balance, uint256 totalKreditsEarned, uint256 contributionsCount, bool exists ) {
    id = _id;
    Contributor storage c = contributors[_id];
    account = c.account;
@@ -128,6 +138,9 @@ 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.3",
-      "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.4.3.tgz",
-      "integrity": "sha512-rkv8WIvJshA5Ev8iNMGgz5WZkRtgtiPexiT7w5qevGTuT7ZBfM3de9ox1y9JR5/OXb/sWGBbWlHNa7vQKqku3Q==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.4.0.tgz",
+      "integrity": "sha512-bVsjsrtsDflIHp5I6caaAa2V25Kzn50HKPL6g3X0P0ni1ks+58cPB8Mz6AOKVuRPgaVdq/OwEUc/1vKqX+Mo4A==",
      "requires": {
        "core-js": "^2.6.5",
        "regenerator-runtime": "^0.13.2"
@@ -322,9 +322,9 @@
      }
    },
    "@babel/runtime": {
-      "version": "7.4.3",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.3.tgz",
-      "integrity": "sha512-9lsJwJLxDh/T3Q3SZszfWOTkk3pHbkmH+3KY+zwIDmsNlxsumuhS2TH3NIpktU4kNvfzy+k3eLT7aTJSPTo0OA==",
+      "version": "7.4.2",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.2.tgz",
+      "integrity": "sha512-7Bl2rALb7HpvXFL7TETNzKSAeBVCPHELzc0C//9FCxN8nsiueWSJBqaF+2oIJScyILStASR/Cx5WMkXGYTiJFA==",
      "requires": {
        "regenerator-runtime": "^0.13.2"
      },
@@ -1266,9 +1266,9 @@
      }
    },
    "bluebird": {
-      "version": "3.5.4",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz",
-      "integrity": "sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw=="
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz",
+      "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw=="
    },
    "bn.js": {
      "version": "4.11.8",
@@ -1320,9 +1320,9 @@
          "integrity": "sha512-QD46ppGintwPGuL1KqmwhR0O+N2cZUg8JG/VzwI2e28sM9TqHjQB10lI4QAaMHVbLzwVLLAwEglpKPViWX+5NQ=="
        },
        "commander": {
-          "version": "2.20.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
-          "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="
+          "version": "2.19.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
+          "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg=="
        }
      }
    },
@@ -1539,9 +1539,9 @@
      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
    },
    "caniuse-lite": {
-      "version": "1.0.30000957",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000957.tgz",
-      "integrity": "sha512-8wxNrjAzyiHcLXN/iunskqQnJquQQ6VX8JHfW5kLgAPRSiSuKZiNfmIkP5j7jgyXqAQBSoXyJxfnbCFS0ThSiQ=="
+      "version": "1.0.30000955",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000955.tgz",
+      "integrity": "sha512-6AwmIKgqCYfDWWadRkAuZSHMQP4Mmy96xAXEdRBlN/luQhlRYOKgwOlZ9plpCOsVbBuqbTmGqDK3JUM/nlr8CA=="
    },
    "caseless": {
      "version": "0.12.0",
@@ -2018,9 +2018,9 @@
      },
      "dependencies": {
        "object-keys": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-          "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz",
+          "integrity": "sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg=="
        }
      }
    },
@@ -2145,9 +2145,9 @@
      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
    },
    "electron-to-chromium": {
-      "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=="
+      "version": "1.3.122",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.122.tgz",
+      "integrity": "sha512-3RKoIyCN4DhP2dsmleuFvpJAIDOseWH88wFYBzb22CSwoFDSWRc4UAMfrtc9h8nBdJjTNIN3rogChgOy6eFInw=="
    },
    "elegant-spinner": {
      "version": "1.0.1",
@@ -2224,9 +2224,9 @@
      },
      "dependencies": {
        "object-keys": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-          "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz",
+          "integrity": "sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg=="
        }
      }
    },
@@ -9144,9 +9144,9 @@
      }
    },
    "ipfs-http-client": {
-      "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==",
+      "version": "30.1.1",
+      "resolved": "https://registry.npmjs.org/ipfs-http-client/-/ipfs-http-client-30.1.1.tgz",
+      "integrity": "sha512-tMqSwEhW57VnjHDBLjKKlgtAvlhkqVSR3oIFC0IiGnaM1nzcw7pbFBoHaFzl0PKIuXm40a5bJt85Rm2trYx+Ag==",
      "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.2",
+        "iso-stream-http": "~0.1.1",
        "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.1.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
-      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.0.0.tgz",
+      "integrity": "sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg=="
    },
    "p-limit": {
      "version": "1.3.0",
@@ -12155,9 +12155,9 @@
      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
    },
    "source-map-support": {
-      "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==",
+      "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==",
      "requires": {
        "buffer-from": "^1.0.0",
        "source-map": "^0.6.0"
@@ -12194,9 +12194,9 @@
      }
    },
    "spdx-license-ids": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz",
-      "integrity": "sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA=="
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz",
+      "integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g=="
    },
    "split2": {
      "version": "2.2.0",
@@ -13806,9 +13806,9 @@
          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
        },
        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.0.tgz",
+          "integrity": "sha512-Y05ICatFYPAfykDIB7VdwSJ0LUl1yq/BwO2OpyGGLjiRe1fgzTwVypPiWnzkGFOVFHXrCXUNBl86bpjBhZWSJg=="
        },
        "cliui": {
          "version": "4.1.0",
--- a/apps/contributor/test/app.js
+++ b/apps/contributor/test/app.js
@@ -1,5 +1,5 @@
-const CounterApp = artifacts.require('CounterApp.sol')
+const Contributor = artifacts.require('Contributor.sol')

-contract('CounterApp', (accounts) => {
+contract('Contributor', (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.3",
-      "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.4.3.tgz",
-      "integrity": "sha512-rkv8WIvJshA5Ev8iNMGgz5WZkRtgtiPexiT7w5qevGTuT7ZBfM3de9ox1y9JR5/OXb/sWGBbWlHNa7vQKqku3Q==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.4.0.tgz",
+      "integrity": "sha512-bVsjsrtsDflIHp5I6caaAa2V25Kzn50HKPL6g3X0P0ni1ks+58cPB8Mz6AOKVuRPgaVdq/OwEUc/1vKqX+Mo4A==",
      "requires": {
        "core-js": "^2.6.5",
        "regenerator-runtime": "^0.13.2"
@@ -322,9 +322,9 @@
      }
    },
    "@babel/runtime": {
-      "version": "7.4.3",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.3.tgz",
-      "integrity": "sha512-9lsJwJLxDh/T3Q3SZszfWOTkk3pHbkmH+3KY+zwIDmsNlxsumuhS2TH3NIpktU4kNvfzy+k3eLT7aTJSPTo0OA==",
+      "version": "7.4.2",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.2.tgz",
+      "integrity": "sha512-7Bl2rALb7HpvXFL7TETNzKSAeBVCPHELzc0C//9FCxN8nsiueWSJBqaF+2oIJScyILStASR/Cx5WMkXGYTiJFA==",
      "requires": {
        "regenerator-runtime": "^0.13.2"
      },
@@ -1266,9 +1266,9 @@
      }
    },
    "bluebird": {
-      "version": "3.5.4",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz",
-      "integrity": "sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw=="
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz",
+      "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw=="
    },
    "bn.js": {
      "version": "4.11.8",
@@ -1320,9 +1320,9 @@
          "integrity": "sha512-QD46ppGintwPGuL1KqmwhR0O+N2cZUg8JG/VzwI2e28sM9TqHjQB10lI4QAaMHVbLzwVLLAwEglpKPViWX+5NQ=="
        },
        "commander": {
-          "version": "2.20.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
-          "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="
+          "version": "2.19.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
+          "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg=="
        }
      }
    },
@@ -1539,9 +1539,9 @@
      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
    },
    "caniuse-lite": {
-      "version": "1.0.30000957",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000957.tgz",
-      "integrity": "sha512-8wxNrjAzyiHcLXN/iunskqQnJquQQ6VX8JHfW5kLgAPRSiSuKZiNfmIkP5j7jgyXqAQBSoXyJxfnbCFS0ThSiQ=="
+      "version": "1.0.30000955",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000955.tgz",
+      "integrity": "sha512-6AwmIKgqCYfDWWadRkAuZSHMQP4Mmy96xAXEdRBlN/luQhlRYOKgwOlZ9plpCOsVbBuqbTmGqDK3JUM/nlr8CA=="
    },
    "caseless": {
      "version": "0.12.0",
@@ -2018,9 +2018,9 @@
      },
      "dependencies": {
        "object-keys": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-          "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz",
+          "integrity": "sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg=="
        }
      }
    },
@@ -2145,9 +2145,9 @@
      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
    },
    "electron-to-chromium": {
-      "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=="
+      "version": "1.3.122",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.122.tgz",
+      "integrity": "sha512-3RKoIyCN4DhP2dsmleuFvpJAIDOseWH88wFYBzb22CSwoFDSWRc4UAMfrtc9h8nBdJjTNIN3rogChgOy6eFInw=="
    },
    "elegant-spinner": {
      "version": "1.0.1",
@@ -2224,9 +2224,9 @@
      },
      "dependencies": {
        "object-keys": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-          "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz",
+          "integrity": "sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg=="
        }
      }
    },
@@ -9144,9 +9144,9 @@
      }
    },
    "ipfs-http-client": {
-      "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==",
+      "version": "30.1.1",
+      "resolved": "https://registry.npmjs.org/ipfs-http-client/-/ipfs-http-client-30.1.1.tgz",
+      "integrity": "sha512-tMqSwEhW57VnjHDBLjKKlgtAvlhkqVSR3oIFC0IiGnaM1nzcw7pbFBoHaFzl0PKIuXm40a5bJt85Rm2trYx+Ag==",
      "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.2",
+        "iso-stream-http": "~0.1.1",
        "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.1.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
-      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.0.0.tgz",
+      "integrity": "sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg=="
    },
    "p-limit": {
      "version": "1.3.0",
@@ -12155,9 +12155,9 @@
      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
    },
    "source-map-support": {
-      "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==",
+      "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==",
      "requires": {
        "buffer-from": "^1.0.0",
        "source-map": "^0.6.0"
@@ -12194,9 +12194,9 @@
      }
    },
    "spdx-license-ids": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz",
-      "integrity": "sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA=="
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz",
+      "integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g=="
    },
    "split2": {
      "version": "2.2.0",
@@ -13806,9 +13806,9 @@
          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
        },
        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.0.tgz",
+          "integrity": "sha512-Y05ICatFYPAfykDIB7VdwSJ0LUl1yq/BwO2OpyGGLjiRe1fgzTwVypPiWnzkGFOVFHXrCXUNBl86bpjBhZWSJg=="
        },
        "cliui": {
          "version": "4.1.0",
--- a/apps/proposal/test/app.js
+++ b/apps/proposal/test/app.js
@@ -0,0 +1,5 @@
+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,11 +14,15 @@ 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) {
-    _mint(contributorAccount, amount);
+    uint256 amountInWei = amount.mul(1 ether);
+    _mint(contributorAccount, amountInWei);
    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.3",
-      "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.4.3.tgz",
-      "integrity": "sha512-rkv8WIvJshA5Ev8iNMGgz5WZkRtgtiPexiT7w5qevGTuT7ZBfM3de9ox1y9JR5/OXb/sWGBbWlHNa7vQKqku3Q==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.4.0.tgz",
+      "integrity": "sha512-bVsjsrtsDflIHp5I6caaAa2V25Kzn50HKPL6g3X0P0ni1ks+58cPB8Mz6AOKVuRPgaVdq/OwEUc/1vKqX+Mo4A==",
      "requires": {
        "core-js": "^2.6.5",
        "regenerator-runtime": "^0.13.2"
@@ -322,9 +322,9 @@
      }
    },
    "@babel/runtime": {
-      "version": "7.4.3",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.3.tgz",
-      "integrity": "sha512-9lsJwJLxDh/T3Q3SZszfWOTkk3pHbkmH+3KY+zwIDmsNlxsumuhS2TH3NIpktU4kNvfzy+k3eLT7aTJSPTo0OA==",
+      "version": "7.4.2",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.2.tgz",
+      "integrity": "sha512-7Bl2rALb7HpvXFL7TETNzKSAeBVCPHELzc0C//9FCxN8nsiueWSJBqaF+2oIJScyILStASR/Cx5WMkXGYTiJFA==",
      "requires": {
        "regenerator-runtime": "^0.13.2"
      },
@@ -1266,9 +1266,9 @@
      }
    },
    "bluebird": {
-      "version": "3.5.4",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz",
-      "integrity": "sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw=="
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz",
+      "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw=="
    },
    "bn.js": {
      "version": "4.11.8",
@@ -1320,9 +1320,9 @@
          "integrity": "sha512-QD46ppGintwPGuL1KqmwhR0O+N2cZUg8JG/VzwI2e28sM9TqHjQB10lI4QAaMHVbLzwVLLAwEglpKPViWX+5NQ=="
        },
        "commander": {
-          "version": "2.20.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
-          "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="
+          "version": "2.19.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
+          "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg=="
        }
      }
    },
@@ -1539,9 +1539,9 @@
      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
    },
    "caniuse-lite": {
-      "version": "1.0.30000957",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000957.tgz",
-      "integrity": "sha512-8wxNrjAzyiHcLXN/iunskqQnJquQQ6VX8JHfW5kLgAPRSiSuKZiNfmIkP5j7jgyXqAQBSoXyJxfnbCFS0ThSiQ=="
+      "version": "1.0.30000955",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000955.tgz",
+      "integrity": "sha512-6AwmIKgqCYfDWWadRkAuZSHMQP4Mmy96xAXEdRBlN/luQhlRYOKgwOlZ9plpCOsVbBuqbTmGqDK3JUM/nlr8CA=="
    },
    "caseless": {
      "version": "0.12.0",
@@ -2018,9 +2018,9 @@
      },
      "dependencies": {
        "object-keys": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-          "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz",
+          "integrity": "sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg=="
        }
      }
    },
@@ -2145,9 +2145,9 @@
      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
    },
    "electron-to-chromium": {
-      "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=="
+      "version": "1.3.122",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.122.tgz",
+      "integrity": "sha512-3RKoIyCN4DhP2dsmleuFvpJAIDOseWH88wFYBzb22CSwoFDSWRc4UAMfrtc9h8nBdJjTNIN3rogChgOy6eFInw=="
    },
    "elegant-spinner": {
      "version": "1.0.1",
@@ -2224,9 +2224,9 @@
      },
      "dependencies": {
        "object-keys": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-          "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz",
+          "integrity": "sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg=="
        }
      }
    },
@@ -9144,9 +9144,9 @@
      }
    },
    "ipfs-http-client": {
-      "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==",
+      "version": "30.1.1",
+      "resolved": "https://registry.npmjs.org/ipfs-http-client/-/ipfs-http-client-30.1.1.tgz",
+      "integrity": "sha512-tMqSwEhW57VnjHDBLjKKlgtAvlhkqVSR3oIFC0IiGnaM1nzcw7pbFBoHaFzl0PKIuXm40a5bJt85Rm2trYx+Ag==",
      "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.2",
+        "iso-stream-http": "~0.1.1",
        "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.1.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
-      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.0.0.tgz",
+      "integrity": "sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg=="
    },
    "p-limit": {
      "version": "1.3.0",
@@ -12155,9 +12155,9 @@
      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
    },
    "source-map-support": {
-      "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==",
+      "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==",
      "requires": {
        "buffer-from": "^1.0.0",
        "source-map": "^0.6.0"
@@ -12194,9 +12194,9 @@
      }
    },
    "spdx-license-ids": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz",
-      "integrity": "sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA=="
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz",
+      "integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g=="
    },
    "split2": {
      "version": "2.2.0",
@@ -13806,9 +13806,9 @@
          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
        },
        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.0.tgz",
+          "integrity": "sha512-Y05ICatFYPAfykDIB7VdwSJ0LUl1yq/BwO2OpyGGLjiRe1fgzTwVypPiWnzkGFOVFHXrCXUNBl86bpjBhZWSJg=="
        },
        "cliui": {
          "version": "4.1.0",
--- a/apps/token/test/app.js
+++ b/apps/token/test/app.js
@@ -1,5 +1,5 @@
-const CounterApp = artifacts.require('CounterApp.sol')
+const Token = artifacts.require('Token.sol')

-contract('CounterApp', (accounts) => {
+contract('Token', (accounts) => {
  it('should be tested')
 })
--- a/apps/token/yarn.lock
+++ b/apps/token/yarn.lock
--- a/config/seeds.js
+++ b/config/seeds.js
@@ -1,16 +1,48 @@
 const contractCalls = [
-  ['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 }]],
+  ['Contributor', 'add', [{
+    account: '0x7e8f313c56f809188313aa274fa67ee58c31515d',
+    name: 'bumi',
+    kind: 'person',
+    url: '',
+    github_username: 'bumi',
+    github_uid: 318,
+    gitea_username: 'bumi',
+    wiki_username: 'Bumi'
+  }, { gasLimit: 200000 }]],
+
+  ['Contributor', 'add', [{
+    account: '0x49575f3DD9a0d60aE661BC992f72D837A77f05Bc',
+    name: 'raucao',
+    kind: 'person',
+    url: '',
+    github_username: 'skddc',
+    github_uid: 842,
+    gitea_username: 'raucao',
+    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 }]],
  ['Proposal', 'vote', [1, { gasLimit: 550000 }]],
-  ['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', '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', 'claim', [1, { gasLimit: 300000 }]]
 ];
+
 const funds = [
  '0x7e8f313c56f809188313aa274fa67ee58c31515d',
  '0xa502eb4021f3b9ab62f75b57a94e1cfbf81fd827'
 ];
+
 module.exports = { contractCalls, funds };
--- a/deployments/rinkeby/contribution.md
+++ b/deployments/rinkeby/contribution.md
@@ -1,5 +1,13 @@
 # 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,5 +1,13 @@
 # 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,5 +1,10 @@
 # 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,5 +1,13 @@
 # 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,5 +1,13 @@
 # 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,4 +1,3 @@
 {
-  "4": "0x76e069b47b79442657eaf0555a32c6b16fa1b8b4",
-  "41787949": "0xa35aacdfccac54d3d96e0d29050c773b251c2c83"
+  "4": "0x76e069b47b79442657eaf0555a32c6b16fa1b8b4"
 }
--- a/lib/addresses/dao.json
+++ b/lib/addresses/dao.json
@@ -1,4 +1,3 @@
 {
-  "4": "0xcd75458fbc4aa2231252d5b21f1391fd031e5cb2",
-  "41787949": "0x183af3950364390a266edff2a0e7c4c2f95c0691"
+  "4": "0xc34edf7d11b7f8433d597f0bb0697acdff55ef14"
 }
--- a/lib/contracts/base.js
+++ b/lib/contracts/base.js
@@ -20,4 +20,5 @@ class Base {
    return this.contract.on(type, callback);
  }
 }
+
 module.exports = Base;
--- a/lib/contracts/contribution.js
+++ b/lib/contracts/contribution.js
@@ -1,21 +1,9 @@
-const ethers = require('ethers');
-
+const Record = require('./record');
 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;
-      });
+class Contribution extends Record {
+  get count () {
+    return this.functions.contributionsCount();
  }

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

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

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

-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);
-      });
+class Contributor extends Record {
+  get count () {
+    return this.functions.contributorsCount();
  }

  getById(id) {
    return this.functions.getContributorById(id)
-      // Fetch IPFS data if available
-      .then((data) => {
+      .then(data => {
+        data.balanceInt = formatKredits(data.balance);
        return this.ipfs.catAndMerge(data, ContributorSerializer.deserialize);
-      });
+      })
  }

  filterByAccount(search) {
@@ -50,12 +39,16 @@ class Contributor extends Base {
    });
  }

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

    return this.ipfs
-      .add(json)
+      .add(jsonStr)
      .then((ipfsHashAttr) => {
        let contributor = [
          contributorAttr.account,
@@ -67,6 +60,30 @@ class Contributor extends Base {
        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,21 +1,9 @@
-const ethers = require('ethers');
-const RSVP = require('rsvp');
-
+const Record = require('./record');
 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);
-      });
+class Proposal extends Record {
+  get count () {
+    return this.functions.proposalsCount();
  }

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

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

    return this.ipfs
-      .add(json)
+      .add(jsonStr)
      .then((ipfsHashAttr) => {
        let proposal = [
          proposalAttr.contributorId,
--- a/lib/contracts/record.js
+++ b/lib/contracts/record.js
@@ -0,0 +1,14 @@
+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,4 +4,3 @@ class Token extends Base {
 }

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

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

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

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

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

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

    let data = {
      "@context": "https://schema.kosmos.org",
@@ -50,6 +35,8 @@ class Contribution {
      "contributor": {
        "ipfs": contributorIpfsHash
      },
+      date,
+      time,
      kind,
      description,
      "details": details || {}
@@ -62,6 +49,44 @@ 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,3 +1,5 @@
+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
@@ -6,41 +8,9 @@
 * @public
 */
 class Contributor {
- /**
-  * 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,
-    };
+  constructor(attrs) {
+    Object.keys(attrs).forEach(a => this[a] = attrs[a]);
  }

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

    let data = {
      "@context": "https://schema.kosmos.org",
@@ -80,6 +51,14 @@ class Contributor {
      });
    }

+    if (gitea_username) {
+      data.accounts.push({
+        "site": "gitea.kosmos.org",
+        "username": gitea_username,
+        "url": `https://gitea.kosmos.org/${gitea_username}`
+      });
+    }
+
    if (wiki_username) {
      data.accounts.push({
        "site": "wiki.kosmos.org",
@@ -91,6 +70,60 @@ 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, gitea_username, wiki_username;
+    let github = accounts.find(a => a.site === 'github.com');
+    let gitea  = accounts.find(a => a.site === 'gitea.kosmos.org');
+    let wiki   = accounts.find(a => a.site === 'wiki.kosmos.org');
+
+    if (github) {
+      (({ username: github_username, uid: github_uid} = github));
+    }
+    if (gitea) {
+      (({ username: gitea_username } = gitea));
+    }
+    if (wiki) {
+      (({ username: wiki_username } = wiki));
+    }
+
+    return {
+      name,
+      kind,
+      url,
+      accounts,
+      github_uid,
+      github_username,
+      gitea_username,
+      wiki_username,
+      ipfsData: serialized,
+    };
+  }
+
 }

 module.exports = Contributor;
--- a/lib/utils/format-kredits.js
+++ b/lib/utils/format-kredits.js
@@ -0,0 +1,10 @@
+const ethersUtils = require('ethers').utils;
+
+module.exports = function (value, options = {}) {
+  let etherValue = ethersUtils.formatEther(value);
+  if (options.asFloat) {
+    return parseFloat(etherValue);
+  } else {
+    return parseInt(etherValue);
+  }
+}
--- a/lib/utils/pagination.js
+++ b/lib/utils/pagination.js
@@ -0,0 +1,46 @@
+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
@@ -0,0 +1,15 @@
+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": "4.0.2",
+  "version": "5.3.0",
  "description": "Ethereum contracts and npm wrapper for Kredits",
  "main": "./lib/kredits.js",
  "directories": {
@@ -45,7 +45,8 @@
  "dependencies": {
    "ethers": "^4.0.27",
    "ipfs-http-client": "^30.1.1",
-    "rsvp": "^4.8.2"
+    "kosmos-schemas": "^2.0.0",
+    "tv4": "^1.3.0"
  },
  "keywords": [
    "kosmos",
--- a/scripts/add-contribution.js
+++ b/scripts/add-contribution.js
@@ -1,4 +1,5 @@
 const promptly = require('promptly');
+const { inspect } = require('util');

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

@@ -26,23 +27,32 @@ 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) => {
-    console.log("\n\nResult:");
-    console.log(result);
-    callback();
-  }).catch((error) => {
-    console.log('Failed to create contribution');
-    callback(error);
-  });
+  kredits.Contribution.addContribution(contributionAttributes, { gasLimit: 300000 })
+    .then(result => {
+      console.log("\n\nResult:");
+      console.log(result);
+      callback();
+    })
+    .catch(error => {
+      console.log('Failed to create contribution');
+      callback(inspect(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: await prompt('GitHub UID: '),
+    github_uid: parseInt(await prompt('GitHub UID: ')),
    wiki_username: await prompt('Wiki username: '),
  };

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

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

@@ -25,23 +26,31 @@ 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) => {
-    console.log("\n\nResult:");
-    console.log(result);
-    callback();
-  }).catch((error) => {
-    console.log('Failed to create proposal');
-    callback(error);
-  });
+  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));
+    });
 }
--- a/scripts/list-contributions.js
+++ b/scripts/list-contributions.js
@@ -15,13 +15,14 @@ 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?']
+    head: ['ID', 'Contributor ID', 'Description', 'Amount', 'Confirmed?', 'Vetoed?', 'Claimed?', 'IPFS']
  })

  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;

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

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

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

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

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

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

-  let contributors = await kredits.Contributor.all()
+  try {
+    const contributors = await kredits.Contributor.all()
+
+    contributors.forEach((c) => {
+      table.push([
+        c.id.toString(),
+        c.account,
+        `${c.name}`,
+        c.isCore,
+        c.balanceInt.toString(),
+        c.totalKreditsEarned.toString(),
+        c.contributionsCount.toString(),
+        c.ipfsHash
+      ])
+    })
+
+    console.log(table.toString())
+  } catch(e) {
+    callback(e);
+    return;
+  }

-  contributors.forEach((c) => {
-    table.push([
-      c.id.toString(),
-      c.account,
-      c.isCore,
-      `${c.name}`,
-      c.balance.toString()
-    ])
-  })
-  console.log(table.toString())
  callback()
 }
-
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
Sebastian Kippe	8539b56a48	5.3.0	2019-04-24 14:22:53 +01:00
Sebastian Kippe	f59c37827a	Merge pull request #108 from 67P/feature/kredits-formatter Add kredits-formatter and additionally format balance	2019-04-24 14:20:44 +01:00
Michael Bumann	58db57ee45	Merge branch 'master' into feature/kredits-formatter	2019-04-24 13:10:48 +00:00
Michael Bumann	b64a7ca299	Merge pull request #113 from 67P/feature/gitea_site Add Gitea site/username to serializer and seeds	2019-04-24 12:58:44 +00:00
Michael Bumann	6f09ca8d13	Merge pull request #114 from 67P/chore/scripts Improve/fix scripts	2019-04-24 12:57:43 +00:00
Michael Bumann	6f53c8097e	Wrap anything that could break in the try/catch block	2019-04-24 14:55:35 +02:00
Sebastian Kippe	6b2ac15f56	Improve error handling for list-contributors script	2019-04-24 13:46:27 +01:00
Sebastian Kippe	359989f235	Fix function name for total kredits issued/earned	2019-04-24 13:45:56 +01:00
Sebastian Kippe	5894f6323b	Add Gitea username to contributor seeds	2019-04-24 13:43:46 +01:00
Sebastian Kippe	09b78e1e8f	Add Gitea site/username to contributor serializer	2019-04-23 20:28:56 +01:00
Michael Bumann	48c8f6b9b3	Merge branch 'master' into feature/kredits-formatter	2019-04-23 12:56:55 +00:00
Sebastian Kippe	542ebaf3f3	5.2.0	2019-04-23 13:52:46 +01:00
Sebastian Kippe	d82ffba75e	Update ABI	2019-04-23 13:52:37 +01:00
Sebastian Kippe	bdb2cee0c4	Merge pull request #110 from 67P/feature/contribution-balances Add contract calls for total contribution balances	2019-04-23 13:47:50 +01:00
Michael Bumann	cd45ce260f	Merge pull request #112 from 67P/feature/update-contributor-profile Update contributor profile	2019-04-20 09:22:31 +00:00
Sebastian Kippe	3a97983540	Merge pull request #111 from 67P/feature/contributor-schema-validation Add Contributor validation against JSON schema	2019-04-20 08:47:49 +01:00
Michael Bumann	9714926e11	Add function to update contributor profile to wrapper The function updates the contributor profile, adds the new profile to IPFS and does the contract call to update the profile hash	2019-04-20 02:17:38 +02:00
Michael Bumann	59614201b5	Ups...	2019-04-20 02:15:53 +02:00
Michael Bumann	e591742e40	Add Contributor validation against JSON schema based on the Contribution validation.	2019-04-20 01:10:46 +02:00
Michael Bumann	791190f5e7	Cleanup promise call	2019-04-20 00:30:20 +02:00
Michael Bumann	24b66daf2a	Update ABI	2019-04-19 14:16:40 +02:00
Michael Bumann	ad034d7712	Naming is hard	2019-04-19 14:15:30 +02:00
Michael Bumann	375d8f3275	Cleanup	2019-04-19 13:34:39 +02:00
Michael Bumann	80dc787971	Merge pull request #109 from 67P/dev/list_contributors_error_handling Handle errors in contributor list script	2019-04-19 11:22:38 +00:00
Michael Bumann	7967dc26f2	Update ABIs	2019-04-19 13:20:25 +02:00
Michael Bumann	c248725cc1	Add balances to getContributorById call	2019-04-19 13:19:55 +02:00
Michael Bumann	59135bf312	Add contract calls for total contribution balances Those methods return the total kredits amounts of contribtions.	2019-04-19 13:06:36 +02:00
Sebastian Kippe	1d771c43e8	Handle errors in contributor list script	2019-04-19 12:02:28 +01:00
Michael Bumann	3cb94fb660	Add kredits-formatter and additionally format balance This adds a `balanceInt` value to the contributor data that has the token balance formatted as full Kredits. (similar to Ether)	2019-04-19 11:57:35 +02:00
Michael Bumann	5820d71b2c	Merge pull request #96 from 67P/feature/pagination Add pagination for .all methods	2019-04-17 13:53:17 +00:00
Michael Bumann	4771c0c8a0	Merge branch 'master' into feature/pagination	2019-04-17 13:52:53 +00:00
Sebastian Kippe	2a1ae117e8	5.1.1	2019-04-16 12:50:07 +01:00
Michael Bumann	8abc7ba77f	Merge pull request #104 from 67P/chore/update-kosmos-schema Update kosmos-schema dependency	2019-04-16 11:19:03 +00:00
Michael Bumann	f696721918	Readme: add note about locally running out of funds	2019-04-16 13:17:54 +02:00
Michael Bumann	00b58dec66	Update kosmos-schema dependency	2019-04-16 13:16:05 +02:00
Michael Bumann	560315cbca	Merge pull request #102 from 67P/chore/add-yarn-support Add yarn lock files	2019-04-15 15:54:38 +00:00
Manuel Wiedenmann	24933f31a7	Add yarn lock files	2019-04-15 17:34:48 +02:00
Michael Bumann	b13bf6e8b0	Readme: add note about locally running out of funds	2019-04-15 15:59:54 +02:00
Michael Bumann	8dcad88372	Merge pull request #99 from 67P/update-seeds Update seeds	2019-04-15 10:39:10 +00:00
Manuel Wiedenmann	dc6d2716aa	Update seeds	2019-04-15 12:33:51 +02:00
Sebastian Kippe	80ad9db630	5.1.0	2019-04-13 12:41:49 +01:00
Manuel Wiedenmann	6f97c905d6	Add count property and DRY	2019-04-13 13:05:47 +02:00
Sebastian Kippe	1b5f7ff95d	Merge pull request #93 from 67P/deployments/weltempfaenger-release Production release to rinkeby	2019-04-13 11:07:58 +01:00
Manuel Wiedenmann	f6189bf910	Add pagination for .all methods I removed rsvp as a dependency as we only use Promise.all	2019-04-12 21:21:19 +02:00
Michael Bumann	b6c06c289c	Merge pull request #95 from 67P/cosmetics Cosmetic cleanups	2019-04-12 18:55:59 +00:00
Michael Bumann	f405e39c04	Merge pull request #94 from 67P/bugfix/schema_changes Refactor contribution serializer and validation	2019-04-12 18:54:56 +00:00
Manuel Wiedenmann	1dbf3b5742	Cosmetic cleanups	2019-04-12 20:16:24 +02:00
Sebastian Kippe	952b5153fd	Validate proposed contributions	2019-04-11 13:46:42 +02:00
Sebastian Kippe	d953141f52	Refactor contribution serializer and validation	2019-04-11 13:05:40 +02:00
Sebastian Kippe	aa57d7c70b	Adjust seeds for new requirements	2019-04-11 11:02:15 +02:00
Sebastian Kippe	4c0bb879e8	Show IPFS hash in list script output	2019-04-11 11:01:45 +02:00
Sebastian Kippe	9c5a517fb9	5.0.0	2019-04-11 08:45:49 +02:00
Sebastian Kippe	b00ddda312	Merge pull request #92 from 67P/feature/contribution_schema Validate contribution docs against schema	2019-04-11 08:40:38 +02:00
Sebastian Kippe	130e2a7797	Validate contribution docs against schema Currently requires an open PR branch for the schemas, which is adding date and time for contributions. refs #30	2019-04-10 18:37:02 +02:00
Michael Bumann	27e5190e29	Production release to rinkeby Deployed all apps and created a new Kredits DAO	2019-04-10 18:28:24 +02:00
Sebastian Kippe	b9c171884b	Merge pull request #91 from 67P/feature/store-balance-as-wei Store kredits tokens as wei with 18 decimals	2019-04-10 15:51:36 +02:00
Michael Bumann	4d2e0ea84b	Update Token symbol	2019-04-10 15:50:33 +02:00
Michael Bumann	26d12ba239	Store kredits tokens as wei with 18 decimals This stores the tokens with 18 decimals as most other tokens and as assumed by a potential future token standard EIP 777.	2019-04-10 13:59:00 +02:00