6.0.0

package-lock
Merge pull request #200 from 67P/ethers5
2020-07-17 13:22:59 +02:00 · 2020-07-17 13:22:24 +02:00 · 2020-07-07 16:59:40 +02:00 · 2020-06-29 23:49:46 +02:00 · 2020-06-29 23:49:03 +02:00 · 2020-06-29 17:23:08 +02:00
55 changed files with 26293 additions and 170340 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -28,5 +28,6 @@ module.exports = {
      named: 'always',
      asyncArrow: 'always',
    }],
+    'indent': ['error', 2]
  }
 }
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -0,0 +1,4 @@
+template: |
+  ## Changes
+
+  $CHANGES
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,13 +6,32 @@ node_js:
 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
-  # - yarn lint:contracts
+  # FIXME Fix tests
+  # - npm run test:token
+  # - npm run test:contributor
+  # - npm run test:contribution
+  # - npm run test:proposal

 branches:
  only:
--- a/README.md
+++ b/README.md
@@ -14,6 +14,8 @@ framework](http://truffleframework.com/) for some things.

 ### Installation

+#### App dependencies
+
 All requirements are defined in `package.json`.

    $ npm install
@@ -25,13 +27,20 @@ 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
+
 ### Local development chain

 For local development it is recommended to use
 [ganache](http://truffleframework.com/ganache/) to run a local development
-chain. Using the ganache simulator no full Ethereum node is required.
+chain. When using the ganache simulator, no full Ethereum node is required.

-We use the default aragon-cli devchain command to confgure and run a local
+We use the default aragon-cli devchain command to configure and run a local
 development ganache.

    $ npm run devchain (or aragon devchain --port 7545)
@@ -43,6 +52,10 @@ 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
@@ -50,21 +63,26 @@ Ethereum RPC port.
        $ npm run devchain
        $ ipfs daemon

-2. Deploy each app to the devchain
+2. Compile contracts
+
+        (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

-3. Deploy a new KreditsKit and create a new DAO with the latest app versions
+4. Deploy a new KreditsKit and create a new DAO with the latest app versions

        $ npm run deploy:kit
        $ npm run deploy:dao

-4. Execute seeds to create demo contributors, contributons, etc. (optional)
+5. Execute seeds to create demo contributors, contributions, etc. (optional)

        $ npm run seeds

-**Step 2-4 is also summarized in `npm run bootstrap`**
+**Step 2-5 is also summarized in `npm run bootstrap`**

 If you want to reset your local setup:

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

-`ENS` address is required as environment variable.
-`DAO_FACTORY` can optionally be set as environment variable. (see aragon)
+#### Kredits configuration options:
+
+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

@@ -163,7 +187,7 @@ Creates and configures a new DAO instance.
    or
    $ npm run deploy:dao

-KreditsKit address is load from `lib/addresses/KreditsKit.json` or can be
+KreditsKit address is loaded from `lib/addresses/KreditsKit.json` or can be
 configured through the `KREDITS_KIT` environment variable.

 ### deploy-apps.sh
@@ -198,7 +222,7 @@ make sure all apps and the KreditsKit are deployed, then create a new DAO:

 ## Upgradeable contracts

-We use aragonOS for upgradeablity of the different contracts.  Refer to the
+We use aragonOS for upgradeability of the different contracts.  Refer to the
 [aragonOS upgradeablity documentation](https://hack.aragon.org/docs/upgradeability-intro)
 for more details.

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

-  // TODO refactor into a single function
-  function getTokenContract() public view returns (address) {
+  function getContract(uint8 appId) public view returns (address) {
    IKernel k = IKernel(kernel());
-    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)]);
+    return k.getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[appId]);
  }

  function getContributorIdByAddress(address contributorAccount) public view returns (uint32) {
-    address contributor = getContributorContract();
+    address contributor = getContract(uint8(Apps.Contributor));
    return ContributorInterface(contributor).getContributorIdByAddress(contributorAccount);
  }

  function getContributorAddressById(uint32 contributorId) public view returns (address) {
-    address contributor = getContributorContract();
+    address contributor = getContract(uint8(Apps.Contributor));
    return ContributorInterface(contributor).getContributorAddressById(contributorId);
  }

@@ -198,14 +193,14 @@ contract Contribution is AragonApp {
    require(block.number >= c.confirmedAtBlock, 'NOT_CLAIMABLE');

    c.claimed = true;
-    address token = getTokenContract();
+    address token = getContract(uint8(Apps.Token));
    address contributorAccount = getContributorAddressById(c.contributorId);
    uint256 amount = uint256(c.amount);
    IToken(token).mintFor(contributorAccount, amount, contributionId);
    emit ContributionClaimed(contributionId, c.contributorId, c.amount);
  }

-  function exists(uint32 contributionId) view public returns (bool) {
+  function exists(uint32 contributionId) public view returns (bool) {
    return contributions[contributionId].exists;
  }
 }
--- a/apps/contribution/package-lock.json
+++ b/apps/contribution/package-lock.json
--- a/apps/contribution/package.json
+++ b/apps/contribution/package.json
@@ -3,16 +3,19 @@
  "version": "1.0.0",
  "description": "",
  "dependencies": {
-    "@aragon/os": "^4.2.0",
-    "@aragon/cli": "^5.9.6"
+    "@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"
  },
-  "devDependencies": {},
  "scripts": {
    "start": "npm run start:aragon:ipfs",
    "start:aragon:ipfs": "aragon run",
    "start:aragon:http": "aragon run --http localhost:8001 --http-served-from ./dist",
    "start:app": "",
-    "test": "aragon contracts test",
    "compile": "aragon contracts compile",
    "sync-assets": "",
    "build:app": "",
@@ -21,7 +24,8 @@
    "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": []
 }
--- a/apps/contribution/yarn.lock
+++ b/apps/contribution/yarn.lock
--- a/apps/contributor/contracts/Contributor.sol
+++ b/apps/contributor/contracts/Contributor.sol
@@ -41,19 +41,12 @@ contract Contributor is AragonApp {
    initialized();
  }

-  function getTokenContract() public view returns (address) {
+  function getContract(uint8 appId) public view returns (address) {
    IKernel k = IKernel(kernel());
-
-    return k.getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[uint8(Apps.Token)]);
+    return k.getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[appId]);
  }

-  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) {
+  function coreContributorsCount() public view returns (uint32) {
    uint32 count = 0;
    for (uint32 i = 1; i <= contributorsCount; i++) {
      if (isCoreTeam(i)) {
@@ -64,10 +57,13 @@ 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;
-    ContributorAccountUpdated(id, oldAccount, newAccount);
+    emit ContributorAccountUpdated(id, oldAccount, newAccount);
  }

  function updateContributorProfileHash(uint32 id, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize) public isInitialized auth(MANAGE_CONTRIBUTORS_ROLE) {
@@ -136,9 +132,9 @@ contract Contributor is AragonApp {
    hashFunction = c.hashFunction;
    hashSize = c.hashSize;
    isCore = isCoreTeam(id);
-    address token = getTokenContract();
+    address token = getContract(uint8(Apps.Token));
    balance = ITokenBalance(token).balanceOf(c.account);
-    address contribution = getContributionContract();
+    address contribution = getContract(uint8(Apps.Contribution));
    totalKreditsEarned = IContributionBalance(contribution).totalKreditsEarnedByContributor(_id, true);
    contributionsCount = IContributionBalance(contribution).balanceOf(c.account);
    exists = c.exists;
--- a/apps/contributor/contracts/test/Spoof.sol
+++ b/apps/contributor/contracts/test/Spoof.sol
@@ -0,0 +1,16 @@
+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 {
+  // ...
+}
--- a/apps/contributor/package-lock.json
+++ b/apps/contributor/package-lock.json
--- a/apps/contributor/package.json
+++ b/apps/contributor/package.json
@@ -3,16 +3,19 @@
  "version": "1.0.0",
  "description": "",
  "dependencies": {
-    "@aragon/os": "^4.2.0",
-    "@aragon/cli": "^5.9.6"
+    "@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"
  },
-  "devDependencies": {},
  "scripts": {
    "start": "npm run start:aragon:ipfs",
    "start:aragon:ipfs": "aragon run",
    "start:aragon:http": "aragon run --http localhost:8001 --http-served-from ./dist",
    "start:app": "",
-    "test": "aragon contracts test",
    "compile": "aragon contracts compile",
    "sync-assets": "",
    "build:app": "",
@@ -21,7 +24,8 @@
    "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": []
 }
--- a/apps/contributor/test/app.js
+++ b/apps/contributor/test/app.js
@@ -1,5 +0,0 @@
-// const Contributor = artifacts.require('Contributor.sol');
-
-contract('Contributor', (_accounts) => {
-  it('should be tested');
-});
--- a/apps/contributor/test/contributor.js
+++ b/apps/contributor/test/contributor.js
@@ -0,0 +1,170 @@
+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';
+      });
+    });
+
+  });
+});
--- a/apps/contributor/yarn.lock
+++ b/apps/contributor/yarn.lock
--- a/apps/proposal/contracts/Proposal.sol
+++ b/apps/proposal/contracts/Proposal.sol
@@ -51,16 +51,13 @@ contract Proposal is AragonApp {
    initialized();
  }

-  function getContributorContract() public view returns (address) {
-    return IKernel(kernel()).getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[uint8(Apps.Contributor)]);
-  }
-
-  function getContributionContract() public view returns (address) {
-    return IKernel(kernel()).getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[uint8(Apps.Contribution)]);
+  function getContract(uint8 appId) public view returns (address) {
+    IKernel k = IKernel(kernel());
+    return k.getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[appId]);
  }

  function addProposal(uint32 contributorId, uint32 amount, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize) public isInitialized auth(ADD_PROPOSAL_ROLE) {
-    require(IContributor(getContributorContract()).exists(contributorId), 'CONTRIBUTOR_NOT_FOUND');
+    require(IContributor(getContract(uint8(Apps.Contributor))).exists(contributorId), 'CONTRIBUTOR_NOT_FOUND');

    uint32 proposalId = proposalsCount + 1;
    uint16 _votesNeeded = 1; //contributorsContract().coreContributorsCount() / 100 * 75;
@@ -69,10 +66,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.votesCount =  0;
+    p.hashSize = hashSize;
+    p.votesCount = 0;
    p.votesNeeded = _votesNeeded;
    p.exists = true;

@@ -102,7 +99,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(getContributorContract()).getContributorIdByAddress(msg.sender);
+    uint32 voterId = IContributor(getContract(uint8(Apps.Contributor))).getContributorIdByAddress(msg.sender);
    require(p.votes[voterId] != true, 'ALREADY_VOTED');
    p.voterIds.push(voterId);
    p.votes[voterId] = true;
@@ -126,7 +123,7 @@ contract Proposal is AragonApp {
    require(p.votesCount >= p.votesNeeded, 'MISSING_VOTES');

    p.executed = true;
-    IContribution(getContributionContract()).add(p.amount, p.contributorId, p.hashDigest, p.hashFunction, p.hashSize);
+    IContribution(getContract(uint8(Apps.Contribution))).add(p.amount, p.contributorId, p.hashDigest, p.hashFunction, p.hashSize);
    emit ProposalExecuted(proposalId, p.contributorId, p.amount);
  }

--- a/apps/proposal/package-lock.json
+++ b/apps/proposal/package-lock.json
--- a/apps/proposal/package.json
+++ b/apps/proposal/package.json
@@ -3,16 +3,19 @@
  "version": "1.0.0",
  "description": "",
  "dependencies": {
-    "@aragon/os": "^4.2.0",
-    "@aragon/cli": "^5.9.6"
+    "@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"
  },
-  "devDependencies": {},
  "scripts": {
    "start": "npm run start:aragon:ipfs",
    "start:aragon:ipfs": "aragon run",
    "start:aragon:http": "aragon run --http localhost:8001 --http-served-from ./dist",
    "start:app": "",
-    "test": "aragon contracts test",
    "compile": "aragon contracts compile",
    "sync-assets": "",
    "build:app": "",
@@ -21,7 +24,8 @@
    "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": []
 }
--- a/apps/proposal/yarn.lock
+++ b/apps/proposal/yarn.lock
--- a/apps/token/contracts/Token.sol
+++ b/apps/token/contracts/Token.sol
@@ -21,6 +21,8 @@ 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);
--- a/apps/token/contracts/test/Spoof.sol
+++ b/apps/token/contracts/test/Spoof.sol
@@ -0,0 +1,16 @@
+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 {
+  // ...
+}
--- a/apps/token/package-lock.json
+++ b/apps/token/package-lock.json
--- a/apps/token/package.json
+++ b/apps/token/package.json
@@ -3,16 +3,19 @@
  "version": "1.0.0",
  "description": "",
  "dependencies": {
-    "@aragon/os": "^4.2.0",
-    "@aragon/cli": "^5.9.6"
+    "@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"
  },
-  "devDependencies": {},
  "scripts": {
    "start": "npm run start:aragon:ipfs",
    "start:aragon:ipfs": "aragon run",
    "start:aragon:http": "aragon run --http localhost:8001 --http-served-from ./dist",
    "start:app": "",
-    "test": "aragon contracts test",
    "compile": "aragon contracts compile",
    "sync-assets": "",
    "build:app": "",
@@ -21,7 +24,8 @@
    "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": []
 }
--- a/apps/token/test/app.js
+++ b/apps/token/test/app.js
@@ -1,5 +0,0 @@
-// const Token = artifacts.require('Token.sol');
-
-contract('Token', (_accounts) => {
-  it('should be tested');
-});
--- a/apps/token/test/token.js
+++ b/apps/token/test/token.js
@@ -0,0 +1,123 @@
+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
+    });
+  });
+});
--- a/apps/token/yarn.lock
+++ b/apps/token/yarn.lock
--- a/arapp.json
+++ b/arapp.json
@@ -34,7 +34,6 @@
  "environments": {
    "development": {
      "network": "development",
-      "apm": "open.aragonpm.eth",
      "registry": "0x5f6f7e8cc7346a11ca2def8f827b7a0b612c56a1",
      "appName": "dummy.open.aragonpm.eth"
    },
@@ -42,9 +41,10 @@
      "network": "rinkeby",
      "registry": "0x98Df287B6C145399Aaa709692c8D308357bC085D",
      "wsRPC": "wss://rinkeby.eth.aragon.network/ws",
-      "daoFactory": "0x2298d27a9b847c681d2b2c2828ab9d79013f5f1d",
      "appName": "dummy.open.aragonpm.eth",
-      "apm": "open.aragonpm.eth"
+      "kredits": {
+        "daoFactory": "0x2298d27a9b847c681d2b2c2828ab9d79013f5f1d"
+      }
    },
    "kovan": {
      "network": "kovan",
@@ -52,8 +52,7 @@
    },
    "default": {
      "network": "development",
-      "appName": "dummy.aragonpm.eth",
-      "apm": "open.aragonpm.eth"
+      "appName": "dummy.aragonpm.eth"
    }
  },
  "path": "contracts/misc/DummyApp.sol"
--- a/lib/contracts/acl.js
+++ b/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.functions.hasPermission(
+    return this.hasPermission(
      fromAddress,
      contractAddress,
      roleHash,
--- a/lib/contracts/base.js
+++ b/lib/contracts/base.js
@@ -1,10 +1,13 @@
+const deprecate = require('../utils/deprecate');
+
 class Base {
  constructor (contract) {
    this.contract = contract;
  }

  get functions () {
-    return this.contract.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;
  }

  get address () {
--- a/lib/contracts/contribution.js
+++ b/lib/contracts/contribution.js
@@ -4,29 +4,33 @@ const deprecate = require('../utils/deprecate');

 class Contribution extends Record {
  get count () {
-    return this.functions.contributionsCount();
+    return this.contract.contributionsCount();
  }

  getById (id) {
-    return this.functions.getContribution(id)
+    return this.contract.getContribution(id)
      .then(data => {
        return this.ipfs.catAndMerge(data, ContributionSerializer.deserialize);
      });
  }

+  getData (id) {
+    return this.contract.getContribution(id);
+  }
+
  getByContributorId (contributorId) {
-    return this.functions.getContributorAddressById(contributorId)
+    return this.contract.getContributorAddressById(contributorId)
      .then(address => this.getByContributorAddress(address));
  }

  getByContributorAddress (address) {
-    return this.functions.balanceOf(address)
+    return this.contract.balanceOf(address)
      .then(async (balance) => {
        const count = balance.toNumber();
        const contributions = [];

        for (let index = 0; index < count; index++) {
-          const id = await this.functions.tokenOfOwnerByIndex(address, index);
+          const id = await this.contract.tokenOfOwnerByIndex(address, index);
          const contribution = await this.getById(id);
          contributions.push(contribution);
        }
@@ -54,7 +58,7 @@ class Contribution extends Record {
          ipfsHashAttr.hashSize,
        ];

-        return this.functions.add(...contribution, callOptions);
+        return this.contract.add(...contribution, callOptions);
      });
  }

@@ -62,6 +66,7 @@ class Contribution extends Record {
    deprecate('The function `addContribution()` is deprecated and will be removed in the next major version. Use `add()` instead');
    return this.add(...arguments);
  }
+
 }

 module.exports = Contribution;
--- a/lib/contracts/contributor.js
+++ b/lib/contracts/contributor.js
@@ -4,17 +4,22 @@ const formatKredits = require('../utils/format-kredits');

 class Contributor extends Record {
  get count () {
-    return this.functions.contributorsCount();
+    return this.contract.contributorsCount();
  }

  getById (id) {
-    return this.functions.getContributorById(id)
-      .then(data => {
+    return this.contract.getContributorById(id)
+      .then(contractData => {
+        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');
  }
@@ -57,7 +62,7 @@ class Contributor extends Record {
          ipfsHashAttr.hashSize,
        ];

-        return this.functions.addContributor(...contributor, callOptions);
+        return this.contract.addContributor(...contributor, callOptions);
      });
  }

@@ -74,7 +79,7 @@ class Contributor extends Record {
      return this.ipfs
        .add(jsonStr)
        .then(ipfsHashAttr => {
-          return this.functions.updateContributorProfileHash(
+          return this.contract.updateContributorProfileHash(
            contributorId,
            ipfsHashAttr.hashDigest,
            ipfsHashAttr.hashFunction,
@@ -84,6 +89,7 @@ class Contributor extends Record {
        });
    });
  }
+
 }

 module.exports = Contributor;
--- a/lib/contracts/kernel.js
+++ b/lib/contracts/kernel.js
@@ -11,9 +11,9 @@ class Kernel extends Base {

  getApp (appName) {
    if (appName === 'Acl') {
-      return this.functions.acl();
+      return this.contract.acl();
    }
-    return this.functions.getApp(KERNEL_APP_ADDR_NAMESPACE, this.appNamehash(appName));
+    return this.contract.getApp(KERNEL_APP_ADDR_NAMESPACE, this.appNamehash(appName));
  }

  appNamehash (appName) {
--- a/lib/contracts/proposal.js
+++ b/lib/contracts/proposal.js
@@ -4,11 +4,11 @@ const deprecate = require('../utils/deprecate');

 class Proposal extends Record {
  get count () {
-    return this.functions.proposalsCount();
+    return this.contract.proposalsCount();
  }

  getById (id) {
-    return this.functions.getProposal(id)
+    return this.contract.getProposal(id)
      .then(data => {
        return this.ipfs.catAndMerge(data, ContributionSerializer.deserialize);
      });
@@ -33,7 +33,7 @@ class Proposal extends Record {
          ipfsHashAttr.hashSize,
        ];

-        return this.functions.addProposal(...proposal, callOptions);
+        return this.contract.addProposal(...proposal, callOptions);
      });
  }

--- a/lib/kreditskit.js
+++ b/lib/kreditskit.js
@@ -30,11 +30,11 @@ class KreditsKit {
  appIdFor (contractName) {
    // see appIds in KreditsKit.sol for more details
    const knownContracts = ['Contribution', 'Contributor', 'Proposal', 'Token'];
-    return this.contract.functions.appIds(knownContracts.indexOf(contractName));
+    return this.contract.appIds(knownContracts.indexOf(contractName));
  }

  newDAO (options = {}) {
-    return this.contract.functions.newInstance(options).then(transaction => {
+    return this.contract.newInstance(options).then(transaction => {
      return transaction.wait().then(result => {
        const deployEvent = result.events.find(e => e.event === 'DeployInstance');
        return {
--- a/lib/serializers/contributor.js
+++ b/lib/serializers/contributor.js
@@ -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,
-      accounts,
+      zoom_display_name,
    } = this;

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

    if (url) {
@@ -68,6 +68,13 @@ 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);
  }
@@ -97,10 +104,11 @@ class Contributor {
      accounts,
    } = JSON.parse(serialized.toString('utf8'));

-    let github_username, github_uid, gitea_username, wiki_username;
+    let github_username, github_uid, gitea_username, wiki_username, zoom_display_name;
    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));
@@ -111,6 +119,9 @@ class Contributor {
    if (wiki) {
      (({ username: wiki_username } = wiki));
    }
+    if (zoom) {
+      (({ username: zoom_display_name } = zoom));
+    }

    return {
      name,
@@ -121,6 +132,7 @@ class Contributor {
      github_username,
      gitea_username,
      wiki_username,
+      zoom_display_name,
      ipfsData: serialized,
    };
  }
--- a/lib/utils/ipfs.js
+++ b/lib/utils/ipfs.js
@@ -1,16 +1,18 @@
 const ipfsClient = require('ipfs-http-client');
 const multihashes = require('multihashes');
+const fetch = require('node-fetch');

 class IPFS {
  constructor (config) {
    if (!config) {
      config = { host: 'localhost', port: '5001', protocol: 'http' };
    }
-    this._ipfsAPI = ipfsClient(config);
    this._config = config;
+    this._ipfsAPI = ipfsClient(config);
  }

-  catAndMerge (data, deserialize) {
+  catAndMerge (contractData, 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;
@@ -35,10 +37,22 @@ class IPFS {

  cat (hashData) {
    let ipfsHash = hashData; // default - if it is a string
-    if (hashData.hasOwnProperty('hashSize')) {
+    if (Object.prototype.hasOwnProperty.call(hashData, 'hashSize')) {
      ipfsHash = this.encodeHash(hashData);
    }
-    return this._ipfsAPI.cat(ipfsHash);
+    if (this._config['gatewayUrl']) {
+      return fetch(`${this._config['gatewayUrl']}/${ipfsHash}`).then(r => r.text());
+    } else {
+      return this._ipfsAPI.cat(ipfsHash);
+    }
+  }
+
+  pin (hashData) {
+    let ipfsHash = hashData; // default - if it is a string
+    if (Object.prototype.hasOwnProperty.call(hashData, 'hashSize')) {
+      ipfsHash = this.encodeHash(hashData);
+    }
+    return this._ipfsAPI.pin.add(multihashes.toB58String(ipfsHash));
  }

  decodeHash (ipfsHash) {
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "kredits-contracts",
-  "version": "5.3.0",
+  "version": "6.0.0",
  "description": "Ethereum contracts and npm wrapper for Kredits",
  "main": "./lib/kredits.js",
  "directories": {
@@ -12,19 +12,23 @@
    "build-json": "npm run compile-contracts && node ./scripts/build-json.js",
    "repl": "truffle exec scripts/repl.js",
    "seeds": "truffle exec scripts/seeds.js",
-    "compile-contracts": "aragon contracts compile --all",
+    "compile-contracts": "truffle compile --all",
    "bootstrap": "npm run reset:hard && npm run seeds",
    "reset": "npm run deploy:kit && npm run deploy:dao",
-    "reset:hard": "npm run deploy:apps && npm run reset",
-    "deploy:kit": "npm run compile-contracts && aragon contracts exec scripts/deploy-kit.js",
-    "deploy:dao": "aragon contracts exec scripts/new-dao.js",
-    "deploy:apps": "./scripts/every-app.sh \"aragon apm publish major\"",
+    "reset:hard": "npm run compile-contracts && npm run deploy:apps && npm run reset",
+    "deploy:kit": "truffle exec scripts/deploy-kit.js",
+    "deploy:dao": "truffle exec scripts/new-dao.js",
+    "deploy:apps": "./scripts/every-app.sh \"aragon apm publish major --propagate-content=false --build=false --prepublish=false --skip-confirmation\"",
    "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": "echo \"Error: no test specified\" && exit 1",
+    "test": "npm run test:token && npm run test:contributor && npm run test:contribution && npm run test:proposal",
+    "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": {
@@ -38,25 +42,28 @@
  },
  "homepage": "https://github.com/67P/truffle-kredits#readme",
  "devDependencies": {
-    "@aragon/cli": "^5.9.6",
    "@aragon/kits-base": "^1.0.0",
-    "@aragon/os": "^4.2.0",
+    "@aragon/os": "^4.4.0",
    "async-each-series": "^1.1.0",
    "cli-table": "^0.3.1",
-    "eslint": "^5.16.0",
-    "eslint-plugin-import": "^2.17.3",
-    "eslint-plugin-node": "^8.0.1",
-    "eslint-plugin-promise": "^4.1.1",
-    "eth-provider": "^0.2.2",
+    "eslint": "^7.1.0",
+    "eslint-plugin-import": "^2.20.2",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-promise": "^4.2.1",
+    "eth-provider": "^0.2.5",
+    "homedir": "^0.6.0",
    "promptly": "^3.0.3",
-    "solc": "^0.4.26",
-    "solhint": "^2.1.0",
-    "yargs": "^12.0.0"
+    "solc": "^0.6.8",
+    "solhint": "^2.3.1",
+    "truffle-hdwallet-provider": "^1.0.17",
+    "truffle-hdwallet-provider-privkey": "^0.3.0",
+    "yargs": "^15.0.0"
  },
  "dependencies": {
-    "ethers": "^4.0.29",
-    "ipfs-http-client": "^32.0.1",
-    "kosmos-schemas": "^2.1.0",
+    "ethers": "^5.0.2",
+    "ipfs-http-client": "^41.0.1",
+    "kosmos-schemas": "^2.2.1",
+    "node-fetch": "^2.6.0",
    "tv4": "^1.3.0"
  },
  "keywords": [
--- a/scripts/add-contribution.js
+++ b/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.functions.getContributorAddressById(contributor);
+    contributorAccount = await kredits.Contributor.contract.getContributorAddressById(contributor);
  } else {
    contributorAccount = contributor;
-    contributorId = await kredits.Contributor.functions.getContributorIdByAddress(contributor);
+    contributorId = await kredits.Contributor.contract.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.addContribution(contributionAttributes, { gasLimit: 300000 })
+  kredits.Contribution.add(contributionAttributes, { gasLimit: 300000 })
    .then(result => {
      console.log("\n\nResult:");
      console.log(result);
--- a/scripts/add-proposal.js
+++ b/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.functions.getContributorAddressById(contributor);
+    contributorAccount = await kredits.Contributor.contract.getContributorAddressById(contributor);
  } else {
    contributorAccount = contributor;
-    contributorId = await kredits.Contributor.functions.getContributorIdByAddress(contributor);
+    contributorId = await kredits.Contributor.contract.getContributorIdByAddress(contributor);
  }
  console.log(`Creating a proposal for contributor ID #${contributorId} account: ${contributorAccount}`);

--- a/scripts/claim-contributions.js
+++ b/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.functions.claim(c.id, { gasLimit: 500000 }).then(tx => {
+        return kredits.Contribution.contract.claim(c.id, { gasLimit: 500000 }).then(tx => {
          table.push([
            c.id.toString(),
            `${c.description}`,
--- a/scripts/cli.js
+++ b/scripts/cli.js
@@ -17,7 +17,7 @@ module.exports = async function(callback) {

      method = await promptly.prompt('Function: ');
    }
-    if (!contractWrapper[method] && !contractWrapper.functions[method]) {
+    if (!contractWrapper[method] && !contractWrapper.contract[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.functions[method];
+      func = contractWrapper.contract[method];
    }
    func.apply(contractWrapper, args).then((result) => {
      console.log("\nResult:");
--- a/scripts/current-address.js
+++ b/scripts/current-address.js
@@ -1,9 +1,12 @@
 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 networkId = await getNetworkId(web3)
+  const provider = new ethers.providers.Web3Provider(web3.currentProvider);
+  let network = await provider.getNetwork();
+  let networkId = network.chainId;

  console.log('# All known DAO addresses');
  Object.keys(knownDAOAddresses).forEach((networkId) => {
--- a/scripts/deploy-kit.js
+++ b/scripts/deploy-kit.js
@@ -3,23 +3,33 @@ const deployDAOFactory = require('@aragon/os/scripts/deploy-daofactory.js')
 const fs = require('fs');
 const path = require('path');
 const argv = require('yargs').argv
-const namehash = require('ethers').utils.namehash;
+const ethers = require('ethers');
+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 networkId = await getNetworkId(web3)
+  const provider = new ethers.providers.Web3Provider(web3.currentProvider);
+  const network = await provider.getNetwork();
+  const networkId = network.chainId;
  console.log(`Deploying to networkId: ${networkId}`)

  if (!ensAddr) {
--- a/scripts/helpers/init_kredits.js
+++ b/scripts/helpers/init_kredits.js
@@ -1,6 +1,5 @@
 const argv = require('yargs').argv;
 const ethers = require('ethers');
-const getNetworkId = require('./networkid.js');
 const Kredits = require('../../lib/kredits');

 const arapp = require('../../arapp.json');
@@ -10,7 +9,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);
-    let signer = provider.getSigner();
+    const signer = provider.getSigner();
    // checking if siner supports signing transactions
    signer.getAddress().then(_ => {
      new Kredits(provider, signer, { apm }).init().then(kredits => {
--- a/scripts/helpers/networkid.js
+++ b/scripts/helpers/networkid.js
@@ -1,17 +0,0 @@
-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);
-      }
-    })
-  })
-}
--- a/scripts/helpers/update_local_networkid.js
+++ b/scripts/helpers/update_local_networkid.js
@@ -1,12 +1,14 @@
 const fs = require('fs');
-const getNetworkId = require('./networkid.js');
+const ethers = require('ethers');

 module.exports = async function(callback) {
  const daoAddressPath = 'lib/addresses/dao.json';

  // TODO maybe do the same for KreditsKit address file
  try {
-    const networkId = await getNetworkId(web3);
+    const provider = new ethers.providers.Web3Provider(web3.currentProvider);
+    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];
--- a/scripts/list-contributions.js
+++ b/scripts/list-contributions.js
@@ -41,8 +41,8 @@ module.exports = async function(callback) {

    console.log(table.toString());

-    let totalKreditsEarnedUnConfirmed = await kredits.Contribution.functions.totalKreditsEarned(false);
-    let totalKreditsEarnedConfirmed = await kredits.Contribution.functions.totalKreditsEarned(true);
+    let totalKreditsEarnedUnConfirmed = await kredits.Contribution.contract.totalKreditsEarned(false);
+    let totalKreditsEarnedConfirmed = await kredits.Contribution.contract.totalKreditsEarned(true);
    console.log(`Total Kredits: ${totalKreditsEarnedConfirmed} (confirmed) | ${totalKreditsEarnedUnConfirmed} (including unconfirmed)`);
  } catch (err) {
    console.log(err);
--- a/scripts/new-dao.js
+++ b/scripts/new-dao.js
@@ -3,13 +3,15 @@ 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 networkId = await getNetworkId(web3)
+  const provider = new ethers.providers.Web3Provider(web3.currentProvider);
+  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');
@@ -20,9 +22,6 @@ 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
--- a/scripts/seeds.js
+++ b/scripts/seeds.js
@@ -38,7 +38,7 @@ module.exports = async function(callback) {
    if (contractWrapper[method]) {
      func = contractWrapper[method];
    } else {
-      func = contractWrapper.functions[method];
+      func = contractWrapper.contract[method];
    }
    func.apply(contractWrapper, args).then((result) => {
      console.log(`[OK] kredits.${contractName}.${method}(${JSON.stringify(args)}) => ${result.hash}`);
--- a/scripts/send-funds.js
+++ b/scripts/send-funds.js
@@ -5,7 +5,8 @@ module.exports = async function(callback) {
  let amount = await promptly.prompt('Amount: ', {default: '1'});
  amount = parseInt(amount);

-  let fromAccount = web3.eth.accounts[0];
+  const accounts = await web3.eth.personal.getAccounts();
+  let fromAccount = accounts[0];
  let fromBalance = await web3.eth.getBalance(fromAccount);
  let recipientBalance = await web3.eth.getBalance(recipient);

@@ -13,11 +14,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 ${web3.eth.accounts[0]} to ${recipient}`);
+  console.log(`\nsending ${amount} ETH from ${accounts[0]} to ${recipient}`);

-  let transaction = await web3.eth.sendTransaction({to: recipient, value: web3.toWei(amount), from: web3.eth.accounts[0]});
+  let transaction = await web3.eth.sendTransaction({to: recipient, value: web3.utils.toWei(new web3.utils.BN(amount)), from: accounts[0]});

-  console.log(`transaction id: ${transaction}`);
+  console.log(`transaction id: ${transaction.transactionHash}`);

  recipientBalance = await web3.eth.getBalance(recipient);
  console.log(`\nnew recipient account balance ${recipient}: ${recipientBalance}`);
--- a/scripts/veto-contribution.js
+++ b/scripts/veto-contribution.js
@@ -15,7 +15,7 @@ module.exports = async function(callback) {
  console.log(`Recording a veto for contribution #${contributionId}`);

  try {
-    kredits.Contribution.functions.veto(contributionId, { gasLimit: 300000 })
+    kredits.Contribution.contract.veto(contributionId, { gasLimit: 300000 })
      .then(result => {
        console.log("\n\nResult:");
        console.log(result);
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
Michael Bumann	8f0d7e5196	6.0.0	2020-07-17 13:22:59 +02:00
Michael Bumann	4add0c7d96	package-lock	2020-07-17 13:22:24 +02:00
Michael Bumann	fbd82a442e	Merge pull request #200 from 67P/ethers5 Update to ethers 5	2020-07-07 16:59:40 +02:00
Michael Bumann	c39fe406d0	Fix deprecation	2020-06-29 23:49:46 +02:00
Michael Bumann	a609d921aa	Remove accidentally added local DAO addresses	2020-06-29 23:49:03 +02:00
Michael Bumann	23d3dd3a80	Adjust API for new ethers v5 API see issue for details: https://github.com/ethers-io/ethers.js/issues/920#issuecomment-650836642	2020-06-29 17:23:08 +02:00
Michael Bumann	bc38dcb136	Copy contract data into new object to avoid object is not extensible error It seems the new ethers.js version returns contract data as a non- extensible object. We have to clone it before adding the IPFS data.	2020-06-27 20:39:23 +02:00
Michael Bumann	c2dcedfe58	Update to ethers 5	2020-06-24 01:20:04 +02:00
Michael Bumann	2b99593699	Merge pull request #196 from 67P/chore/dependency-updates Chore/dependency updates	2020-05-27 16:22:40 +02:00
Michael Bumann	606350eb5e	Update solc our contracts still use an older version, but I guess it is good to have the latest solc package	2020-05-27 10:53:31 +02:00
Michael Bumann	a330a8eedf	npm upgrade	2020-05-27 10:46:41 +02:00
Michael Bumann	3c72fa3a8b	run npm upgrade in every app are those package-lock.json there actually used?	2020-05-27 10:31:12 +02:00
Michael Bumann	a4ef2398be	update dependencies	2020-05-27 10:06:06 +02:00
Sebastian Kippe	31c29ab6d0	Merge pull request #194 from 67P/updates Some required dependency updates	2020-05-07 10:08:26 +02:00
Sebastian Kippe	ef0c0c0a39	(ci) Disable all tests	2020-05-07 09:59:27 +02:00
Sebastian Kippe	844bdbd681	(ci) Disable token tests They are failing in different ways both locally and on Travis.	2020-05-07 09:51:26 +02:00
Sebastian Kippe	9d96824fe9	(ci) Wait a little for the devchain to start up	2020-05-07 09:41:11 +02:00
Sebastian Kippe	d246531cfa	Update package lockfile	2020-05-07 09:40:58 +02:00
Sebastian Kippe	6be06b2e57	Merge branch 'master' into updates	2020-05-07 09:30:29 +02:00
Sebastian Kippe	c2220c3654	Fix ESLint error	2020-05-07 09:27:15 +02:00
Michael Bumann	5044d8fe41	fix syntax error	2020-04-15 20:44:13 +02:00
Michael Bumann	3c49c688d2	Add missing dev dependencies and update dependencies	2020-04-15 20:43:46 +02:00
Michael Bumann	47f59126a7	5.5.0	2020-03-01 12:46:22 +01:00
Michael Bumann	2ce5d925d0	Merge pull request #182 from 67P/chore/update_dependencies WIP: Fix Aragon breaking changes; update dependencies	2020-02-20 11:42:04 +00:00
Michael Bumann	3db89b0fa3	Refactor kredits related configuration in arapp.json we use an environment specific entry for the daoAddress. Locally we deploy our own, but for rinkeby and other public networks we use the official entries. To make deployments easy we store the address in the arapp.json	2020-02-10 15:55:16 +01:00
Michael Bumann	190d3b77d5	Update tests getContract now seems to return a Promise	2020-02-10 14:59:22 +01:00
Michael Bumann	b7eac4202c	Adjust deploy script and readme for updates	2020-02-10 14:30:03 +01:00
Sebastian Kippe	93aeea69c6	Fix test commands Aragon CLI does not come with the contracts command anymore.	2020-02-08 17:37:26 -05:00
Sebastian Kippe	e7700d5ec7	Remove @aragon/cli from app package configs We're assuming a global install now.	2020-02-08 17:36:48 -05:00
Sebastian Kippe	c3eced5c1d	Remove apm app config keys	2020-02-08 17:19:39 -05:00
Sebastian Kippe	4c6ed12167	Re-add fixed package lock	2020-02-08 16:41:08 -05:00
Sebastian Kippe	9431bc22a6	Re-add package lock fix script m(	2020-02-08 16:36:29 -05:00
Sebastian Kippe	78c8052629	Update dependencies Dance the update dance with me.	2020-02-08 16:28:13 -05:00
Sebastian Kippe	a318fe8374	Add release-drafter config	2019-09-18 12:49:00 +02:00
Sebastian Kippe	eded4a811f	Merge pull request #175 from 67P/feature/zoom-profile Add support for zoom profiles	2019-09-18 09:28:19 +02:00
Sebastian Kippe	66a37a1e74	Improve property name	2019-09-18 08:44:13 +02:00
Michael Bumann	aba4a23104	Fixes & linting	2019-09-17 18:30:19 +02:00
Michael Bumann	13ed02e134	Add support for zoom profils This adds an accessor for the zoom_name to the contributor profile. Doing this also removes general support for preserviing the contributor accounts array as this was buggy and caused accounts to be added multiple times.	2019-09-17 17:24:35 +02:00
Sebastian Kippe	48ff304861	Merge pull request #166 from 67P/dev/remove_yarn_lockfile Remove yarn lockfiles	2019-08-27 12:34:29 +02:00
Michael Bumann	1c1a318ae6	Merge pull request #165 from 67P/docs/blocktime Document how to configure block time for Ganache	2019-08-09 22:10:06 +00:00
Sebastian Kippe	580d6e8f51	Remove yarn lockfiles	2019-08-09 19:03:29 +02:00
Sebastian Kippe	a572f02b2e	Merge pull request #164 from 67P/chore/remove-cached-artifacts Remove cached artifacts	2019-08-09 19:00:21 +02:00
Sebastian Kippe	abd4caa336	Document how to configure block time for Ganache	2019-08-09 18:58:20 +02:00
Michael Bumann	f1941eb6b8	Remove cached artifacts Thos should be generated on every contract app deployment and thus don't need to be in the repo. We also don't have those for the other contract apps.	2019-08-09 18:46:36 +02:00
Sebastian Kippe	ddeeb5ffd7	Merge pull request #162 from 67P/dev/aragon_truffle Remove Aragon CLI, document system deps	2019-08-09 18:38:40 +02:00
Sebastian Kippe	ae71691c5b	Install Aragon CLI and Truffle on Travis	2019-08-09 18:26:38 +02:00
Sebastian Kippe	819fbc547a	Add contract publish options This removes most of the features we don't need/want and minimizes prompts during the bootstrap process.	2019-08-09 18:18:36 +02:00
Sebastian Kippe	7236b04b4b	Remove Aragon CLI, document system deps In order to prevent regular issues with the notoriously npm-issue-ridden Aragon CLI module, this removes it as a direct dependency and requires it to be installed as a system dependency. Also adds Truffle as a system dependency to the docs (which was missing before).	2019-08-09 18:04:21 +02:00
Sebastian Kippe	f746470cf6	Merge pull request #161 from 67P/fix_typos Fix a few typos in the README	2019-08-07 16:42:01 +02:00
Greg Karékinian	5452cf2dad	Fix a few typos	2019-08-07 15:55:11 +02:00
Sebastian Kippe	3c08e3ecfc	Merge pull request #160 from 67P/bugfix/packages-install-scripts Fix package script command deploy:kit	2019-08-04 19:42:42 +02:00
Manuel Wiedenmann	6e8c994a0a	Fix package script command deploy:kit	2019-08-04 19:37:31 +02:00
Haythem Sellami	fd844a00fd	Test token app (#157 ) * test token app * update travis config	2019-07-31 15:17:38 +00:00
Haythem Sellami	eb4e06edf1	Contributor app tests (#143 ) Adds tests for the contributor contract	2019-07-22 06:55:22 +00:00
Michael Bumann	4ae17aa36f	Merge pull request #156 from haythem96/refactor-get-contract Refactor get apps contract functions	2019-07-22 06:54:05 +00:00
Haythem Sellami	e14cb0a77d	refactor get apps contract functions	2019-07-20 15:06:17 +01:00
Michael Bumann	d92ad83379	Merge pull request #155 from 67P/bugfix/send-for-new-web3 Fix send-funds script to use new web3 API	2019-07-19 09:11:55 +00:00
Michael Bumann	fa3e99d404	Fix send-funds script to use new web3 API The API changed with the recent aragon/truffle update.	2019-07-18 16:25:06 +02:00
Sebastian Kippe	4aa5f3aa89	Merge pull request #151 from 67P/chore/remove-ipfs-pinner Remove IPFS pinner	2019-07-03 12:50:59 +02:00
Michael Bumann	2316e8f15a	Remove IPFS pinner The pinner now lives in its own npm package	2019-07-02 19:09:26 +02:00
Michael Bumann	87a468bc91	5.4.0	2019-07-02 16:27:26 +02:00
Michael Bumann	0734acbcbe	Merge pull request #149 from 67P/feature/support-ipfs-gateway Add support to use IPFS gateway to read ipfs data	2019-07-01 15:41:07 +00:00
Michael Bumann	a45c8d14be	Downgrade IPFS package The new version uses generators which breaks the build on kredits-web.	2019-07-01 16:12:22 +02:00
Michael Bumann	61fe9add1b	Add support to use IPFS gateway to read ipfs data This makes caching of IPFS documents easier. Browsers should cache those by default	2019-07-01 15:53:18 +02:00
Sebastian Kippe	16141ed482	Merge pull request #136 from 67P/feature/ipfs-pinner Add IPFS pinning script	2019-07-01 13:06:45 +02:00
Michael Bumann	01ef37fd39	Merge pull request #147 from 67P/bugfix/compile_all Fix compile command	2019-07-01 10:30:41 +00:00
Sebastian Kippe	03b9f69d22	Fix compile command The Aragon one is failing now, but just using the underlying Truffle command works. So it appears to be the passing of the argument in aragon that's broken. Co-authored-by: Michael Bumann <hello@michaelbumann.com>	2019-07-01 12:24:56 +02:00
Michael Bumann	dd76ebdc8d	Merge pull request #141 from haythem96/setup-tests Solidity test setup	2019-06-26 15:05:23 +00:00
Haythem Sellami	e485bd90c0	install packages	2019-06-19 14:34:14 +01:00
Haythem Sellami	1d89759c49	merge	2019-06-19 13:47:58 +01:00
Michael Bumann	d653b3715f	Update package-lock	2019-06-19 14:10:44 +02:00
Michael Bumann	a05e2c75f3	Merge pull request #142 from 67P/chore/update-dependencies-2 Chore/update aragon-cli dependencies	2019-06-19 08:39:06 +00:00
Michael Bumann	124287b977	Updated latest package-json	2019-06-19 01:00:53 +02:00
Sebastian Kippe	9906fde7ef	Use postshrinkwrap instead of postinstall `postinstall` is executed before package-lock.json is written to disk. https://github.com/npm/npm/issues/18798	2019-06-19 00:52:48 +02:00
Sebastian Kippe	c7e1f118a6	Add postinstall lockfile fix https://github.com/67P/kredits-contracts/pull/140	2019-06-19 00:52:47 +02:00
Michael Bumann	1702c22084	Make sure fix lockfile uses the correct file path	2019-06-19 00:52:47 +02:00
Michael Bumann	32a123a825	Default to open.aragonpm.eth it is now also available on the devchain	2019-06-19 00:52:47 +02:00
Michael Bumann	ac83573438	I don't know why this is needed but it fixes an npm issue if install fails node scripts/fix-package-lock.js might help	2019-06-19 00:52:47 +02:00
Michael Bumann	77c6c11800	Remove npm cache and use LTS node on travis	2019-06-19 00:52:05 +02:00
Haythem Sellami	ca0a6f6ef9	user 7545 port for tests	2019-06-17 23:35:53 +01:00
Haythem Sellami	4614c454a5	test setup	2019-06-17 12:13:35 +01:00
Sebastian Kippe	9fd9dbc1b5	Handle errors in IPFS pin script	2019-06-13 18:31:47 +02:00
Michael Bumann	6d6c6056f0	Refactor IPFS pinner	2019-06-12 01:08:07 +02:00
Michael Bumann	b09c2830c8	Make IPFS node configurable	2019-06-11 23:45:27 +02:00
Michael Bumann	fc5a41123a	Add IPFS pinning script This script loads the IPFS hashes for contributors and contributions and pins them on the connected IPFS node. usage: $ node script/ipfs-pinner.js $ ETH_RPC_URL=http://localhost:7547 APM_DOMAIN=aragonpm.eth node scripts/ipfs.pinner.js	2019-06-11 21:48:50 +02:00