Use postshrinkwrap instead of postinstall

`postinstall` is executed before package-lock.json is written to disk. https://github.com/npm/npm/issues/18798
Add postinstall lockfile fix
2019-06-18 10:30:35 +02:00 · 2019-06-17 18:58:31 +02:00 · 2019-06-17 09:38:47 +02:00 · 2019-06-15 00:49:26 +02:00 · 2019-06-15 00:32:07 +02:00 · 2019-06-15 00:28:04 +02:00
45 changed files with 127048 additions and 54836 deletions
--- a/.eslintignore
+++ b/.eslintignore
@@ -0,0 +1 @@
+/scripts/
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +1,17 @@
 ---
 language: node_js
 node_js:
-  - "11"
+  - "lts/*"

 sudo: false
 dist: xenial

-cache:
-  yarn: true
-
-before_install:
-  - curl -o- -L https://yarnpkg.com/install.sh | bash
-  - export PATH=$HOME/.yarn/bin:$PATH
-
 install:
-  - yarn install --no-lockfile --non-interactive
+  - npm install

 script:
-  - yarn lint:wrapper
-  - yarn lint:contract-tests
+  - npm run lint:wrapper
+  - npm run lint:contract-tests
  # - yarn lint:contracts

 branches:
--- a/apps/contribution/arapp.json
+++ b/apps/contribution/arapp.json
@@ -19,7 +19,7 @@
  "environments": {
    "default": {
      "network": "development",
-      "appName": "kredits-contribution.aragonpm.eth"
+      "appName": "kredits-contribution.open.aragonpm.eth"
    },
    "rinkeby": {
      "registry": "0x98df287b6c145399aaa709692c8d308357bc085d",
--- a/apps/contribution/artifact.json
+++ b/apps/contribution/artifact.json
@@ -0,0 +1,912 @@
+{
+	"roles": [
+		{
+			"name": "Add contributions",
+			"id": "ADD_CONTRIBUTION_ROLE",
+			"params": [],
+			"bytes": "0x493d28cd0d82bcb20db66e4f6390a00122ef772717e282b436ba3240af18bfb1"
+		},
+		{
+			"name": "Manage token contract",
+			"id": "MANAGE_TOKEN_CONTRACT_ROLE",
+			"params": [],
+			"bytes": "0xdd275187bc43df45ce7b34f6716e572716c69ad44e5e496175008950f032854b"
+		},
+		{
+			"name": "Veto contributions",
+			"id": "VETO_CONTRIBUTION_ROLE",
+			"params": [],
+			"bytes": "0x495a36de1ed34d5c1b9f8704e7d8bc8badb027221b09c79691d430bc54c4c88f"
+		}
+	],
+	"environments": {
+		"default": {
+			"network": "development",
+			"appName": "kredits-contribution.open.aragonpm.eth"
+		}
+	},
+	"path": "contracts/Contribution.sol",
+	"appName": "kredits-contribution.open.aragonpm.eth",
+	"appId": "0x09f5274cba299b46c5be722ef672d10eef7a2ef980b612aef529d74fb9da7643",
+	"abi": [
+		{
+			"constant": true,
+			"inputs": [],
+			"name": "hasInitialized",
+			"outputs": [
+				{
+					"name": "",
+					"type": "bool"
+				}
+			],
+			"payable": false,
+			"stateMutability": "view",
+			"type": "function"
+		},
+		{
+			"constant": true,
+			"inputs": [],
+			"name": "ADD_CONTRIBUTION_ROLE",
+			"outputs": [
+				{
+					"name": "",
+					"type": "bytes32"
+				}
+			],
+			"payable": false,
+			"stateMutability": "view",
+			"type": "function"
+		},
+		{
+			"constant": true,
+			"inputs": [
+				{
+					"name": "_script",
+					"type": "bytes"
+				}
+			],
+			"name": "getEVMScriptExecutor",
+			"outputs": [
+				{
+					"name": "",
+					"type": "address"
+				}
+			],
+			"payable": false,
+			"stateMutability": "view",
+			"type": "function"
+		},
+		{
+			"constant": true,
+			"inputs": [],
+			"name": "getRecoveryVault",
+			"outputs": [
+				{
+					"name": "",
+					"type": "address"
+				}
+			],
+			"payable": false,
+			"stateMutability": "view",
+			"type": "function"
+		},
+		{
+			"constant": true,
+			"inputs": [],
+			"name": "contributionsCount",
+			"outputs": [
+				{
+					"name": "",
+					"type": "uint32"
+				}
+			],
+			"payable": false,
+			"stateMutability": "view",
+			"type": "function"
+		},
+		{
+			"constant": true,
+			"inputs": [
+				{
+					"name": "token",
+					"type": "address"
+				}
+			],
+			"name": "allowRecoverability",
+			"outputs": [
+				{
+					"name": "",
+					"type": "bool"
+				}
+			],
+			"payable": false,
+			"stateMutability": "view",
+			"type": "function"
+		},
+		{
+			"constant": true,
+			"inputs": [],
+			"name": "appId",
+			"outputs": [
+				{
+					"name": "",
+					"type": "bytes32"
+				}
+			],
+			"payable": false,
+			"stateMutability": "view",
+			"type": "function"
+		},
+		{
+			"constant": true,
+			"inputs": [],
+			"name": "getInitializationBlock",
+			"outputs": [
+				{
+					"name": "",
+					"type": "uint256"
+				}
+			],
+			"payable": false,
+			"stateMutability": "view",
+			"type": "function"
+		},
+		{
+			"constant": true,
+			"inputs": [],
+			"name": "KERNEL_APP_ADDR_NAMESPACE",
+			"outputs": [
+				{
+					"name": "",
+					"type": "bytes32"
+				}
+			],
+			"payable": false,
+			"stateMutability": "view",
+			"type": "function"
+		},
+		{
+			"constant": false,
+			"inputs": [
+				{
+					"name": "_token",
+					"type": "address"
+				}
+			],
+			"name": "transferToVault",
+			"outputs": [],
+			"payable": false,
+			"stateMutability": "nonpayable",
+			"type": "function"
+		},
+		{
+			"constant": true,
+			"inputs": [
+				{
+					"name": "_sender",
+					"type": "address"
+				},
+				{
+					"name": "_role",
+					"type": "bytes32"
+				},
+				{
+					"name": "_params",
+					"type": "uint256[]"
+				}
+			],
+			"name": "canPerform",
+			"outputs": [
+				{
+					"name": "",
+					"type": "bool"
+				}
+			],
+			"payable": false,
+			"stateMutability": "view",
+			"type": "function"
+		},
+		{
+			"constant": true,
+			"inputs": [],
+			"name": "getEVMScriptRegistry",
+			"outputs": [
+				{
+					"name": "",
+					"type": "address"
+				}
+			],
+			"payable": false,
+			"stateMutability": "view",
+			"type": "function"
+		},
+		{
+			"constant": true,
+			"inputs": [
+				{
+					"name": "",
+					"type": "uint32"
+				}
+			],
+			"name": "contributionOwner",
+			"outputs": [
+				{
+					"name": "",
+					"type": "uint32"
+				}
+			],
+			"payable": false,
+			"stateMutability": "view",
+			"type": "function"
+		},
+		{
+			"constant": true,
+			"inputs": [
+				{
+					"name": "",
+					"type": "uint32"
+				}
+			],
+			"name": "contributions",
+			"outputs": [
+				{
+					"name": "contributorId",
+					"type": "uint32"
+				},
+				{
+					"name": "amount",
+					"type": "uint32"
+				},
+				{
+					"name": "claimed",
+					"type": "bool"
+				},
+				{
+					"name": "hashDigest",
+					"type": "bytes32"
+				},
+				{
+					"name": "hashFunction",
+					"type": "uint8"
+				},
+				{
+					"name": "hashSize",
+					"type": "uint8"
+				},
+				{
+					"name": "tokenMetadataURL",
+					"type": "string"
+				},
+				{
+					"name": "confirmedAtBlock",
+					"type": "uint256"
+				},
+				{
+					"name": "vetoed",
+					"type": "bool"
+				},
+				{
+					"name": "exists",
+					"type": "bool"
+				}
+			],
+			"payable": false,
+			"stateMutability": "view",
+			"type": "function"
+		},
+		{
+			"constant": true,
+			"inputs": [
+				{
+					"name": "",
+					"type": "uint32"
+				},
+				{
+					"name": "",
+					"type": "uint256"
+				}
+			],
+			"name": "ownedContributions",
+			"outputs": [
+				{
+					"name": "",
+					"type": "uint32"
+				}
+			],
+			"payable": false,
+			"stateMutability": "view",
+			"type": "function"
+		},
+		{
+			"constant": true,
+			"inputs": [],
+			"name": "kernel",
+			"outputs": [
+				{
+					"name": "",
+					"type": "address"
+				}
+			],
+			"payable": false,
+			"stateMutability": "view",
+			"type": "function"
+		},
+		{
+			"constant": true,
+			"inputs": [],
+			"name": "blocksToWait",
+			"outputs": [
+				{
+					"name": "",
+					"type": "uint32"
+				}
+			],
+			"payable": false,
+			"stateMutability": "view",
+			"type": "function"
+		},
+		{
+			"constant": true,
+			"inputs": [],
+			"name": "isPetrified",
+			"outputs": [
+				{
+					"name": "",
+					"type": "bool"
+				}
+			],
+			"payable": false,
+			"stateMutability": "view",
+			"type": "function"
+		},
+		{
+			"constant": true,
+			"inputs": [
+				{
+					"name": "",
+					"type": "uint256"
+				}
+			],
+			"name": "appIds",
+			"outputs": [
+				{
+					"name": "",
+					"type": "bytes32"
+				}
+			],
+			"payable": false,
+			"stateMutability": "view",
+			"type": "function"
+		},
+		{
+			"constant": true,
+			"inputs": [],
+			"name": "VETO_CONTRIBUTION_ROLE",
+			"outputs": [
+				{
+					"name": "",
+					"type": "bytes32"
+				}
+			],
+			"payable": false,
+			"stateMutability": "view",
+			"type": "function"
+		},
+		{
+			"anonymous": false,
+			"inputs": [
+				{
+					"indexed": false,
+					"name": "id",
+					"type": "uint32"
+				},
+				{
+					"indexed": true,
+					"name": "contributorId",
+					"type": "uint32"
+				},
+				{
+					"indexed": false,
+					"name": "amount",
+					"type": "uint32"
+				}
+			],
+			"name": "ContributionAdded",
+			"type": "event"
+		},
+		{
+			"anonymous": false,
+			"inputs": [
+				{
+					"indexed": false,
+					"name": "id",
+					"type": "uint32"
+				},
+				{
+					"indexed": true,
+					"name": "contributorId",
+					"type": "uint32"
+				},
+				{
+					"indexed": false,
+					"name": "amount",
+					"type": "uint32"
+				}
+			],
+			"name": "ContributionClaimed",
+			"type": "event"
+		},
+		{
+			"anonymous": false,
+			"inputs": [
+				{
+					"indexed": false,
+					"name": "id",
+					"type": "uint32"
+				},
+				{
+					"indexed": false,
+					"name": "vetoedByAccount",
+					"type": "address"
+				}
+			],
+			"name": "ContributionVetoed",
+			"type": "event"
+		},
+		{
+			"anonymous": false,
+			"inputs": [
+				{
+					"indexed": true,
+					"name": "executor",
+					"type": "address"
+				},
+				{
+					"indexed": false,
+					"name": "script",
+					"type": "bytes"
+				},
+				{
+					"indexed": false,
+					"name": "input",
+					"type": "bytes"
+				},
+				{
+					"indexed": false,
+					"name": "returnData",
+					"type": "bytes"
+				}
+			],
+			"name": "ScriptResult",
+			"type": "event"
+		},
+		{
+			"anonymous": false,
+			"inputs": [
+				{
+					"indexed": true,
+					"name": "vault",
+					"type": "address"
+				},
+				{
+					"indexed": true,
+					"name": "token",
+					"type": "address"
+				},
+				{
+					"indexed": false,
+					"name": "amount",
+					"type": "uint256"
+				}
+			],
+			"name": "RecoverToVault",
+			"type": "event"
+		},
+		{
+			"constant": false,
+			"inputs": [
+				{
+					"name": "_appIds",
+					"type": "bytes32[4]"
+				}
+			],
+			"name": "initialize",
+			"outputs": [],
+			"payable": false,
+			"stateMutability": "nonpayable",
+			"type": "function"
+		},
+		{
+			"constant": true,
+			"inputs": [],
+			"name": "getTokenContract",
+			"outputs": [
+				{
+					"name": "",
+					"type": "address"
+				}
+			],
+			"payable": false,
+			"stateMutability": "view",
+			"type": "function"
+		},
+		{
+			"constant": true,
+			"inputs": [],
+			"name": "getContributorContract",
+			"outputs": [
+				{
+					"name": "",
+					"type": "address"
+				}
+			],
+			"payable": false,
+			"stateMutability": "view",
+			"type": "function"
+		},
+		{
+			"constant": true,
+			"inputs": [
+				{
+					"name": "contributorAccount",
+					"type": "address"
+				}
+			],
+			"name": "getContributorIdByAddress",
+			"outputs": [
+				{
+					"name": "",
+					"type": "uint32"
+				}
+			],
+			"payable": false,
+			"stateMutability": "view",
+			"type": "function"
+		},
+		{
+			"constant": true,
+			"inputs": [
+				{
+					"name": "contributorId",
+					"type": "uint32"
+				}
+			],
+			"name": "getContributorAddressById",
+			"outputs": [
+				{
+					"name": "",
+					"type": "address"
+				}
+			],
+			"payable": false,
+			"stateMutability": "view",
+			"type": "function"
+		},
+		{
+			"constant": true,
+			"inputs": [],
+			"name": "name",
+			"outputs": [
+				{
+					"name": "",
+					"type": "string"
+				}
+			],
+			"payable": false,
+			"stateMutability": "view",
+			"type": "function"
+		},
+		{
+			"constant": true,
+			"inputs": [],
+			"name": "symbol",
+			"outputs": [
+				{
+					"name": "",
+					"type": "string"
+				}
+			],
+			"payable": false,
+			"stateMutability": "view",
+			"type": "function"
+		},
+		{
+			"constant": true,
+			"inputs": [
+				{
+					"name": "owner",
+					"type": "address"
+				}
+			],
+			"name": "balanceOf",
+			"outputs": [
+				{
+					"name": "",
+					"type": "uint256"
+				}
+			],
+			"payable": false,
+			"stateMutability": "view",
+			"type": "function"
+		},
+		{
+			"constant": true,
+			"inputs": [
+				{
+					"name": "contributionId",
+					"type": "uint32"
+				}
+			],
+			"name": "ownerOf",
+			"outputs": [
+				{
+					"name": "",
+					"type": "address"
+				}
+			],
+			"payable": false,
+			"stateMutability": "view",
+			"type": "function"
+		},
+		{
+			"constant": true,
+			"inputs": [
+				{
+					"name": "owner",
+					"type": "address"
+				},
+				{
+					"name": "index",
+					"type": "uint32"
+				}
+			],
+			"name": "tokenOfOwnerByIndex",
+			"outputs": [
+				{
+					"name": "",
+					"type": "uint32"
+				}
+			],
+			"payable": false,
+			"stateMutability": "view",
+			"type": "function"
+		},
+		{
+			"constant": true,
+			"inputs": [
+				{
+					"name": "contributionId",
+					"type": "uint32"
+				}
+			],
+			"name": "tokenMetadata",
+			"outputs": [
+				{
+					"name": "",
+					"type": "string"
+				}
+			],
+			"payable": false,
+			"stateMutability": "view",
+			"type": "function"
+		},
+		{
+			"constant": true,
+			"inputs": [
+				{
+					"name": "confirmedOnly",
+					"type": "bool"
+				}
+			],
+			"name": "totalKreditsEarned",
+			"outputs": [
+				{
+					"name": "amount",
+					"type": "uint32"
+				}
+			],
+			"payable": false,
+			"stateMutability": "view",
+			"type": "function"
+		},
+		{
+			"constant": true,
+			"inputs": [
+				{
+					"name": "contributorId",
+					"type": "uint32"
+				},
+				{
+					"name": "confirmedOnly",
+					"type": "bool"
+				}
+			],
+			"name": "totalKreditsEarnedByContributor",
+			"outputs": [
+				{
+					"name": "amount",
+					"type": "uint32"
+				}
+			],
+			"payable": false,
+			"stateMutability": "view",
+			"type": "function"
+		},
+		{
+			"constant": true,
+			"inputs": [
+				{
+					"name": "contributionId",
+					"type": "uint32"
+				}
+			],
+			"name": "getContribution",
+			"outputs": [
+				{
+					"name": "id",
+					"type": "uint32"
+				},
+				{
+					"name": "contributorId",
+					"type": "uint32"
+				},
+				{
+					"name": "amount",
+					"type": "uint32"
+				},
+				{
+					"name": "claimed",
+					"type": "bool"
+				},
+				{
+					"name": "hashDigest",
+					"type": "bytes32"
+				},
+				{
+					"name": "hashFunction",
+					"type": "uint8"
+				},
+				{
+					"name": "hashSize",
+					"type": "uint8"
+				},
+				{
+					"name": "confirmedAtBlock",
+					"type": "uint256"
+				},
+				{
+					"name": "exists",
+					"type": "bool"
+				},
+				{
+					"name": "vetoed",
+					"type": "bool"
+				}
+			],
+			"payable": false,
+			"stateMutability": "view",
+			"type": "function"
+		},
+		{
+			"constant": false,
+			"inputs": [
+				{
+					"name": "amount",
+					"type": "uint32"
+				},
+				{
+					"name": "contributorId",
+					"type": "uint32"
+				},
+				{
+					"name": "hashDigest",
+					"type": "bytes32"
+				},
+				{
+					"name": "hashFunction",
+					"type": "uint8"
+				},
+				{
+					"name": "hashSize",
+					"type": "uint8"
+				}
+			],
+			"name": "add",
+			"outputs": [],
+			"payable": false,
+			"stateMutability": "nonpayable",
+			"type": "function"
+		},
+		{
+			"constant": false,
+			"inputs": [
+				{
+					"name": "contributionId",
+					"type": "uint32"
+				}
+			],
+			"name": "veto",
+			"outputs": [],
+			"payable": false,
+			"stateMutability": "nonpayable",
+			"type": "function"
+		},
+		{
+			"constant": false,
+			"inputs": [
+				{
+					"name": "contributionId",
+					"type": "uint32"
+				}
+			],
+			"name": "claim",
+			"outputs": [],
+			"payable": false,
+			"stateMutability": "nonpayable",
+			"type": "function"
+		},
+		{
+			"constant": true,
+			"inputs": [
+				{
+					"name": "contributionId",
+					"type": "uint32"
+				}
+			],
+			"name": "exists",
+			"outputs": [
+				{
+					"name": "",
+					"type": "bool"
+				}
+			],
+			"payable": false,
+			"stateMutability": "view",
+			"type": "function"
+		}
+	],
+	"deployment": {
+		"contractName": "Contribution",
+		"compiledAt": "2019-06-13T12:39:07.659Z",
+		"compiler": {
+			"name": "solc",
+			"version": "0.4.24+commit.e67f0147.Emscripten.clang",
+			"optimizer": {
+				"enabled": false
+			}
+		},
+		"flattenedCode": "./code.sol",
+		"transactionHash": "0x073057bb616243e415823fa9a8c8cc096b573fbd0bbf11c2f59bb75a84291689"
+	},
+	"functions": [
+		{
+			"sig": "mintFor(address,uint256,uint32)",
+			"roles": [],
+			"notice": null
+		},
+		{
+			"sig": "initialize(bytes32[4])",
+			"roles": [],
+			"notice": null
+		},
+		{
+			"sig": "add(uint32,uint32,bytes32,uint8,uint8)",
+			"roles": [
+				"ADD_CONTRIBUTION_ROLE"
+			],
+			"notice": null
+		},
+		{
+			"sig": "veto(uint32)",
+			"roles": [
+				"VETO_CONTRIBUTION_ROLE"
+			],
+			"notice": null
+		},
+		{
+			"sig": "claim(uint32)",
+			"roles": [],
+			"notice": null
+		}
+	]
+}
--- a/apps/contribution/code.sol
+++ b/apps/contribution/code.sol
--- a/apps/contribution/contracts/Contribution.sol
+++ b/apps/contribution/contracts/Contribution.sol
@@ -118,22 +118,22 @@ contract Contribution is AragonApp {
  // Custom functions
  //

-  function totalKreditsEarned(bool confirmedOnly) public view returns (uint256 count) {
+  function totalKreditsEarned(bool confirmedOnly) public view returns (uint32 amount) {
    for (uint32 i = 1; i <= contributionsCount; i++) {
      ContributionData memory c = contributions[i];
-      if (block.number >= c.confirmedAtBlock || !confirmedOnly) {
-        count += c.amount; // should use safemath
+      if (!c.vetoed && (block.number >= c.confirmedAtBlock || !confirmedOnly)) {
+        amount += 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++) {
+  function totalKreditsEarnedByContributor(uint32 contributorId, bool confirmedOnly) public view returns (uint32 amount) {
+    uint256 tokenCount = ownedContributions[contributorId].length;
+    for (uint256 i = 0; i < tokenCount; i++) {
      uint32 cId = ownedContributions[contributorId][i];
      ContributionData memory c = contributions[cId];
-      if (block.number >= c.confirmedAtBlock || !confirmedOnly) {
-        count += c.amount; // should use safemath
+      if (!c.vetoed && (block.number >= c.confirmedAtBlock || !confirmedOnly)) {
+        amount += c.amount; // should use safemath
      }
    }
  }
--- a/apps/contribution/package-lock.json
+++ b/apps/contribution/package-lock.json
--- a/apps/contribution/package.json
+++ b/apps/contribution/package.json
@@ -3,8 +3,8 @@
  "version": "1.0.0",
  "description": "",
  "dependencies": {
-    "@aragon/os": "^4.1.0",
-    "@aragon/cli": "^5.5.0"
+    "@aragon/os": "^4.2.0",
+    "@aragon/cli": "^5.9.6"
  },
  "devDependencies": {},
  "scripts": {
--- a/apps/contributor/arapp.json
+++ b/apps/contributor/arapp.json
@@ -9,7 +9,7 @@
  "environments": {
    "default": {
      "network": "development",
-      "appName": "kredits-contributor.aragonpm.eth"
+      "appName": "kredits-contributor.open.aragonpm.eth"
    },
    "rinkeby": {
      "registry": "0x98df287b6c145399aaa709692c8d308357bc085d",
--- a/apps/contributor/contracts/Contributor.sol
+++ b/apps/contributor/contracts/Contributor.sol
@@ -7,7 +7,7 @@ interface ITokenBalance {
  function balanceOf(address contributorAccount) public view returns (uint256);
 }
 interface IContributionBalance {
-  function totalKreditsEarnedByContributor(uint32 contributorId, bool confirmedOnly) public view returns (uint256 count);
+  function totalKreditsEarnedByContributor(uint32 contributorId, bool confirmedOnly) public view returns (uint32 amount);
  function balanceOf(address owner) public view returns (uint256);
 }

@@ -128,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, 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, uint32 totalKreditsEarned, uint256 contributionsCount, bool exists ) {
    id = _id;
    Contributor storage c = contributors[_id];
    account = c.account;
@@ -144,7 +144,7 @@ contract Contributor is AragonApp {
    exists = c.exists;
  }

-  function canPerform(address _who, address _where, bytes32 _what/*, uint256[] memory _how*/) public returns (bool) {
+  function canPerform(address _who, address _where, bytes32 _what, uint256[] memory _how) public returns (bool) {
    address sender = _who;
    if (sender == address(-1)) {
      sender = tx.origin;
--- a/apps/contributor/package-lock.json
+++ b/apps/contributor/package-lock.json
--- a/apps/contributor/package.json
+++ b/apps/contributor/package.json
@@ -3,8 +3,8 @@
  "version": "1.0.0",
  "description": "",
  "dependencies": {
-    "@aragon/os": "^4.1.0",
-    "@aragon/cli": "^5.5.0"
+    "@aragon/os": "^4.2.0",
+    "@aragon/cli": "^5.9.6"
  },
  "devDependencies": {},
  "scripts": {
--- a/apps/proposal/arapp.json
+++ b/apps/proposal/arapp.json
@@ -14,7 +14,7 @@
  "environments": {
    "default": {
      "network": "development",
-      "appName": "kredits-proposal.aragonpm.eth"
+      "appName": "kredits-proposal.open.aragonpm.eth"
    },
    "rinkeby": {
      "registry": "0x98df287b6c145399aaa709692c8d308357bc085d",
--- a/apps/proposal/package-lock.json
+++ b/apps/proposal/package-lock.json
--- a/apps/proposal/package.json
+++ b/apps/proposal/package.json
@@ -3,8 +3,8 @@
  "version": "1.0.0",
  "description": "",
  "dependencies": {
-    "@aragon/os": "^4.1.0",
-    "@aragon/cli": "^5.5.0"
+    "@aragon/os": "^4.2.0",
+    "@aragon/cli": "^5.9.6"
  },
  "devDependencies": {},
  "scripts": {
--- a/apps/token/arapp.json
+++ b/apps/token/arapp.json
@@ -9,7 +9,7 @@
  "environments": {
    "default": {
      "network": "development",
-      "appName": "kredits-token.aragonpm.eth"
+      "appName": "kredits-token.open.aragonpm.eth"
    },
    "rinkeby": {
      "registry": "0x98df287b6c145399aaa709692c8d308357bc085d",
--- a/apps/token/package-lock.json
+++ b/apps/token/package-lock.json
--- a/apps/token/package.json
+++ b/apps/token/package.json
@@ -3,8 +3,8 @@
  "version": "1.0.0",
  "description": "",
  "dependencies": {
-    "@aragon/os": "^4.1.0",
-    "@aragon/cli": "^5.5.0"
+    "@aragon/os": "^4.2.0",
+    "@aragon/cli": "^5.9.6"
  },
  "devDependencies": {},
  "scripts": {
--- a/arapp.json
+++ b/arapp.json
@@ -21,7 +21,7 @@
      "params": []
    },
    {
-      "name": "Add proposal", 
+      "name": "Add proposal",
      "id": "ADD_PROPOSAL_ROLE",
      "params": []
    },
@@ -34,15 +34,15 @@
  "environments": {
    "development": {
      "network": "development",
-      "apm": "aragonpm.eth",
+      "apm": "open.aragonpm.eth",
      "registry": "0x5f6f7e8cc7346a11ca2def8f827b7a0b612c56a1",
-      "appName": "dummy.aragonpm.eth"
+      "appName": "dummy.open.aragonpm.eth"
    },
    "rinkeby": {
      "network": "rinkeby",
      "registry": "0x98Df287B6C145399Aaa709692c8D308357bC085D",
      "wsRPC": "wss://rinkeby.eth.aragon.network/ws",
-      "daoFactory": "0x2298d27a9b847c681d2b2c2828ab9d79013f5f1d", 
+      "daoFactory": "0x2298d27a9b847c681d2b2c2828ab9d79013f5f1d",
      "appName": "dummy.open.aragonpm.eth",
      "apm": "open.aragonpm.eth"
    },
--- a/config/seeds.js
+++ b/config/seeds.js
@@ -7,7 +7,7 @@ const contractCalls = [
    github_username: 'bumi',
    github_uid: 318,
    gitea_username: 'bumi',
-    wiki_username: 'Bumi'
+    wiki_username: 'Bumi',
  }, { gasLimit: 200000 }]],

  ['Contributor', 'add', [{
@@ -18,7 +18,7 @@ const contractCalls = [
    github_username: 'skddc',
    github_uid: 842,
    gitea_username: 'raucao',
-    wiki_username: 'Basti'
+    wiki_username: 'Basti',
  }, { gasLimit: 200000 }]],

  ['Contributor', 'add', [{
@@ -28,21 +28,21 @@ const contractCalls = [
    url: '',
    github_username: 'fsmanuel',
    github_uid: 54812,
-    wiki_username: 'Manuel'
+    wiki_username: 'Manuel',
  }, { gasLimit: 200000 }]],

-  ['Proposal', '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', 'add', [{ contributorId: 1, contributorIpfsHash: 'QmWKCYGr2rSf6abUPaTYqf98urvoZxGrb7dbspFZA6oyVF', date: '2019-04-09', amount: 500, kind: 'dev', description: '[67P/kredits-contracts] Ran the seeds', url: '' }, { gasLimit: 350000 }]],
+  ['Proposal', 'add', [{ contributorId: 2, contributorIpfsHash: 'QmcHzEeAM26HV2zHTf5HnZrCtCtGdEccL5kUtDakAB7ozB', date: '2019-04-10', amount: 500, kind: 'dev', description: '[67P/kredits-contracts] Ran the seeds', url: '' }, { gasLimit: 350000 }]],
+  ['Proposal', 'add', [{ contributorId: 2, contributorIpfsHash: 'QmcHzEeAM26HV2zHTf5HnZrCtCtGdEccL5kUtDakAB7ozB', date: '2019-04-11', amount: 500, kind: 'dev', description: '[67P/kredits-contracts] Hacked on kredits', url: '' }, { gasLimit: 350000 }]],
  ['Proposal', 'vote', [1, { gasLimit: 550000 }]],
-  ['Contribution', '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 }]]
+  ['Contribution', 'add', [{ contributorId: 1, contributorIpfsHash: 'QmWKCYGr2rSf6abUPaTYqf98urvoZxGrb7dbspFZA6oyVF', date: '2019-04-11', amount: 5000, kind: 'dev', description: '[67P/kredits-contracts] Introduce contribution token', url: '' }, { gasLimit: 350000 }]],
+  ['Contribution', 'add', [{ contributorId: 2, contributorIpfsHash: 'QmcHzEeAM26HV2zHTf5HnZrCtCtGdEccL5kUtDakAB7ozB', date: '2019-04-11', amount: 1500, kind: 'dev', description: '[67P/kredits-web] Reviewed stuff', url: '' }, { gasLimit: 350000 }]],
+  ['Contribution', 'claim', [1, { gasLimit: 300000 }]],
 ];

 const funds = [
  '0x7e8f313c56f809188313aa274fa67ee58c31515d',
-  '0xa502eb4021f3b9ab62f75b57a94e1cfbf81fd827'
+  '0xa502eb4021f3b9ab62f75b57a94e1cfbf81fd827',
 ];

 module.exports = { contractCalls, funds };
--- a/contracts/KreditsKit.sol
+++ b/contracts/KreditsKit.sol
@@ -34,20 +34,20 @@ contract KreditsKit is KitBase  {
        Contributor contributor = Contributor(_installApp(dao, appIds[uint8(Apps.Contributor)]));
        contributor.initialize(root, appIds);
        acl.createPermission(root, contributor, contributor.MANAGE_CONTRIBUTORS_ROLE(), this);
-        
+
        Token token = Token(_installApp(dao, appIds[uint8(Apps.Token)]));
        token.initialize(appIds);
-        
+
        Contribution contribution = Contribution(_installApp(dao, appIds[uint8(Apps.Contribution)]));
        contribution.initialize(appIds);
-        
+
        Proposal proposal = Proposal(_installApp(dao, appIds[uint8(Apps.Proposal)]));
        proposal.initialize(appIds);

        acl.createPermission(root, contribution, contribution.ADD_CONTRIBUTION_ROLE(), this);
        acl.createPermission(root, contribution, contribution.VETO_CONTRIBUTION_ROLE(), this);
        acl.grantPermission(proposal, contribution, contribution.ADD_CONTRIBUTION_ROLE());
-        
+
        uint256[] memory params = new uint256[](1);
        params[0] = uint256(203) << 248 | uint256(1) << 240 | uint240(contributor);
        acl.grantPermissionP(acl.ANY_ENTITY(), contribution, contribution.ADD_CONTRIBUTION_ROLE(), params);
@@ -57,7 +57,7 @@ contract KreditsKit is KitBase  {
        //acl.setPermissionManager(this, proposal, proposal.VOTE_PROPOSAL_ROLE();
        acl.createPermission(root, proposal, proposal.VOTE_PROPOSAL_ROLE(), this);
        acl.grantPermissionP(acl.ANY_ENTITY(), proposal, proposal.VOTE_PROPOSAL_ROLE(), params);
-        
+
        acl.createPermission(root, proposal, proposal.ADD_PROPOSAL_ROLE(), this);
        //acl.grantPermissionP(address(-1), proposal, proposal.ADD_PROPOSAL_ROLE(), params);
        acl.grantPermission(acl.ANY_ENTITY(), proposal, proposal.ADD_PROPOSAL_ROLE());
@@ -67,9 +67,9 @@ contract KreditsKit is KitBase  {
        acl.setPermissionManager(root, contribution, contribution.ADD_CONTRIBUTION_ROLE());
        acl.setPermissionManager(root, contribution, contribution.VETO_CONTRIBUTION_ROLE());
        acl.setPermissionManager(root, contributor, contributor.MANAGE_CONTRIBUTORS_ROLE());
-        
+
        acl.createPermission(root, token, token.MINT_TOKEN_ROLE(), this);
-        acl.grantPermission(contribution, token, token.MINT_TOKEN_ROLE());        
+        acl.grantPermission(contribution, token, token.MINT_TOKEN_ROLE());
        acl.setPermissionManager(root, token, token.MINT_TOKEN_ROLE());


--- a/deployments/rinkeby/contributor.md
+++ b/deployments/rinkeby/contributor.md
@@ -2,7 +2,14 @@

 aragon apm publish major --environment=rinkeby

-## 2019-04-29 update balances
+## 2019-04-25 canPerform fix
+
+✔ Successfully published kredits-contributor.open.aragonpm.eth v6.0.0: 
+ ℹ Contract address: 0xA5379D49C718845A1BD7720c6BE3872bA69906cc
+ ℹ Content (ipfs): QmdennNV6s2FNpe6QNYxrUsUXPVdnQGvh1vCi22Tqs8ojq
+ ℹ Transaction hash: 0x51077afeff70a24e87c78bb23ea13bdb9b4445bd43ea7a74a4178fadfeeb6c35
+
+## 2019-04-24 update balances

 ✔ Successfully published kredits-contributor.open.aragonpm.eth v5.0.0: 
 ℹ Contract address: 0xadefa3b66b68a127Fe38bEa1813b844EE69CFD86
--- a/deployments/rinkeby/dao.md
+++ b/deployments/rinkeby/dao.md
@@ -1,5 +1,12 @@
 # Kredits deployment

+## 2019-04-25 canPerfom fix
+
+aragon dao upgrade 0xc34edf7d11b7f8433d597f0bb0697acdff55ef14 kredits-contributor.open.aragonpm.eth --environment=rinkeby
+ ✔ Fetching kredits-contributor.open.aragonpm.eth@latest
+ ✔ Upgrading app
+ ✔ Successfully executed: "Set the resolving address of 'kredits-contributor.open.aragonpm.eth' in namespace 'App code' to 0xA5379D49C718845A1BD7720c6BE3872bA69906cc"
+
 ## 2019-04-24 upgrade contributor and contribution

 aragon dao upgrade 0xc34edf7d11b7f8433d597f0bb0697acdff55ef14 kredits-contributor.open.aragonpm.eth --environment=rinkeby
@@ -8,7 +15,6 @@ eth-provider | Invalid provider preset/location: "local"
 ✔ Upgrading app
 ✔ Successfully executed: "Set the resolving address of 'kredits-contributor.open.aragonpm.eth' in namespace 'App code' to 0xadefa3b66b68a127Fe38bEa1813b844EE69CFD86"

-
 aragon dao upgrade 0xc34edf7d11b7f8433d597f0bb0697acdff55ef14 kredits-contribution.open.aragonpm.eth --environment=rinkeby
 ✔ Fetching kredits-contribution.open.aragonpm.eth@latest
 ✔ Upgrading app
--- a/lib/abis/Contribution.json
+++ b/lib/abis/Contribution.json
--- a/lib/abis/Contributor.json
+++ b/lib/abis/Contributor.json
--- a/lib/abis/KreditsKit.json
+++ b/lib/abis/KreditsKit.json
@@ -0,0 +1 @@
+[{"constant":true,"inputs":[],"name":"ens","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"fac","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"appId","type":"bytes32"}],"name":"latestVersionAppBase","outputs":[{"name":"base","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"appIds","outputs":[{"name":"","type":"bytes32"}],"payable":false,"stateMutability":"view","type":"function"},{"inputs":[{"name":"_fac","type":"address"},{"name":"_ens","type":"address"},{"name":"_appIds","type":"bytes32[4]"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"dao","type":"address"}],"name":"DeployInstance","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"dao","type":"address"},{"indexed":false,"name":"appProxy","type":"address"},{"indexed":false,"name":"appId","type":"bytes32"}],"name":"InstalledApp","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"appProxy","type":"address"},{"indexed":false,"name":"appId","type":"bytes32"}],"name":"InstalledApp","type":"event"},{"constant":false,"inputs":[],"name":"newInstance","outputs":[{"name":"dao","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"function"}]
--- a/lib/contracts/base.js
+++ b/lib/contracts/base.js
@@ -7,6 +7,10 @@ class Base {
    return this.contract.functions;
  }

+  get address () {
+    return this.contract.address;
+  }
+
  get ipfs () {
    if (!this._ipfsAPI) { throw new Error('IPFS API not configured; please set an ipfs instance'); }
    return this._ipfsAPI;
--- a/lib/contracts/contribution.js
+++ b/lib/contracts/contribution.js
@@ -1,5 +1,6 @@
 const Record = require('./record');
 const ContributionSerializer = require('../serializers/contribution');
+const deprecate = require('../utils/deprecate');

 class Contribution extends Record {
  get count () {
@@ -34,7 +35,7 @@ class Contribution extends Record {
      });
  }

-  async addContribution (contributionAttr, callOptions = {}) {
+  async add (contributionAttr, callOptions = {}) {
    const contribution = new ContributionSerializer(contributionAttr);

    try { await contribution.validate(); }
@@ -56,6 +57,11 @@ class Contribution extends Record {
        return this.functions.add(...contribution, callOptions);
      });
  }
+
+  addContribution () {
+    deprecate('The function `addContribution()` is deprecated and will be removed in the next major version. Use `add()` instead');
+    return this.add(...arguments);
+  }
 }

 module.exports = Contribution;
--- a/lib/contracts/kernel.js
+++ b/lib/contracts/kernel.js
@@ -6,7 +6,7 @@ const KERNEL_APP_ADDR_NAMESPACE = '0xd6f028ca0e8edb4a8c9757ca4fdccab25fa1e0317da
 class Kernel extends Base {
  constructor (contract) {
    super(contract);
-    this.apm = 'aragonpm.eth'; // can be overwritten if needed
+    this.apm = 'open.aragonpm.eth'; // can be overwritten if needed
  }

  getApp (appName) {
--- a/lib/contracts/proposal.js
+++ b/lib/contracts/proposal.js
@@ -1,5 +1,6 @@
 const Record = require('./record');
 const ContributionSerializer = require('../serializers/contribution');
+const deprecate = require('../utils/deprecate');

 class Proposal extends Record {
  get count () {
@@ -13,7 +14,7 @@ class Proposal extends Record {
      });
  }

-  async addProposal (proposalAttr, callOptions = {}) {
+  async add (proposalAttr, callOptions = {}) {
    const contribution = new ContributionSerializer(proposalAttr);

    try { await contribution.validate(); }
@@ -35,6 +36,11 @@ class Proposal extends Record {
        return this.functions.addProposal(...proposal, callOptions);
      });
  }
+
+  addProposal () {
+    deprecate('The function `addProposal()` is deprecated and will be removed in the next major version. Use `add()` instead');
+    return this.add(...arguments);
+  }
 }

 module.exports = Proposal;
--- a/lib/kredits.js
+++ b/lib/kredits.js
@@ -66,6 +66,27 @@ class Kredits {
    return new Kredits(provider, signer, { ipfsConfig: ipfsConfig }).init();
  }

+  static for (connectionOptions, kreditsOptions) {
+    let { network, rpcUrl, wallet } = connectionOptions;
+    if (!rpcUrl && network === 'local') { rpcUrl = 'http://localhost:8545'; }
+    let ethProvider, signer;
+    if (rpcUrl) {
+      ethProvider = new ethers.providers.JsonRpcProvider(rpcUrl);
+    } else {
+      ethProvider = new ethers.getDefaultProvider(network);
+    }
+    if (wallet) {
+      signer = wallet.connect(ethProvider);
+    } else if (ethProvider.getSigner) {
+      signer = ethProvider.getSigner();
+    }
+    return new Kredits(ethProvider, signer, kreditsOptions);
+  }
+
+  static availableNetworks () {
+    return Object.keys(DaoAddresses);
+  }
+
  get Kernel () {
    let k = this.contractFor('Kernel');
    // in case we want to use a special apm (e.g. development vs. production)
--- a/lib/kreditskit.js
+++ b/lib/kreditskit.js
@@ -0,0 +1,49 @@
+const ethers = require('ethers');
+
+const ABI = require('./abis/KreditsKit.json');
+const Addresses = require('./addresses/KreditsKit.json');
+
+class KreditsKit {
+
+  constructor (provider, signer, options = {}) {
+    let { address, abi } = options;
+
+    this.provider = provider;
+    this.signer = signer;
+    this.options = options;
+    this.address = address;
+    this.abi = abi || ABI;
+  }
+
+  init () {
+    return this.provider.getNetwork().then((network) => {
+      this.address = this.address || Addresses[network.chainId.toString()];
+      this.contract = new ethers.Contract(
+        this.address,
+        this.abi,
+        (this.signer || this.provider)
+      );
+      return this;
+    });
+  }
+
+  appIdFor (contractName) {
+    // see appIds in KreditsKit.sol for more details
+    const knownContracts = ['Contribution', 'Contributor', 'Proposal', 'Token'];
+    return this.contract.functions.appIds(knownContracts.indexOf(contractName));
+  }
+
+  newDAO (options = {}) {
+    return this.contract.functions.newInstance(options).then(transaction => {
+      return transaction.wait().then(result => {
+        const deployEvent = result.events.find(e => e.event === 'DeployInstance');
+        return {
+          daoAddress: deployEvent.args.dao,
+          transactionHash: transaction.hash,
+        };
+      });
+    });
+  }
+}
+
+module.exports = KreditsKit;
--- a/lib/serializers/contributor.js
+++ b/lib/serializers/contributor.js
@@ -28,6 +28,7 @@ class Contributor {
      github_username,
      gitea_username,
      wiki_username,
+      accounts,
    } = this;

    let data = {
@@ -35,7 +36,7 @@ class Contributor {
      '@type': 'Contributor',
      kind,
      name,
-      'accounts': [],
+      accounts: accounts || [],
    };

    if (url) {
--- a/lib/utils/pagination.js
+++ b/lib/utils/pagination.js
@@ -4,8 +4,8 @@ function pageNumber (number, size, recordCount) {
  number = parseInt(number) || 1;

  // Ensure page number is in range
-  number = number < 1 ? 1 : number;
  number = number > numberOfPages ? numberOfPages : number;
+  number = number < 1 ? 1 : number;

  return number;
 }
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
  },
  "scripts": {
    "install-all": "./scripts/every-app.sh \"npm install\"",
+    "postshrinkwrap": "node scripts/fix-package-lock.js &>/dev/null || true",
    "build-json": "npm run compile-contracts && node ./scripts/build-json.js",
    "repl": "truffle exec scripts/repl.js",
    "seeds": "truffle exec scripts/seeds.js",
@@ -23,7 +24,8 @@
    "lint:contracts": "solhint \"contracts/**/*.sol\" \"apps/*/contracts/**/*.sol\"",
    "lint:contract-tests": "eslint apps/*/test",
    "lint:wrapper": "eslint lib/",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "setup-git-hooks": "sh scripts/git-hooks/install"
  },
  "repository": {
    "type": "git",
@@ -36,24 +38,25 @@
  },
  "homepage": "https://github.com/67P/truffle-kredits#readme",
  "devDependencies": {
-    "@aragon/cli": "^5.5.0",
+    "@aragon/cli": "^5.9.6",
    "@aragon/kits-base": "^1.0.0",
-    "@aragon/os": "^4.1.0",
+    "@aragon/os": "^4.2.0",
    "async-each-series": "^1.1.0",
+    "cli-table": "^0.3.1",
    "eslint": "^5.16.0",
-    "eslint-plugin-import": "^2.16.0",
+    "eslint-plugin-import": "^2.17.3",
    "eslint-plugin-node": "^8.0.1",
    "eslint-plugin-promise": "^4.1.1",
    "eth-provider": "^0.2.2",
-    "openzeppelin-solidity": "^2.2.0",
    "promptly": "^3.0.3",
-    "solc": "^0.4.25",
-    "solhint": "^2.0.0"
+    "solc": "^0.4.26",
+    "solhint": "^2.1.0",
+    "yargs": "^12.0.0"
  },
  "dependencies": {
-    "ethers": "^4.0.27",
-    "ipfs-http-client": "^30.1.1",
-    "kosmos-schemas": "^2.0.0",
+    "ethers": "^4.0.29",
+    "ipfs-http-client": "^32.0.1",
+    "kosmos-schemas": "^2.1.0",
    "tv4": "^1.3.0"
  },
  "keywords": [
--- a/scripts/claim-contributions.js
+++ b/scripts/claim-contributions.js
@@ -0,0 +1,53 @@
+const promptly = require('promptly');
+const Table = require('cli-table');
+
+const initKredits = require('./helpers/init_kredits.js');
+
+module.exports = async function(callback) {
+  let kredits;
+  try {
+    kredits = await initKredits(web3);
+  } catch(e) {
+    callback(e);
+    return;
+  }
+
+  console.log(`Using Contribution at: ${kredits.Contribution.contract.address}`);
+
+  let recipient = await promptly.prompt('Contributor ID: ');
+  recipient = parseInt(recipient);
+
+  const table = new Table({
+    head: ['ID', 'Description', 'Amount', 'Claim Transaction'],
+  });
+
+  try {
+    let blockNumber = await kredits.provider.getBlockNumber();
+    let contributions = await kredits.Contribution.all({page: {size: 200}});
+
+    console.log(`Current block number: ${blockNumber}`);
+    let claimPromises = contributions.map(async (c) => {
+      const confirmed = c.confirmedAtBlock <= blockNumber;
+
+      if (c.contributorId === recipient && confirmed && !c.vetoed && !c.claimed) {
+        console.log(`Claiming contribution ID=${c.id}`);
+        return kredits.Contribution.functions.claim(c.id, { gasLimit: 500000 }).then(tx => {
+          table.push([
+            c.id.toString(),
+            `${c.description}`,
+            c.amount.toString(),
+            tx.hash,
+          ]);
+        });
+      }
+    });
+
+    Promise.all(claimPromises).then(_ => {
+      console.log(table.toString());
+      callback();
+    });
+  } catch (err) {
+    console.log(err);
+    callback();
+  }
+};
--- a/scripts/deploy-kit.js
+++ b/scripts/deploy-kit.js
@@ -35,7 +35,9 @@ module.exports = async function(callback) {
  }
  console.log(`Using DAOFactory at: ${daoFactory.address}`)

-  const apps = fs.readdirSync('./apps')
+  const apps = fs.readdirSync('./apps', { withFileTypes: true })
+                 .filter(e => e.isDirectory())
+                 .map(e => e.name);
  console.log(`Found apps: [${apps}].${apm}`)
  let appIds = {}
  apps.sort().forEach((app) => {
--- a/scripts/fix-package-lock.js
+++ b/scripts/fix-package-lock.js
@@ -0,0 +1,47 @@
+#!/usr/bin/env node
+
+// whatever npm does?! and for whatever this is needed..
+// https://github.com/aragon/aragon-cli/blob/master/packages/aragon-cli/scripts/fix-lockfile
+// https://github.com/aragon/aragon-cli/blob/master/docs-internal/Dependencies.md#regenerate-the-lockfiles
+
+const fs = require('fs')
+const path = require('path')
+
+function replaceAll(string, mapObject) {
+  const regex = new RegExp(Object.keys(mapObject).join('|'), 'gi')
+  let occurrences = 0
+  const result = string.replace(regex, matched => {
+    occurrences++
+    return mapObject[matched]
+  })
+  console.log(`[fix-lockfile] Replaced ${occurrences} occurrences.`)
+  return result
+}
+async function fixLockfile(path, replacementMap) {
+  const originalJson = require(path)
+  const originalText = JSON.stringify(originalJson, null, 2)
+  const fixedText = replaceAll(originalText, replacementMap)
+  const fixedJson = JSON.parse(fixedText)
+  console.log('writing file', path);
+  await fs.writeFileSync(path, JSON.stringify(fixedJson, null, 2))
+}
+//
+
+const LOCKFILE_PATH = path.join(__dirname, '..', 'package-lock.json')
+
+const replacementMap = {
+  //
+  '"version": "github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c"':
+    '"version": "0.2.3"',
+  //
+  '"from": "github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c"':
+    '"resolved": "github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c"',
+  //
+  '"from": "async-eventemitter@github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c"':
+    '"resolved": "github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c"',
+  //
+  '"async-eventemitter": "async-eventemitter@github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c"':
+    '"async-eventemitter": "github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c"',
+}
+
+fixLockfile(LOCKFILE_PATH, replacementMap)
--- a/scripts/git-hooks/install
+++ b/scripts/git-hooks/install
@@ -0,0 +1,2 @@
+#!/bin/sh
+cp -f scripts/git-hooks/pre-commit .git/hooks
--- a/scripts/git-hooks/pre-commit
+++ b/scripts/git-hooks/pre-commit
@@ -0,0 +1,17 @@
+#!/bin/sh
+#
+# Run appropriate linter against staged files
+#
+if [ $(git diff --name-only --cached lib/ | wc -l) != 0 ]; then
+  ./node_modules/.bin/eslint lib/
+  if [ $? != 0 ]; then
+    exit 1
+  fi
+fi
+# TODO master not linted yet, uncomment this when ready
+# if [ $(git diff --name-only --cached contracts/ | wc -l) != 0 ]; then
+#   solhint contracts/**/*.sol && apps/*/contracts/**/*.sol
+#   if [ $? != 0 ]; then
+#     exit 1
+#   fi
+# fi
--- a/scripts/list-contributions.js
+++ b/scripts/list-contributions.js
@@ -20,8 +20,9 @@ module.exports = async function(callback) {

  try {
    let blockNumber = await kredits.provider.getBlockNumber();
-    let contributions = await kredits.Contribution.all();
+    let contributions = await kredits.Contribution.all({page: {size: 1000}});

+    let kreditsSum = 0;
    console.log(`Current block number: ${blockNumber}`);
    contributions.forEach((c) => {
      const confirmed = c.confirmedAtBlock <= blockNumber;
@@ -40,8 +41,9 @@ module.exports = async function(callback) {

    console.log(table.toString());

-    let totalKreditsEarned = await kredits.Contribution.functions.totalKreditsEarned(true);
-    console.log(`Total confirmed kredits: ${totalKreditsEarned}`);
+    let totalKreditsEarnedUnConfirmed = await kredits.Contribution.functions.totalKreditsEarned(false);
+    let totalKreditsEarnedConfirmed = await kredits.Contribution.functions.totalKreditsEarned(true);
+    console.log(`Total Kredits: ${totalKreditsEarnedConfirmed} (confirmed) | ${totalKreditsEarnedUnConfirmed} (including unconfirmed)`);
  } catch (err) {
    console.log(err);
  }
--- a/scripts/new-dao.js
+++ b/scripts/new-dao.js
@@ -1,13 +1,13 @@
 const fs = require('fs');
 const path = require('path');

+const ethers = require('ethers');
 const fileInject = require('./helpers/file_inject.js');
 const getNetworkId = require('./helpers/networkid.js');
+const KreditsKit = require('../lib/kreditskit');

 const addressesPath = path.join(__dirname, '..', 'lib/addresses');

-const KreditsKit = artifacts.require('KreditsKit')
-
 module.exports = async function(callback) {
  const networkId = await getNetworkId(web3)
  console.log(`Deploying to networkId: ${networkId}`)
@@ -20,25 +20,21 @@ module.exports = async function(callback) {
  }
  console.log(`Using KreditsKit at: ${kreditsKitAddress}`);

-  let kreditsKit = KreditsKit.at(kreditsKitAddress)
+  const provider = new ethers.providers.Web3Provider(web3.currentProvider);
+  let signer = provider.getSigner();

-  kreditsKit.newInstance().then((ret) => {
-    console.log(ret.logs);
-    const installedEvents = ret.logs.filter(log => log.event === 'InstalledApp').map(log => log.args)
-    const deployEvents = ret.logs.filter(log => log.event === 'DeployInstance').map(log => log.args)
+  let kit = await new KreditsKit(provider, signer).init()

-    if (deployEvents.length > 1) {
-      callback(new Error("More than one DAO was deployed. Something is wrong"))
-    }
-    const daoAddress = deployEvents[0].dao;
+  // TODO: get rid of the hard coded gas limit
+  kit.newDAO({ gasLimit: 10000000 }).then(result => {
+    console.log(result);
+    fileInject(path.join(addressesPath, 'dao.json'), networkId, result.daoAddress)

-    fileInject(path.join(addressesPath, 'dao.json'), networkId, daoAddress)
-
-    console.log(`\n\nCreated new DAO at: ${daoAddress}`)
+    console.log(`\n\nCreated new DAO at: ${result.daoAddress}`)

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

  each(seeds.contractCalls, (call, next) => {
--- a/scripts/veto-contribution.js
+++ b/scripts/veto-contribution.js
@@ -0,0 +1,32 @@
+const promptly = require('promptly');
+const { inspect } = require('util');
+
+const initKredits = require('./helpers/init_kredits.js');
+
+module.exports = async function(callback) {
+  let kredits;
+  try { kredits = await initKredits(web3);
+  } catch(e) { callback(e); return; }
+
+  console.log(`Using Contributions at: ${kredits.Contribution.contract.address}\n`);
+
+  let contributionId = await promptly.prompt('Contribution ID: ');
+
+  console.log(`Recording a veto for contribution #${contributionId}`);
+
+  try {
+    kredits.Contribution.functions.veto(contributionId, { gasLimit: 300000 })
+      .then(result => {
+        console.log("\n\nResult:");
+        console.log(result);
+        callback();
+      })
+      .catch(error => {
+        console.log('Failed to veto contribution');
+        callback(inspect(error));
+      });
+  } catch(err) {
+    console.log('Failed to veto contribution');
+    callback(inspect(err));
+  }
+}
Author	SHA1	Message	Date
Sebastian Kippe	b3dab3200f	Use postshrinkwrap instead of postinstall `postinstall` is executed before package-lock.json is written to disk. https://github.com/npm/npm/issues/18798	2019-06-18 10:30:35 +02:00
Sebastian Kippe	165ca8d3fc	Add postinstall lockfile fix https://github.com/67P/kredits-contracts/pull/140	2019-06-17 18:58:31 +02:00
Michael Bumann	42ef48b34d	Make sure fix lockfile uses the correct file path	2019-06-17 09:38:47 +02:00
Michael Bumann	aacec26d0e	Default to open.aragonpm.eth it is now also available on the devchain	2019-06-15 00:49:26 +02:00
Michael Bumann	9ac3837f67	I don't know why this is needed but it fixes an npm issue if install fails node scripts/fix-package-lock.js might help	2019-06-15 00:32:07 +02:00
Michael Bumann	b32b5e240d	package-lock	2019-06-15 00:28:04 +02:00
Michael Bumann	ee70125139	package-lock	2019-06-15 00:26:38 +02:00
Michael Bumann	fa6423ed2e	Fix fix... don't really know what I am doing	2019-06-15 00:21:54 +02:00
Michael Bumann	97071c1b60	still broken	2019-06-14 23:56:22 +02:00
Michael Bumann	9b8004af69	Remove npm cache and use LTS node on travis Can we have a green build with that?	2019-06-13 18:39:26 +02:00
Michael Bumann	86bbe49c0b	Fix seeds script to support new web3 version	2019-06-13 18:39:25 +02:00
Michael Bumann	d5322530c3	Update aragon CLI to latest version	2019-06-13 18:37:33 +02:00
Michael Bumann	011d85447f	Merge pull request #138 from 67P/dev/seeds Various small seed/script improvements	2019-06-13 16:36:38 +00:00
Sebastian Kippe	b7d87cd8f2	Ignore scripts folder in eslint Lots of undef etc. due to the scripts being piped through truffle	2019-06-13 17:39:03 +02:00
Sebastian Kippe	6c8491e67b	Handle errors in seed funding	2019-06-13 17:38:34 +02:00
Sebastian Kippe	2623e71055	Update deprecated functions in seeds	2019-06-13 17:38:00 +02:00
Sebastian Kippe	ed0d420fd5	Fix linter issues in seeds	2019-06-13 17:37:36 +02:00
Sebastian Kippe	36666fd417	Update package lockfile	2019-06-12 16:07:38 +02:00
Michael Bumann	231d6e2477	Merge pull request #135 from 67P/feature/expose-available-networks Expose available network IDs	2019-06-12 07:57:31 +00:00
Michael Bumann	107654ecca	Expose available network IDs This exposes the network IDs on which kredits is deployed. Helpful to check if the used network is supported.	2019-06-11 15:45:14 +02:00
Sebastian Kippe	810a2eb5fd	Merge pull request #134 from 67P/chore/update-dependencies Update dependencies	2019-06-10 13:19:29 +02:00
Michael Bumann	06a4e2173a	Try npm instead of yarn on travis There is some strange error with yarn: https://travis-ci.org/67P/kredits-contracts/builds/543186831	2019-06-10 12:59:02 +02:00
Sebastian Kippe	e55a209343	Merge pull request #133 from 67P/feature/list-totals Print total unconfirmed and confirmed contribution kredits	2019-06-09 13:58:42 +02:00
Sebastian Kippe	17bc4e7d8f	Merge pull request #121 from 67P/refactor/amounts_vs_counts Improve totalKreditsEarned	2019-06-09 13:57:44 +02:00
Sebastian Kippe	4919605664	Merge pull request #130 from 67P/feature/kredits-kit-wrapper Add JS wrapper for Kit contract	2019-06-09 13:56:32 +02:00
Sebastian Kippe	f639e3aa19	Add pre-commit hook and setup script (#129 ) Add pre-commit hook and setup script Runs the appropriate linter on staged files before committing.	2019-06-09 13:53:40 +02:00
Michael Bumann	84b4461ba6	Update dependencies	2019-06-08 19:05:35 +02:00
Michael Bumann	c4f8e9278e	Use consitently uint32 for amounts	2019-06-08 17:56:50 +02:00
Michael Bumann	00905eb269	Update ABIs	2019-06-08 17:53:26 +02:00
Michael Bumann	6a64842415	Only count not-vetoed contributions for total balances	2019-06-08 17:49:24 +02:00
Michael Bumann	055d8bc0ef	Print total unconfirmed and confirmed contribution kredits	2019-06-08 17:42:20 +02:00
Michael Bumann	91779ccd03	Merge pull request #131 from 67P/feature/claim-contribution-script Add script to claim contributions for one contributor	2019-05-21 11:29:56 +00:00
Michael Bumann	516b8b31ac	Add script to claim contributions for one contributor	2019-05-20 13:48:15 +02:00
Michael Bumann	ccd52f6ee5	Cleanup	2019-05-17 18:24:55 +02:00
Michael Bumann	ffff09ab23	Add contract address accessor	2019-05-17 15:56:24 +02:00
Michael Bumann	3df0831d9b	Cleanup whitespace	2019-05-17 15:56:02 +02:00
Michael Bumann	27a746261c	Add JS wrapper for kredits kit This makes it easier to deploy new DAOs and the deploy script is less dependent on truffle	2019-05-17 15:54:52 +02:00
Michael Bumann	345b6bde82	Merge pull request #127 from 67P/feature/allow-setting-contributor-accounts Allow setting any contributor accounts	2019-05-17 08:42:43 +00:00
Michael Bumann	a86ea08bdf	Merge pull request #128 from 67P/feature/simple-init Add helper to initialize a new instance with provider	2019-05-17 07:37:10 +00:00
Michael Bumann	e20bda73fb	Remove not needed network check We default to localhost anyway	2019-05-17 09:17:10 +02:00
Michael Bumann	4c64aa7c2a	linting	2019-05-14 12:03:29 +02:00
Michael Bumann	cf43bf9487	Linting	2019-05-14 11:32:42 +02:00
Michael Bumann	1a227ba67c	Linting	2019-05-14 11:31:33 +02:00
Michael Bumann	df7536589d	Add helper to initialize a new instance with provider So far we always had to initialze a provider and signer and pass those to the kredits constructor. This helper makes it easier to initialize a default ethers provider and a default signer.	2019-05-14 11:25:21 +02:00
Michael Bumann	f0fe62f6d7	Apply suggestions from code review Co-Authored-By: Sebastian Kippe <sebastian@kip.pe>	2019-05-14 09:18:23 +00:00
Michael Bumann	66fc992291	Allow setting any contributor accounts This allows to pass in an account object when creating or updating a contribtor.	2019-05-14 11:06:49 +02:00
Garret Alfert	2a675c9417	Merge pull request #126 from 67P/chore/update_schemas Update kosmos-schemas	2019-05-10 16:08:30 +02:00
Sebastian Kippe	a3590d7c16	Update kosmos-schemas Includes the new "special" contribution kind, as discussed in our last call.	2019-05-10 13:14:56 +02:00
Sebastian Kippe	07a5ca847d	Merge pull request #125 from 67P/bugfix/pagination Fix page number calculation for zero records	2019-05-07 17:12:16 +02:00
Michael Bumann	37ce2fddde	Merge pull request #124 from 67P/bugfix/fix-me-1 Fix util import	2019-05-04 08:40:58 +00:00
Michael Bumann	3a43284557	Fix page number calculation for zero records So far it returned 0 because of those in range checks which both applied because numberOfPages is 0 if we have no record.	2019-05-04 01:34:05 +02:00
Michael Bumann	572848c04a	Fix util import	2019-05-04 01:09:22 +02:00
Michael Bumann	b6ce9dcfc8	Merge pull request #118 from 67P/deprecate/old-add-methods Deprecate old add* methods	2019-05-01 18:12:18 +00:00
Sebastian Kippe	e7e8744ad2	Update lib/contracts/proposal.js Co-Authored-By: bumi <hello@michaelbumann.com>	2019-05-01 18:06:55 +00:00
Sebastian Kippe	d2198dca61	Update lib/contracts/contribution.js Co-Authored-By: bumi <hello@michaelbumann.com>	2019-05-01 18:06:43 +00:00
Michael Bumann	f9f2ef234e	Merge pull request #122 from 67P/feature/veto_script Add script for vetoing via console	2019-05-01 18:05:37 +00:00
Sebastian Kippe	a1f51428d0	Add script for vetoing via console	2019-04-28 15:09:18 +01:00
Sebastian Kippe	555cb53c78	Improve totalKreditsEarned * Use a more reasonable size of integer * Use better variable names (count != amount, balance != count)	2019-04-27 21:01:51 +01:00
Michael Bumann	ad74d30aa7	Contributor canPerform fix deployment	2019-04-25 22:25:38 +02:00
Sebastian Kippe	3568d3c141	Merge pull request #120 from 67P/bugfix/fix-core-permissions Fix canPerform method	2019-04-25 21:17:37 +01:00
Sebastian Kippe	db566a581f	Merge pull request #119 from 67P/bugfix/fix-kit-deployment Fix apps lookup	2019-04-25 21:10:04 +01:00
Michael Bumann	c69ebd0a62	Fix canPerform method Even if the variable is not used and the linter might complain we have to have that parameter in the signature. otherwise the method is not found and can not be called.	2019-04-25 22:06:40 +02:00
Sebastian Kippe	5c375f764f	Update scripts/deploy-kit.js Co-Authored-By: bumi <hello@michaelbumann.com>	2019-04-25 20:05:03 +00:00
Michael Bumann	b04d572b9a	Fix apps lookup We use the directories in ./apps to load available app names. For this we need to make sure that we only use directories.	2019-04-25 16:45:39 +02:00
Manuel Wiedenmann	1199b053fe	Add missing returns for the deprecated methods	2019-04-24 21:55:10 +02:00
Manuel Wiedenmann	f06b21dfee	Deprecate old add* methods	2019-04-24 21:49:27 +02:00
				`@@ -0,0 +1 @@`
				[{"constant":true,"inputs":[],"name":"ens","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"fac","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"appId","type":"bytes32"}],"name":"latestVersionAppBase","outputs":[{"name":"base","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"appIds","outputs":[{"name":"","type":"bytes32"}],"payable":false,"stateMutability":"view","type":"function"},{"inputs":[{"name":"_fac","type":"address"},{"name":"_ens","type":"address"},{"name":"_appIds","type":"bytes32[4]"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"dao","type":"address"}],"name":"DeployInstance","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"dao","type":"address"},{"indexed":false,"name":"appProxy","type":"address"},{"indexed":false,"name":"appId","type":"bytes32"}],"name":"InstalledApp","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"appProxy","type":"address"},{"indexed":false,"name":"appId","type":"bytes32"}],"name":"InstalledApp","type":"event"},{"constant":false,"inputs":[],"name":"newInstance","outputs":[{"name":"dao","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"function"}]