Use postshrinkwrap instead of postinstall

`postinstall` is executed before package-lock.json is written to disk.

https://github.com/npm/npm/issues/18798

.eslintrc.js

@@ -28,6 +28,5 @@ module.exports = {
       named: 'always',
       asyncArrow: 'always',
     }],
-    'indent': ['error', 2]
   }
 }

.github/release-drafter.yml

@@ -1,4 +0,0 @@
-template: |
-  ## Changes
-
-  $CHANGES

.gitignore

@@ -1,4 +1,3 @@
-data
 build
 flattened_contracts
 node_modules

.nvmrc

@@ -1 +0,0 @@
-12

.travis.yml

@@ -1,37 +1,18 @@
 ---
 language: node_js
 node_js:
-  - "12"
+  - "lts/*"
 
 sudo: false
 dist: xenial
 
-cache:
-  directories:
-    - node_modules
-    - apps/contribution/node_modules
-    - apps/contributor/node_modules
-    - apps/proposal/node_modules
-    - apps/token/node_modules
-    - apps/vault/node_modules
-
 install:
-  - npm install -g @aragon/cli
-  - npm install -g truffle
   - npm install
 
-before_script:
-  - npm run devchain &
-  - sleep 10
-
 script:
   - npm run lint:wrapper
   - npm run lint:contract-tests
-  # FIXME Fix tests
+  # - yarn lint:contracts
-  # - npm run test:token
-  # - npm run test:contributor
-  # - npm run test:contribution
-  # - npm run test:proposal
 
 branches:
   only:

README.md

@@ -14,8 +14,6 @@ framework](http://truffleframework.com/) for some things.
 
 ### Installation
 
-#### App dependencies
-
 All requirements are defined in `package.json`.
 
     $ npm install
@@ -27,23 +25,13 @@ Each of the aragon apps are separate packages:
 
 You can use `npm run install-all` to install all app dependencies at once.
 
-#### Sytem dependencies
-
-Aragon CLI and Truffle need to be installed on your sytem as well:
-
-    npm install -g @aragon/cli
-    npm install -g truffle
-
-_Note: `@aragon/cli` currently fails to install on node.js 14. Please use
-node.js 12 until the issue has been resolved upstream._
-
 ### Local development chain
 
 For local development it is recommended to use
 [ganache](http://truffleframework.com/ganache/) to run a local development
-chain. When using the ganache simulator, no full Ethereum node is required.
+chain. Using the ganache simulator no full Ethereum node is required.
 
-We use the default aragon-cli devchain command to configure and run a local
+We use the default aragon-cli devchain command to confgure and run a local
 development ganache.
 
     $ npm run devchain (or aragon devchain --port 7545)
@@ -55,10 +43,6 @@ To clear/reset the chain use (e.g. if you run out of funds on your devchain)
 We default to port 7545 for development to not get in conflict with the default
 Ethereum RPC port.
 
-You can also set certain ganache options to configure the devchain, for example
-if you want to increase the block time to 10 seconds you can add
-`--block-time=10`.
-
 ### Bootstrap
 
 1. Run an Ethereum node and ipfs
@@ -66,26 +50,21 @@ if you want to increase the block time to 10 seconds you can add
         $ npm run devchain
         $ ipfs daemon
 
-2. Compile contracts
+2. Deploy each app to the devchain
-
-        (compiled contracts will be in `/build`)
-        $ npm run compile-contracts
-
-3. Deploy each app to the devchain
 
         (make sure you've run `npm install` for every app - see installation)
         $ npm run deploy:apps
 
-4. Deploy a new KreditsKit and create a new DAO with the latest app versions
+3. Deploy a new KreditsKit and create a new DAO with the latest app versions
 
         $ npm run deploy:kit
         $ npm run deploy:dao
 
-5. Execute seeds to create demo contributors, contributions, etc. (optional)
+4. Execute seeds to create demo contributors, contributons, etc. (optional)
 
         $ npm run seeds
 
-**Step 2-5 is also summarized in `npm run bootstrap`**
+**Step 2-4 is also summarized in `npm run bootstrap`**
 
 If you want to reset your local setup:
 
@@ -173,14 +152,8 @@ Deploys a new KreditsKit that allows to create a new DAO
     or
     $ npm run deploy:kit
 
-#### Kredits configuration options:
+`ENS` address is required as environment variable.
-
+`DAO_FACTORY` can optionally be set as environment variable. (see aragon)
-Configuration options can be set in an environment specific `kredits` object in the `arapp.json` or using a CLI parameter.
-
-* daoFactory: Ethereum address of the used DAO Factory. On public networks we use [official aragon factories](https://github.com/aragon/deployments/tree/master/environments/)
-* apmDomain: the ENS domain of the aragonPM (normally `open.aragonpm.eth`)
-
-(please also see the [arapp.json related configuration options](https://hack.aragon.org/docs/cli-global-confg#the-arappjson-file))
 
 ### new-dao.js
 
@@ -190,7 +163,7 @@ Creates and configures a new DAO instance.
     or
     $ npm run deploy:dao
 
-KreditsKit address is loaded from `lib/addresses/KreditsKit.json` or can be
+KreditsKit address is load from `lib/addresses/KreditsKit.json` or can be
 configured through the `KREDITS_KIT` environment variable.
 
 ### deploy-apps.sh
@@ -225,7 +198,7 @@ make sure all apps and the KreditsKit are deployed, then create a new DAO:
 
 ## Upgradeable contracts
 
-We use aragonOS for upgradeability of the different contracts.  Refer to the
+We use aragonOS for upgradeablity of the different contracts.  Refer to the
 [aragonOS upgradeablity documentation](https://hack.aragon.org/docs/upgradeability-intro)
 for more details.
 

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

@@ -21,8 +21,8 @@ contract Contribution is AragonApp {
   bytes32 public constant KERNEL_APP_ADDR_NAMESPACE = 0xd6f028ca0e8edb4a8c9757ca4fdccab25fa1e0317da1188108f7d2dee14902fb;
 
   // ensure alphabetic order
-  enum Apps { Contribution, Contributor, Proposal, Reimbursement, Token }
+  enum Apps { Contribution, Contributor, Proposal, Token }
-  bytes32[5] public appIds;
+  bytes32[4] public appIds;
 
   struct ContributionData {
     uint32 contributorId;
@@ -54,25 +54,30 @@ contract Contribution is AragonApp {
   event ContributionClaimed(uint32 id, uint32 indexed contributorId, uint32 amount);
   event ContributionVetoed(uint32 id, address vetoedByAccount);
 
-  function initialize(bytes32[5] _appIds) public onlyInit {
+  function initialize(bytes32[4] _appIds) public onlyInit {
     appIds = _appIds;
     blocksToWait = 40320; // 7 days; 15 seconds block time
     initialized();
   }
 
-  function getContract(uint8 appId) public view returns (address) {
+  // TODO refactor into a single function
+  function getTokenContract() public view returns (address) {
     IKernel k = IKernel(kernel());
-    return k.getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[appId]);
+    return k.getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[uint8(Apps.Token)]);
+  }
+  function getContributorContract() public view returns (address) {
+    IKernel k = IKernel(kernel());
+    return k.getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[uint8(Apps.Contributor)]);
   }
 
   function getContributorIdByAddress(address contributorAccount) public view returns (uint32) {
-    address contributorContract = getContract(uint8(Apps.Contributor));
+    address contributor = getContributorContract();
-    return ContributorInterface(contributorContract).getContributorIdByAddress(contributorAccount);
+    return ContributorInterface(contributor).getContributorIdByAddress(contributorAccount);
   }
 
   function getContributorAddressById(uint32 contributorId) public view returns (address) {
-    address contributorContract = getContract(uint8(Apps.Contributor));
+    address contributor = getContributorContract();
-    return ContributorInterface(contributorContract).getContributorAddressById(contributorId);
+    return ContributorInterface(contributor).getContributorAddressById(contributorId);
   }
 
   //
@@ -164,7 +169,7 @@ contract Contribution is AragonApp {
     if (contributionId < 10) {
       c.confirmedAtBlock = block.number;
     } else {
-      c.confirmedAtBlock = block.number + 1 + blocksToWait;
+      c.confirmedAtBlock = block.number + blocksToWait;
     }
 
     contributionsCount++;
@@ -193,14 +198,14 @@ contract Contribution is AragonApp {
     require(block.number >= c.confirmedAtBlock, 'NOT_CLAIMABLE');
 
     c.claimed = true;
-    address tokenContract = getContract(uint8(Apps.Token));
+    address token = getTokenContract();
     address contributorAccount = getContributorAddressById(c.contributorId);
     uint256 amount = uint256(c.amount);
-    IToken(tokenContract).mintFor(contributorAccount, amount, contributionId);
+    IToken(token).mintFor(contributorAccount, amount, contributionId);
     emit ContributionClaimed(contributionId, c.contributorId, c.amount);
   }
 
-  function exists(uint32 contributionId) public view returns (bool) {
+  function exists(uint32 contributionId) view public returns (bool) {
     return contributions[contributionId].exists;
   }
 }

apps/contribution/package.json

@@ -3,19 +3,16 @@
   "version": "1.0.0",
   "description": "",
   "dependencies": {
-    "@aragon/os": "^4.4.0"
+    "@aragon/os": "^4.2.0",
-  },
+    "@aragon/cli": "^5.9.6"
-  "devDependencies": {
-    "@aragon/test-helpers": "^2.1.0",
-    "eth-gas-reporter": "^0.2.17",
-    "ganache-cli": "^6.9.1",
-    "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": "",
@@ -24,8 +21,7 @@
     "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"
   },
   "keywords": []
 }

apps/contributor/contracts/Contributor.sol

@@ -28,25 +28,32 @@ contract Contributor is AragonApp {
   uint32 public contributorsCount;
 
   // ensure alphabetic order
-  enum Apps { Contribution, Contributor, Proposal, Reimbursement, Token }
+  enum Apps { Contribution, Contributor, Proposal, Token }
-  bytes32[5] public appIds;
+  bytes32[4] public appIds;
 
   event ContributorProfileUpdated(uint32 id, bytes32 oldHashDigest, bytes32 newHashDigest); // what should be logged
   event ContributorAccountUpdated(uint32 id, address oldAccount, address newAccount);
   event ContributorAdded(uint32 id, address account);
 
-  function initialize(address root, bytes32[5] _appIds) public onlyInit {
+  function initialize(address root,bytes32[4] _appIds) public onlyInit {
     appIds = _appIds;
 
     initialized();
   }
 
-  function getContract(uint8 appId) public view returns (address) {
+  function getTokenContract() public view returns (address) {
     IKernel k = IKernel(kernel());
-    return k.getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[appId]);
+
+    return k.getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[uint8(Apps.Token)]);
   }
 
-  function coreContributorsCount() public view returns (uint32) {
+  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++) {
       if (isCoreTeam(i)) {
@@ -57,13 +64,10 @@ contract Contributor is AragonApp {
   }
 
   function updateContributorAccount(uint32 id, address oldAccount, address newAccount) public auth(MANAGE_CONTRIBUTORS_ROLE) {
-    require(newAccount != address(0), "invalid new account address");
-    require(getContributorAddressById(id) == oldAccount, "contributor does not exist");
-
     contributorIds[oldAccount] = 0;
     contributorIds[newAccount] = id;
     contributors[id].account = newAccount;
-    emit ContributorAccountUpdated(id, oldAccount, newAccount);
+    ContributorAccountUpdated(id, oldAccount, newAccount);
   }
 
   function updateContributorProfileHash(uint32 id, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize) public isInitialized auth(MANAGE_CONTRIBUTORS_ROLE) {
@@ -132,9 +136,9 @@ contract Contributor is AragonApp {
     hashFunction = c.hashFunction;
     hashSize = c.hashSize;
     isCore = isCoreTeam(id);
-    address token = getContract(uint8(Apps.Token));
+    address token = getTokenContract();
     balance = ITokenBalance(token).balanceOf(c.account);
-    address contribution = getContract(uint8(Apps.Contribution));
+    address contribution = getContributionContract();
     totalKreditsEarned = IContributionBalance(contribution).totalKreditsEarnedByContributor(_id, true);
     contributionsCount = IContributionBalance(contribution).balanceOf(c.account);
     exists = c.exists;

apps/contributor/contracts/test/Spoof.sol

@@ -1,16 +0,0 @@
-pragma solidity ^0.4.24;
-
-import "@aragon/os/contracts/acl/ACL.sol";
-import "@aragon/os/contracts/kernel/Kernel.sol";
-import "@aragon/os/contracts/factory/DAOFactory.sol";
-
-// You might think this file is a bit odd, but let me explain.
-// We only use for now those imported contracts in our tests, which
-// means Truffle will not compile them for us, because they are from
-// an external dependency.
-
-
-// solium-disable-next-line no-empty-blocks
-contract Spoof {
-  // ...
-}

apps/contributor/package.json

@@ -3,19 +3,16 @@
   "version": "1.0.0",
   "description": "",
   "dependencies": {
-    "@aragon/os": "^4.4.0"
+    "@aragon/os": "^4.2.0",
-  },
+    "@aragon/cli": "^5.9.6"
-  "devDependencies": {
-    "@aragon/test-helpers": "^2.1.0",
-    "eth-gas-reporter": "^0.2.17",
-    "ganache-cli": "^6.9.1",
-    "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": "",
@@ -24,8 +21,7 @@
     "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"
   },
   "keywords": []
 }

apps/contributor/test/app.js

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

apps/contributor/test/contributor.js

@@ -1,170 +0,0 @@
-const namehash = require('ethers').utils.namehash;
-
-// eslint-disable-next-line no-undef
-const Contributor = artifacts.require("Contributor.sol");
-
-// eslint-disable-next-line no-undef
-const getContract = name => artifacts.require(name);
-const { assertRevert } = require('@aragon/test-helpers/assertThrow');
-
-const ZERO_ADDR = '0x0000000000000000000000000000000000000000';
-
-contract('Contributor app', (accounts) => {
-  let kernelBase, aclBase, daoFactory, r, dao, acl, contributor;
-
-  const root = accounts[0];
-  const member1 = accounts[1];
-
-  // eslint-disable-next-line no-undef
-  before(async () => {
-    kernelBase = await getContract('Kernel').new(true); // petrify immediately
-    aclBase = await getContract('ACL').new();
-    daoFactory = await getContract('DAOFactory').new(kernelBase.address, aclBase.address, ZERO_ADDR);
-    r = await daoFactory.newDAO(root);
-    dao = await getContract('Kernel').at(r.logs.filter(l => l.event == 'DeployDAO')[0].args.dao);
-    acl = await getContract('ACL').at(await dao.acl());
-
-    //create dao mamnager permission for coin owner
-    await acl.createPermission(
-      root,
-      dao.address,
-      await dao.APP_MANAGER_ROLE(),
-      root,
-      { from: root }
-    );
-
-    //get new app instance from DAO
-    const receipt = await dao.newAppInstance(
-      '0x1234',
-      (await Contributor.new()).address,
-      0x0,
-      false,
-      { from: root }
-    );
-    contributor = Contributor.at(
-      receipt.logs.filter(l => l.event == 'NewAppProxy')[0].args.proxy
-    );
-
-    //apps id
-    let appsId = [];
-    appsId[0] = namehash("kredits-contribution");
-    appsId[1] = namehash("kredits-contributor");
-    appsId[2] = namehash("kredits-proposal");
-    appsId[3] = namehash("kredits-token");
-
-    //init contributor (app)
-    await contributor.initialize(root, appsId);
-
-    //create manage contributors role
-    await acl.createPermission(
-      root,
-      contributor.address,
-      await contributor.MANAGE_CONTRIBUTORS_ROLE(),
-      root,
-      { from: root }
-    );
-
-  });
-
-  describe("Owner default permissions", async () => {
-    it('check owner is contributors manager', async () => {
-      let manageContributorPermission = await acl.hasPermission(root, contributor.address, await contributor.MANAGE_CONTRIBUTORS_ROLE());
-      // eslint-disable-next-line no-undef
-      assert.equal(manageContributorPermission, true);
-    });
-  });
-
-  describe("Add contributor", async () => {
-    let account = root;
-    let hashDigest = '0x0';
-    let hashFunction = 0;
-    let hashSize = 0;
-
-    it("should revert when add contributor from an address that does not have permission", async () => {
-      return assertRevert(async () => {
-        await contributor.addContributor(account, hashDigest, hashFunction, hashSize, { from: member1});
-        'sender does not have permission';
-      });
-    });
-
-    it('add contributor', async () => {
-      let contributorCount = await contributor.coreContributorsCount();
-      await contributor.addContributor(account, hashDigest, hashFunction, hashSize);
-      // eslint-disable-next-line no-undef
-      assert.equal(await contributor.addressExists(account), true);
-      let contributorCountAfter = await contributor.coreContributorsCount();
-      // eslint-disable-next-line no-undef
-      assert.equal(await contributorCountAfter.toNumber(), parseInt(contributorCount)+1);
-    });
-
-    it("should revert when add contributor with an address that already exist", async () => {
-      return assertRevert(async () => {
-        await contributor.addContributor(account, hashDigest, hashFunction, hashSize, { from: member1});
-        'address already exist';
-      });
-    });
-  });
-
-  describe("Update contributor", async () => {
-    let id;
-    let oldAccount;
-    let newAccount;
-    let hashDigest;
-    let hashFunction;
-    let hashSize;
-
-    // eslint-disable-next-line no-undef
-    before(async () =>  {
-      id = await contributor.coreContributorsCount();
-      oldAccount = root;
-      newAccount = member1;
-      hashDigest = '0x1000000000000000000000000000000000000000000000000000000000000000';
-      hashFunction = 1;
-      hashSize = 1;
-    });
-
-    it('update contributor account', async () => {
-      await contributor.updateContributorAccount(id.toNumber(), oldAccount, newAccount);
-      let contributorId = await contributor.getContributorIdByAddress(oldAccount);
-      // eslint-disable-next-line no-undef
-      assert.equal(contributorId.toNumber(), 0);
-    });
-
-    it("should revert when update contributor account from address that does not have permission", async () => {
-      return assertRevert(async () => {
-        await contributor.updateContributorAccount(id.toNumber(), oldAccount, newAccount, {from: member1});
-        'sender does not have permission';
-      });
-    });
-
-    it("should revert when update contributor account that does not exist", async () => {
-      return assertRevert(async () => {
-        await contributor.updateContributorAccount(id.toNumber(), accounts[3], newAccount);
-        'contributor does not exist';
-      });
-    });
-
-    it("should revert when update contributor account with address(0)", async () => {
-      return assertRevert(async () => {
-        await contributor.updateContributorAccount(id.toNumber(), oldAccount, ZERO_ADDR);
-        'contributor does not exist';
-      });
-    });
-
-    it('update contributor profile hash', async () => {
-      await contributor.updateContributorProfileHash(id.toNumber(), hashDigest, hashFunction, hashSize);
-      let contributorProfile = await contributor.contributors(id.toNumber());
-      assert.equal(hashDigest, contributorProfile[1]);    // eslint-disable-line no-undef
-      assert.equal(hashFunction, contributorProfile[2].toNumber());   // eslint-disable-line no-undef
-      assert.equal(hashSize, contributorProfile[3].toNumber());   // eslint-disable-line no-undef
-    });
-
-    it("should revert when update contributor profile hash from address that does not have permission", async () => {
-      return assertRevert(async () => {
-        await contributor.updateContributorProfileHash(id.toNumber(), hashDigest, hashFunction, hashSize, {from: member1});
-        'sender does not have permission';
-      });
-    });
-
-  });
-});

apps/proposal/contracts/Proposal.sol

@@ -20,8 +20,8 @@ contract Proposal is AragonApp {
 
   bytes32 public constant KERNEL_APP_ADDR_NAMESPACE = 0xd6f028ca0e8edb4a8c9757ca4fdccab25fa1e0317da1188108f7d2dee14902fb;
   // ensure alphabetic order
-  enum Apps { Contribution, Contributor, Proposal, Reimbursement, Token }
+  enum Apps { Contribution, Contributor, Proposal, Token }
-  bytes32[5] public appIds;
+  bytes32[4] public appIds;
 
   struct Proposal {
     address creatorAccount;
@@ -46,18 +46,21 @@ contract Proposal is AragonApp {
   event ProposalVoted(uint32 id, uint32 voterId, uint16 totalVotes);
   event ProposalExecuted(uint32 id, uint32 contributorId, uint32 amount);
 
-  function initialize(bytes32[5] _appIds) public onlyInit {
+  function initialize(bytes32[4] _appIds) public onlyInit {
     appIds = _appIds;
     initialized();
   }
 
-  function getContract(uint8 appId) public view returns (address) {
+  function getContributorContract() public view returns (address) {
-    IKernel k = IKernel(kernel());
+    return IKernel(kernel()).getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[uint8(Apps.Contributor)]);
-    return k.getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[appId]);
+  }
+
+  function getContributionContract() public view returns (address) {
+    return IKernel(kernel()).getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[uint8(Apps.Contribution)]);
   }
 
   function addProposal(uint32 contributorId, uint32 amount, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize) public isInitialized auth(ADD_PROPOSAL_ROLE) {
-    require(IContributor(getContract(uint8(Apps.Contributor))).exists(contributorId), 'CONTRIBUTOR_NOT_FOUND');
+    require(IContributor(getContributorContract()).exists(contributorId), 'CONTRIBUTOR_NOT_FOUND');
 
     uint32 proposalId = proposalsCount + 1;
     uint16 _votesNeeded = 1; //contributorsContract().coreContributorsCount() / 100 * 75;
@@ -66,10 +69,10 @@ contract Proposal is AragonApp {
     p.creatorAccount = msg.sender;
     p.contributorId = contributorId;
     p.amount = amount;
-    p.hashDigest = hashDigest;
+    p.hashDigest  = hashDigest;
     p.hashFunction = hashFunction;
-    p.hashSize = hashSize;
+    p.hashSize =  hashSize;
-    p.votesCount = 0;
+    p.votesCount =  0;
     p.votesNeeded = _votesNeeded;
     p.exists = true;
 
@@ -99,7 +102,7 @@ contract Proposal is AragonApp {
   function vote(uint32 proposalId) public isInitialized auth(VOTE_PROPOSAL_ROLE) {
     Proposal storage p = proposals[proposalId];
     require(!p.executed, 'ALREADY_EXECUTED');
-    uint32 voterId = IContributor(getContract(uint8(Apps.Contributor))).getContributorIdByAddress(msg.sender);
+    uint32 voterId = IContributor(getContributorContract()).getContributorIdByAddress(msg.sender);
     require(p.votes[voterId] != true, 'ALREADY_VOTED');
     p.voterIds.push(voterId);
     p.votes[voterId] = true;
@@ -123,7 +126,7 @@ contract Proposal is AragonApp {
     require(p.votesCount >= p.votesNeeded, 'MISSING_VOTES');
 
     p.executed = true;
-    IContribution(getContract(uint8(Apps.Contribution))).add(p.amount, p.contributorId, p.hashDigest, p.hashFunction, p.hashSize);
+    IContribution(getContributionContract()).add(p.amount, p.contributorId, p.hashDigest, p.hashFunction, p.hashSize);
     emit ProposalExecuted(proposalId, p.contributorId, p.amount);
   }
 

apps/proposal/package.json

@@ -3,19 +3,16 @@
   "version": "1.0.0",
   "description": "",
   "dependencies": {
-    "@aragon/os": "^4.4.0"
+    "@aragon/os": "^4.2.0",
-  },
+    "@aragon/cli": "^5.9.6"
-  "devDependencies": {
-    "@aragon/test-helpers": "^2.1.0",
-    "eth-gas-reporter": "^0.2.17",
-    "ganache-cli": "^6.9.1",
-    "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": "",
@@ -24,8 +21,7 @@
     "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"
   },
   "keywords": []
 }

apps/reimbursement/.gitattributes

@@ -1 +0,0 @@
-*.sol linguist-language=Solidity

apps/reimbursement/.gitignore

@@ -1,7 +0,0 @@
-node_modules
-artifacts
-.cache
-cache
-dist
-ipfs.cmd
-package-lock.json

apps/reimbursement/arapp.json

@@ -1,34 +0,0 @@
-{
-  "roles": [
-    {
-      "name": "Add reimursements",
-      "id": "ADD_REIMBURSEMENT_ROLE",
-      "params": []
-    },
-    {
-      "name": "Veto reimbursement",
-      "id": "VETO_REIMBURSEMENT_ROLE",
-      "params": []
-    }
-  ],
-  "environments": {
-    "default": {
-      "network": "development",
-      "appName": "kredits-reimbursement.open.aragonpm.eth"
-    },
-    "rinkeby": {
-      "registry": "0x98df287b6c145399aaa709692c8d308357bc085d",
-      "appName": "kredits-reimbursement.open.aragonpm.eth",
-      "wsRPC": "wss://rinkeby.eth.aragon.network/ws",
-      "network": "rinkeby"
-    },
-    "production": {
-      "registry": "0x314159265dd8dbb310642f98f50c066173c1259b",
-      "appName": "kredits-reimbursement.aragonpm.eth",
-      "wsRPC": "wss://mainnet.eth.aragon.network/ws",
-      "network": "mainnet"
-    }
-  },
-  "appName": "kredits-reimbursement.aragonpm.eth",
-  "path": "contracts/Reimbursement.sol"
-}

apps/reimbursement/buidler.config.js

@@ -1,34 +0,0 @@
-const { usePlugin } = require('@nomiclabs/buidler/config')
-const hooks = require('./scripts/buidler-hooks')
-
-usePlugin('@aragon/buidler-aragon')
-
-module.exports = {
-  // Default Buidler configurations. Read more about it at https://buidler.dev/config/
-  defaultNetwork: 'localhost',
-  networks: {
-    localhost: {
-      url: 'http://localhost:8545',
-    },
-  },
-  solc: {
-    version: '0.4.24',
-    optimizer: {
-      enabled: true,
-      runs: 10000,
-    },
-  },
-  // Etherscan plugin configuration. Learn more at https://github.com/nomiclabs/buidler/tree/master/packages/buidler-etherscan
-  etherscan: {
-    apiKey: '', // API Key for smart contract verification. Get yours at https://etherscan.io/apis
-  },
-  // Aragon plugin configuration
-  aragon: {
-    appServePort: 8001,
-    clientServePort: 3000,
-    appSrcPath: 'app/',
-    appBuildOutputPath: 'dist/',
-    appName: 'expenses',
-    hooks, // Path to script hooks
-  },
-}

apps/reimbursement/contracts/Reimbursement.sol

@@ -1,94 +0,0 @@
-pragma solidity ^0.4.24;
-
-import "@aragon/os/contracts/apps/AragonApp.sol";
-import "@aragon/os/contracts/kernel/IKernel.sol";
-
-contract Reimbursement is AragonApp {
-  bytes32 public constant ADD_REIMBURSEMENT_ROLE = keccak256("ADD_REIMBURSEMENT_ROLE");
-  bytes32 public constant VETO_REIMBURSEMENT_ROLE = keccak256("VETO_REIMBURSEMENT_ROLE");
-  // bytes32 public constant MANAGE_APPS_ROLE = keccak256("MANAGE_APPS_ROLE");
-
-  struct ReimbursementData {
-    uint32 recipientId;
-    uint256 amount;
-    address token;
-    bytes32 hashDigest;
-    uint8 hashFunction;
-    uint8 hashSize;
-    uint256 confirmedAtBlock;
-    bool vetoed;
-    bool exists;
-  }
-
-  mapping(uint32 => ReimbursementData) public reimbursements;
-  uint32 public reimbursementsCount;
-
-  uint32 public blocksToWait;
-
-  event ReimbursementAdded(uint32 id, address indexed addedByAccount, uint256 amount);
-  event ReimbursementVetoed(uint32 id, address vetoedByAccount);
-
-  function initialize() public onlyInit {
-    blocksToWait = 40320; // 7 days; 15 seconds block time
-    initialized();
-  }
-
-  // function setApps() public isInitialized auth(MANAGE_APPS_ROLE) {
-  // }
-
-  function totalAmount(bool confirmedOnly) public view returns (uint256 amount) {
-    for (uint32 i = 1; i <= reimbursementsCount; i++) {
-      ReimbursementData memory r = reimbursements[i];
-      if (!r.vetoed && (block.number >= r.confirmedAtBlock || !confirmedOnly)) {
-        amount += r.amount; // should use safemath
-      }
-    }
-  }
-
-  function get(uint32 reimbursementId) public view returns (uint32 id, uint32 recipientId, uint256 amount, address token, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize, uint256 confirmedAtBlock, bool exists, bool vetoed) {
-    id = reimbursementId;
-    ReimbursementData storage r = reimbursements[id];
-    return (
-      id,
-      r.recipientId,
-      r.amount,
-      r.token,
-      r.hashDigest,
-      r.hashFunction,
-      r.hashSize,
-      r.confirmedAtBlock,
-      r.exists,
-      r.vetoed
-    );
-  }
-
-  function add(uint256 amount, address token, uint32 recipientId, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize) public isInitialized auth(ADD_REIMBURSEMENT_ROLE) {
-    uint32 reimbursementId = reimbursementsCount + 1;
-    ReimbursementData storage r = reimbursements[reimbursementId];
-    r.exists = true;
-    r.amount = amount;
-    r.token = token;
-    r.recipientId = recipientId;
-    r.hashDigest = hashDigest;
-    r.hashFunction = hashFunction;
-    r.hashSize = hashSize;
-    r.confirmedAtBlock = block.number + blocksToWait;
-
-    reimbursementsCount++;
-
-    emit ReimbursementAdded(reimbursementId, msg.sender, amount);
-  }
-
-  function veto(uint32 reimbursementId) public isInitialized auth(VETO_REIMBURSEMENT_ROLE) {
-    ReimbursementData storage r = reimbursements[reimbursementId];
-    require(r.exists, 'NOT_FOUND');
-    require(block.number < r.confirmedAtBlock, 'VETO_PERIOD_ENDED');
-    r.vetoed = true;
-
-    emit ReimbursementVetoed(reimbursementId, msg.sender);
-  }
-
-  function exists(uint32 reimbursementId) public view returns (bool) {
-    return reimbursements[reimbursementId].exists;
-  }
-}

apps/reimbursement/manifest.json

@@ -1,16 +0,0 @@
-{
-  "name": "kredits Reimbursement",
-  "author": "Placeholder-author",
-  "description": "An application for Aragon",
-  "details_url": "/meta/details.md",
-  "source_url": "https://<placeholder-repository-url>",
-  "icons": [
-    {
-      "src": "/meta/icon.svg",
-      "sizes": "56x56"
-    }
-  ],
-  "screenshots": [{ "src": "/meta/screenshot-1.png" }],
-  "start_url": "/index.html",
-  "script": "/script.js"
-}

apps/reimbursement/package.json

@@ -1,30 +0,0 @@
-{
-  "name": "kredits-reimbursement",
-  "version": "1.0.0",
-  "description": "",
-  "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": "",
-    "compile": "aragon contracts compile",
-    "sync-assets": "",
-    "build:app": "",
-    "build:script": "",
-    "build": "",
-    "publish:patch": "aragon apm publish patch",
-    "publish:minor": "aragon apm publish minor",
-    "publish:major": "aragon apm publish major",
-    "versions": "aragon apm versions",
-    "test": "truffle test"
-  },
-  "dependencies": {
-    "@aragon/os": "^4.4.0"
-  },
-  "devDependencies": {
-    "@aragon/test-helpers": "^2.1.0",
-    "eth-gas-reporter": "^0.2.17",
-    "ganache-cli": "^6.9.1",
-    "solidity-coverage": "^0.5.11"
-  }
-}

apps/reimbursement/test/helpers/dao.js

@@ -1,65 +0,0 @@
-/*
-
-const { hash } = require('eth-ens-namehash')
-const { getEventArgument } = require('@aragon/contract-test-helpers/events')
-const Kernel = artifacts.require('@aragon/os/build/contracts/kernel/Kernel')
-const ACL = artifacts.require('@aragon/os/build/contracts/acl/ACL')
-const EVMScriptRegistryFactory = artifacts.require(
-  '@aragon/os/build/contracts/factory/EVMScriptRegistryFactory'
-)
-const DAOFactory = artifacts.require(
-  '@aragon/os/build/contracts/factory/DAOFactory'
-)
-
-const newDao = async (rootAccount) => {
-  // Deploy a DAOFactory.
-  const kernelBase = await Kernel.new(true)
-  const aclBase = await ACL.new()
-  const registryFactory = await EVMScriptRegistryFactory.new()
-  const daoFactory = await DAOFactory.new(
-    kernelBase.address,
-    aclBase.address,
-    registryFactory.address
-  )
-
-  // Create a DAO instance.
-  const daoReceipt = await daoFactory.newDAO(rootAccount)
-  const dao = await Kernel.at(getEventArgument(daoReceipt, 'DeployDAO', 'dao'))
-
-  // Grant the rootAccount address permission to install apps in the DAO.
-  const acl = await ACL.at(await dao.acl())
-  const APP_MANAGER_ROLE = await kernelBase.APP_MANAGER_ROLE()
-  await acl.createPermission(
-    rootAccount,
-    dao.address,
-    APP_MANAGER_ROLE,
-    rootAccount,
-    { from: rootAccount }
-  )
-
-  return { dao, acl }
-}
-
-const newApp = async (dao, appName, baseAppAddress, rootAccount) => {
-  const receipt = await dao.newAppInstance(
-    hash(`${appName}.aragonpm.test`), // appId - Unique identifier for each app installed in the DAO; can be any bytes32 string in the tests.
-    baseAppAddress, // appBase - Location of the app's base implementation.
-    '0x', // initializePayload - Used to instantiate and initialize the proxy in the same call (if given a non-empty bytes string).
-    false, // setDefault - Whether the app proxy is the default proxy.
-    { from: rootAccount }
-  )
-
-  // Find the deployed proxy address in the tx logs.
-  const logs = receipt.logs
-  const log = logs.find((l) => l.event === 'NewAppProxy')
-  const proxyAddress = log.args.proxy
-
-  return proxyAddress
-}
-
-module.exports = {
-  newDao,
-  newApp,
-}
-
-*/

apps/reimbursement/test/helpers/permissions.js

@@ -1,21 +0,0 @@
-/*
-
-const ANY_ADDRESS = '0xffffffffffffffffffffffffffffffffffffffff'
-
-const setOpenPermission = async (acl, appAddress, role, rootAddress) => {
-  // Note: Setting a permission to 0xffffffffffffffffffffffffffffffffffffffff
-  // is interpreted by aragonOS as allowing the role for any address.
-  await acl.createPermission(
-    ANY_ADDRESS, // entity (who?) - The entity or address that will have the permission.
-    appAddress, // app (where?) - The app that holds the role involved in this permission.
-    role, // role (what?) - The particular role that the entity is being assigned to in this permission.
-    rootAddress, // manager - Can grant/revoke further permissions for this role.
-    { from: rootAddress}
-  )
-}
-
-module.exports = {
-  setOpenPermission
-}
-
-*/

apps/reimbursement/truffle.js

@@ -1 +0,0 @@
-module.exports = require("../../truffle.js");

apps/token/contracts/Token.sol

@@ -7,12 +7,12 @@ contract Token is ERC20Token, AragonApp {
   bytes32 public constant MINT_TOKEN_ROLE = keccak256("MINT_TOKEN_ROLE");
 
   // ensure alphabetic order
-  enum Apps { Contribution, Contributor, Proposal, Reimbursement, Token }
+  enum Apps { Contribution, Contributor, Proposal, Token }
-  bytes32[5] public appIds;
+  bytes32[4] public appIds;
 
   event LogMint(address indexed recipient, uint256 amount, uint32 contributionId);
 
-  function initialize(bytes32[5] _appIds) public onlyInit {
+  function initialize(bytes32[4] _appIds) public onlyInit {
     appIds = _appIds;
     name = 'Kredits';
     symbol = '₭S';
@@ -21,8 +21,6 @@ contract Token is ERC20Token, AragonApp {
   }
 
   function mintFor(address contributorAccount, uint256 amount, uint32 contributionId) public isInitialized auth(MINT_TOKEN_ROLE) {
-    require(amount > 0, "INVALID_AMOUNT");
-
     uint256 amountInWei = amount.mul(1 ether);
     _mint(contributorAccount, amountInWei);
     emit LogMint(contributorAccount, amount, contributionId);

apps/token/contracts/test/Spoof.sol

@@ -1,16 +0,0 @@
-pragma solidity ^0.4.24;
-
-import "@aragon/os/contracts/acl/ACL.sol";
-import "@aragon/os/contracts/kernel/Kernel.sol";
-import "@aragon/os/contracts/factory/DAOFactory.sol";
-
-// You might think this file is a bit odd, but let me explain.
-// We only use for now those imported contracts in our tests, which
-// means Truffle will not compile them for us, because they are from
-// an external dependency.
-
-
-// solium-disable-next-line no-empty-blocks
-contract Spoof {
-  // ...
-}

apps/token/package.json

@@ -3,19 +3,16 @@
   "version": "1.0.0",
   "description": "",
   "dependencies": {
-    "@aragon/os": "^4.4.0"
+    "@aragon/os": "^4.2.0",
-  },
+    "@aragon/cli": "^5.9.6"
-  "devDependencies": {
-    "@aragon/test-helpers": "^2.1.0",
-    "eth-gas-reporter": "^0.2.17",
-    "ganache-cli": "^6.9.1",
-    "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": "",
@@ -24,8 +21,7 @@
     "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"
   },
   "keywords": []
 }

apps/token/test/app.js

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

apps/token/test/token.js

@@ -1,123 +0,0 @@
-const namehash = require('ethers').utils.namehash;
-
-// eslint-disable-next-line no-undef
-const Token = artifacts.require("Token.sol");
-
-// eslint-disable-next-line no-undef
-const getContract = name => artifacts.require(name);
-const { assertRevert } = require('@aragon/test-helpers/assertThrow');
-
-const ZERO_ADDR = '0x0000000000000000000000000000000000000000';
-
-contract('Token app', (accounts) => {
-  let kernelBase, aclBase, daoFactory, dao, r, acl, token;
-
-  const root = accounts[0];
-  const member1 = accounts[1];
-
-  // eslint-disable-next-line no-undef
-  before(async () => {
-    kernelBase = await getContract('Kernel').new(true); // petrify immediately
-    aclBase = await getContract('ACL').new();
-    daoFactory = await getContract('DAOFactory').new(kernelBase.address, aclBase.address, ZERO_ADDR);
-    r = await daoFactory.newDAO(root);
-    dao = await getContract('Kernel').at(r.logs.filter(l => l.event == 'DeployDAO')[0].args.dao);
-    acl = await getContract('ACL').at(await dao.acl());
-
-    //create dao mamnager permission for coin owner
-    await acl.createPermission(
-      root,
-      dao.address,
-      await dao.APP_MANAGER_ROLE(),
-      root,
-      { from: root }
-    );
-
-    //get new app instance from DAO
-    const receipt = await dao.newAppInstance(
-      '0x1234',
-      (await Token.new()).address,
-      0x0,
-      false,
-      { from: root }
-    );
-    token = Token.at(
-      receipt.logs.filter(l => l.event == 'NewAppProxy')[0].args.proxy
-    );
-
-    //apps id
-    let appsId = [];
-    appsId[0] = namehash("kredits-contribution");
-    appsId[1] = namehash("kredits-contributor");
-    appsId[2] = namehash("kredits-proposal");
-    appsId[3] = namehash("kredits-token");
-
-    //init token (app)
-    await token.initialize(appsId);
-
-    //create token mint permission for coin owner
-    await acl.createPermission(
-      root,
-      token.address,
-      await token.MINT_TOKEN_ROLE(),
-      root,
-      { from: root }
-    );
-
-  });
-
-  describe("Owner default space permissions", async () => {
-    it('check owner is token issuer', async () => {
-      let tokenIssuerPermission = await acl.hasPermission(root, token.address, await token.MINT_TOKEN_ROLE());
-      // eslint-disable-next-line no-undef
-      assert.equal(tokenIssuerPermission, true);
-    });
-  });
-
-  describe("Token issuing", async () => {
-    let name = "Kredits";
-    let symbol = "₭S";
-    let decimals = 18;
-
-    it("check token properties", async () => {
-      assert.equal(await token.name(), name); // eslint-disable-line no-undef
-      assert.equal(await token.symbol(), symbol); // eslint-disable-line no-undef
-      assert.equal(await token.decimals(), decimals); // eslint-disable-line no-undef
-    });
-
-  });
-
-  describe("Token minting", async () => {
-    let tokenToMint = 250;
-    let ether = 1000000000000000000;
-
-    it("should revert when mint tokens from an address that does not have minting permission", async () => {
-      return assertRevert(async () => {
-        await token.mintFor(root, tokenToMint, 1, { from: member1});
-        'address does not have permission to mint tokens';
-      });
-    });
-
-    it("should revert when mint tokens to address(0)", async () => {
-      return assertRevert(async () => {
-        await token.mintFor(ZERO_ADDR, tokenToMint, 1, { from: root});
-        'invalid contributor address';
-      });
-    });
-
-    it("should revert when mint amount of tokens equal to 0", async () => {
-      return assertRevert(async () => {
-        await token.mintFor(root, 0, 1, { from: root});
-        'amount to mint should be greater than zero';
-      });
-    });
-
-    it("mint tokens", async () => {
-      await token.mintFor(root, tokenToMint, 1, { from: root });
-      let ownerBalance = await token.balanceOf(root);
-      let totalSupply = await token.totalSupply();
-      assert.equal(ownerBalance.toNumber(), tokenToMint*ether); // eslint-disable-line no-undef
-      assert.equal(totalSupply.toNumber(), tokenToMint*ether);  // eslint-disable-line no-undef
-    });
-  });
-});

arapp.json

@@ -34,6 +34,7 @@
   "environments": {
     "development": {
       "network": "development",
+      "apm": "open.aragonpm.eth",
       "registry": "0x5f6f7e8cc7346a11ca2def8f827b7a0b612c56a1",
       "appName": "dummy.open.aragonpm.eth"
     },
@@ -41,10 +42,9 @@
       "network": "rinkeby",
       "registry": "0x98Df287B6C145399Aaa709692c8D308357bC085D",
       "wsRPC": "wss://rinkeby.eth.aragon.network/ws",
+      "daoFactory": "0x2298d27a9b847c681d2b2c2828ab9d79013f5f1d",
       "appName": "dummy.open.aragonpm.eth",
-      "kredits": {
+      "apm": "open.aragonpm.eth"
-        "daoFactory": "0x2298d27a9b847c681d2b2c2828ab9d79013f5f1d"
-      }
     },
     "kovan": {
       "network": "kovan",
@@ -52,7 +52,8 @@
     },
     "default": {
       "network": "development",
-      "appName": "dummy.aragonpm.eth"
+      "appName": "dummy.aragonpm.eth",
+      "apm": "open.aragonpm.eth"
     }
   },
   "path": "contracts/misc/DummyApp.sol"

config/seeds.js

@@ -31,19 +31,13 @@ const contractCalls = [
     wiki_username: 'Manuel',
   }, { gasLimit: 200000 }]],
 
-  ['Contribution', 'add', [{ contributorId: 1, contributorIpfsHash: 'QmWKCYGr2rSf6abUPaTYqf98urvoZxGrb7dbspFZA6oyVF', date: '2019-04-11', amount: 500, kind: 'dev', description: '[67P/kredits-contracts] Test this thing', url: '' }, { gasLimit: 350000 }]],
+  ['Proposal', 'add', [{ contributorId: 1, contributorIpfsHash: 'QmWKCYGr2rSf6abUPaTYqf98urvoZxGrb7dbspFZA6oyVF', date: '2019-04-09', amount: 500, kind: 'dev', description: '[67P/kredits-contracts] Ran the seeds', url: '' }, { gasLimit: 350000 }]],
+  ['Proposal', 'add', [{ contributorId: 2, contributorIpfsHash: 'QmcHzEeAM26HV2zHTf5HnZrCtCtGdEccL5kUtDakAB7ozB', date: '2019-04-10', amount: 500, kind: 'dev', description: '[67P/kredits-contracts] Ran the seeds', url: '' }, { gasLimit: 350000 }]],
+  ['Proposal', 'add', [{ contributorId: 2, contributorIpfsHash: 'QmcHzEeAM26HV2zHTf5HnZrCtCtGdEccL5kUtDakAB7ozB', date: '2019-04-11', amount: 500, kind: 'dev', description: '[67P/kredits-contracts] Hacked on kredits', url: '' }, { gasLimit: 350000 }]],
+  ['Proposal', 'vote', [1, { gasLimit: 550000 }]],
+  ['Contribution', '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', 'add', [{ contributorId: 1, contributorIpfsHash: 'QmWKCYGr2rSf6abUPaTYqf98urvoZxGrb7dbspFZA6oyVF', date: '2019-04-11', amount: 1500, kind: 'dev', description: '[67P/kredits-contracts] Add tests', url: '' }, { gasLimit: 350000 }]],
+  ['Contribution', 'claim', [1, { gasLimit: 300000 }]],
-  ['Contribution', 'add', [{ contributorId: 1, contributorIpfsHash: 'QmWKCYGr2rSf6abUPaTYqf98urvoZxGrb7dbspFZA6oyVF', date: '2019-04-11', amount: 1500, kind: 'dev', description: '[67P/kredits-contracts] Introduce contribution token', url: '' }, { gasLimit: 350000 }]],
-  ['Contribution', 'add', [{ contributorId: 2, contributorIpfsHash: 'QmcHzEeAM26HV2zHTf5HnZrCtCtGdEccL5kUtDakAB7ozB', date: '2019-04-11', amount: 5000, kind: 'dev', description: '[67P/kredits-web] Expense UI, first draft', url: '' }, { gasLimit: 350000 }]],
-
-  ['Reimbursement', 'add', [{amount: 1116000, recipientId: 1, token: '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599', expenses: [
-    { title: 'Server rent', description: 'Dedicated server: andromeda.kosmos.org, April 2020', amount: 61, currency: 'EUR', date: '2020-05-28' },
-    { title: 'Server rent', description: 'Dedicated server: centaurus.kosmos.org, April 2020', amount: 32, currency: 'EUR', date: '2020-05-28' }
-  ]}, { gasLimit: 300000 }]],
-  ['Reimbursement', 'add', [{amount: 166800, recipientId: 2, token: '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599', expenses: [
-    { title: 'Domain kosmos.chat', description: 'Yearly registration fee for domain kosmos.chat', amount: 13.90, currency: 'EUR', date: '2020-05-30' }
-  ]}, { gasLimit: 300000 }]],
 ];
 
 const funds = [

contracts/KreditsKit.sol

@@ -10,18 +10,17 @@ import "../apps/contribution/contracts/Contribution.sol";
 import "../apps/contributor/contracts/Contributor.sol";
 import "../apps/token/contracts/Token.sol";
 import "../apps/proposal/contracts/Proposal.sol";
-import "../apps/reimbursement/contracts/Reimbursement.sol";
 
 contract KreditsKit is KitBase  {
 
     // ensure alphabetic order
-    enum Apps { Contribution, Contributor, Proposal, Reimbursement, Token }
+    enum Apps { Contribution, Contributor, Proposal, Token }
-    bytes32[5] public appIds;
+    bytes32[4] public appIds;
 
     event DeployInstance(address dao);
     event InstalledApp(address dao, address appProxy, bytes32 appId);
 
-    constructor (DAOFactory _fac, ENS _ens, bytes32[5] _appIds) public KitBase(_fac, _ens) {
+    constructor (DAOFactory _fac, ENS _ens, bytes32[4] _appIds) public KitBase(_fac, _ens) {
       appIds = _appIds;
     }
 
@@ -42,24 +41,18 @@ contract KreditsKit is KitBase  {
         Contribution contribution = Contribution(_installApp(dao, appIds[uint8(Apps.Contribution)]));
         contribution.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());
-
         Proposal proposal = Proposal(_installApp(dao, appIds[uint8(Apps.Proposal)]));
         proposal.initialize(appIds);
 
-        Reimbursement reimbursement = Reimbursement(_installApp(dao, appIds[uint8(Apps.Reimbursement)]));
+        acl.createPermission(root, contribution, contribution.ADD_CONTRIBUTION_ROLE(), this);
-        reimbursement.initialize();
+        acl.createPermission(root, contribution, contribution.VETO_CONTRIBUTION_ROLE(), this);
-        acl.createPermission(root, reimbursement, reimbursement.ADD_REIMBURSEMENT_ROLE(), this);
+        acl.grantPermission(proposal, contribution, contribution.ADD_CONTRIBUTION_ROLE());
-        acl.createPermission(root, reimbursement, reimbursement.VETO_REIMBURSEMENT_ROLE(), this);
 
         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);
         acl.grantPermissionP(acl.ANY_ENTITY(), contribution, contribution.VETO_CONTRIBUTION_ROLE(), params);
         acl.grantPermissionP(acl.ANY_ENTITY(), contributor, contributor.MANAGE_CONTRIBUTORS_ROLE(), params);
-        acl.grantPermissionP(acl.ANY_ENTITY(), reimbursement, reimbursement.ADD_REIMBURSEMENT_ROLE(), params);
 
         //acl.setPermissionManager(this, proposal, proposal.VOTE_PROPOSAL_ROLE();
         acl.createPermission(root, proposal, proposal.VOTE_PROPOSAL_ROLE(), this);
@@ -74,8 +67,6 @@ 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.setPermissionManager(root, reimbursement, reimbursement.ADD_REIMBURSEMENT_ROLE());
-        acl.setPermissionManager(root, reimbursement, reimbursement.VETO_REIMBURSEMENT_ROLE());
 
         acl.createPermission(root, token, token.MINT_TOKEN_ROLE(), this);
         acl.grantPermission(contribution, token, token.MINT_TOKEN_ROLE());

data/contributors.json

@@ -1,121 +0,0 @@
-{
-  "1": {
-    "account": "0x7E8f313C56F809188313aa274Fa67EE58c31515d",
-    "hashDigest": "0x99b8afd7b266e19990924a8be9099e81054b70c36b20937228a77a5cf75723b8",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 1
-  },
-  "2": {
-    "account": "0x49575f3DD9a0d60aE661BC992f72D837A77f05Bc",
-    "hashDigest": "0xeb78574922d8606419b714174b31961007afefe313111c9db817aa9d3f82e157",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 2
-  },
-  "3": {
-    "account": "0xF722709ECC3B05c19d02E82a2a4A4021B8F48C62",
-    "hashDigest": "0x7acd73632c7cc8d317fa9e72e925eaef1d700e69f185b84e3f0168471e17cf2d",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 3
-  },
-  "4": {
-    "account": "0xD4a64570B12dA659Ee4BBd41c3509B7b1F9c51AC",
-    "hashDigest": "0x4d394c58e4b0534446be10a9b7f8b50e5478258719c23a3e158a5ea9fca14bdd",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 4
-  },
-  "5": {
-    "account": "0x35d9e68a5F7A935C64b08221d5DC7f161a415184",
-    "hashDigest": "0xd6f726f37ad52998b8341b7021cb5d9f4dcf7ce09af575358505a2a7c2f81edb",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 5
-  },
-  "6": {
-    "account": "0x8345E84D848792bf750A1d032d76f20f00aeC1a7",
-    "hashDigest": "0x1acdc784e20f62c44ec222552531bf89daafaaca1893a68057a9ada920ea0984",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 6
-  },
-  "7": {
-    "account": "0x4D99d767477Fbb2B47EFeb17E2a78970AD22CCc1",
-    "hashDigest": "0xd6d16bde5ee3d3374dd5981dab0296938b24e3c812e72ba4fa3d38011b6fab24",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 7
-  },
-  "8": {
-    "account": "0x6a6cD99ab0335C92E55fbb4403D67A4f4B52AfEc",
-    "hashDigest": "0xec30c91b31a85eef2af7afce0ba66b0636f1d61a75a12d8ca188a2d9e1626cf2",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 8
-  },
-  "9": {
-    "account": "0x21aB0B3527326dcA4467245654Cf881F5F7a8c5e",
-    "hashDigest": "0xd6c8b0f285e614b12f700d6e66e2e67901c16c420308625f844357283bd555ba",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 9
-  },
-  "10": {
-    "account": "0x150A69bAfA216FD55C7CeF8eA2002cd582dc5982",
-    "hashDigest": "0x7490aabadf995751211686b3b9f4b8cfee3354947df23cec043c15bfb519c817",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 10
-  },
-  "11": {
-    "account": "0x2f65679cAf0c3abCbF77fC68fA56759f4D96C73c",
-    "hashDigest": "0xd147d2d26f7eb1cbe1c5da53c345565df2d3c6c33a8a3e3331952d4b878b2bb0",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 11
-  },
-  "12": {
-    "account": "0x13a24319Abb4e00c383D8a80dACb20690699Ac8C",
-    "hashDigest": "0x84c63c2d3f9510f87717e54a2cecb41f88dce6a41ae6392480ebf6561e30670e",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 12
-  },
-  "13": {
-    "account": "0x0e0F02508b80e401C26F584fF02eE80Ab094CdF9",
-    "hashDigest": "0xe4c34e15b87114e9edd599fa1bbd6d4b1bf45c3b0163d0772158fb93503c1fe1",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 13
-  },
-  "14": {
-    "account": "0x49750D74930b20b2937DDF77A6C30d81882d888E",
-    "hashDigest": "0xa1f18c54e77d1e8f0fa106463b3f66a34a6287bcd9b643febea0ab2e97009665",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 14
-  },
-  "15": {
-    "account": "0x608FD4b95116Ea616990Aaeb1d4f1ce07612f261",
-    "hashDigest": "0x1d9de6de5c72eedca6d7a5e8a9159e2f5fe676506aece3000acefcc821723429",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 15
-  },
-  "16": {
-    "account": "0xCaBba4560c96FADe3Dd6C29cF24Cfb16a228bC1c",
-    "hashDigest": "0x0c81914b8a332808879b06b1a68398edccea7e7facb50767e4116c33914d2c64",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 16
-  },
-  "17": {
-    "account": "0x765E88b4F9a59C3a3b300C6eFF9E6E9fDDf9FbD9",
-    "hashDigest": "0xcfbeeadc244dfdc55bbad50d431871439df067970db84c73023956c96a6f5df2",
-    "hashFunction": 18,
-    "hashSize": 32,
-    "id": 17
-  }
-}

deployments/rinkeby/contribution.md

@@ -2,36 +2,6 @@
 
 aragon apm publish major --environment=rinkeby"
 
-## 20212-01-14 
-
-apps/contribution@master  » aragon apm publish major --environment=rinkeby
-eth-provider | Invalid provider preset/location: "local"
-  ✔ Start IPFS
-  ✔ Applying version bump (major)
-  ↓ Building frontend [skipped]
-    → build script not defined in package.json
-  ✔ Deploy contract
-  ✔ Determine contract address for version
-  ✔ Prepare files for publishing
-  ✔ Generate application artifact
-  ✔ Publish intent
-
-⚠ Publishing files from the project's root folder is not recommended. Consider using the distribution folder of your project: "--files <folder>".
-
- The following information will be published:
- Contract address: 0x914Da982ef17B56D2e868E3a67E923EbED1aE017
- Content (ipfs): QmdVrY2R48NFqwLopd8ix1anAK1d6WafDGauou3ZJrB9gf
-
-? Publish to kredits-contribution.open.aragonpm.eth repo Yes
-
-  ✔ Publish kredits-contribution.open.aragonpm.eth
-
- Successfully published kredits-contribution.open.aragonpm.eth v7.0.0 :
-
-Transaction hash: 0xb817b2e80e90a6be60b45dd39987498e3132c9962c0501feb7549ad30186c6d5
-
-
-
 ## 2019-04-24 update balances
 
  ✔ Successfully published kredits-contribution.open.aragonpm.eth v6.0.0: 

deployments/rinkeby/dao.md

@@ -1,16 +1,5 @@
 # Kredits deployment
 
-
-## 2021-01-14
-
-apps/contribution@master  » aragon dao upgrade 0xc34edf7d11b7f8433d597f0bb0697acdff55ef14 kredits-contribution.open.aragonpm.eth --environment=rinkeby
-eth-provider | Invalid provider preset/location: "local"
-  ✔ Fetching kredits-contribution.open.aragonpm.eth@latest
-  ✔ Fetching kredits-contribution.open.aragonpm.eth@latest
-  ✔ Upgrading app
-
-✔ Successfully executed: "Upgrade 'kredits-contribution.open.aragonpm.eth' app instances to v7.0.0"
-
 ## 2019-04-25 canPerfom fix
 
 aragon dao upgrade 0xc34edf7d11b7f8433d597f0bb0697acdff55ef14 kredits-contributor.open.aragonpm.eth --environment=rinkeby

lib/contracts/acl.js

@@ -5,7 +5,7 @@ class Acl extends Base {
   hasPermission (fromAddress, contractAddress, roleID, params = null) {
     let roleHash = EthersUtils.keccak256(EthersUtils.toUtf8Bytes(roleID));
 
-    return this.hasPermission(
+    return this.functions.hasPermission(
       fromAddress,
       contractAddress,
       roleHash,

lib/contracts/base.js

@@ -1,13 +1,10 @@
-const deprecate = require('../utils/deprecate');
-
 class Base {
   constructor (contract) {
     this.contract = contract;
   }
 
   get functions () {
-    deprecate('The property `functions` is deprecated. contract functions are now directly defined on the ethers contract object. https://github.com/ethers-io/ethers.js/issues/920#issuecomment-650836642');
+    return this.contract.functions;
-    return this.contract;
   }
 
   get address () {

lib/contracts/contribution.js

@@ -4,33 +4,29 @@ const deprecate = require('../utils/deprecate');
 
 class Contribution extends Record {
   get count () {
-    return this.contract.contributionsCount();
+    return this.functions.contributionsCount();
   }
 
   getById (id) {
-    return this.contract.getContribution(id)
+    return this.functions.getContribution(id)
       .then(data => {
         return this.ipfs.catAndMerge(data, ContributionSerializer.deserialize);
       });
   }
 
-  getData (id) {
-    return this.contract.getContribution(id);
-  }
-
   getByContributorId (contributorId) {
-    return this.contract.getContributorAddressById(contributorId)
+    return this.functions.getContributorAddressById(contributorId)
       .then(address => this.getByContributorAddress(address));
   }
 
   getByContributorAddress (address) {
-    return this.contract.balanceOf(address)
+    return this.functions.balanceOf(address)
       .then(async (balance) => {
         const count = balance.toNumber();
         const contributions = [];
 
         for (let index = 0; index < count; index++) {
-          const id = await this.contract.tokenOfOwnerByIndex(address, index);
+          const id = await this.functions.tokenOfOwnerByIndex(address, index);
           const contribution = await this.getById(id);
           contributions.push(contribution);
         }
@@ -58,7 +54,7 @@ class Contribution extends Record {
           ipfsHashAttr.hashSize,
         ];
 
-        return this.contract.add(...contribution, callOptions);
+        return this.functions.add(...contribution, callOptions);
       });
   }
 
@@ -66,7 +62,6 @@ 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;

lib/contracts/contributor.js

@@ -4,22 +4,17 @@ const formatKredits = require('../utils/format-kredits');
 
 class Contributor extends Record {
   get count () {
-    return this.contract.contributorsCount();
+    return this.functions.contributorsCount();
   }
 
   getById (id) {
-    return this.contract.getContributorById(id)
+    return this.functions.getContributorById(id)
-      .then(contractData => {
+      .then(data => {
-        let data = {...contractData};
         data.balanceInt = formatKredits(data.balance);
         return this.ipfs.catAndMerge(data, ContributorSerializer.deserialize);
       });
   }
 
-  getData (id) {
-    return this.contract.getContributorById(id);
-  }
-
   filterByAccount (search) {
     return this._byAccount(search, 'filter');
   }
@@ -62,7 +57,7 @@ class Contributor extends Record {
           ipfsHashAttr.hashSize,
         ];
 
-        return this.contract.addContributor(...contributor, callOptions);
+        return this.functions.addContributor(...contributor, callOptions);
       });
   }
 
@@ -79,7 +74,7 @@ class Contributor extends Record {
       return this.ipfs
         .add(jsonStr)
         .then(ipfsHashAttr => {
-          return this.contract.updateContributorProfileHash(
+          return this.functions.updateContributorProfileHash(
             contributorId,
             ipfsHashAttr.hashDigest,
             ipfsHashAttr.hashFunction,
@@ -89,7 +84,6 @@ class Contributor extends Record {
         });
     });
   }
-
 }
 
 module.exports = Contributor;

lib/contracts/index.js

@@ -3,7 +3,6 @@ module.exports = {
   Contribution: require('./contribution'),
   Proposal: require('./proposal'),
   Token: require('./token'),
-  Reimbursement: require('./reimbursement'),
   Kernel: require('./kernel'),
   Acl: require('./acl'),
 };

lib/contracts/kernel.js

@@ -11,9 +11,9 @@ class Kernel extends Base {
 
   getApp (appName) {
     if (appName === 'Acl') {
-      return this.contract.acl();
+      return this.functions.acl();
     }
-    return this.contract.getApp(KERNEL_APP_ADDR_NAMESPACE, this.appNamehash(appName));
+    return this.functions.getApp(KERNEL_APP_ADDR_NAMESPACE, this.appNamehash(appName));
   }
 
   appNamehash (appName) {

lib/contracts/proposal.js

@@ -4,11 +4,11 @@ const deprecate = require('../utils/deprecate');
 
 class Proposal extends Record {
   get count () {
-    return this.contract.proposalsCount();
+    return this.functions.proposalsCount();
   }
 
   getById (id) {
-    return this.contract.getProposal(id)
+    return this.functions.getProposal(id)
       .then(data => {
         return this.ipfs.catAndMerge(data, ContributionSerializer.deserialize);
       });
@@ -33,7 +33,7 @@ class Proposal extends Record {
           ipfsHashAttr.hashSize,
         ];
 
-        return this.contract.addProposal(...proposal, callOptions);
+        return this.functions.addProposal(...proposal, callOptions);
       });
   }
 

lib/contracts/reimbursement.js

@@ -1,65 +0,0 @@
-const Record = require('./record');
-const ExpenseSerializer = require('../serializers/expense');
-
-class Reimbursement extends Record {
-  get count () {
-    return this.functions.reimbursementsCount();
-  }
-
-  getById (id) {
-    return this.functions.get(id)
-      .then(data => {
-        return this.ipfs.catAndMerge(data, (ipfsDocument) => {
-          const expenses = JSON.parse(ipfsDocument);
-          return { expenses };
-        });
-      });
-  }
-
-  getData (id) {
-    return this.functions.getReimbursement(id);
-  }
-
-  async add (attrs, callOptions = {}) {
-    const amount = parseInt(attrs.amount);
-    const token = attrs.token;
-    const recipientId = attrs.recipientId;
-    const expenses = attrs.expenses.map( e => new ExpenseSerializer(e) );
-    let errorMessage;
-
-    if (typeof amount !== 'number' || amount <= 0) {
-      errorMessage = 'Invalid data: amount must be a positive number.';
-    }
-    if (!token || token === '') {
-      errorMessage = 'Invalid data: token must be a token address.';
-    }
-    if (!recipientId || recipientId === '') {
-      errorMessage = 'Invalid data: recipientId is required.';
-    }
-    if (expenses.length === 0) {
-      errorMessage = 'Invalid data: at least one expense item is required.';
-    }
-    if (errorMessage) { return Promise.reject(new Error(errorMessage)); }
-
-    return Promise.all(expenses.map(e => e.validate()))
-      .then(() => {
-        const jsonStr = JSON.stringify(expenses.map(e => e.data), null, 2);
-        return this.ipfs
-          .add(jsonStr)
-          .then(ipfsHashAttr => {
-            const reimbursement = [
-              amount,
-              token,
-              parseInt(recipientId),
-              ipfsHashAttr.hashDigest,
-              ipfsHashAttr.hashFunction,
-              ipfsHashAttr.hashSize,
-            ];
-
-            return this.functions.add(...reimbursement, callOptions);
-          });
-      });
-  }
-}
-
-module.exports = Reimbursement;

lib/kredits.js

@@ -6,7 +6,6 @@ const deprecate = require('./utils/deprecate');
 const ABIS = {
   Contributor: require('./abis/Contributor.json'),
   Contribution: require('./abis/Contribution.json'),
-  Reimbursement: require('./abis/Reimbursement.json'),
   Token: require('./abis/Token.json'),
   Proposal: require('./abis/Proposal.json'),
   Kernel: require('./abis/Kernel.json'),
@@ -17,7 +16,6 @@ const APP_CONTRACTS = [
   'Contribution',
   'Token',
   'Proposal',
-  'Reimbursement',
   'Acl',
 ];
 const DaoAddresses = require('./addresses/dao.json');
@@ -123,10 +121,6 @@ class Kredits {
     return this.contractFor('Contribution');
   }
 
-  get Reimbursement () {
-    return this.contractFor('Reimbursement');
-  }
-
   get Acl () {
     return this.contractFor('Acl');
   }

lib/kreditskit.js

@@ -29,12 +29,12 @@ class KreditsKit {
 
   appIdFor (contractName) {
     // see appIds in KreditsKit.sol for more details
-    const knownContracts = ['Contribution', 'Contributor', 'Proposal', 'Reimbursement', 'Token'];
+    const knownContracts = ['Contribution', 'Contributor', 'Proposal', 'Token'];
-    return this.contract.appIds(knownContracts.indexOf(contractName));
+    return this.contract.functions.appIds(knownContracts.indexOf(contractName));
   }
 
   newDAO (options = {}) {
-    return this.contract.newInstance(options).then(transaction => {
+    return this.contract.functions.newInstance(options).then(transaction => {
       return transaction.wait().then(result => {
         const deployEvent = result.events.find(e => e.event === 'DeployInstance');
         return {

lib/serializers/contribution.js

@@ -1,4 +1,4 @@
-const schemas = require('@kosmos/schemas');
+const schemas = require('kosmos-schemas');
 const validator = require('../utils/validator');
 
 /**

lib/serializers/contributor.js

@@ -1,4 +1,4 @@
-const schemas = require('@kosmos/schemas');
+const schemas = require('kosmos-schemas');
 const validator = require('../utils/validator');
 /**
  * Handle serialization for JSON-LD object of the contributor, according to
@@ -13,7 +13,7 @@ class Contributor {
     Object.keys(attrs).forEach(a => this[a] = attrs[a]);
   }
 
-  /**
+ /**
   * Serialize object to JSON
   *
   * @method
@@ -28,7 +28,7 @@ class Contributor {
       github_username,
       gitea_username,
       wiki_username,
-      zoom_display_name,
+      accounts,
     } = this;
 
     let data = {
@@ -36,7 +36,7 @@ class Contributor {
       '@type': 'Contributor',
       kind,
       name,
-      accounts: [],
+      accounts: accounts || [],
     };
 
     if (url) {
@@ -68,13 +68,6 @@ class Contributor {
       });
     }
 
-    if (zoom_display_name) {
-      data.accounts.push({
-        'site': 'zoom.us',
-        'username': zoom_display_name,
-      });
-    }
-
     // Write it pretty to ipfs
     return JSON.stringify(data, null, 2);
   }
@@ -104,11 +97,10 @@ class Contributor {
       accounts,
     } = JSON.parse(serialized.toString('utf8'));
 
-    let github_username, github_uid, gitea_username, wiki_username, zoom_display_name;
+    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');
-    let zoom   = accounts.find(a => a.site === 'zoom.us');
 
     if (github) {
       (({ username: github_username, uid: github_uid} = github));
@@ -119,9 +111,6 @@ class Contributor {
     if (wiki) {
       (({ username: wiki_username } = wiki));
     }
-    if (zoom) {
-      (({ username: zoom_display_name } = zoom));
-    }
 
     return {
       name,
@@ -132,7 +121,6 @@ class Contributor {
       github_username,
       gitea_username,
       wiki_username,
-      zoom_display_name,
       ipfsData: serialized,
     };
   }

lib/serializers/expense.js

@@ -1,100 +0,0 @@
-const schemas = require('@kosmos/schemas');
-const validator = require('../utils/validator');
-
-/**
- * Serialization and validation for JSON-LD document of the Expense
- *
- * @class
- * @public
- */
-class ExpenseSerializer {
-
-  constructor (attrs) {
-    Object.keys(attrs).forEach(a => this[a] = attrs[a]);
-  }
-
-  /**
-   * Serialize object to JSON
-   *
-   * @public
-   */
-  serialize () {
-    // Write it pretty to ipfs
-    return JSON.stringify(this.data, null, 2);
-  }
-
-  get data () {
-    const {
-      title,
-      description,
-      currency,
-      amount,
-      date,
-      url,
-      tags,
-      details,
-    } = this;
-
-    const data = {
-      '@context': 'https://schema.kosmos.org',
-      '@type': 'Expense',
-      title,
-      description,
-      currency,
-      amount,
-      date,
-      'tags': tags || [],
-      'details': details || {},
-    };
-
-    if (url) {
-      data['url'] = url;
-    }
-
-    return data;
-  }
-
-  /**
-   * Validate serialized data against schema
-   *
-   * @public
-   */
-  validate () {
-    const serialized = JSON.parse(this.serialize());
-    const valid = validator.validate(serialized, schemas['expense']);
-    return valid ? Promise.resolve() : Promise.reject(validator.error);
-  }
-
-  /**
-   * Deserialize JSON to object
-   *
-   * @public
-   */
-  static deserialize (serialized) {
-    const {
-      title,
-      description,
-      currency,
-      amount,
-      date,
-      url,
-      tags,
-      details,
-    } = JSON.parse(serialized.toString('utf8'));
-
-    return {
-      title,
-      description,
-      currency,
-      amount,
-      date,
-      url,
-      tags,
-      details,
-      ipfsData: serialized,
-    };
-  }
-
-}
-
-module.exports = ExpenseSerializer;

lib/utils/ipfs.js

@@ -1,18 +1,16 @@
 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._config = config;
     this._ipfsAPI = ipfsClient(config);
+    this._config = config;
   }
 
-  catAndMerge (contractData, deserialize) {
+  catAndMerge (data, deserialize) {
-    let data = {...contractData}; // data from ethers.js is not extensible. this copy the attributes in a new object
     // if no hash details are found simply return the data; nothing to merge
     if (!data.hashSize || data.hashSize === 0) {
       return data;
@@ -37,22 +35,10 @@ class IPFS {
 
   cat (hashData) {
     let ipfsHash = hashData; // default - if it is a string
-    if (Object.prototype.hasOwnProperty.call(hashData, 'hashSize')) {
+    if (hashData.hasOwnProperty('hashSize')) {
       ipfsHash = this.encodeHash(hashData);
     }
-    if (this._config['gatewayUrl']) {
+    return this._ipfsAPI.cat(ipfsHash);
-      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 (Object.prototype.hasOwnProperty.call(hashData, 'hashSize')) {
-      ipfsHash = this.encodeHash(hashData);
-    }
-    return this._ipfsAPI.pin.add(multihashes.toB58String(ipfsHash));
   }
 
   decodeHash (ipfsHash) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kredits-contracts",
-  "version": "6.0.0",
+  "version": "5.3.0",
   "description": "Ethereum contracts and npm wrapper for Kredits",
   "main": "./lib/kredits.js",
   "directories": {
@@ -12,23 +12,19 @@
     "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": "truffle compile --all",
+    "compile-contracts": "aragon contracts compile --all",
     "bootstrap": "npm run reset:hard && npm run seeds",
     "reset": "npm run deploy:kit && npm run deploy:dao",
-    "reset:hard": "npm run compile-contracts && npm run deploy:apps && npm run reset",
+    "reset:hard": "npm run deploy:apps && npm run reset",
-    "deploy:kit": "truffle exec scripts/deploy-kit.js",
+    "deploy:kit": "npm run compile-contracts && aragon contracts exec scripts/deploy-kit.js",
-    "deploy:dao": "truffle exec scripts/new-dao.js",
+    "deploy:dao": "aragon contracts exec scripts/new-dao.js",
-    "deploy:apps": "./scripts/every-app.sh \"aragon apm publish major --propagate-content=false --build=false --prepublish=false --skip-confirmation\"",
+    "deploy:apps": "./scripts/every-app.sh \"aragon apm publish major\"",
     "devchain": "aragon devchain --port 7545",
     "dao:address": "truffle exec scripts/current-address.js",
     "lint:contracts": "solhint \"contracts/**/*.sol\" \"apps/*/contracts/**/*.sol\"",
     "lint:contract-tests": "eslint apps/*/test",
     "lint:wrapper": "eslint lib/",
-    "test": "npm run test:token && npm run test:contributor && npm run test:contribution && npm run test:proposal",
+    "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": {
@@ -42,29 +38,25 @@
   },
   "homepage": "https://github.com/67P/truffle-kredits#readme",
   "devDependencies": {
+    "@aragon/cli": "^5.9.6",
     "@aragon/kits-base": "^1.0.0",
-    "@aragon/os": "^4.4.0",
+    "@aragon/os": "^4.2.0",
     "async-each-series": "^1.1.0",
     "cli-table": "^0.3.1",
-    "eslint": "^7.1.0",
+    "eslint": "^5.16.0",
-    "eslint-plugin-import": "^2.20.2",
+    "eslint-plugin-import": "^2.17.3",
-    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-node": "^8.0.1",
-    "eslint-plugin-promise": "^4.2.1",
+    "eslint-plugin-promise": "^4.1.1",
-    "eth-provider": "^0.2.5",
+    "eth-provider": "^0.2.2",
-    "ethereum-block-by-date": "^1.4.0",
-    "homedir": "^0.6.0",
     "promptly": "^3.0.3",
-    "solc": "^0.6.8",
+    "solc": "^0.4.26",
-    "solhint": "^2.3.1",
+    "solhint": "^2.1.0",
-    "truffle-hdwallet-provider": "^1.0.17",
+    "yargs": "^12.0.0"
-    "truffle-hdwallet-provider-privkey": "^0.3.0",
-    "yargs": "^15.0.0"
   },
   "dependencies": {
-    "ethers": "^5.0.2",
+    "ethers": "^4.0.29",
-    "ipfs-http-client": "^41.0.1",
+    "ipfs-http-client": "^32.0.1",
-    "@kosmos/schemas": "^3.0.0",
+    "kosmos-schemas": "^2.1.0",
-    "node-fetch": "^2.6.0",
     "tv4": "^1.3.0"
   },
   "keywords": [

scripts/add-contribution.js

@@ -19,10 +19,10 @@ module.exports = async function(callback) {
   let contributorAccount;
   if (contributor.length < 5) {
     contributorId = contributor;
-    contributorAccount = await kredits.Contributor.contract.getContributorAddressById(contributor);
+    contributorAccount = await kredits.Contributor.functions.getContributorAddressById(contributor);
   } else {
     contributorAccount = contributor;
-    contributorId = await kredits.Contributor.contract.getContributorIdByAddress(contributor);
+    contributorId = await kredits.Contributor.functions.getContributorIdByAddress(contributor);
   }
 
   console.log(`Creating a contribution for contributor account ${contributorAccount} ID: ${contributorId}`);
@@ -45,7 +45,7 @@ module.exports = async function(callback) {
   console.log("\nAdding contribution:");
   console.log(contributionAttributes);
 
-  kredits.Contribution.add(contributionAttributes, { gasLimit: 300000 })
+  kredits.Contribution.addContribution(contributionAttributes, { gasLimit: 300000 })
     .then(result => {
       console.log("\n\nResult:");
       console.log(result);

scripts/add-proposal.js

@@ -19,10 +19,10 @@ module.exports = async function(callback) {
   let contributorAccount;
   if (contributor.length < 5) {
     contributorId = contributor;
-    contributorAccount = await kredits.Contributor.contract.getContributorAddressById(contributor);
+    contributorAccount = await kredits.Contributor.functions.getContributorAddressById(contributor);
   } else {
     contributorAccount = contributor;
-    contributorId = await kredits.Contributor.contract.getContributorIdByAddress(contributor);
+    contributorId = await kredits.Contributor.functions.getContributorIdByAddress(contributor);
   }
   console.log(`Creating a proposal for contributor ID #${contributorId} account: ${contributorAccount}`);
 

scripts/build-json.js

@@ -11,7 +11,6 @@ const files = [
   'Kernel',
   'Proposal',
   'Token',
-  'Reimbursement',
   'ACL'
 ];
 

scripts/claim-contributions.js

@@ -31,7 +31,7 @@ module.exports = async function(callback) {
 
       if (c.contributorId === recipient && confirmed && !c.vetoed && !c.claimed) {
         console.log(`Claiming contribution ID=${c.id}`);
-        return kredits.Contribution.contract.claim(c.id, { gasLimit: 500000 }).then(tx => {
+        return kredits.Contribution.functions.claim(c.id, { gasLimit: 500000 }).then(tx => {
           table.push([
             c.id.toString(),
             `${c.description}`,

scripts/cli.js

@@ -17,7 +17,7 @@ module.exports = async function(callback) {
 
       method = await promptly.prompt('Function: ');
     }
-    if (!contractWrapper[method] && !contractWrapper.contract[method]) {
+    if (!contractWrapper[method] && !contractWrapper.functions[method]) {
       callback(new Error(`Method ${method} is not defined on ${contractName}`));
       return;
     }
@@ -33,7 +33,7 @@ module.exports = async function(callback) {
     if (contractWrapper[method]) {
       func = contractWrapper[method];
     } else {
-      func = contractWrapper.contract[method];
+      func = contractWrapper.functions[method];
     }
     func.apply(contractWrapper, args).then((result) => {
       console.log("\nResult:");

scripts/current-address.js

@@ -1,12 +1,9 @@
 const knownDAOAddresses = require('../lib/addresses/dao.json');
 const knownKreditsKitAddresses = require('../lib/addresses/KreditsKit.json');
 const getNetworkId = require('./helpers/networkid.js')
-const ethers = require('ethers');
 
 module.exports = async function(callback) {
-  const provider = new ethers.providers.Web3Provider(web3.currentProvider);
+  const networkId = await getNetworkId(web3)
-  let network = await provider.getNetwork();
-  let networkId = network.chainId;
 
   console.log('# All known DAO addresses');
   Object.keys(knownDAOAddresses).forEach((networkId) => {

scripts/deploy-kit.js

@@ -3,33 +3,23 @@ const deployDAOFactory = require('@aragon/os/scripts/deploy-daofactory.js')
 const fs = require('fs');
 const path = require('path');
 const argv = require('yargs').argv
-const ethers = require('ethers');
+const namehash = require('ethers').utils.namehash;
-const namehash = ethers.utils.namehash;
 
 const fileInject = require('./helpers/file_inject.js')
+const getNetworkId = require('./helpers/networkid.js')
 
 const DAOFactory = artifacts.require('DAOFactory')
 const KreditsKit = artifacts.require('KreditsKit')
 
 const arapp = require('../arapp.json')
 const environment = argv['network'] || argv['environment'] || 'development'
+const apm = arapp.environments[environment].apm
+const ensAddr = arapp.environments[environment].registry || process.env.ENS
+const daoFactoryAddress = arapp.environments[environment].daoFactory || process.env.DAO_FACTORY
 
-const kreditsArappConfig = arapp.environments[environment].kredits || {}
-
-// typically we use the open.aragonpm.eth aragonpm.
-const apm = kreditsArappConfig.apmDomain || argv['apmDomain'] || 'open.aragonpm.eth'
-
-// daoFactory is environment specific.
-// See https://github.com/aragon/deployments/tree/master/environments/ for the official daoFactory
-// Locally we deploy our own daoFactory and no daoFactory is required (`daoFactoryAddress` is null).
-const daoFactoryAddress = kreditsArappConfig.daoFactory || argv['daoFactory']
-
-const ensAddr = arapp.environments[environment].registry || argv['ensAddress']
 
 module.exports = async function(callback) {
-  const provider = new ethers.providers.Web3Provider(web3.currentProvider);
+  const networkId = await getNetworkId(web3)
-  const network = await provider.getNetwork();
-  const networkId = network.chainId;
   console.log(`Deploying to networkId: ${networkId}`)
 
   if (!ensAddr) {

scripts/export/contributions.js

@@ -1,49 +0,0 @@
-const fs = require('fs');
-const ethers = require('ethers');
-const Kredits = require('../../lib/kredits');
-const provider = new ethers.providers.JsonRpcProvider('https://rpc.ankr.com/eth_rinkeby');
-
-const arapp = require('../../arapp.json');
-const apm = arapp.environments['rinkeby'].apm;
-
-async function main() {
-  const kredits = await new Kredits(provider, null, { apm });
-  //kredits = new Kredits(hre.ethers.provider, hre.ethers.provider.getSigner())
-  await kredits.init();
-
-  console.log(`Using Contribution at: ${kredits.Contribution.contract.address}`);
-
-  const count = await kredits.Contribution.count;
-  const currentBlockHeight = await provider.getBlockNumber();
-
-  const backup = {};
-  const promises = [];
-  for (let i = 1; i <= count; i++) {
-    promises.push(new Promise((resolve, reject) => {
-      setTimeout(async () => {
-        console.log(`Loading contribution #${i}`);
-        await kredits.Contribution.contract.getContribution(i).then(contractData => {
-          backup[i] = {
-            amount: contractData.amount,
-            contributorId: contractData.contributorId,
-            hashDigest: contractData.hashDigest,
-            hashFunction: contractData.hashFunction,
-            hashSize: contractData.hashSize,
-            confirmedAtBlock: contractData.confirmedAtBlock,
-            confirmed: contractData.confirmedAtBlock <= currentBlockHeight,
-            vetoed: contractData.vetoed,
-            id: contractData.id,
-          }
-          resolve();
-        });
-      }, 100 * i);
-    }));
-  }
-
-  await Promise.all(promises).then(() => {
-    fs.writeFileSync("./data/contributions.json", JSON.stringify(backup, null, 2));
-    console.log("Exported");
-  });
-}
-
-main();

scripts/export/contributors.js

@@ -1,44 +0,0 @@
-const fs = require('fs');
-const ethers = require('ethers');
-const Kredits = require('../../lib/kredits');
-const provider = new ethers.providers.JsonRpcProvider('https://rpc.ankr.com/eth_rinkeby');
-
-const arapp = require('../../arapp.json');
-const apm = arapp.environments['rinkeby'].apm;
-
-async function main() {
-  const kredits = await new Kredits(provider, null, { apm });
-  //kredits = new Kredits(hre.ethers.provider, hre.ethers.provider.getSigner())
-  await kredits.init();
-
-  console.log(`Using Contributor at: ${kredits.Contributor.contract.address}`);
-
-  const count = await kredits.Contributor.count;
-
-  const backup = {};
-  const promises = [];
-  for (let i = 1; i <= count; i++) {
-    promises.push(new Promise((resolve, reject) => {
-      setTimeout(async () => {
-        console.log(`Loading contributor #${i}`);
-        await kredits.Contributor.contract.getContributorById(i).then(contractData => {
-          backup[i] = {
-            account: contractData.account,
-            hashDigest: contractData.hashDigest,
-            hashFunction: contractData.hashFunction,
-            hashSize: contractData.hashSize,
-            id: contractData.id,
-          }
-          resolve();
-        });
-      }, 100 * i);
-    }));
-  }
-
-  await Promise.all(promises).then(() => {
-    fs.writeFileSync("./data/contributors.json", JSON.stringify(backup, null, 2));
-    console.log("Exported");
-  });
-}
-
-main();

scripts/find-block-for-date.js

@@ -1,19 +0,0 @@
-const promptly = require('promptly');
-const EthDater = require('ethereum-block-by-date');
-const initKredits = require('./helpers/init_kredits.js');
-
-module.exports = async function(callback) {
-  let kredits;
-  try { kredits = await initKredits(web3); } catch(e) { callback(e); return; }
-
-  const dater     = new EthDater(kredits.provider);
-  const dateStr   = await promptly.prompt('Specify a date and time (e.g. 2021-05-07T14:00:40Z): ');
-  const blockData = await dater.getDate(dateStr, true);
-
-  console.log(`
-The closest block is #${blockData.block}:
-https://rinkeby.etherscan.io/block/${blockData.block}
-`);
-
-  callback();
-}

scripts/helpers/init_kredits.js

@@ -1,5 +1,6 @@
 const argv = require('yargs').argv;
 const ethers = require('ethers');
+const getNetworkId = require('./networkid.js');
 const Kredits = require('../../lib/kredits');
 
 const arapp = require('../../arapp.json');
@@ -9,7 +10,7 @@ const apm = arapp.environments[environment].apm;
 module.exports = async function(web3) {
   return new Promise((resolve, reject) => {
     const provider = new ethers.providers.Web3Provider(web3.currentProvider);
-    const signer = provider.getSigner();
+    let signer = provider.getSigner();
     // checking if siner supports signing transactions
     signer.getAddress().then(_ => {
       new Kredits(provider, signer, { apm }).init().then(kredits => {

scripts/helpers/networkid.js

@@ -0,0 +1,17 @@
+module.exports = function(web3) {
+  return new Promise((resolve, reject) => {
+    let func;
+    if (web3.version.getNetwork) {
+      func = web3.version.getNetwork;
+    } else {
+      func = web3.eth.net.getId;
+    }
+    func((err, network) => {
+      if (err) {
+        reject(err);
+      } else {
+        resolve(network);
+      }
+    })
+  })
+}

scripts/helpers/update_local_networkid.js

@@ -1,14 +1,12 @@
 const fs = require('fs');
-const ethers = require('ethers');
+const getNetworkId = require('./networkid.js');
 
 module.exports = async function(callback) {
   const daoAddressPath = 'lib/addresses/dao.json';
 
   // TODO maybe do the same for KreditsKit address file
   try {
-    const provider = new ethers.providers.Web3Provider(web3.currentProvider);
+    const networkId = await getNetworkId(web3);
-    const network = await provider.getNetwork();
-    const networkId = network.chainId;
     const daoAddresses = JSON.parse(fs.readFileSync(daoAddressPath));
     const oldNetworkId = Math.max(...Object.keys(daoAddresses).map(a => parseInt(a)));
     const localDaoAddress = daoAddresses[oldNetworkId];

scripts/list-contributions-per-contributor.js

@@ -1,76 +0,0 @@
-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}`);
-
-  const table = new Table({
-    head: ['ID', 'Name', 'Kredits']
-  })
-
-  try {
-    let currentBlockNumber = await kredits.provider.getBlockNumber();
-    console.log(`Current block number: ${currentBlockNumber}`);
-
-    let confirmedBeforeBlock = await promptly.prompt('Before block: ');
-    let confirmedAfterBlock = await promptly.prompt('After block: ');
-
-    let tokens = {};
-    let contributors = await kredits.Contributor.all();
-    contributors.forEach(c => {
-      tokens[c.id] = { amount: 0, contributor: c };
-    });
-
-    let contributionId = await kredits.Contribution.contract.contributionsCount();
-    let nextContribution = true;
-
-    while (nextContribution) {
-      console.log(`Getting contribution: ${contributionId}`);
-      let contribution = await kredits.Contribution.getById(contributionId);
-      contributionId = contributionId - 1;
-
-      // if no conribution is found
-      if (!contribution.exists) {
-        nextContribution = false;
-        break;
-      }
-      // check if the contribution is older
-      // in that case we assume all other contributions now are older
-      if (contribution.confirmedAtBlock < confirmedAfterBlock) {
-        nextContribution = false;
-      }
-
-      // if the contribution is within the range count it
-      if (!contribution.vetoed && contribution.confirmedAtBlock < confirmedBeforeBlock && contribution.confirmedAtBlock > confirmedAfterBlock) {
-        // init
-        tokens[contribution.contributorId].amount = tokens[contribution.contributorId].amount + contribution.amount;
-      }
-    }
-
-    Object.keys(tokens).forEach((contributorId) => {
-      table.push([
-        contributorId,
-        `${tokens[contributorId].contributor.name}`,
-        `${tokens[contributorId].amount}`
-      ]);
-    });
-
-    const total = Object.keys(tokens).map(cid => { return tokens[cid].amount}).reduce((a,b) => { return a+b }, 0);
-    console.log(`Total confirmed Kredits: ${total} between block ${confirmedAfterBlock} and ${confirmedBeforeBlock}`);
-    console.log(table.toString());
-  } catch (err) {
-    console.log(err);
-  }
-
-  callback();
-}

scripts/list-contributions.js

@@ -41,8 +41,8 @@ module.exports = async function(callback) {
 
     console.log(table.toString());
 
-    let totalKreditsEarnedUnConfirmed = await kredits.Contribution.contract.totalKreditsEarned(false);
+    let totalKreditsEarnedUnConfirmed = await kredits.Contribution.functions.totalKreditsEarned(false);
-    let totalKreditsEarnedConfirmed = await kredits.Contribution.contract.totalKreditsEarned(true);
+    let totalKreditsEarnedConfirmed = await kredits.Contribution.functions.totalKreditsEarned(true);
     console.log(`Total Kredits: ${totalKreditsEarnedConfirmed} (confirmed) | ${totalKreditsEarnedUnConfirmed} (including unconfirmed)`);
   } catch (err) {
     console.log(err);

scripts/list-reimbursements.js

@@ -1,52 +0,0 @@
-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 Reimbursement at: ${kredits.Reimbursement.contract.address}`);
-
-  const table = new Table({
-    head: ['ID', 'Amount', 'Token', 'recipientId', 'Confirmed?', 'Vetoed?', 'IPFS', 'Expenses']
-  })
-
-  try {
-    let blockNumber = await kredits.provider.getBlockNumber();
-    let reimbursements = await kredits.Reimbursement.all({page: {size: 1000}});
-
-    let kreditsSum = 0;
-    console.log(`Current block number: ${blockNumber}`);
-    reimbursements.forEach(r => {
-      const confirmed = r.confirmedAtBlock <= blockNumber;
-
-      table.push([
-        r.id.toString(),
-        r.amount.toString(),
-        `${r.token}`,
-        `${r.recipientId}`,
-        `${confirmed}`,
-        `${r.vetoed}`,
-        `${r.ipfsHash}`,
-        `${r.expenses.length}`
-      ]);
-    });
-
-    console.log(table.toString());
-
-    let totalAmountUnconfirmed = await kredits.Reimbursement.functions.totalAmount(false);
-    let totalAmountConfirmed = await kredits.Reimbursement.functions.totalAmount(true);
-    console.log(`Total: ${totalAmountConfirmed} (confirmed) | ${totalAmountUnconfirmed} (including unconfirmed)`);
-  } catch (err) {
-    console.log(err);
-  }
-
-  callback();
-}

scripts/new-dao.js

@@ -3,15 +3,13 @@ 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');
 
 module.exports = async function(callback) {
-  const provider = new ethers.providers.Web3Provider(web3.currentProvider);
+  const networkId = await getNetworkId(web3)
-  const signer = provider.getSigner();
-  const network = await provider.getNetwork();
-  const networkId = network.chainId;
   console.log(`Deploying to networkId: ${networkId}`)
 
   let kitAddresseFile = path.join(addressesPath, 'KreditsKit.json');
@@ -22,6 +20,9 @@ module.exports = async function(callback) {
   }
   console.log(`Using KreditsKit at: ${kreditsKitAddress}`);
 
+  const provider = new ethers.providers.Web3Provider(web3.currentProvider);
+  let signer = provider.getSigner();
+
   let kit = await new KreditsKit(provider, signer).init()
 
   // TODO: get rid of the hard coded gas limit

scripts/seeds.js

@@ -38,7 +38,7 @@ module.exports = async function(callback) {
     if (contractWrapper[method]) {
       func = contractWrapper[method];
     } else {
-      func = contractWrapper.contract[method];
+      func = contractWrapper.functions[method];
     }
     func.apply(contractWrapper, args).then((result) => {
       console.log(`[OK] kredits.${contractName}.${method}(${JSON.stringify(args)}) => ${result.hash}`);

scripts/send-funds.js

@@ -5,8 +5,7 @@ module.exports = async function(callback) {
   let amount = await promptly.prompt('Amount: ', {default: '1'});
   amount = parseInt(amount);
 
-  const accounts = await web3.eth.personal.getAccounts();
+  let fromAccount = web3.eth.accounts[0];
-  let fromAccount = accounts[0];
   let fromBalance = await web3.eth.getBalance(fromAccount);
   let recipientBalance = await web3.eth.getBalance(recipient);
 
@@ -14,11 +13,11 @@ module.exports = async function(callback) {
   console.log(`sender account balance ${fromAccount}: ${fromBalance}`);
   console.log(`recipient account balance ${recipient}: ${recipientBalance}`);
 
-  console.log(`\nsending ${amount} ETH from ${accounts[0]} to ${recipient}`);
+  console.log(`\nsending ${amount} ETH from ${web3.eth.accounts[0]} to ${recipient}`);
 
-  let transaction = await web3.eth.sendTransaction({to: recipient, value: web3.utils.toWei(new web3.utils.BN(amount)), from: accounts[0]});
+  let transaction = await web3.eth.sendTransaction({to: recipient, value: web3.toWei(amount), from: web3.eth.accounts[0]});
 
-  console.log(`transaction id: ${transaction.transactionHash}`);
+  console.log(`transaction id: ${transaction}`);
 
   recipientBalance = await web3.eth.getBalance(recipient);
   console.log(`\nnew recipient account balance ${recipient}: ${recipientBalance}`);

scripts/veto-contribution.js

@@ -15,7 +15,7 @@ module.exports = async function(callback) {
   console.log(`Recording a veto for contribution #${contributionId}`);
 
   try {
-    kredits.Contribution.contract.veto(contributionId, { gasLimit: 300000 })
+    kredits.Contribution.functions.veto(contributionId, { gasLimit: 300000 })
       .then(result => {
         console.log("\n\nResult:");
         console.log(result);