5.4.0

Add support to use IPFS gateway to read ipfs data

.eslintignore

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

.eslintrc.js

@@ -0,0 +1,32 @@
+module.exports = {
+  'env': {
+    'browser': true,
+    'es6': true,
+    'node': true
+  },
+  'extends': 'eslint:recommended',
+  'globals': {
+    'Atomics': 'readonly',
+    'SharedArrayBuffer': 'readonly'
+  },
+  'parserOptions': {
+    'ecmaVersion': 2018,
+    'sourceType': 'module'
+  },
+  'rules': {
+    'comma-dangle': ['error', {
+      arrays: 'always-multiline',
+      objects: 'always-multiline',
+      imports: 'never',
+      exports: 'never',
+      functions: 'ignore',
+    }],
+    'eol-last': ['error', 'always'],
+    semi: ['error', 'always'],
+    'space-before-function-paren': ['error', {
+      anonymous: 'never',
+      named: 'always',
+      asyncArrow: 'always',
+    }],
+  }
+}

.solhint.json

@@ -0,0 +1,9 @@
+{
+  "extends": [
+    "solhint:default",
+    "solhint:recommended"
+  ],
+  "rules": {
+    "indent": "2"
+  }
+}

.travis.yml

@@ -0,0 +1,19 @@
+---
+language: node_js
+node_js:
+  - "lts/*"
+
+sudo: false
+dist: xenial
+
+install:
+  - npm install
+
+script:
+  - npm run lint:wrapper
+  - npm run lint:contract-tests
+  # - yarn lint:contracts
+
+branches:
+  only:
+    - master

apps/.eslintrc.js

@@ -0,0 +1,12 @@
+module.exports = {
+  'globals': {
+    contract: true,
+    describe: true,
+    it: true,
+  },
+  rules: {
+    'no-unused-vars': ['error', {
+      'argsIgnorePattern': '^_',
+    }],
+  }
+}

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",

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
+		}
+	]
+}

apps/contribution/contracts/Contribution.sol

@@ -118,6 +118,26 @@ contract Contribution is AragonApp {
   // Custom functions
   //
 
+  function totalKreditsEarned(bool confirmedOnly) public view returns (uint32 amount) {
+    for (uint32 i = 1; i <= contributionsCount; i++) {
+      ContributionData memory c = contributions[i];
+      if (!c.vetoed && (block.number >= c.confirmedAtBlock || !confirmedOnly)) {
+        amount += c.amount; // should use safemath
+      }
+    }
+  }
+
+  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 (!c.vetoed && (block.number >= c.confirmedAtBlock || !confirmedOnly)) {
+        amount += 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];

apps/contribution/package.json

@@ -3,16 +3,20 @@
   "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": {
+    "@aragon/test-helpers": "^1.1.0",
+    "eth-gas-reporter": "^0.2.0",
+    "ganache-cli": "^6.4.3",
+    "solidity-coverage": "^0.5.11"
   },
-  "devDependencies": {},
   "scripts": {
     "start": "npm run start:aragon:ipfs",
     "start:aragon:ipfs": "aragon run",
     "start:aragon:http": "aragon run --http localhost:8001 --http-served-from ./dist",
     "start:app": "",
-    "test": "aragon contracts test",
     "compile": "aragon contracts compile",
     "sync-assets": "",
     "build:app": "",
@@ -21,7 +25,11 @@
     "publish:patch": "aragon apm publish patch",
     "publish:minor": "aragon apm publish minor",
     "publish:major": "aragon apm publish major",
-    "versions": "aragon apm versions"
+    "versions": "aragon apm versions",
+    "test": "TRUFFLE_TEST=true PORT=7545 npm run ganache-cli:test",
+    "test:gas": "GAS_REPORTER=true npm test",
+    "coverage": "SOLIDITY_COVERAGE=true npm run ganache-cli:test",
+    "ganache-cli:test": "./node_modules/@aragon/test-helpers/ganache-cli.sh"
   },
   "keywords": []
 }

apps/contribution/test/app.js

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

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",

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 (uint32 amount);
+  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, uint32 totalKreditsEarned, uint256 contributionsCount, bool exists ) {
     id = _id;
     Contributor storage c = contributors[_id];
     account = c.account;
@@ -128,10 +138,13 @@ 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;
   }
 
-  function canPerform(address _who, address _where, bytes32 _what/*, uint256[] memory _how*/) public returns (bool) {
+  function canPerform(address _who, address _where, bytes32 _what, uint256[] memory _how) public returns (bool) {
     address sender = _who;
     if (sender == address(-1)) {
       sender = tx.origin;

apps/contributor/package.json

@@ -3,16 +3,20 @@
   "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": {
+    "@aragon/test-helpers": "^1.1.0",
+    "eth-gas-reporter": "^0.2.0",
+    "ganache-cli": "^6.4.3",
+    "solidity-coverage": "^0.5.11"
   },
-  "devDependencies": {},
   "scripts": {
     "start": "npm run start:aragon:ipfs",
     "start:aragon:ipfs": "aragon run",
     "start:aragon:http": "aragon run --http localhost:8001 --http-served-from ./dist",
     "start:app": "",
-    "test": "aragon contracts test",
     "compile": "aragon contracts compile",
     "sync-assets": "",
     "build:app": "",
@@ -21,7 +25,11 @@
     "publish:patch": "aragon apm publish patch",
     "publish:minor": "aragon apm publish minor",
     "publish:major": "aragon apm publish major",
-    "versions": "aragon apm versions"
+    "versions": "aragon apm versions",
+    "test": "TRUFFLE_TEST=true PORT=7545 npm run ganache-cli:test",
+    "test:gas": "GAS_REPORTER=true npm test",
+    "coverage": "SOLIDITY_COVERAGE=true npm run ganache-cli:test",
+    "ganache-cli:test": "./node_modules/@aragon/test-helpers/ganache-cli.sh"
   },
   "keywords": []
 }

apps/contributor/test/app.js

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

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",

apps/proposal/package.json

@@ -3,16 +3,20 @@
   "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": {
+    "@aragon/test-helpers": "^1.1.0",
+    "eth-gas-reporter": "^0.2.0",
+    "ganache-cli": "^6.4.3",
+    "solidity-coverage": "^0.5.11"
   },
-  "devDependencies": {},
   "scripts": {
     "start": "npm run start:aragon:ipfs",
     "start:aragon:ipfs": "aragon run",
     "start:aragon:http": "aragon run --http localhost:8001 --http-served-from ./dist",
     "start:app": "",
-    "test": "aragon contracts test",
     "compile": "aragon contracts compile",
     "sync-assets": "",
     "build:app": "",
@@ -21,7 +25,11 @@
     "publish:patch": "aragon apm publish patch",
     "publish:minor": "aragon apm publish minor",
     "publish:major": "aragon apm publish major",
-    "versions": "aragon apm versions"
+    "versions": "aragon apm versions",
+    "test": "TRUFFLE_TEST=true PORT=7545 npm run ganache-cli:test",
+    "test:gas": "GAS_REPORTER=true npm test",
+    "coverage": "SOLIDITY_COVERAGE=true npm run ganache-cli:test",
+    "ganache-cli:test": "./node_modules/@aragon/test-helpers/ganache-cli.sh"
   },
   "keywords": []
 }

apps/proposal/test/app.js

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

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",

apps/token/package.json

@@ -3,16 +3,20 @@
   "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": {
+    "@aragon/test-helpers": "^1.1.0",
+    "eth-gas-reporter": "^0.2.0",
+    "ganache-cli": "^6.4.3",
+    "solidity-coverage": "^0.5.11"
   },
-  "devDependencies": {},
   "scripts": {
     "start": "npm run start:aragon:ipfs",
     "start:aragon:ipfs": "aragon run",
     "start:aragon:http": "aragon run --http localhost:8001 --http-served-from ./dist",
     "start:app": "",
-    "test": "aragon contracts test",
     "compile": "aragon contracts compile",
     "sync-assets": "",
     "build:app": "",
@@ -21,7 +25,11 @@
     "publish:patch": "aragon apm publish patch",
     "publish:minor": "aragon apm publish minor",
     "publish:major": "aragon apm publish major",
-    "versions": "aragon apm versions"
+    "versions": "aragon apm versions",
+    "test": "TRUFFLE_TEST=true PORT=7545 npm run ganache-cli:test",
+    "test:gas": "GAS_REPORTER=true npm test",
+    "coverage": "SOLIDITY_COVERAGE=true npm run ganache-cli:test",
+    "ganache-cli:test": "./node_modules/@aragon/test-helpers/ganache-cli.sh"
   },
   "keywords": []
 }

apps/token/test/app.js

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

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"
     },

config/seeds.js

@@ -1,19 +1,48 @@
 const contractCalls = [
-  ['Contributor', 'add', [{ account: '0x7e8f313c56f809188313aa274fa67ee58c31515d', name: 'bumi', kind: 'person', url: '', github_username: 'bumi', github_uid: 318, wiki_username: 'Bumi' }, { gasLimit: 200000 }]],
-  ['Contributor', 'add', [{ account: '0x49575f3DD9a0d60aE661BC992f72D837A77f05Bc', name: 'raucao', kind: 'person', url: '', github_username: 'skddc', github_uid: 842, wiki_username: 'Basti' }, { gasLimit: 200000 }]],
-  ['Contributor', 'add', [{ account: '0xF722709ECC3B05c19d02E82a2a4A4021B8F48C62', name: 'Manuel', kind: 'person', url: '', github_username: 'fsmanuel', github_uid: 54812, wiki_username: 'Manuel' }, { gasLimit: 200000 }]],
-  ['Proposal', 'addProposal', [{ contributorId: 1, contributorIpfsHash: 'QmWKCYGr2rSf6abUPaTYqf98urvoZxGrb7dbspFZA6oyVF', date: '2019-04-09', amount: 500, kind: 'dev', description: '[67P/kredits-contracts] Ran the seeds', url: '' }, { gasLimit: 350000 }]],
-  ['Proposal', 'addProposal', [{ contributorId: 2, contributorIpfsHash: 'QmcHzEeAM26HV2zHTf5HnZrCtCtGdEccL5kUtDakAB7ozB', date: '2019-04-10', amount: 500, kind: 'dev', description: '[67P/kredits-contracts] Ran the seeds', url: '' }, { gasLimit: 350000 }]],
-  ['Proposal', 'addProposal', [{ contributorId: 2, contributorIpfsHash: 'QmcHzEeAM26HV2zHTf5HnZrCtCtGdEccL5kUtDakAB7ozB', date: '2019-04-11', amount: 500, kind: 'dev', description: '[67P/kredits-contracts] Hacked on kredits', url: '' }, { gasLimit: 350000 }]],
+  ['Contributor', 'add', [{
+    account: '0x7e8f313c56f809188313aa274fa67ee58c31515d',
+    name: 'bumi',
+    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', '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 };

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());
 
 

deployments/rinkeby/contribution.md

@@ -1,5 +1,14 @@
 # Contribution deployments
 
+aragon apm publish major --environment=rinkeby"
+
+## 2019-04-24 update balances
+
+ ✔ Successfully published kredits-contribution.open.aragonpm.eth v6.0.0: 
+ ℹ Contract address: 0x2c083EEA83fd3a99C93759D97D0317A43261c758
+ ℹ Content (ipfs): QmULpSqz7BgTFmDu8AL7YZZEz525xkcEzf3dPKtbRdUtFs
+ ℹ Transaction hash: 0x8b01c4c00162e918659d267a2beaf33b578e2aaf9f427f1aa9a43029333c5cd7
+
 ## 2019-04-10 - Weltempfänger release
 
 ✔ Successfully published kredits-contribution.open.aragonpm.eth v5.0.0: 

deployments/rinkeby/contributor.md

@@ -1,5 +1,22 @@
 # Contributor deployments
 
+aragon apm publish major --environment=rinkeby
+
+## 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
+ ℹ Content (ipfs): QmeygbQgoj2McLWzo9hJayLWuBZqFaK4HTpa5qLeQdkn5K
+ ℹ Transaction hash: 0x4237a9636f6e4a8190e0d5bcfa85a452da097bf654a173a88e0e1de3d078f08d
+
+
 ## 2019-04-10 - Weltempfänger release
 
 ✔ Successfully published kredits-contributor.open.aragonpm.eth v4.0.0: 

deployments/rinkeby/dao.md

@@ -1,5 +1,25 @@
 # 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
+eth-provider | Invalid provider preset/location: "local"
+ ✔ 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 0xadefa3b66b68a127Fe38bEa1813b844EE69CFD86"
+
+aragon dao upgrade 0xc34edf7d11b7f8433d597f0bb0697acdff55ef14 kredits-contribution.open.aragonpm.eth --environment=rinkeby
+ ✔ Fetching kredits-contribution.open.aragonpm.eth@latest
+ ✔ Upgrading app
+ ✔ Successfully executed: "Set the resolving address of 'kredits-contribution.open.aragonpm.eth' in namespace 'App code' to 0x2c083EEA83fd3a99C93759D97D0317A43261c758"
+
 ## 2019-04-10 - Weltempfänger release
 
 Using KreditsKit at: 0x76e069b47b79442657eaf0555a32c6b16fa1b8b4

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"}]

lib/contracts/acl.js

@@ -2,11 +2,15 @@ const Base = require('./base');
 const EthersUtils = require('ethers').utils;
 
 class Acl extends Base {
-
-  hasPermission(fromAddress, contractAddress, roleID, params = null) {
+  hasPermission (fromAddress, contractAddress, roleID, params = null) {
     let roleHash = EthersUtils.keccak256(EthersUtils.toUtf8Bytes(roleID));
-    console.log(roleHash)
-    return this.functions.hasPermission(fromAddress, contractAddress, roleHash, params);
+
+    return this.functions.hasPermission(
+      fromAddress,
+      contractAddress,
+      roleHash,
+      params
+    );
   }
 }
 

lib/contracts/base.js

@@ -1,22 +1,26 @@
 class Base {
-  constructor(contract) {
+  constructor (contract) {
     this.contract = contract;
   }
 
-  get functions() {
+  get functions () {
     return this.contract.functions;
   }
 
-  get ipfs() {
+  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;
   }
 
-  set ipfs(ipfsAPI) {
+  set ipfs (ipfsAPI) {
     this._ipfsAPI = ipfsAPI;
   }
 
-  on(type, callback) {
+  on (type, callback) {
     return this.contract.on(type, callback);
   }
 }

lib/contracts/contribution.js

@@ -1,37 +1,29 @@
-const ethers = require('ethers');
-
+const Record = require('./record');
 const ContributionSerializer = require('../serializers/contribution');
-const Base = require('./base');
+const deprecate = require('../utils/deprecate');
 
-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) {
+  getById (id) {
     return this.functions.getContribution(id)
       .then(data => {
         return this.ipfs.catAndMerge(data, ContributionSerializer.deserialize);
       });
-
   }
 
-  getByContributorId(contributorId) {
+  getData (id) {
+    return this.functions.getContribution(id);
+  }
+
+  getByContributorId (contributorId) {
     return this.functions.getContributorAddressById(contributorId)
       .then(address => this.getByContributorAddress(address));
   }
 
-  getByContributorAddress(address) {
+  getByContributorAddress (address) {
     return this.functions.balanceOf(address)
       .then(async (balance) => {
         const count = balance.toNumber();
@@ -47,7 +39,7 @@ class Contribution extends Base {
       });
   }
 
-  async addContribution(contributionAttr, callOptions = {}) {
+  async add (contributionAttr, callOptions = {}) {
     const contribution = new ContributionSerializer(contributionAttr);
 
     try { await contribution.validate(); }
@@ -69,6 +61,12 @@ class Contribution extends Base {
         return this.functions.add(...contribution, callOptions);
       });
   }
+
+  addContribution () {
+    deprecate('The function `addContribution()` is deprecated and will be removed in the next major version. Use `add()` instead');
+    return this.add(...arguments);
+  }
+
 }
 
 module.exports = Contribution;

lib/contracts/contributor.js

@@ -1,38 +1,33 @@
-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) {
+  getById (id) {
     return this.functions.getContributorById(id)
-      .then((data) => {
+      .then(data => {
+        data.balanceInt = formatKredits(data.balance);
         return this.ipfs.catAndMerge(data, ContributorSerializer.deserialize);
       });
   }
 
-  filterByAccount(search) {
+  getData (id) {
+    return this.functions.getContributorById(id);
+  }
+
+  filterByAccount (search) {
     return this._byAccount(search, 'filter');
   }
 
-  findByAccount(search) {
+  findByAccount (search) {
     return this._byAccount(search, 'find');
   }
 
-  _byAccount(search, method = 'filter') {
+  _byAccount (search, method = 'filter') {
     return this.all().then((contributors) => {
       const searchEntries = Object.entries(search);
 
@@ -48,12 +43,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,
@@ -65,6 +64,31 @@ 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;

lib/contracts/index.js

@@ -4,5 +4,5 @@ module.exports = {
   Proposal: require('./proposal'),
   Token: require('./token'),
   Kernel: require('./kernel'),
-  Acl: require('./acl')
+  Acl: require('./acl'),
 };

lib/contracts/kernel.js

@@ -4,19 +4,19 @@ const Base = require('./base');
 const KERNEL_APP_ADDR_NAMESPACE = '0xd6f028ca0e8edb4a8c9757ca4fdccab25fa1e0317da1188108f7d2dee14902fb';
 
 class Kernel extends Base {
-  constructor(contract) {
+  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) {
+  getApp (appName) {
     if (appName === 'Acl') {
       return this.functions.acl();
     }
     return this.functions.getApp(KERNEL_APP_ADDR_NAMESPACE, this.appNamehash(appName));
   }
 
-  appNamehash(appName) {
+  appNamehash (appName) {
     return namehash(`kredits-${appName.toLowerCase()}.${this.apm}`);
   }
 }

lib/contracts/proposal.js

@@ -1,30 +1,20 @@
-const RSVP = require('rsvp');
-
+const Record = require('./record');
 const ContributionSerializer = require('../serializers/contribution');
-const Base = require('./base');
+const deprecate = require('../utils/deprecate');
 
-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) {
+  getById (id) {
     return this.functions.getProposal(id)
       .then(data => {
         return this.ipfs.catAndMerge(data, ContributionSerializer.deserialize);
       });
   }
 
-  async addProposal(proposalAttr, callOptions = {}) {
+  async add (proposalAttr, callOptions = {}) {
     const contribution = new ContributionSerializer(proposalAttr);
 
     try { await contribution.validate(); }
@@ -46,6 +36,11 @@ class Proposal extends Base {
         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
+module.exports = Proposal;

lib/contracts/record.js

@@ -0,0 +1,26 @@
+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);
+      });
+  }
+
+  pinIpfsHashes () {
+    return this.count.then(count => {
+      let promises = [...Array(count).keys()].map(i => {
+        let id = i + 1; // 0 => 1 - ids start with 1 and not with 0
+        return this.getData(id).then(data => {
+          return this.ipfs.pin(data);
+        });
+      });
+      return Promise.all(promises);
+    });
+  }
+}
+
+module.exports = Record;

lib/kredits.js

@@ -1,7 +1,7 @@
 const ethers = require('ethers');
-const RSVP = require('rsvp');
 
 const Preflight = require('./utils/preflight');
+const deprecate = require('./utils/deprecate');
 
 const ABIS = {
   Contributor: require('./abis/Contributor.json'),
@@ -9,29 +9,29 @@ const ABIS = {
   Token: require('./abis/Token.json'),
   Proposal: require('./abis/Proposal.json'),
   Kernel: require('./abis/Kernel.json'),
-  Acl: require('./abis/ACL.json')
+  Acl: require('./abis/ACL.json'),
 };
 const APP_CONTRACTS = [
   'Contributor',
   'Contribution',
   'Token',
   'Proposal',
-  'Acl'
+  'Acl',
 ];
 const DaoAddresses = require('./addresses/dao.json');
 
 const Contracts = require('./contracts');
-const IPFS = require('./utils/ipfs')
+const IPFS = require('./utils/ipfs');
 
 // Helpers
-function capitalize(word) {
+function capitalize (word) {
   let [first, ...rest] = word;
   return `${first.toUpperCase()}${rest.join('')}`;
 }
 
 class Kredits {
 
-  constructor(provider, signer, options = {}) {
+  constructor (provider, signer, options = {}) {
     let { addresses, abis, ipfsConfig } = options;
 
     this.provider = provider;
@@ -43,7 +43,7 @@ class Kredits {
     this.contracts = {};
   }
 
-  init(names) {
+  init (names) {
     let contractsToLoad = names || APP_CONTRACTS;
     return this.provider.getNetwork().then(network => {
       this.addresses['Kernel'] = this.addresses['Kernel'] || DaoAddresses[network.chainId.toString()];
@@ -51,22 +51,43 @@ class Kredits {
         return this.Kernel.getApp(contractName).then((address) => {
           this.addresses[contractName] = address;
         }).catch((error) => {
-          console.log(error);
           throw new Error(`Failed to get address for ${contractName} from DAO at ${this.Kernel.contract.address}
             - ${error.message}`
           );
         });
       });
-      return RSVP.all(addressPromises).then(() => { return this });
+
+      return Promise.all(addressPromises).then(() => { return this; });
     });
   }
 
-  static setup(provider, signer, ipfsConfig = null) {
-    console.log('Kredits.setup() is deprecated use new Kredits().init() instead');
+  static setup (provider, signer, ipfsConfig = null) {
+    deprecate('Kredits.setup() is deprecated use new Kredits().init() instead');
     return new Kredits(provider, signer, { ipfsConfig: ipfsConfig }).init();
   }
 
-  get Kernel() {
+  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)
     if (this.options.apm) {
@@ -75,37 +96,37 @@ class Kredits {
     return k;
   }
 
-  get Contributor() {
+  get Contributor () {
     return this.contractFor('Contributor');
   }
 
-  get Contributors() {
-    console.log('Contributors is deprecated use Contributor instead');
+  get Contributors () {
+    deprecate('Contributors is deprecated use Contributor instead');
     return this.Contributor;
   }
 
-  get Proposal() {
+  get Proposal () {
     return this.contractFor('Proposal');
   }
 
-  get Operator() {
+  get Operator () {
     return this.Proposal;
   }
 
-  get Token() {
+  get Token () {
     return this.contractFor('Token');
   }
 
-  get Contribution() {
+  get Contribution () {
     return this.contractFor('Contribution');
   }
 
-  get Acl() {
+  get Acl () {
     return this.contractFor('Acl');
   }
 
   // Should be private
-  contractFor(name) {
+  contractFor (name) {
     if (this.contracts[name]) {
       return this.contracts[name];
     }
@@ -125,7 +146,7 @@ class Kredits {
     return this.contracts[name];
   }
 
-  preflightChecks() {
+  preflightChecks () {
     return new Preflight(this).check();
   }
 }

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;

lib/serializers/contribution.js

@@ -9,7 +9,7 @@ const validator = require('../utils/validator');
  */
 class Contribution {
 
-  constructor(attrs) {
+  constructor (attrs) {
     Object.keys(attrs).forEach(a => this[a] = attrs[a]);
   }
 
@@ -26,24 +26,24 @@ class Contribution {
       kind,
       description,
       url,
-      details
+      details,
     } = this;
 
     let data = {
-      "@context": "https://schema.kosmos.org",
-      "@type": "Contribution",
-      "contributor": {
-        "ipfs": contributorIpfsHash
+      '@context': 'https://schema.kosmos.org',
+      '@type': 'Contribution',
+      'contributor': {
+        'ipfs': contributorIpfsHash,
       },
       date,
       time,
       kind,
       description,
-      "details": details || {}
+      'details': details || {},
     };
 
     if (url) {
-      data["url"] = url;
+      data['url'] = url;
     }
 
     // Write it pretty to ipfs

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,13 +8,88 @@
  * @public
  */
 class Contributor {
+
+  constructor (attrs) {
+    Object.keys(attrs).forEach(a => this[a] = attrs[a]);
+  }
+
  /**
+  * Serialize object to JSON
+  *
+  * @method
+  * @public
+  */
+  serialize () {
+    let {
+      name,
+      kind,
+      url,
+      github_uid,
+      github_username,
+      gitea_username,
+      wiki_username,
+      accounts,
+    } = this;
+
+    let data = {
+      '@context': 'https://schema.kosmos.org',
+      '@type': 'Contributor',
+      kind,
+      name,
+      accounts: accounts || [],
+    };
+
+    if (url) {
+      data['url'] = url;
+    }
+
+    if (github_uid) {
+      data.accounts.push({
+        'site': 'github.com',
+        'uid': github_uid,
+        'username': github_username,
+        'url': `https://github.com/${github_username}`,
+      });
+    }
+
+    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',
+        'username': wiki_username,
+        'url': `https://wiki.kosmos.org/User:${wiki_username}`,
+      });
+    }
+
+    // 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) {
+  static deserialize (serialized) {
     let {
       name,
       kind,
@@ -20,13 +97,17 @@ class Contributor {
       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');
+    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));
     }
@@ -38,59 +119,12 @@ class Contributor {
       accounts,
       github_uid,
       github_username,
+      gitea_username,
       wiki_username,
       ipfsData: serialized,
     };
   }
 
- /**
-  * Serialize object to JSON
-  *
-  * @method
-  * @public
-  */
-  static serialize(deserialized) {
-    let {
-      name,
-      kind,
-      url,
-      github_uid,
-      github_username,
-      wiki_username,
-    } = deserialized;
-
-    let data = {
-      "@context": "https://schema.kosmos.org",
-      "@type": "Contributor",
-      kind,
-      name,
-      "accounts": []
-    };
-
-    if (url) {
-      data["url"] = url;
-    }
-
-    if (github_uid) {
-      data.accounts.push({
-        "site": "github.com",
-        "uid": github_uid,
-        "username": github_username,
-        "url": `https://github.com/${github_username}`
-      });
-    }
-
-    if (wiki_username) {
-      data.accounts.push({
-        "site": "wiki.kosmos.org",
-        "username": wiki_username,
-        "url": `https://wiki.kosmos.org/User:${wiki_username}`
-      });
-    }
-
-    // Write it pretty to ipfs
-    return JSON.stringify(data, null, 2);
-  }
 }
 
 module.exports = Contributor;

lib/utils/deprecate.js

@@ -0,0 +1,5 @@
+/*eslint no-console: ["error", { allow: ["warn"] }] */
+
+module.exports = function deprecate (msg) {
+  console.warn(msg);
+};

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);
+  }
+};

lib/utils/ipfs-pinner.js

@@ -0,0 +1,32 @@
+class IpfsPinner {
+  constructor (kredits) {
+    this.kredits = kredits;
+  }
+
+  pinAll () {
+    return Promise.all([
+      this.kredits.Contributor.pinIpfsHashes(),
+      this.kredits.Contribution.pinIpfsHashes(),
+    ]);
+  }
+
+  monitor (callback) {
+    this.kredits.Contribution.on('ContributionAdded', (id) => {
+      this.kredits.Contribution.getData(id)
+        .then(data => { return this.kredits.ipfs.pin(data); })
+        .then(callback);
+    });
+    this.kredits.Contributor.on('ContributorAdded', (id) => {
+      this.kredits.Contribution.getData(id)
+        .then(data => { return this.kredits.ipfs.pin(data); })
+        .then(callback);
+    });
+    this.kredits.Contributor.on('ContributorProfileUpdated', (id) => {
+      this.kredits.Contributor.getData(id)
+        .then(data => { return this.kredits.ipfs.pin(data); })
+        .then(callback);
+    });
+  }
+
+}
+module.exports = IpfsPinner;

lib/utils/ipfs.js

@@ -1,17 +1,17 @@
 const ipfsClient = require('ipfs-http-client');
 const multihashes = require('multihashes');
+const fetch = require('node-fetch');
 
 class IPFS {
-
-  constructor(config) {
+  constructor (config) {
     if (!config) {
       config = { host: 'localhost', port: '5001', protocol: 'http' };
     }
-    this._ipfsAPI = ipfsClient(config);
     this._config = config;
+    this._ipfsAPI = ipfsClient(config);
   }
 
-  catAndMerge(data, deserialize) {
+  catAndMerge (data, deserialize) {
     // if no hash details are found simply return the data; nothing to merge
     if (!data.hashSize || data.hashSize === 0) {
       return data;
@@ -26,7 +26,7 @@ class IPFS {
       });
   }
 
-  add(data) {
+  add (data) {
     return this._ipfsAPI
       .add(ipfsClient.Buffer.from(data))
       .then((res) => {
@@ -34,29 +34,40 @@ class IPFS {
       });
   }
 
-  cat(hashData) {
+  cat (hashData) {
     let ipfsHash = hashData; // default - if it is a string
     if (hashData.hasOwnProperty('hashSize')) {
       ipfsHash = this.encodeHash(hashData);
     }
-    return this._ipfsAPI.cat(ipfsHash);
+    if (this._config['gatewayUrl']) {
+      return fetch(`${this._config['gatewayUrl']}/${ipfsHash}`).then(r => r.text());
+    } else {
+      return this._ipfsAPI.cat(ipfsHash);
+    }
   }
 
-  decodeHash(ipfsHash) {
+  pin (hashData) {
+    let ipfsHash = hashData; // default - if it is a string
+    if (hashData.hasOwnProperty('hashSize')) {
+      ipfsHash = this.encodeHash(hashData);
+    }
+    return this._ipfsAPI.pin.add(multihashes.toB58String(ipfsHash));
+  }
+
+  decodeHash (ipfsHash) {
     let multihash = multihashes.decode(multihashes.fromB58String(ipfsHash));
     return {
       hashDigest: '0x' + multihashes.toHexString(multihash.digest),
       hashSize: multihash.length,
       hashFunction: multihash.code,
-      ipfsHash: ipfsHash
+      ipfsHash: ipfsHash,
     };
   }
 
-  encodeHash(hashData) {
+  encodeHash (hashData) {
     let digest = ipfsClient.Buffer.from(hashData.hashDigest.slice(2), 'hex');
     return multihashes.encode(digest, hashData.hashFunction, hashData.hashSize);
   }
-
 }
 
 module.exports = IPFS;

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 > numberOfPages ? numberOfPages : number;
+  number = number < 1 ? 1 : 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);
+};

lib/utils/preflight.js

@@ -1,9 +1,9 @@
 class Preflight {
-  constructor(kredits) {
+  constructor (kredits) {
     this.kredits = kredits;
   }
 
-  check() {
+  check () {
     return this.kredits.ipfs._ipfsAPI.id()
       .catch((error) => {
         throw new Error(`IPFS node not available; config: ${JSON.stringify(this.kredits.ipfs.config)} - ${error.message}`);

lib/utils/validator.js

@@ -4,12 +4,12 @@ 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";
+    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";
-  }
-})
+    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;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kredits-contracts",
-  "version": "5.1.1",
+  "version": "5.4.0",
   "description": "Ethereum contracts and npm wrapper for Kredits",
   "main": "./lib/kredits.js",
   "directories": {
@@ -8,10 +8,11 @@
   },
   "scripts": {
     "install-all": "./scripts/every-app.sh \"npm install\"",
+    "postshrinkwrap": "node scripts/fix-package-lock.js &>/dev/null || true",
     "build-json": "npm run compile-contracts && node ./scripts/build-json.js",
     "repl": "truffle exec scripts/repl.js",
     "seeds": "truffle exec scripts/seeds.js",
-    "compile-contracts": "aragon contracts compile --all",
+    "compile-contracts": "truffle compile --all",
     "bootstrap": "npm run reset:hard && npm run seeds",
     "reset": "npm run deploy:kit && npm run deploy:dao",
     "reset:hard": "npm run deploy:apps && npm run reset",
@@ -20,7 +21,14 @@
     "deploy:apps": "./scripts/every-app.sh \"aragon apm publish major\"",
     "devchain": "aragon devchain --port 7545",
     "dao:address": "truffle exec scripts/current-address.js",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "lint:contracts": "solhint \"contracts/**/*.sol\" \"apps/*/contracts/**/*.sol\"",
+    "lint:contract-tests": "eslint apps/*/test",
+    "lint:wrapper": "eslint lib/",
+    "test:token": "cd apps/token && npm run test",
+    "test:contributor": "cd apps/contributor && npm run test",
+    "test:contribution": "cd apps/contribution && npm run test",
+    "test:proposal": "cd apps/proposal && npm run test",
+    "setup-git-hooks": "sh scripts/git-hooks/install"
   },
   "repository": {
     "type": "git",
@@ -33,20 +41,26 @@
   },
   "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.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"
+    "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",
-    "rsvp": "^4.8.2",
+    "ethers": "^4.0.29",
+    "ipfs-http-client": "^30.1.3",
+    "kosmos-schemas": "^2.1.0",
+    "node-fetch": "^2.6.0",
     "tv4": "^1.3.0"
   },
   "keywords": [

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: '),
   };
 

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();
+  }
+};

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) => {

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)

scripts/git-hooks/install

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

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

scripts/ipfs-pinner.js

@@ -0,0 +1,31 @@
+const Kredits = require('../lib/kredits');
+const IpfsPinner = require('../lib/utils/ipfs-pinner');
+
+const network = process.env.ETH_NETWORK || 'rinkeby';
+const rpcUrl = process.env.ETH_RPC_URL;
+const apm = process.env.APM_DOMAIN || 'open.aragonpm.eth';
+
+const ipfsConfig = {
+  host: process.env.IPFS_HOST || 'localhost',
+  port: process.env.IPFS_PORT || '5001',
+  protocol: process.env.IPFS_PROTOCOL || 'http',
+};
+console.log(`Using IPFS:`, ipfsConfig);
+
+(async () => {
+  try {
+    const kredits = await Kredits.for({ network, rpcUrl }, { apm, ipfsConfig }).init();
+    const ipfsPinner = new IpfsPinner(kredits);
+
+    ipfsPinner.pinAll().then(pins => {
+      console.log('Pinned', JSON.stringify(pins, null, 2));
+    });
+    ipfsPinner.monitor((pin) => {
+      console.log('Pinned', JSON.stringify(pin));
+    });
+    console.log(`Subscribed to DAO: ${kredits.Kernel.contract.address}`);
+  } catch(e) {
+    console.log(e);
+    process.exit(1);
+  }
+})();

scripts/list-contributions.js

@@ -20,8 +20,10 @@ 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;
 
@@ -30,7 +32,7 @@ module.exports = async function(callback) {
         c.contributorId,
         `${c.description}`,
         c.amount.toString(),
-        confirmed,
+        `${confirmed} (${c.confirmedAtBlock})`,
         c.vetoed,
         c.claimed,
         c.ipfsHash
@@ -38,6 +40,10 @@ module.exports = async function(callback) {
     });
 
     console.log(table.toString());
+
+    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);
   }

scripts/list-contributors.js

@@ -15,24 +15,31 @@ module.exports = async function(callback) {
 
   console.log(`Using Contributor at: ${kredits.Contributor.contract.address}`);
 
-
   const table = new Table({
-    head: ['ID', 'Account', 'Name', 'Core?', 'Balance', 'IPFS']
+    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.name}`,
-      c.isCore,
-      ethers.utils.formatEther(c.balance),
-      c.ipfsHash
-    ])
-  })
-  console.log(table.toString())
   callback()
 }
-

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)
   })
 }

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) => {

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));
+  }
+}