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

.travis.yml

@@ -6,29 +6,13 @@ 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 &
-  - ipfs daemon --offline &
-
 script:
   - npm run lint:wrapper
   - npm run lint:contract-tests
-  - npm run test
-  - npm run bootstrap
+  # - yarn lint:contracts
 
 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,20 +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
-
 ### 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.
 
-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)
@@ -69,7 +60,7 @@ Ethereum RPC port.
         $ npm run deploy:kit
         $ npm run deploy:dao
 
-4. Execute seeds to create demo contributors, contributions, etc. (optional)
+4. Execute seeds to create demo contributors, contributons, etc. (optional)
 
         $ npm run seeds
 
@@ -172,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
@@ -207,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/contracts/Contribution.sol

@@ -60,18 +60,23 @@ contract Contribution is AragonApp {
     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 contributor = getContract(uint8(Apps.Contributor));
+    address contributor = getContributorContract();
     return ContributorInterface(contributor).getContributorIdByAddress(contributorAccount);
   }
 
   function getContributorAddressById(uint32 contributorId) public view returns (address) {
-    address contributor = getContract(uint8(Apps.Contributor));
+    address contributor = getContributorContract();
     return ContributorInterface(contributor).getContributorAddressById(contributorId);
   }
 
@@ -193,14 +198,14 @@ contract Contribution is AragonApp {
     require(block.number >= c.confirmedAtBlock, 'NOT_CLAIMABLE');
 
     c.claimed = true;
-    address token = getContract(uint8(Apps.Token));
+    address token = getTokenContract();
     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) public view returns (bool) {
+  function exists(uint32 contributionId) view public returns (bool) {
     return contributions[contributionId].exists;
   }
 }

apps/contribution/package.json

@@ -6,17 +6,13 @@
     "@aragon/os": "^4.2.0",
     "@aragon/cli": "^5.9.6"
   },
-  "devDependencies": {
-    "@aragon/test-helpers": "^2.0.0",
-    "eth-gas-reporter": "^0.2.0",
-    "ganache-cli": "^6.4.3",
-    "solidity-coverage": "^0.5.11"
-  },
+  "devDependencies": {},
   "scripts": {
     "start": "npm run start:aragon:ipfs",
     "start:aragon:ipfs": "aragon run",
     "start:aragon:http": "aragon run --http localhost:8001 --http-served-from ./dist",
     "start:app": "",
+    "test": "aragon contracts test",
     "compile": "aragon contracts compile",
     "sync-assets": "",
     "build:app": "",
@@ -25,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",
-    "test": "aragon contracts test"
+    "versions": "aragon apm versions"
   },
   "keywords": []
 }

apps/contributor/contracts/Contributor.sol

@@ -41,12 +41,19 @@ contract Contributor is AragonApp {
     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

@@ -6,17 +6,13 @@
     "@aragon/os": "^4.2.0",
     "@aragon/cli": "^5.9.6"
   },
-  "devDependencies": {
-    "eth-gas-reporter": "^0.2.0",
-    "ganache-cli": "^6.4.3",
-    "solidity-coverage": "^0.5.11",
-    "@aragon/test-helpers": "^2.0.0"
-  },
+  "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": "",
@@ -25,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",
-    "test": "aragon contracts test"
+    "versions": "aragon apm versions"
   },
   "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 = getContract('Kernel').at(r.logs.filter(l => l.event == 'DeployDAO')[0].args.dao);
-    acl = 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

@@ -51,13 +51,16 @@ contract Proposal is AragonApp {
     initialized();
   }
 
-  function getContract(uint8 appId) public view returns (address) {
-    IKernel k = IKernel(kernel());
-    return k.getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[appId]);
+  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 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.votesCount = 0;
+    p.hashSize =  hashSize;
+    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

@@ -6,17 +6,13 @@
     "@aragon/os": "^4.2.0",
     "@aragon/cli": "^5.9.6"
   },
-  "devDependencies": {
-    "@aragon/test-helpers": "^2.0.0",
-    "eth-gas-reporter": "^0.2.0",
-    "ganache-cli": "^6.4.3",
-    "solidity-coverage": "^0.5.11"
-  },
+  "devDependencies": {},
   "scripts": {
     "start": "npm run start:aragon:ipfs",
     "start:aragon:ipfs": "aragon run",
     "start:aragon:http": "aragon run --http localhost:8001 --http-served-from ./dist",
     "start:app": "",
+    "test": "aragon contracts test",
     "compile": "aragon contracts compile",
     "sync-assets": "",
     "build:app": "",
@@ -25,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",
-    "test": "aragon contracts test"
+    "versions": "aragon apm versions"
   },
   "keywords": []
 }

apps/token/contracts/Token.sol

@@ -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

@@ -6,17 +6,13 @@
     "@aragon/os": "^4.2.0",
     "@aragon/cli": "^5.9.6"
   },
-  "devDependencies": {
-    "@aragon/test-helpers": "^2.0.0",
-    "eth-gas-reporter": "^0.2.0",
-    "ganache-cli": "^6.4.3",
-    "solidity-coverage": "^0.5.11"
-  },
+  "devDependencies": {},
   "scripts": {
     "start": "npm run start:aragon:ipfs",
     "start:aragon:ipfs": "aragon run",
     "start:aragon:http": "aragon run --http localhost:8001 --http-served-from ./dist",
     "start:app": "",
+    "test": "aragon contracts test",
     "compile": "aragon contracts compile",
     "sync-assets": "",
     "build:app": "",
@@ -25,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",
-    "test": "aragon contracts test"
+    "versions": "aragon apm versions"
   },
   "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 = getContract('Kernel').at(r.logs.filter(l => l.event == 'DeployDAO')[0].args.dao);
-    acl = 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
-    });
-  });
-});

lib/contracts/contribution.js

@@ -14,10 +14,6 @@ class Contribution extends Record {
       });
   }
 
-  getData (id) {
-    return this.functions.getContribution(id);
-  }
-
   getByContributorId (contributorId) {
     return this.functions.getContributorAddressById(contributorId)
       .then(address => this.getByContributorAddress(address));
@@ -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

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

lib/serializers/contributor.js

@@ -13,7 +13,7 @@ class Contributor {
     Object.keys(attrs).forEach(a => this[a] = attrs[a]);
   }
 
-  /**
+ /**
   * Serialize object to JSON
   *
   * @method

lib/utils/ipfs.js

@@ -1,14 +1,13 @@
 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 (data, deserialize) {
@@ -39,19 +38,7 @@ class IPFS {
     if (hashData.hasOwnProperty('hashSize')) {
       ipfsHash = this.encodeHash(hashData);
     }
-    if (this._config['gatewayUrl']) {
-      return fetch(`${this._config['gatewayUrl']}/${ipfsHash}`).then(r => r.text());
-    } else {
-      return this._ipfsAPI.cat(ipfsHash);
-    }
-  }
-
-  pin (hashData) {
-    let ipfsHash = hashData; // default - if it is a string
-    if (hashData.hasOwnProperty('hashSize')) {
-      ipfsHash = this.encodeHash(hashData);
-    }
-    return this._ipfsAPI.pin.add(multihashes.toB58String(ipfsHash));
+    return this._ipfsAPI.cat(ipfsHash);
   }
 
   decodeHash (ipfsHash) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kredits-contracts",
-  "version": "5.4.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 deploy:apps && npm run reset",
-    "deploy:kit": "aragon contracts exec scripts/deploy-kit.js",
+    "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 --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: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",
+    "test": "echo \"Error: no test specified\" && exit 1",
     "setup-git-hooks": "sh scripts/git-hooks/install"
   },
   "repository": {
@@ -42,6 +38,7 @@
   },
   "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",
     "async-each-series": "^1.1.0",
@@ -58,9 +55,8 @@
   },
   "dependencies": {
     "ethers": "^4.0.29",
-    "ipfs-http-client": "^30.1.3",
+    "ipfs-http-client": "^32.0.1",
     "kosmos-schemas": "^2.1.0",
-    "node-fetch": "^2.6.0",
     "tv4": "^1.3.0"
   },
   "keywords": [

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 = accounts[0];
+  let fromAccount = web3.eth.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}`);