5.4.0

Merge pull request #149 from 67P/feature/support-ipfs-gateway
Add support to use IPFS gateway to read ipfs data
2019-07-02 16:27:26 +02:00 · 2019-07-01 15:41:07 +00:00 · 2019-07-01 16:12:22 +02:00 · 2019-07-01 15:53:18 +02:00 · 2019-07-01 13:06:45 +02:00 · 2019-07-01 10:30:41 +00:00
26 changed files with 8626 additions and 3623 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,11 @@
 ---
 language: node_js
 node_js:
-  - "11"
+  - "lts/*"

 sudo: false
 dist: xenial

-cache:
-  npm: true
-
 install:
  - npm install

--- 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/package-lock.json
+++ b/apps/contribution/package-lock.json
--- a/apps/contribution/package.json
+++ b/apps/contribution/package.json
@@ -6,13 +6,17 @@
    "@aragon/os": "^4.2.0",
    "@aragon/cli": "^5.9.6"
  },
-  "devDependencies": {},
+  "devDependencies": {
+    "@aragon/test-helpers": "^1.1.0",
+    "eth-gas-reporter": "^0.2.0",
+    "ganache-cli": "^6.4.3",
+    "solidity-coverage": "^0.5.11"
+  },
  "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": []
 }
--- 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/package-lock.json
+++ b/apps/contributor/package-lock.json
--- a/apps/contributor/package.json
+++ b/apps/contributor/package.json
@@ -6,13 +6,17 @@
    "@aragon/os": "^4.2.0",
    "@aragon/cli": "^5.9.6"
  },
-  "devDependencies": {},
+  "devDependencies": {
+    "@aragon/test-helpers": "^1.1.0",
+    "eth-gas-reporter": "^0.2.0",
+    "ganache-cli": "^6.4.3",
+    "solidity-coverage": "^0.5.11"
+  },
  "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": []
 }
--- 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
@@ -6,13 +6,17 @@
    "@aragon/os": "^4.2.0",
    "@aragon/cli": "^5.9.6"
  },
-  "devDependencies": {},
+  "devDependencies": {
+    "@aragon/test-helpers": "^1.1.0",
+    "eth-gas-reporter": "^0.2.0",
+    "ganache-cli": "^6.4.3",
+    "solidity-coverage": "^0.5.11"
+  },
  "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": []
 }
--- 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
@@ -6,13 +6,17 @@
    "@aragon/os": "^4.2.0",
    "@aragon/cli": "^5.9.6"
  },
-  "devDependencies": {},
+  "devDependencies": {
+    "@aragon/test-helpers": "^1.1.0",
+    "eth-gas-reporter": "^0.2.0",
+    "ganache-cli": "^6.4.3",
+    "solidity-coverage": "^0.5.11"
+  },
  "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": []
 }
--- 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/lib/contracts/contribution.js
+++ b/lib/contracts/contribution.js
@@ -14,6 +14,10 @@ class Contribution extends Record {
      });
  }

+  getData (id) {
+    return this.functions.getContribution(id);
+  }
+
  getByContributorId (contributorId) {
    return this.functions.getContributorAddressById(contributorId)
      .then(address => this.getByContributorAddress(address));
@@ -62,6 +66,7 @@ class Contribution extends Record {
    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/contributor.js
+++ b/lib/contracts/contributor.js
@@ -15,6 +15,10 @@ class Contributor extends Record {
      });
  }

+  getData (id) {
+    return this.functions.getContributorById(id);
+  }
+
  filterByAccount (search) {
    return this._byAccount(search, 'filter');
  }
@@ -84,6 +88,7 @@ class Contributor extends Record {
        });
    });
  }
+
 }

 module.exports = Contributor;
--- 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/record.js
+++ b/lib/contracts/record.js
@@ -9,6 +9,18 @@ class Record extends Base {
        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;
--- a/lib/utils/ipfs-pinner.js
+++ b/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;
--- a/lib/utils/ipfs.js
+++ b/lib/utils/ipfs.js
@@ -1,13 +1,14 @@
 const ipfsClient = require('ipfs-http-client');
 const multihashes = require('multihashes');
+const fetch = require('node-fetch');

 class IPFS {
  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) {
@@ -38,7 +39,19 @@ class IPFS {
    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);
+    }
+  }
+
+  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) {
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "kredits-contracts",
-  "version": "5.3.0",
+  "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",
@@ -23,7 +24,10 @@
    "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: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": {
@@ -54,8 +58,9 @@
  },
  "dependencies": {
    "ethers": "^4.0.29",
-    "ipfs-http-client": "^32.0.1",
+    "ipfs-http-client": "^30.1.3",
    "kosmos-schemas": "^2.1.0",
+    "node-fetch": "^2.6.0",
    "tv4": "^1.3.0"
  },
  "keywords": [
--- 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/ipfs-pinner.js
+++ b/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);
+  }
+})();
Author	SHA1	Message	Date
Michael Bumann	87a468bc91	5.4.0	2019-07-02 16:27:26 +02:00
Michael Bumann	0734acbcbe	Merge pull request #149 from 67P/feature/support-ipfs-gateway Add support to use IPFS gateway to read ipfs data	2019-07-01 15:41:07 +00:00
Michael Bumann	a45c8d14be	Downgrade IPFS package The new version uses generators which breaks the build on kredits-web.	2019-07-01 16:12:22 +02:00
Michael Bumann	61fe9add1b	Add support to use IPFS gateway to read ipfs data This makes caching of IPFS documents easier. Browsers should cache those by default	2019-07-01 15:53:18 +02:00
Sebastian Kippe	16141ed482	Merge pull request #136 from 67P/feature/ipfs-pinner Add IPFS pinning script	2019-07-01 13:06:45 +02:00
Michael Bumann	01ef37fd39	Merge pull request #147 from 67P/bugfix/compile_all Fix compile command	2019-07-01 10:30:41 +00:00
Sebastian Kippe	03b9f69d22	Fix compile command The Aragon one is failing now, but just using the underlying Truffle command works. So it appears to be the passing of the argument in aragon that's broken. Co-authored-by: Michael Bumann <hello@michaelbumann.com>	2019-07-01 12:24:56 +02:00
Michael Bumann	dd76ebdc8d	Merge pull request #141 from haythem96/setup-tests Solidity test setup	2019-06-26 15:05:23 +00:00
Haythem Sellami	e485bd90c0	install packages	2019-06-19 14:34:14 +01:00
Haythem Sellami	1d89759c49	merge	2019-06-19 13:47:58 +01:00
Michael Bumann	d653b3715f	Update package-lock	2019-06-19 14:10:44 +02:00
Michael Bumann	a05e2c75f3	Merge pull request #142 from 67P/chore/update-dependencies-2 Chore/update aragon-cli dependencies	2019-06-19 08:39:06 +00:00
Michael Bumann	124287b977	Updated latest package-json	2019-06-19 01:00:53 +02:00
Sebastian Kippe	9906fde7ef	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-19 00:52:48 +02:00
Sebastian Kippe	c7e1f118a6	Add postinstall lockfile fix https://github.com/67P/kredits-contracts/pull/140	2019-06-19 00:52:47 +02:00
Michael Bumann	1702c22084	Make sure fix lockfile uses the correct file path	2019-06-19 00:52:47 +02:00
Michael Bumann	32a123a825	Default to open.aragonpm.eth it is now also available on the devchain	2019-06-19 00:52:47 +02:00
Michael Bumann	ac83573438	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-19 00:52:47 +02:00
Michael Bumann	77c6c11800	Remove npm cache and use LTS node on travis	2019-06-19 00:52:05 +02:00
Haythem Sellami	ca0a6f6ef9	user 7545 port for tests	2019-06-17 23:35:53 +01:00
Haythem Sellami	4614c454a5	test setup	2019-06-17 12:13:35 +01:00
Sebastian Kippe	9fd9dbc1b5	Handle errors in IPFS pin script	2019-06-13 18:31:47 +02:00
Michael Bumann	6d6c6056f0	Refactor IPFS pinner	2019-06-12 01:08:07 +02:00
Michael Bumann	b09c2830c8	Make IPFS node configurable	2019-06-11 23:45:27 +02:00
Michael Bumann	fc5a41123a	Add IPFS pinning script This script loads the IPFS hashes for contributors and contributions and pins them on the connected IPFS node. usage: $ node script/ipfs-pinner.js $ ETH_RPC_URL=http://localhost:7547 APM_DOMAIN=aragonpm.eth node scripts/ipfs.pinner.js	2019-06-11 21:48:50 +02:00