hack hack apm

.eslintignore

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

.eslintrc.js

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

.gitignore

@@ -4,5 +4,3 @@ node_modules
 **/node_modules
 .ganache-db
 .tm_properties
-yarn-error.log
-.DS_Store

.solhint.json

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

.travis.yml

@@ -1,33 +0,0 @@
----
-language: node_js
-node_js:
-  - "lts/*"
-
-sudo: false
-dist: xenial
-
-cache:
-  directories:
-    - node_modules
-    - apps/contribution/node_modules
-    - apps/contributor/node_modules
-    - apps/proposal/node_modules
-    - apps/token/node_modules
-    - apps/vault/node_modules
-
-install:
-  - npm install -g @aragon/cli
-  - npm install -g truffle
-  - npm install
-
-before_script:
-  - npm run devchain &
-
-script:
-  - npm run lint:wrapper
-  - npm run lint:contract-tests
-  - npm run test
-
-branches:
-  only:
-    - master

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,35 +25,24 @@ 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. When using the ganache simulator, no full Ethereum node is required.
+chain. Using the ganache simulator no full Ethereum node is required.
 
-We use the default aragon-cli devchain command to configure and run a local
+We use the default aragon-cli devchain command to confgure and run a local
 development ganache.
 
     $ npm run devchain (or aragon devchain --port 7545)
 
-To clear/reset the chain use (e.g. if you run out of funds on your devchain)
+To clear/reset the chain use:
 
     $ npm run devchain -- --reset (or aragon devchain --port 7545 --reset)
 
 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
@@ -73,7 +60,7 @@ if you want to increase the block time to 10 seconds you can add
         $ 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
 
@@ -92,9 +79,9 @@ Kredits DAO independently.
 
 ![](docs/kredits-diagram.png)
 
-A DAO can be deployed using the `scripts/deploy-kit.js` script or with the
+A DAO can be deployed using the `scripts/deploy-kit.js` script or with the `npm
-`npm run deploy:dao` command. This deploys a new Kredits DAO, installs the
+run deploy:dao` command. This deploys a new Kredits DAO, installs the latest
-latest app versions and sets the required permissions.
+app versions and sets the required permissions.
 
 See each app in `/apps/*` for details.
 
@@ -128,11 +115,11 @@ Script to add a new entries to the contracts using the JS wrapper
 
     $ truffle exec scripts/add-{contributor, contribution, proposal}.js
 
-### list-{contributors, contributions, proposals}.js
+### list-{contributor, contribution, proposal}.js
 
 List contract entries
 
-    $ truffle exec scripts/list-{contributors, contributions, proposals}.js
+    $ truffle exec scripts/list-{contributor, contribution, proposal}.js
 
 ### send-funds.js
 
@@ -176,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
@@ -211,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/.eslintrc.js

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

apps/contribution/arapp.json

@@ -19,7 +19,7 @@
   "environments": {
     "default": {
       "network": "development",
-      "appName": "kredits-contribution.open.aragonpm.eth"
+      "appName": "kredits-contribution.aragonpm.eth"
     },
     "rinkeby": {
       "registry": "0x98df287b6c145399aaa709692c8d308357bc085d",

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);
   }
 
@@ -113,26 +118,6 @@ contract Contribution is AragonApp {
   // Custom functions
   //
 
-  function totalKreditsEarned(bool confirmedOnly) public view returns (uint32 amount) {
-    for (uint32 i = 1; i <= contributionsCount; i++) {
-      ContributionData memory c = contributions[i];
-      if (!c.vetoed && (block.number >= c.confirmedAtBlock || !confirmedOnly)) {
-        amount += c.amount; // should use safemath
-      }
-    }
-  }
-
-  function totalKreditsEarnedByContributor(uint32 contributorId, bool confirmedOnly) public view returns (uint32 amount) {
-    uint256 tokenCount = ownedContributions[contributorId].length;
-    for (uint256 i = 0; i < tokenCount; i++) {
-      uint32 cId = ownedContributions[contributorId][i];
-      ContributionData memory c = contributions[cId];
-      if (!c.vetoed && (block.number >= c.confirmedAtBlock || !confirmedOnly)) {
-        amount += c.amount; // should use safemath
-      }
-    }
-  }
-
   function getContribution(uint32 contributionId) public view returns (uint32 id, uint32 contributorId, uint32 amount, bool claimed, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize, uint256 confirmedAtBlock, bool exists, bool vetoed) {
     id = contributionId;
     ContributionData storage c = contributions[id];
@@ -193,14 +178,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

@@ -3,30 +3,25 @@
   "version": "1.0.0",
   "description": "",
   "dependencies": {
-    "@aragon/os": "^4.2.0",
+    "@aragon/os": "^4.1.0",
-    "@aragon/cli": "^5.9.6"
+    "@aragon/cli": "^5.5.0"
-  },
-  "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": "",
+    "start:app": "npm run sync-assets && npm run build:script -- --no-minify && parcel serve app/index.html -p 8001 --out-dir dist/ --no-cache",
+    "test": "aragon contracts test",
     "compile": "aragon contracts compile",
-    "sync-assets": "",
+    "sync-assets": "copy-aragon-ui-assets -n aragon-ui ./dist",
     "build:app": "",
     "build:script": "",
     "build": "",
     "publish:patch": "aragon apm publish patch",
     "publish:minor": "aragon apm publish minor",
     "publish:major": "aragon apm publish major",
-    "versions": "aragon apm versions",
+    "versions": "aragon apm versions"
-    "test": "aragon contracts test"
   },
   "keywords": []
 }

apps/contribution/test/app.js

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

apps/contributor/arapp.json

@@ -9,7 +9,7 @@
   "environments": {
     "default": {
       "network": "development",
-      "appName": "kredits-contributor.open.aragonpm.eth"
+      "appName": "kredits-contributor.aragonpm.eth"
     },
     "rinkeby": {
       "registry": "0x98df287b6c145399aaa709692c8d308357bc085d",

apps/contributor/contracts/Contributor.sol

@@ -6,10 +6,6 @@ import "@aragon/os/contracts/kernel/IKernel.sol";
 interface ITokenBalance {
   function balanceOf(address contributorAccount) public view returns (uint256);
 }
-interface IContributionBalance {
-  function totalKreditsEarnedByContributor(uint32 contributorId, bool confirmedOnly) public view returns (uint32 amount);
-  function balanceOf(address owner) public view returns (uint256);
-}
 
 contract Contributor is AragonApp {
   bytes32 public constant KERNEL_APP_ADDR_NAMESPACE = 0xd6f028ca0e8edb4a8c9757ca4fdccab25fa1e0317da1188108f7d2dee14902fb;
@@ -41,12 +37,13 @@ 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 coreContributorsCount() view public returns (uint32) {
     uint32 count = 0;
     for (uint32 i = 1; i <= contributorsCount; i++) {
       if (isCoreTeam(i)) {
@@ -57,13 +54,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) {
@@ -124,7 +118,7 @@ contract Contributor is AragonApp {
     return contributors[id];
   }
 
-  function getContributorById(uint32 _id) public view returns (uint32 id, address account, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize, bool isCore, uint256 balance, uint32 totalKreditsEarned, uint256 contributionsCount, bool exists ) {
+  function getContributorById(uint32 _id) public view returns (uint32 id, address account, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize, bool isCore, uint256 balance, bool exists ) {
     id = _id;
     Contributor storage c = contributors[_id];
     account = c.account;
@@ -132,15 +126,12 @@ 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));
-    totalKreditsEarned = IContributionBalance(contribution).totalKreditsEarnedByContributor(_id, true);
-    contributionsCount = IContributionBalance(contribution).balanceOf(c.account);
     exists = c.exists;
   }
 
-  function canPerform(address _who, address _where, bytes32 _what, uint256[] memory _how) public returns (bool) {
+  function canPerform(address _who, address _where, bytes32 _what/*, uint256[] memory _how*/) public returns (bool) {
     address sender = _who;
     if (sender == address(-1)) {
       sender = tx.origin;

apps/contributor/contracts/test/Spoof.sol

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

apps/contributor/package.json

@@ -3,20 +3,16 @@
   "version": "1.0.0",
   "description": "",
   "dependencies": {
-    "@aragon/os": "^4.2.0",
+    "@aragon/os": "^4.1.0",
-    "@aragon/cli": "^5.9.6"
+    "@aragon/cli": "^5.5.0"
-  },
-  "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",
+    "versions": "aragon apm versions"
-    "test": "aragon contracts test"
   },
   "keywords": []
 }

apps/contributor/test/app.js

@@ -0,0 +1,5 @@
+const CounterApp = artifacts.require('CounterApp.sol')
+
+contract('CounterApp', (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/arapp.json

@@ -14,7 +14,7 @@
   "environments": {
     "default": {
       "network": "development",
-      "appName": "kredits-proposal.open.aragonpm.eth"
+      "appName": "kredits-proposal.aragonpm.eth"
     },
     "rinkeby": {
       "registry": "0x98df287b6c145399aaa709692c8d308357bc085d",

apps/proposal/contracts/Proposal.sol

@@ -51,13 +51,16 @@ contract Proposal is AragonApp {
     initialized();
   }
 
-  function getContract(uint8 appId) public view returns (address) {
+  function getContributorContract() public view returns (address) {
-    IKernel k = IKernel(kernel());
+    return IKernel(kernel()).getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[uint8(Apps.Contributor)]);
-    return k.getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[appId]);
+  }
+
+  function getContributionContract() public view returns (address) {
+    return IKernel(kernel()).getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[uint8(Apps.Contribution)]);
   }
 
   function addProposal(uint32 contributorId, uint32 amount, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize) public isInitialized auth(ADD_PROPOSAL_ROLE) {
-    require(IContributor(getContract(uint8(Apps.Contributor))).exists(contributorId), 'CONTRIBUTOR_NOT_FOUND');
+    require(IContributor(getContributorContract()).exists(contributorId), 'CONTRIBUTOR_NOT_FOUND');
 
     uint32 proposalId = proposalsCount + 1;
     uint16 _votesNeeded = 1; //contributorsContract().coreContributorsCount() / 100 * 75;
@@ -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/manifest.json

@@ -1,4 +1,4 @@
 {
   "name": "Proposal",
-  "description": "Kredits Proposal app"
+  "description": "Kredits proposal app"
 }

apps/proposal/package.json

@@ -3,20 +3,16 @@
   "version": "1.0.0",
   "description": "",
   "dependencies": {
-    "@aragon/os": "^4.2.0",
+    "@aragon/os": "^4.1.0",
-    "@aragon/cli": "^5.9.6"
+    "@aragon/cli": "^5.5.0"
-  },
-  "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",
+    "versions": "aragon apm versions"
-    "test": "aragon contracts test"
   },
   "keywords": []
 }

apps/proposal/test/app.js

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

apps/token/arapp.json

@@ -9,7 +9,7 @@
   "environments": {
     "default": {
       "network": "development",
-      "appName": "kredits-token.open.aragonpm.eth"
+      "appName": "kredits-token.aragonpm.eth"
     },
     "rinkeby": {
       "registry": "0x98df287b6c145399aaa709692c8d308357bc085d",

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/manifest.json

@@ -1,4 +1,4 @@
 {
   "name": "Token",
-  "description": "Kredits Token app"
+  "description": "Kredits token app"
 }

apps/token/package.json

@@ -3,20 +3,16 @@
   "version": "1.0.0",
   "description": "",
   "dependencies": {
-    "@aragon/os": "^4.2.0",
+    "@aragon/os": "^4.1.0",
-    "@aragon/cli": "^5.9.6"
+    "@aragon/cli": "^5.5.0"
-  },
-  "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",
+    "versions": "aragon apm versions"
-    "test": "aragon contracts test"
   },
   "keywords": []
 }

apps/token/test/app.js

@@ -0,0 +1,5 @@
+const CounterApp = artifacts.require('CounterApp.sol')
+
+contract('CounterApp', (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
-    });
-  });
-});

arapp.json

@@ -34,9 +34,9 @@
   "environments": {
     "development": {
       "network": "development",
-      "apm": "open.aragonpm.eth",
+      "apm": "aragonpm.eth",
       "registry": "0x5f6f7e8cc7346a11ca2def8f827b7a0b612c56a1",
-      "appName": "dummy.open.aragonpm.eth"
+      "appName": "dummy.aragonpm.eth"
     },
     "rinkeby": {
       "network": "rinkeby",

config/seeds.js

@@ -1,48 +1,16 @@
 const contractCalls = [
-  ['Contributor', 'add', [{
+  ['Contributor', 'add', [{ account: '0x7e8f313c56f809188313aa274fa67ee58c31515d', name: 'bumi', isCore: true, kind: 'person', url: '', github_username: 'bumi', github_uid: 318, wiki_username: 'bumi' }, { gasLimit: 200000 }]],
-    account: '0x7e8f313c56f809188313aa274fa67ee58c31515d',
+  ['Contributor', 'add', [{ account: '0x49575f3DD9a0d60aE661BC992f72D837A77f05Bc', name: 'raucao', isCore: true, kind: 'person', url: '', github_username: 'skddc', github_uid: 842, wiki_username: 'raucau' }, { gasLimit: 200000 }]],
-    name: 'bumi',
+  ['Proposal', 'addProposal', [{ contributorId: 1, amount: 500, kind: 'code', description: '[67P/kredits-contracts] Ran the seeds', url: '' }, { gasLimit: 350000 }]],
-    kind: 'person',
+  ['Proposal', 'addProposal', [{ contributorId: 2, amount: 500, kind: 'code', description: '[67P/kredits-contracts] Ran the seeds', url: '' }, { gasLimit: 350000 }]],
-    url: '',
+  ['Proposal', 'addProposal', [{ contributorId: 2, amount: 500, kind: 'code', description: '[67P/kredits-contracts] Hacked on kredits', url: '' }, { gasLimit: 350000 }]],
-    github_username: 'bumi',
-    github_uid: 318,
-    gitea_username: 'bumi',
-    wiki_username: 'Bumi',
-  }, { gasLimit: 200000 }]],
-
-  ['Contributor', 'add', [{
-    account: '0x49575f3DD9a0d60aE661BC992f72D837A77f05Bc',
-    name: 'raucao',
-    kind: 'person',
-    url: '',
-    github_username: 'skddc',
-    github_uid: 842,
-    gitea_username: 'raucao',
-    wiki_username: 'Basti',
-  }, { gasLimit: 200000 }]],
-
-  ['Contributor', 'add', [{
-    account: '0xF722709ECC3B05c19d02E82a2a4A4021B8F48C62',
-    name: 'Manuel',
-    kind: 'person',
-    url: '',
-    github_username: 'fsmanuel',
-    github_uid: 54812,
-    wiki_username: 'Manuel',
-  }, { gasLimit: 200000 }]],
-
-  ['Proposal', 'add', [{ contributorId: 1, contributorIpfsHash: 'QmWKCYGr2rSf6abUPaTYqf98urvoZxGrb7dbspFZA6oyVF', date: '2019-04-09', amount: 500, kind: 'dev', description: '[67P/kredits-contracts] Ran the seeds', url: '' }, { gasLimit: 350000 }]],
-  ['Proposal', 'add', [{ contributorId: 2, contributorIpfsHash: 'QmcHzEeAM26HV2zHTf5HnZrCtCtGdEccL5kUtDakAB7ozB', date: '2019-04-10', amount: 500, kind: 'dev', description: '[67P/kredits-contracts] Ran the seeds', url: '' }, { gasLimit: 350000 }]],
-  ['Proposal', 'add', [{ contributorId: 2, contributorIpfsHash: 'QmcHzEeAM26HV2zHTf5HnZrCtCtGdEccL5kUtDakAB7ozB', date: '2019-04-11', amount: 500, kind: 'dev', description: '[67P/kredits-contracts] Hacked on kredits', url: '' }, { gasLimit: 350000 }]],
   ['Proposal', 'vote', [1, { gasLimit: 550000 }]],
-  ['Contribution', 'add', [{ contributorId: 1, contributorIpfsHash: 'QmWKCYGr2rSf6abUPaTYqf98urvoZxGrb7dbspFZA6oyVF', date: '2019-04-11', amount: 5000, kind: 'dev', description: '[67P/kredits-contracts] Introduce contribution token', url: '' }, { gasLimit: 350000 }]],
+  ['Contribution', 'addContribution', [{ contributorId: 1, amount: 5000, kind: 'dev', description: '[67P/kredits-contracts] Introduce contribution token', url: '' }, { gasLimit: 350000 }]],
-  ['Contribution', 'add', [{ contributorId: 2, contributorIpfsHash: 'QmcHzEeAM26HV2zHTf5HnZrCtCtGdEccL5kUtDakAB7ozB', date: '2019-04-11', amount: 1500, kind: 'dev', description: '[67P/kredits-web] Reviewed stuff', url: '' }, { gasLimit: 350000 }]],
+  ['Contribution', 'addContribution', [{ contributorId: 2, amount: 1500, kind: 'dev', description: '[67P/kredits-web] Reviewed stuff', url: '' }, { gasLimit: 350000 }]],
-  ['Contribution', 'claim', [1, { gasLimit: 300000 }]],
+  ['Contribution', 'claim', [1, { gasLimit: 300000 }]]
 ];
-
 const funds = [
   '0x7e8f313c56f809188313aa274fa67ee58c31515d',
-  '0xa502eb4021f3b9ab62f75b57a94e1cfbf81fd827',
+  '0xa502eb4021f3b9ab62f75b57a94e1cfbf81fd827'
 ];
-
 module.exports = { contractCalls, funds };

deployments/rinkeby/contribution.md

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

deployments/rinkeby/contributor.md

@@ -1,22 +1,5 @@
 # Contributor deployments
 
-aragon apm publish major --environment=rinkeby
-
-## 2019-04-25 canPerform fix
-
-✔ Successfully published kredits-contributor.open.aragonpm.eth v6.0.0: 
- ℹ Contract address: 0xA5379D49C718845A1BD7720c6BE3872bA69906cc
- ℹ Content (ipfs): QmdennNV6s2FNpe6QNYxrUsUXPVdnQGvh1vCi22Tqs8ojq
- ℹ Transaction hash: 0x51077afeff70a24e87c78bb23ea13bdb9b4445bd43ea7a74a4178fadfeeb6c35
-
-## 2019-04-24 update balances
-
- ✔ Successfully published kredits-contributor.open.aragonpm.eth v5.0.0: 
- ℹ Contract address: 0xadefa3b66b68a127Fe38bEa1813b844EE69CFD86
- ℹ Content (ipfs): QmeygbQgoj2McLWzo9hJayLWuBZqFaK4HTpa5qLeQdkn5K
- ℹ Transaction hash: 0x4237a9636f6e4a8190e0d5bcfa85a452da097bf654a173a88e0e1de3d078f08d
-
-
 ## 2019-04-10 - Weltempfänger release
 
 ✔ Successfully published kredits-contributor.open.aragonpm.eth v4.0.0: 

deployments/rinkeby/dao.md

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

lib/abis/KreditsKit.json

@@ -1 +0,0 @@
-[{"constant":true,"inputs":[],"name":"ens","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"fac","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"appId","type":"bytes32"}],"name":"latestVersionAppBase","outputs":[{"name":"base","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"appIds","outputs":[{"name":"","type":"bytes32"}],"payable":false,"stateMutability":"view","type":"function"},{"inputs":[{"name":"_fac","type":"address"},{"name":"_ens","type":"address"},{"name":"_appIds","type":"bytes32[4]"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"dao","type":"address"}],"name":"DeployInstance","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"dao","type":"address"},{"indexed":false,"name":"appProxy","type":"address"},{"indexed":false,"name":"appId","type":"bytes32"}],"name":"InstalledApp","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"appProxy","type":"address"},{"indexed":false,"name":"appId","type":"bytes32"}],"name":"InstalledApp","type":"event"},{"constant":false,"inputs":[],"name":"newInstance","outputs":[{"name":"dao","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"function"}]

lib/contracts/acl.js

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

lib/contracts/base.js

@@ -1,28 +1,23 @@
 class Base {
-  constructor (contract) {
+  constructor(contract) {
     this.contract = contract;
   }
 
-  get functions () {
+  get functions() {
     return this.contract.functions;
   }
 
-  get address () {
+  get ipfs() {
-    return this.contract.address;
-  }
-
-  get ipfs () {
     if (!this._ipfsAPI) { throw new Error('IPFS API not configured; please set an ipfs instance'); }
     return this._ipfsAPI;
   }
 
-  set ipfs (ipfsAPI) {
+  set ipfs(ipfsAPI) {
     this._ipfsAPI = ipfsAPI;
   }
 
-  on (type, callback) {
+  on(type, callback) {
     return this.contract.on(type, callback);
   }
 }
-
 module.exports = Base;

lib/contracts/contribution.js

@@ -1,29 +1,37 @@
-const Record = require('./record');
+const ethers = require('ethers');
-const ContributionSerializer = require('../serializers/contribution');
-const deprecate = require('../utils/deprecate');
 
-class Contribution extends Record {
+const ContributionSerializer = require('../serializers/contribution');
-  get count () {
+const Base = require('./base');
-    return this.functions.contributionsCount();
+
+class Contribution extends Base {
+  all() {
+    return this.functions.contributionsCount()
+      .then(async (count) => {
+        let contributions = [];
+
+        for (let id = 1; id <= count; id++) {
+          const contribution = await this.getById(id)
+          contributions.push(contribution);
         }
 
-  getById (id) {
+        return contributions;
+      });
+  }
+
+  getById(id) {
     return this.functions.getContribution(id)
       .then(data => {
         return this.ipfs.catAndMerge(data, ContributionSerializer.deserialize);
       });
+
   }
 
-  getData (id) {
+  getByContributorId(contributorId) {
-    return this.functions.getContribution(id);
-  }
-
-  getByContributorId (contributorId) {
     return this.functions.getContributorAddressById(contributorId)
       .then(address => this.getByContributorAddress(address));
   }
 
-  getByContributorAddress (address) {
+  getByContributorAddress(address) {
     return this.functions.balanceOf(address)
       .then(async (balance) => {
         const count = balance.toNumber();
@@ -39,17 +47,13 @@ class Contribution extends Record {
       });
   }
 
-  async add (contributionAttr, callOptions = {}) {
+  addContribution(contributionAttr, callOptions = {}) {
-    const contribution = new ContributionSerializer(contributionAttr);
+    let json = ContributionSerializer.serialize(contributionAttr);
-
+    // TODO: validate against schema
-    try { await contribution.validate(); }
-    catch (error) { return Promise.reject(error); }
-
-    const jsonStr = contribution.serialize();
 
     return this.ipfs
-      .add(jsonStr)
+      .add(json)
-      .then(ipfsHashAttr => {
+      .then((ipfsHashAttr) => {
         let contribution = [
           contributionAttr.amount,
           contributionAttr.contributorId,
@@ -58,18 +62,9 @@ class Contribution extends Record {
           ipfsHashAttr.hashSize,
         ];
 
-        return this.functions.add(...contribution, callOptions).then(res => {
+        return this.functions.add(...contribution, callOptions);
-          res.ipfsHash = this.ipfs.encodeHash(ipfsHashAttr);
-          return res;
-        });
       });
   }
-
-  addContribution () {
-    deprecate('The function `addContribution()` is deprecated and will be removed in the next major version. Use `add()` instead');
-    return this.add(...arguments);
-  }
-
 }
 
 module.exports = Contribution;

lib/contracts/contributor.js

@@ -1,33 +1,40 @@
-const Record = require('./record');
+const ethers = require('ethers');
-const ContributorSerializer = require('../serializers/contributor');
+const RSVP = require('rsvp');
-const formatKredits = require('../utils/format-kredits');
 
-class Contributor extends Record {
+const ContributorSerializer = require('../serializers/contributor');
-  get count () {
+const Base = require('./base');
-    return this.functions.contributorsCount();
+
+class Contributor extends Base {
+  all() {
+    return this.functions.contributorsCount()
+      .then(count => {
+        let contributors = [];
+
+        for (let id = 1; id <= count; id++) {
+          contributors.push(this.getById(id));
         }
 
-  getById (id) {
+        return RSVP.all(contributors);
+      });
+  }
+
+  getById(id) {
     return this.functions.getContributorById(id)
-      .then(data => {
+      // Fetch IPFS data if available
-        data.balanceInt = formatKredits(data.balance);
+      .then((data) => {
         return this.ipfs.catAndMerge(data, ContributorSerializer.deserialize);
       });
   }
 
-  getData (id) {
+  filterByAccount(search) {
-    return this.functions.getContributorById(id);
-  }
-
-  filterByAccount (search) {
     return this._byAccount(search, 'filter');
   }
 
-  findByAccount (search) {
+  findByAccount(search) {
     return this._byAccount(search, 'find');
   }
 
-  _byAccount (search, method = 'filter') {
+  _byAccount(search, method = 'filter') {
     return this.all().then((contributors) => {
       const searchEntries = Object.entries(search);
 
@@ -43,16 +50,12 @@ class Contributor extends Record {
     });
   }
 
-  async add (contributorAttr, callOptions = {}) {
+  add(contributorAttr, callOptions = {}) {
-    let contributor = new ContributorSerializer(contributorAttr);
+    let json = ContributorSerializer.serialize(contributorAttr);
-
+    // TODO: validate against schema
-    try { await contributor.validate(); }
-    catch (error) { return Promise.reject(error); }
-
-    const jsonStr = contributor.serialize();
 
     return this.ipfs
-      .add(jsonStr)
+      .add(json)
       .then((ipfsHashAttr) => {
         let contributor = [
           contributorAttr.account,
@@ -64,31 +67,6 @@ class Contributor extends Record {
         return this.functions.addContributor(...contributor, callOptions);
       });
   }
-
-  updateProfile (contributorId, updateAttr, callOptions = {}) {
-    return this.getById(contributorId).then(async (contributor) => {
-      let updatedContributorAttr = Object.assign(contributor, updateAttr);
-      let updatedContributor = new ContributorSerializer(updatedContributorAttr);
-
-      try { await updatedContributor.validate(); }
-      catch (error) { return Promise.reject(error); }
-
-      const jsonStr = updatedContributor.serialize();
-
-      return this.ipfs
-        .add(jsonStr)
-        .then(ipfsHashAttr => {
-          return this.functions.updateContributorProfileHash(
-            contributorId,
-            ipfsHashAttr.hashDigest,
-            ipfsHashAttr.hashFunction,
-            ipfsHashAttr.hashSize,
-            callOptions
-          );
-        });
-    });
-  }
-
 }
 
 module.exports = Contributor;

lib/contracts/index.js

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

lib/contracts/kernel.js

@@ -4,19 +4,19 @@ const Base = require('./base');
 const KERNEL_APP_ADDR_NAMESPACE = '0xd6f028ca0e8edb4a8c9757ca4fdccab25fa1e0317da1188108f7d2dee14902fb';
 
 class Kernel extends Base {
-  constructor (contract) {
+  constructor(contract) {
     super(contract);
-    this.apm = 'open.aragonpm.eth'; // can be overwritten if needed
+    this.apm = 'aragonpm.eth'; // can be overwritten if needed
   }
 
-  getApp (appName) {
+  getApp(appName) {
     if (appName === 'Acl') {
       return this.functions.acl();
     }
     return this.functions.getApp(KERNEL_APP_ADDR_NAMESPACE, this.appNamehash(appName));
   }
 
-  appNamehash (appName) {
+  appNamehash(appName) {
     return namehash(`kredits-${appName.toLowerCase()}.${this.apm}`);
   }
 }

lib/contracts/proposal.js

@@ -1,29 +1,36 @@
-const Record = require('./record');
+const ethers = require('ethers');
-const ContributionSerializer = require('../serializers/contribution');
+const RSVP = require('rsvp');
-const deprecate = require('../utils/deprecate');
 
-class Proposal extends Record {
+const ContributionSerializer = require('../serializers/contribution');
-  get count () {
+const Base = require('./base');
-    return this.functions.proposalsCount();
+
+class Proposal extends Base {
+  all() {
+    return this.functions.proposalsCount()
+      .then(count => {
+        let proposals = [];
+
+        for (let id = 1; id <= count; id++) {
+          proposals.push(this.getById(id));
         }
 
-  getById (id) {
+        return RSVP.all(proposals);
+      });
+  }
+
+  getById(id) {
     return this.functions.getProposal(id)
       .then(data => {
         return this.ipfs.catAndMerge(data, ContributionSerializer.deserialize);
       });
   }
 
-  async add (proposalAttr, callOptions = {}) {
+  addProposal(proposalAttr, callOptions = {}) {
-    const contribution = new ContributionSerializer(proposalAttr);
+    let json = ContributionSerializer.serialize(proposalAttr);
-
+    // TODO: validate against schema
-    try { await contribution.validate(); }
-    catch (error) { return Promise.reject(error); }
-
-    const jsonStr = contribution.serialize();
 
     return this.ipfs
-      .add(jsonStr)
+      .add(json)
       .then((ipfsHashAttr) => {
         let proposal = [
           proposalAttr.contributorId,
@@ -36,11 +43,6 @@ class Proposal extends Record {
         return this.functions.addProposal(...proposal, callOptions);
       });
   }
-
-  addProposal () {
-    deprecate('The function `addProposal()` is deprecated and will be removed in the next major version. Use `add()` instead');
-    return this.add(...arguments);
-  }
 }
 
-module.exports = Proposal;
+module.exports = Proposal

lib/contracts/record.js

@@ -1,14 +0,0 @@
-const Base = require('./base');
-const paged = require('../utils/pagination');
-
-class Record extends Base {
-  all (options = {}) {
-    return this.count
-      .then((count) => {
-        let records = paged(count, options).map((id) => this.getById(id));
-        return Promise.all(records);
-      });
-  }
-}
-
-module.exports = Record;

lib/contracts/token.js

@@ -4,3 +4,4 @@ class Token extends Base {
 }
 
 module.exports = Token;
+

lib/kredits.js

@@ -1,7 +1,7 @@
 const ethers = require('ethers');
+const RSVP = require('rsvp');
 
 const Preflight = require('./utils/preflight');
-const deprecate = require('./utils/deprecate');
 
 const ABIS = {
   Contributor: require('./abis/Contributor.json'),
@@ -9,29 +9,29 @@ const ABIS = {
   Token: require('./abis/Token.json'),
   Proposal: require('./abis/Proposal.json'),
   Kernel: require('./abis/Kernel.json'),
-  Acl: require('./abis/ACL.json'),
+  Acl: require('./abis/ACL.json')
 };
 const APP_CONTRACTS = [
   'Contributor',
   'Contribution',
   'Token',
   'Proposal',
-  'Acl',
+  'Acl'
 ];
 const DaoAddresses = require('./addresses/dao.json');
 
 const Contracts = require('./contracts');
-const IPFS = require('./utils/ipfs');
+const IPFS = require('./utils/ipfs')
 
 // Helpers
-function capitalize (word) {
+function capitalize(word) {
   let [first, ...rest] = word;
   return `${first.toUpperCase()}${rest.join('')}`;
 }
 
 class Kredits {
 
-  constructor (provider, signer, options = {}) {
+  constructor(provider, signer, options = {}) {
     let { addresses, abis, ipfsConfig } = options;
 
     this.provider = provider;
@@ -43,7 +43,7 @@ class Kredits {
     this.contracts = {};
   }
 
-  init (names) {
+  init(names) {
     let contractsToLoad = names || APP_CONTRACTS;
     return this.provider.getNetwork().then(network => {
       this.addresses['Kernel'] = this.addresses['Kernel'] || DaoAddresses[network.chainId.toString()];
@@ -51,43 +51,22 @@ class Kredits {
         return this.Kernel.getApp(contractName).then((address) => {
           this.addresses[contractName] = address;
         }).catch((error) => {
+          console.log(error);
           throw new Error(`Failed to get address for ${contractName} from DAO at ${this.Kernel.contract.address}
             - ${error.message}`
           );
         });
       });
-
+      return RSVP.all(addressPromises).then(() => { return this });
-      return Promise.all(addressPromises).then(() => { return this; });
     });
   }
 
-  static setup (provider, signer, ipfsConfig = null) {
+  static setup(provider, signer, ipfsConfig = null) {
-    deprecate('Kredits.setup() is deprecated use new Kredits().init() instead');
+    console.log('Kredits.setup() is deprecated use new Kredits().init() instead');
     return new Kredits(provider, signer, { ipfsConfig: ipfsConfig }).init();
   }
 
-  static for (connectionOptions, kreditsOptions) {
+  get Kernel() {
-    let { network, rpcUrl, wallet } = connectionOptions;
-    if (!rpcUrl && network === 'local') { rpcUrl = 'http://localhost:8545'; }
-    let ethProvider, signer;
-    if (rpcUrl) {
-      ethProvider = new ethers.providers.JsonRpcProvider(rpcUrl);
-    } else {
-      ethProvider = new ethers.getDefaultProvider(network);
-    }
-    if (wallet) {
-      signer = wallet.connect(ethProvider);
-    } else if (ethProvider.getSigner) {
-      signer = ethProvider.getSigner();
-    }
-    return new Kredits(ethProvider, signer, kreditsOptions);
-  }
-
-  static availableNetworks () {
-    return Object.keys(DaoAddresses);
-  }
-
-  get Kernel () {
     let k = this.contractFor('Kernel');
     // in case we want to use a special apm (e.g. development vs. production)
     if (this.options.apm) {
@@ -96,37 +75,37 @@ class Kredits {
     return k;
   }
 
-  get Contributor () {
+  get Contributor() {
     return this.contractFor('Contributor');
   }
 
-  get Contributors () {
+  get Contributors() {
-    deprecate('Contributors is deprecated use Contributor instead');
+    console.log('Contributors is deprecated use Contributor instead');
     return this.Contributor;
   }
 
-  get Proposal () {
+  get Proposal() {
     return this.contractFor('Proposal');
   }
 
-  get Operator () {
+  get Operator() {
     return this.Proposal;
   }
 
-  get Token () {
+  get Token() {
     return this.contractFor('Token');
   }
 
-  get Contribution () {
+  get Contribution() {
     return this.contractFor('Contribution');
   }
 
-  get Acl () {
+  get Acl() {
     return this.contractFor('Acl');
   }
 
   // Should be private
-  contractFor (name) {
+  contractFor(name) {
     if (this.contracts[name]) {
       return this.contracts[name];
     }
@@ -146,7 +125,7 @@ class Kredits {
     return this.contracts[name];
   }
 
-  preflightChecks () {
+  preflightChecks() {
     return new Preflight(this).check();
   }
 }

lib/kreditskit.js

@@ -1,49 +0,0 @@
-const ethers = require('ethers');
-
-const ABI = require('./abis/KreditsKit.json');
-const Addresses = require('./addresses/KreditsKit.json');
-
-class KreditsKit {
-
-  constructor (provider, signer, options = {}) {
-    let { address, abi } = options;
-
-    this.provider = provider;
-    this.signer = signer;
-    this.options = options;
-    this.address = address;
-    this.abi = abi || ABI;
-  }
-
-  init () {
-    return this.provider.getNetwork().then((network) => {
-      this.address = this.address || Addresses[network.chainId.toString()];
-      this.contract = new ethers.Contract(
-        this.address,
-        this.abi,
-        (this.signer || this.provider)
-      );
-      return this;
-    });
-  }
-
-  appIdFor (contractName) {
-    // see appIds in KreditsKit.sol for more details
-    const knownContracts = ['Contribution', 'Contributor', 'Proposal', 'Token'];
-    return this.contract.functions.appIds(knownContracts.indexOf(contractName));
-  }
-
-  newDAO (options = {}) {
-    return this.contract.functions.newInstance(options).then(transaction => {
-      return transaction.wait().then(result => {
-        const deployEvent = result.events.find(e => e.event === 'DeployInstance');
-        return {
-          daoAddress: deployEvent.args.dao,
-          transactionHash: transaction.hash,
-        };
-      });
-    });
-  }
-}
-
-module.exports = KreditsKit;

lib/serializers/contribution.js

@@ -1,75 +1,19 @@
-const schemas = require('kosmos-schemas');
-const validator = require('../utils/validator');
-
 /**
- * Serialization and validation for JSON-LD document of the contribution.
+ * Handle serialization for JSON-LD object of the contribution, according to
+ * https://github.com/67P/kosmos-schemas/blob/master/schemas/contribution.json
  *
  * @class
  * @public
  */
 class Contribution {
-
-  constructor (attrs) {
-    Object.keys(attrs).forEach(a => this[a] = attrs[a]);
-  }
-
-  /**
-   * Serialize object to JSON
-   *
-   * @public
-   */
-  serialize () {
-    let {
-      contributorIpfsHash,
-      date,
-      time,
-      kind,
-      description,
-      url,
-      details,
-    } = this;
-
-    let data = {
-      '@context': 'https://schema.kosmos.org',
-      '@type': 'Contribution',
-      'contributor': {
-        'ipfs': contributorIpfsHash,
-      },
-      date,
-      time,
-      kind,
-      description,
-      'details': details || {},
-    };
-
-    if (url) {
-      data['url'] = url;
-    }
-
-    // Write it pretty to ipfs
-    return JSON.stringify(data, null, 2);
-  }
-
-  /**
-   * Validate serialized data against schema
-   *
-   * @public
-   */
-  validate () {
-    const serialized = JSON.parse(this.serialize());
-    const valid = validator.validate(serialized, schemas['contribution']);
-    return valid ? Promise.resolve() : Promise.reject(validator.error);
-  }
-
  /**
   * Deserialize JSON to object
   *
+  * @method
   * @public
   */
-  static deserialize (serialized) {
+  static deserialize(serialized) {
     let {
-      date,
-      time,
       kind,
       description,
       details,
@@ -77,8 +21,6 @@ class Contribution {
     } = JSON.parse(serialized.toString('utf8'));
 
     return {
-      date,
-      time,
       kind,
       description,
       details,
@@ -87,6 +29,39 @@ class Contribution {
     };
   }
 
+ /**
+  * Serialize object to JSON
+  *
+  * @method
+  * @public
+  */
+  static serialize(deserialized) {
+    let {
+      contributorIpfsHash,
+      kind,
+      description,
+      url,
+      details
+    } = deserialized;
+
+    let data = {
+      "@context": "https://schema.kosmos.org",
+      "@type": "Contribution",
+      "contributor": {
+        "ipfs": contributorIpfsHash
+      },
+      kind,
+      description,
+      "details": details || {}
+    };
+
+    if (url) {
+      data["url"] = url;
+    }
+
+    // Write it pretty to ipfs
+    return JSON.stringify(data, null, 2);
+  }
 }
 
 module.exports = Contribution;

lib/serializers/contributor.js

@@ -1,5 +1,3 @@
-const schemas = require('kosmos-schemas');
-const validator = require('../utils/validator');
 /**
  * Handle serialization for JSON-LD object of the contributor, according to
  * https://github.com/67P/kosmos-schemas/blob/master/schemas/contributor.json
@@ -8,88 +6,13 @@ const validator = require('../utils/validator');
  * @public
  */
 class Contributor {
-
-  constructor (attrs) {
-    Object.keys(attrs).forEach(a => this[a] = attrs[a]);
-  }
-
-  /**
-  * Serialize object to JSON
-  *
-  * @method
-  * @public
-  */
-  serialize () {
-    let {
-      name,
-      kind,
-      url,
-      github_uid,
-      github_username,
-      gitea_username,
-      wiki_username,
-      accounts,
-    } = this;
-
-    let data = {
-      '@context': 'https://schema.kosmos.org',
-      '@type': 'Contributor',
-      kind,
-      name,
-      accounts: accounts || [],
-    };
-
-    if (url) {
-      data['url'] = url;
-    }
-
-    if (github_uid) {
-      data.accounts.push({
-        'site': 'github.com',
-        'uid': github_uid,
-        'username': github_username,
-        'url': `https://github.com/${github_username}`,
-      });
-    }
-
-    if (gitea_username) {
-      data.accounts.push({
-        'site': 'gitea.kosmos.org',
-        'username': gitea_username,
-        'url': `https://gitea.kosmos.org/${gitea_username}`,
-      });
-    }
-
-    if (wiki_username) {
-      data.accounts.push({
-        'site': 'wiki.kosmos.org',
-        'username': wiki_username,
-        'url': `https://wiki.kosmos.org/User:${wiki_username}`,
-      });
-    }
-
-    // Write it pretty to ipfs
-    return JSON.stringify(data, null, 2);
-  }
-
-  /**
-   * Validate serialized data against schema
-   *
-   * @public
-   */
-  validate () {
-    const serialized = JSON.parse(this.serialize());
-    const valid = validator.validate(serialized, schemas['contributor']);
-    return valid ? Promise.resolve() : Promise.reject(validator.error);
-  }
-
  /**
   * Deserialize JSON to object
   *
   * @method
   * @public
   */
-  static deserialize (serialized) {
+  static deserialize(serialized) {
     let {
       name,
       kind,
@@ -97,17 +20,13 @@ class Contributor {
       accounts,
     } = JSON.parse(serialized.toString('utf8'));
 
-    let github_username, github_uid, gitea_username, wiki_username;
+    let github_username, github_uid, wiki_username;
-    let github = accounts.find(a => a.site === 'github.com');
+    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 wiki   = accounts.find(a => a.site === 'wiki.kosmos.org');
 
     if (github) {
       (({ username: github_username, uid: github_uid} = github));
     }
-    if (gitea) {
-      (({ username: gitea_username } = gitea));
-    }
     if (wiki) {
       (({ username: wiki_username } = wiki));
     }
@@ -119,12 +38,59 @@ class Contributor {
       accounts,
       github_uid,
       github_username,
-      gitea_username,
       wiki_username,
       ipfsData: serialized,
     };
   }
 
+ /**
+  * Serialize object to JSON
+  *
+  * @method
+  * @public
+  */
+  static serialize(deserialized) {
+    let {
+      name,
+      kind,
+      url,
+      github_uid,
+      github_username,
+      wiki_username,
+    } = deserialized;
+
+    let data = {
+      "@context": "https://schema.kosmos.org",
+      "@type": "Contributor",
+      kind,
+      name,
+      "accounts": []
+    };
+
+    if (url) {
+      data["url"] = url;
+    }
+
+    if (github_uid) {
+      data.accounts.push({
+        "site": "github.com",
+        "uid": github_uid,
+        "username": github_username,
+        "url": `https://github.com/${github_username}`
+      });
+    }
+
+    if (wiki_username) {
+      data.accounts.push({
+        "site": "wiki.kosmos.org",
+        "username": wiki_username,
+        "url": `https://wiki.kosmos.org/User:${wiki_username}`
+      });
+    }
+
+    // Write it pretty to ipfs
+    return JSON.stringify(data, null, 2);
+  }
 }
 
 module.exports = Contributor;

lib/utils/deprecate.js

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

lib/utils/format-kredits.js

@@ -1,10 +0,0 @@
-const ethersUtils = require('ethers').utils;
-
-module.exports = function(value, options = {}) {
-  let etherValue = ethersUtils.formatEther(value);
-  if (options.asFloat) {
-    return parseFloat(etherValue);
-  } else {
-    return parseInt(etherValue);
-  }
-};

lib/utils/ipfs.js

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

lib/utils/pagination.js

@@ -1,46 +0,0 @@
-function pageNumber (number, size, recordCount) {
-  let numberOfPages = Math.ceil(recordCount / size);
-
-  number = parseInt(number) || 1;
-
-  // Ensure page number is in range
-  number = number > numberOfPages ? numberOfPages : number;
-  number = number < 1 ? 1 : number;
-
-  return number;
-}
-
-function buildIds (order, number, size, recordCount) {
-  let offset = size * (number - 1);
-
-  let start;
-  let mapFunction;
-
-  if (order === 'asc') {
-    start = 1 + offset;
-    mapFunction = (_, i) => start + i;
-  } else {
-    start = recordCount - offset;
-    mapFunction = (_, i) => start - i;
-  }
-
-  // Ensure size is in range
-  let end = offset + size;
-  if (end > recordCount) {
-    let diff = end - recordCount;
-    size = size - diff;
-  }
-
-  return Array.from({ length: size }, mapFunction);
-}
-
-module.exports = function paged (recordCount, options = {}) {
-  let { order, page } = options;
-  order = order || 'desc';
-  page = page || {};
-
-  let size = parseInt(page.size) || 25;
-  let number = pageNumber(page.number, size, recordCount);
-
-  return buildIds(order, number, size, recordCount);
-};

lib/utils/preflight.js

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

lib/utils/validator.js

@@ -1,15 +0,0 @@
-const tv4 = require('tv4');
-const validator = tv4.freshApi();
-
-validator.addFormat({
-  'date': function(value) {
-    const dateRegexp = /^[0-9]{4,}-[0-9]{2}-[0-9]{2}$/;
-    return dateRegexp.test(value) ? null : 'A valid ISO 8601 full-date string is expected';
-  },
-  'time': function(value) {
-    const timeRegexp = /^([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9]|60)(\.[0-9]+)?(([Zz])|([+|-]([01][0-9]|2[0-3]):[0-5][0-9]))$/;
-    return timeRegexp.test(value) ? null : 'A valid ISO 8601 full-time string is expected';
-  },
-});
-
-module.exports = validator;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kredits-contracts",
-  "version": "5.4.0",
+  "version": "4.0.2",
   "description": "Ethereum contracts and npm wrapper for Kredits",
   "main": "./lib/kredits.js",
   "directories": {
@@ -8,28 +8,19 @@
   },
   "scripts": {
     "install-all": "./scripts/every-app.sh \"npm install\"",
-    "postshrinkwrap": "node scripts/fix-package-lock.js &>/dev/null || true",
     "build-json": "npm run compile-contracts && node ./scripts/build-json.js",
     "repl": "truffle exec scripts/repl.js",
     "seeds": "truffle exec scripts/seeds.js",
-    "compile-contracts": "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\"",
+    "test": "echo \"Error: no test specified\" && exit 1"
-    "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",
-    "setup-git-hooks": "sh scripts/git-hooks/install"
   },
   "repository": {
     "type": "git",
@@ -42,26 +33,19 @@
   },
   "homepage": "https://github.com/67P/truffle-kredits#readme",
   "devDependencies": {
+    "@aragon/cli": "^5.5.0",
     "@aragon/kits-base": "^1.0.0",
-    "@aragon/os": "^4.2.0",
+    "@aragon/os": "^4.1.0",
     "async-each-series": "^1.1.0",
-    "cli-table": "^0.3.1",
-    "eslint": "^5.16.0",
-    "eslint-plugin-import": "^2.17.3",
-    "eslint-plugin-node": "^8.0.1",
-    "eslint-plugin-promise": "^4.1.1",
     "eth-provider": "^0.2.2",
+    "openzeppelin-solidity": "^2.2.0",
     "promptly": "^3.0.3",
-    "solc": "^0.4.26",
+    "solc": "^0.4.25"
-    "solhint": "^2.1.0",
-    "yargs": "^12.0.0"
   },
   "dependencies": {
-    "ethers": "^4.0.29",
+    "ethers": "^4.0.27",
-    "ipfs-http-client": "^30.1.3",
+    "ipfs-http-client": "^30.1.1",
-    "kosmos-schemas": "^2.1.0",
+    "rsvp": "^4.8.2"
-    "node-fetch": "^2.6.0",
-    "tv4": "^1.3.0"
   },
   "keywords": [
     "kosmos",

scripts/add-contribution.js

@@ -1,5 +1,4 @@
 const promptly = require('promptly');
-const { inspect } = require('util');
 
 const initKredits = require('./helpers/init_kredits.js');
 
@@ -27,32 +26,23 @@ module.exports = async function(callback) {
 
   console.log(`Creating a contribution for contributor account ${contributorAccount} ID: ${contributorId}`);
 
-  [ dateNow, timeNow ] = (new Date()).toISOString().split('T');
-
   let contributionAttributes = {
     contributorId,
-    date: dateNow,
-    time: timeNow,
     amount: await promptly.prompt('Amount: '),
     description: await promptly.prompt('Description: '),
     kind: await promptly.prompt('Kind: ', { default: 'dev' }),
     url: await promptly.prompt('URL: ', { default: '' })
   }
 
-  const contributorData = await kredits.Contributor.getById(contributorId);
-  contributionAttributes.contributorIpfsHash = contributorData.ipfsHash;
-
   console.log("\nAdding contribution:");
   console.log(contributionAttributes);
 
-  kredits.Contribution.addContribution(contributionAttributes, { gasLimit: 300000 })
+  kredits.Contribution.addContribution(contributionAttributes, { gasLimit: 300000 }).then((result) => {
-    .then(result => {
     console.log("\n\nResult:");
     console.log(result);
     callback();
-    })
+  }).catch((error) => {
-    .catch(error => {
     console.log('Failed to create contribution');
-      callback(inspect(error));
+    callback(error);
   });
 }

scripts/add-contributor.js

@@ -26,7 +26,7 @@ module.exports = async function(callback) {
     kind: await prompt('Kind (default person): ', {default: 'person'}),
     url: await prompt('URL: '),
     github_username: await prompt('GitHub username: '),
-    github_uid: parseInt(await prompt('GitHub UID: ')),
+    github_uid: await prompt('GitHub UID: '),
     wiki_username: await prompt('Wiki username: '),
   };
 

scripts/add-proposal.js

@@ -1,5 +1,4 @@
 const promptly = require('promptly');
-const { inspect } = require('util');
 
 const initKredits = require('./helpers/init_kredits.js');
 
@@ -26,31 +25,23 @@ module.exports = async function(callback) {
   }
   console.log(`Creating a proposal for contributor ID #${contributorId} account: ${contributorAccount}`);
 
-  [ dateNow, timeNow ] = (new Date()).toISOString().split('T');
-
   let contributionAttributes = {
     contributorId,
-    date: dateNow,
-    time: timeNow,
     amount: await promptly.prompt('Amount: '),
     description: await promptly.prompt('Description: '),
     kind: await promptly.prompt('Kind: ', { default: 'dev' }),
     url: await promptly.prompt('URL: ', { default: '' })
   }
 
-  const contributorData = await kredits.Contributor.getById(contributorId);
-  contributionAttributes.contributorIpfsHash = contributorData.ipfsHash;
-
   console.log("\nAdding proposal:");
   console.log(contributionAttributes);
 
-  kredits.Proposal.addProposal(contributionAttributes, { gasLimit: 300000 })
+  kredits.Proposal.addProposal(contributionAttributes, { gasLimit: 300000 }).then((result) => {
-    .then((result) => {
     console.log("\n\nResult:");
     console.log(result);
     callback();
   }).catch((error) => {
     console.log('Failed to create proposal');
-      callback(inspect(error));
+    callback(error);
   });
 }

scripts/claim-contributions.js

@@ -1,53 +0,0 @@
-const promptly = require('promptly');
-const Table = require('cli-table');
-
-const initKredits = require('./helpers/init_kredits.js');
-
-module.exports = async function(callback) {
-  let kredits;
-  try {
-    kredits = await initKredits(web3);
-  } catch(e) {
-    callback(e);
-    return;
-  }
-
-  console.log(`Using Contribution at: ${kredits.Contribution.contract.address}`);
-
-  let recipient = await promptly.prompt('Contributor ID: ');
-  recipient = parseInt(recipient);
-
-  const table = new Table({
-    head: ['ID', 'Description', 'Amount', 'Claim Transaction'],
-  });
-
-  try {
-    let blockNumber = await kredits.provider.getBlockNumber();
-    let contributions = await kredits.Contribution.all({page: {size: 200}});
-
-    console.log(`Current block number: ${blockNumber}`);
-    let claimPromises = contributions.map(async (c) => {
-      const confirmed = c.confirmedAtBlock <= blockNumber;
-
-      if (c.contributorId === recipient && confirmed && !c.vetoed && !c.claimed) {
-        console.log(`Claiming contribution ID=${c.id}`);
-        return kredits.Contribution.functions.claim(c.id, { gasLimit: 500000 }).then(tx => {
-          table.push([
-            c.id.toString(),
-            `${c.description}`,
-            c.amount.toString(),
-            tx.hash,
-          ]);
-        });
-      }
-    });
-
-    Promise.all(claimPromises).then(_ => {
-      console.log(table.toString());
-      callback();
-    });
-  } catch (err) {
-    console.log(err);
-    callback();
-  }
-};

scripts/deploy-apm.js

@@ -0,0 +1,363 @@
+const namehash = require('eth-ens-namehash').hash
+const keccak256 = require('js-sha3').keccak_256
+
+const deployENS = require('@aragon/os/scripts/deploy-test-ens')
+const deployDaoFactory = require('@aragon/os/scripts/deploy-daofactory')
+const logDeploy = require('@aragon/os/scripts//helpers/deploy-logger')
+const getAccounts = require('@aragon/os/scripts//helpers/get-accounts')
+
+const globalArtifacts = this.artifacts // Not injected unless called directly via truffle
+const globalWeb3 = this.web3 // Not injected unless called directly via truffle
+
+const ZERO_ADDR = '0x0000000000000000000000000000000000000000'
+
+const defaultOwner = process.env.OWNER
+const defaultDaoFactoryAddress = process.env.DAO_FACTORY
+const defaultENSAddress = process.env.ENS
+
+module.exports = async (
+  truffleExecCallback,
+  {
+    artifacts = globalArtifacts,
+    web3 = globalWeb3,
+    ensAddress = defaultENSAddress,
+    owner = defaultOwner,
+    daoFactoryAddress = defaultDaoFactoryAddress,
+    verbose = true
+  } = {}
+) => {
+  const log = (...args) => {
+    if (verbose) { console.log(...args) }
+  }
+
+  const APMRegistry = artifacts.require('APMRegistry')
+  const Repo = artifacts.require('Repo')
+  const ENSSubdomainRegistrar = artifacts.require('ENSSubdomainRegistrar')
+
+  const DAOFactory = artifacts.require('DAOFactory')
+  const APMRegistryFactory = artifacts.require('APMRegistryFactory')
+  const ENS = artifacts.require('ENS')
+
+  const Kernel = artifacts.require('Kernel')
+  const ACL = artifacts.require('ACL')
+
+  const tldName = 'eth'
+  const labelName = 'aragonpm'
+  const tldHash = namehash(tldName)
+  const labelHash = '0x'+keccak256(labelName)
+  const apmNode = namehash(`${labelName}.${tldName}`)
+
+  let ens
+
+  log('Deploying APM...')
+
+  const accounts = await getAccounts(web3)
+  if (!owner) {
+    owner = accounts[0]
+    log('OWNER env variable not found, setting APM owner to the provider\'s first account')
+  }
+  log('Owner:', owner)
+
+  if (!ensAddress) {
+    log('=========')
+    log('Missing ENS! Deploying a custom ENS...')
+    ens = (await deployENS(null, { artifacts, owner, verbose: false })).ens
+    ensAddress = ens.address
+  } else {
+    ens = ENS.at(ensAddress)
+  }
+
+  log('ENS:', ensAddress)
+  log(`TLD: ${tldName} (${tldHash})`)
+  log(`Label: ${labelName} (${labelHash})`)
+  log(`apmNode: ${apmNode}`)
+
+  log('=========')
+  log('Deploying APM bases...')
+
+  const apmRegistryBase = await APMRegistry.new()
+  await logDeploy(apmRegistryBase, { verbose })
+  const apmRepoBase = await Repo.new()
+  await logDeploy(apmRepoBase, { verbose })
+  const ensSubdomainRegistrarBase = await ENSSubdomainRegistrar.new()
+  await logDeploy(ensSubdomainRegistrarBase, { verbose })
+
+  let daoFactory
+  if (daoFactoryAddress) {
+    daoFactory = DAOFactory.at(daoFactoryAddress)
+    const hasEVMScripts = await daoFactory.regFactory() !== ZERO_ADDR
+
+    log(`Using provided DAOFactory (with${hasEVMScripts ? '' : 'out' } EVMScripts):`, daoFactoryAddress)
+  } else {
+    log('Deploying DAOFactory with EVMScripts...')
+    daoFactory = (await deployDaoFactory(null, { artifacts, withEvmScriptRegistryFactory: true, verbose: false })).daoFactory
+  }
+
+  log('Deploying APMRegistryFactory...')
+  const apmFactory = await APMRegistryFactory.new(
+    daoFactory.address,
+    apmRegistryBase.address,
+    apmRepoBase.address,
+    ensSubdomainRegistrarBase.address,
+    ensAddress,
+    '0x00'
+  )
+  await logDeploy(apmFactory, { verbose })
+
+
+  log(`Assigning ENS name (${labelName}.${tldName}) to factory... ${apmFactory.address}`)
+
+  if (await ens.owner(apmNode) === accounts[0]) {
+    log('Transferring name ownership from deployer to APMRegistryFactory')
+    await ens.setOwner(apmNode, apmFactory.address)
+  } else {
+    log('Creating subdomain and assigning it to APMRegistryFactory')
+    try {
+      await ens.setSubnodeOwner(tldHash, labelHash, apmFactory.address)
+      //await ens.setSubnodeOwner(apmNode, keccak256('open'), apmFactory.address)
+    } catch (err) {
+      console.error(err);
+      console.error(
+        `Error: could not set the owner of '${labelName}.${tldName}' on the given ENS instance`,
+        `(${ensAddress}). Make sure you have ownership rights over the subdomain.`
+      )
+      throw err
+    }
+  }
+
+  log('Deploying APM...')
+  const receipt = await apmFactory.newAPM(tldHash, labelHash, owner)
+
+  log('=========')
+  const apmAddr = receipt.logs.filter(l => l.event == 'DeployAPM')[0].args.apm
+  console.log(receipt.logs);
+  const apmDAO = APMRegistry.at(apmAddr);
+
+  log('Address:', apmAddr)
+  log('Transaction hash:', receipt.tx)
+
+
+
+
+  log('Deploying subdomain APM bases...')
+
+  const subApmRegistryBase = await APMRegistry.new()
+  await logDeploy(subApmRegistryBase, { verbose })
+  const subApmRepoBase = await Repo.new()
+  await logDeploy(subApmRepoBase, { verbose })
+  const subEnsSubdomainRegistrarBase = await ENSSubdomainRegistrar.new()
+  await logDeploy(subEnsSubdomainRegistrarBase, { verbose })
+
+  log('Deploying APMRegistryFactory...')
+  const subApmFactory = await APMRegistryFactory.new(
+    daoFactory.address,
+    subApmRegistryBase.address,
+    subApmRepoBase.address,
+    subEnsSubdomainRegistrarBase.address,
+    ensAddress,
+    '0x00'
+  )
+  await logDeploy(subApmFactory, { verbose })
+
+
+  const kernelAddr = await apmDAO.kernel();
+  console.log(kernelAddr);
+  const aclAddr = await Kernel.at(kernelAddr).acl();
+  const acl = ACL.at(aclAddr);
+
+  const role = await ensSubdomainRegistrarBase.CREATE_NAME_ROLE();
+  const registrarAddr = await apmDAO.registrar();
+  const registrar = ENSSubdomainRegistrar.at(registrarAddr);
+
+  console.log(owner, registrarAddr, role);
+
+  try {
+  await acl.grantPermission(owner, registrarAddr, role);
+
+  log('Deploying subdomain APM...')
+
+  console.log(await acl.hasPermission(owner, registrar.address, role))
+  console.log(subApmFactory.address)
+  await registrar.createNameAndPoint(namehash('open'), subApmFactory.address)
+
+  const subReceipt = await subApmFactory.newAPM(namehash('aragonpm.eth'), namehash('open'), owner)
+
+  log('=========')
+  const subApmAddr = subReceipt.logs.filter(l => l.event == 'DeployAPM')[0].args.apm
+  console.log(subReceipt.logs);
+  console.log(subApmAddr);
+
+  } catch(e) {
+    console.log(e);
+  }
+
+  if (typeof truffleExecCallback === 'function') {
+    // Called directly via `truffle exec`
+    truffleExecCallback()
+  } else {
+    return {
+      apmFactory,
+      ens,
+      apm: APMRegistry.at(apmAddr),
+    }
+  }
+}
+
+/*
+"
+
+const namehash = require('eth-ens-namehash').hash
+const keccak256 = require('js-sha3').keccak_256
+
+const deployENS = require('@aragon/os/scripts/deploy-test-ens')
+const deployDaoFactory = require('@aragon/os/scripts/deploy-daofactory')
+const logDeploy = require('@aragon/os/scripts//helpers/deploy-logger')
+const getAccounts = require('@aragon/os/scripts//helpers/get-accounts')
+
+const globalArtifacts = this.artifacts // Not injected unless called directly via truffle
+const globalWeb3 = this.web3 // Not injected unless called directly via truffle
+
+const ZERO_ADDR = '0x0000000000000000000000000000000000000000'
+
+const defaultOwner = process.env.OWNER
+const defaultDaoFactoryAddress = process.env.DAO_FACTORY
+const defaultENSAddress = process.env.ENS
+
+module.exports = async (
+  truffleExecCallback,
+  {
+    artifacts = globalArtifacts,
+    web3 = globalWeb3,
+    ensAddress = defaultENSAddress,
+    owner = defaultOwner,
+    daoFactoryAddress = defaultDaoFactoryAddress,
+    verbose = true
+  } = {}
+) => {
+  const log = (...args) => {
+    if (verbose) { console.log(...args) }
+  }
+
+  const APMRegistry = artifacts.require('APMRegistry')
+  const Repo = artifacts.require('Repo')
+  const ENSSubdomainRegistrar = artifacts.require('ENSSubdomainRegistrar')
+
+  const DAOFactory = artifacts.require('DAOFactory')
+  const APMRegistryFactory = artifacts.require('APMRegistryFactory')
+  const ENS = artifacts.require('ENS')
+
+  const tldName = 'eth'
+  const labelName = 'open.aragonpm'
+  const tldHash = namehash(tldName)
+  const labelHash = '0x'+keccak256(labelName)
+  const apmNode = namehash(`${labelName}.${tldName}`)
+
+  let ens
+
+  log('Deploying APM...')
+
+  const accounts = await getAccounts(web3)
+  if (!owner) {
+    owner = accounts[0]
+    log('OWNER env variable not found, setting APM owner to the provider\'s first account')
+  }
+  log('Owner:', owner)
+
+  if (!ensAddress) {
+    log('=========')
+    log('Missing ENS! Deploying a custom ENS...')
+    ens = (await deployENS(null, { artifacts, owner, verbose: false })).ens
+    ensAddress = ens.address
+  } else {
+    ens = ENS.at(ensAddress)
+  }
+
+  log('ENS:', ensAddress)
+  log(`TLD: ${tldName} (${tldHash})`)
+  log(`Label: ${labelName} (${labelHash})`)
+
+  log('=========')
+  log('Deploying APM bases...')
+
+  const apmRegistryBase = await APMRegistry.new()
+  await logDeploy(apmRegistryBase, { verbose })
+  const apmRepoBase = await Repo.new()
+  await logDeploy(apmRepoBase, { verbose })
+  const ensSubdomainRegistrarBase = await ENSSubdomainRegistrar.new()
+  await logDeploy(ensSubdomainRegistrarBase, { verbose })
+
+  let daoFactory
+  if (daoFactoryAddress) {
+    daoFactory = DAOFactory.at(daoFactoryAddress)
+    const hasEVMScripts = await daoFactory.regFactory() !== ZERO_ADDR
+
+    log(`Using provided DAOFactory (with${hasEVMScripts ? '' : 'out' } EVMScripts):`, daoFactoryAddress)
+  } else {
+    log('Deploying DAOFactory with EVMScripts...')
+    daoFactory = (await deployDaoFactory(null, { artifacts, withEvmScriptRegistryFactory: true, verbose: false })).daoFactory
+  }
+
+  log('Deploying APMRegistryFactory...')
+  const apmFactory = await APMRegistryFactory.new(
+    daoFactory.address,
+    apmRegistryBase.address,
+    apmRepoBase.address,
+    ensSubdomainRegistrarBase.address,
+    ensAddress,
+    '0x00'
+  )
+  await logDeploy(apmFactory, { verbose })
+
+  log(`Assigning ENS name (${labelName}.${tldName}) to factory...`)
+
+  if (await ens.owner(apmNode) === accounts[0]) {
+    log('Transferring name ownership from deployer to APMRegistryFactory')
+    await ens.setOwner(apmNode, apmFactory.address)
+  } else {
+    log('Creating subdomain and assigning it to APMRegistryFactory')
+    try {
+      await ens.setSubnodeOwner(tldHash, labelHash, apmFactory.address)
+    } catch (err) {
+      console.error(
+        `Error: could not set the owner of '${labelName}.${tldName}' on the given ENS instance`,
+        `(${ensAddress}). Make sure you have ownership rights over the subdomain.`
+      )
+      throw err
+    }
+  }
+
+  log('Deploying APM...')
+  const receipt = await apmFactory.newAPM(tldHash, labelHash, owner)
+
+  log('=========')
+  const apmAddr = receipt.logs.filter(l => l.event == 'DeployAPM')[0].args.apm
+  log('# APM:')
+  log('Address:', apmAddr)
+  log('Transaction hash:', receipt.tx)
+  log('=========')
+
+  try {
+    const kernel = await ensSubdomainRegistrarBase.kernel();
+    const acl = await kernel.acl();
+    console.log(acl);
+    let ret = await ensSubdomainRegistrarBase.createNameAndPoint(labelHash, apmAddr).then(console.log).catch(console.log);
+    console.log(ret);
+  } catch(e) {
+    console.log(e);
+  }
+
+
+
+
+  if (typeof truffleExecCallback === 'function') {
+    // Called directly via `truffle exec`
+    truffleExecCallback()
+  } else {
+    return {
+      apmFactory,
+      ens,
+      apm: APMRegistry.at(apmAddr),
+    }
+  }
+}
+*/

scripts/deploy-kit.js

@@ -35,9 +35,7 @@ module.exports = async function(callback) {
   }
   console.log(`Using DAOFactory at: ${daoFactory.address}`)
 
-  const apps = fs.readdirSync('./apps', { withFileTypes: true })
+  const apps = fs.readdirSync('./apps')
-                 .filter(e => e.isDirectory())
-                 .map(e => e.name);
   console.log(`Found apps: [${apps}].${apm}`)
   let appIds = {}
   apps.sort().forEach((app) => {

scripts/fix-package-lock.js

@@ -1,47 +0,0 @@
-#!/usr/bin/env node
-
-// whatever npm does?! and for whatever this is needed..
-// https://github.com/aragon/aragon-cli/blob/master/packages/aragon-cli/scripts/fix-lockfile
-// https://github.com/aragon/aragon-cli/blob/master/docs-internal/Dependencies.md#regenerate-the-lockfiles
-
-const fs = require('fs')
-const path = require('path')
-
-function replaceAll(string, mapObject) {
-  const regex = new RegExp(Object.keys(mapObject).join('|'), 'gi')
-  let occurrences = 0
-  const result = string.replace(regex, matched => {
-    occurrences++
-    return mapObject[matched]
-  })
-  console.log(`[fix-lockfile] Replaced ${occurrences} occurrences.`)
-  return result
-}
-async function fixLockfile(path, replacementMap) {
-  const originalJson = require(path)
-  const originalText = JSON.stringify(originalJson, null, 2)
-  const fixedText = replaceAll(originalText, replacementMap)
-  const fixedJson = JSON.parse(fixedText)
-  console.log('writing file', path);
-  await fs.writeFileSync(path, JSON.stringify(fixedJson, null, 2))
-}
-//
-
-const LOCKFILE_PATH = path.join(__dirname, '..', 'package-lock.json')
-
-const replacementMap = {
-  //
-  '"version": "github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c"':
-    '"version": "0.2.3"',
-  //
-  '"from": "github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c"':
-    '"resolved": "github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c"',
-  //
-  '"from": "async-eventemitter@github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c"':
-    '"resolved": "github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c"',
-  //
-  '"async-eventemitter": "async-eventemitter@github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c"':
-    '"async-eventemitter": "github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c"',
-}
-
-fixLockfile(LOCKFILE_PATH, replacementMap)

scripts/git-hooks/install

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

scripts/git-hooks/pre-commit

@@ -1,17 +0,0 @@
-#!/bin/sh
-#
-# Run appropriate linter against staged files
-#
-if [ $(git diff --name-only --cached lib/ | wc -l) != 0 ]; then
-  ./node_modules/.bin/eslint lib/
-  if [ $? != 0 ]; then
-    exit 1
-  fi
-fi
-# TODO master not linted yet, uncomment this when ready
-# if [ $(git diff --name-only --cached contracts/ | wc -l) != 0 ]; then
-#   solhint contracts/**/*.sol && apps/*/contracts/**/*.sol
-#   if [ $? != 0 ]; then
-#     exit 1
-#   fi
-# fi

scripts/list-contributions.js

@@ -15,15 +15,13 @@ module.exports = async function(callback) {
   console.log(`Using Contribution at: ${kredits.Contribution.contract.address}`);
 
   const table = new Table({
-    head: ['ID', 'Contributor ID', 'Description', 'Amount', 'Confirmed?', 'Vetoed?', 'Claimed?', 'IPFS']
+    head: ['ID', 'Contributor ID', 'Description', 'Amount', 'Confirmed?', 'Vetoed?', 'Claimed?']
   })
 
   try {
     let blockNumber = await kredits.provider.getBlockNumber();
-    let contributions = await kredits.Contribution.all({page: {size: 1000}});
+    let contributions = await kredits.Contribution.all();
 
-    let kreditsSum = 0;
-    console.log(`Current block number: ${blockNumber}`);
     contributions.forEach((c) => {
       const confirmed = c.confirmedAtBlock <= blockNumber;
 
@@ -32,18 +30,13 @@ module.exports = async function(callback) {
         c.contributorId,
         `${c.description}`,
         c.amount.toString(),
-        `${confirmed} (${c.confirmedAtBlock})`,
+        confirmed,
         c.vetoed,
         c.claimed,
-        c.ipfsHash
       ])
     });
 
     console.log(table.toString());
-
-    let totalKreditsEarnedUnConfirmed = await kredits.Contribution.functions.totalKreditsEarned(false);
-    let totalKreditsEarnedConfirmed = await kredits.Contribution.functions.totalKreditsEarned(true);
-    console.log(`Total Kredits: ${totalKreditsEarnedConfirmed} (confirmed) | ${totalKreditsEarnedUnConfirmed} (including unconfirmed)`);
   } catch (err) {
     console.log(err);
   }

scripts/list-contributors.js

@@ -15,31 +15,23 @@ module.exports = async function(callback) {
 
   console.log(`Using Contributor at: ${kredits.Contributor.contract.address}`);
 
+
   const table = new Table({
-    head: ['ID', 'Account', 'Name', 'Core?', 'Balance', 'Kredits earned', 'Contributions count', 'IPFS']
+    head: ['ID', 'Account', 'Core?', 'Name', 'Balance']
   })
 
-  try {
+  let contributors = await kredits.Contributor.all()
-    const contributors = await kredits.Contributor.all()
 
   contributors.forEach((c) => {
     table.push([
       c.id.toString(),
       c.account,
-        `${c.name}`,
       c.isCore,
-        c.balanceInt.toString(),
+      `${c.name}`,
-        c.totalKreditsEarned.toString(),
+      ethers.utils.formatEther(c.balance)
-        c.contributionsCount.toString(),
-        c.ipfsHash
     ])
   })
-
   console.log(table.toString())
-  } catch(e) {
-    callback(e);
-    return;
-  }
-
   callback()
 }
+

scripts/new-dao.js

@@ -1,13 +1,13 @@
 const fs = require('fs');
 const path = require('path');
 
-const ethers = require('ethers');
 const fileInject = require('./helpers/file_inject.js');
 const getNetworkId = require('./helpers/networkid.js');
-const KreditsKit = require('../lib/kreditskit');
 
 const addressesPath = path.join(__dirname, '..', 'lib/addresses');
 
+const KreditsKit = artifacts.require('KreditsKit')
+
 module.exports = async function(callback) {
   const networkId = await getNetworkId(web3)
   console.log(`Deploying to networkId: ${networkId}`)
@@ -20,21 +20,25 @@ module.exports = async function(callback) {
   }
   console.log(`Using KreditsKit at: ${kreditsKitAddress}`);
 
-  const provider = new ethers.providers.Web3Provider(web3.currentProvider);
+  let kreditsKit = KreditsKit.at(kreditsKitAddress)
-  let signer = provider.getSigner();
 
-  let kit = await new KreditsKit(provider, signer).init()
+  kreditsKit.newInstance().then((ret) => {
+    console.log(ret.logs);
+    const installedEvents = ret.logs.filter(log => log.event === 'InstalledApp').map(log => log.args)
+    const deployEvents = ret.logs.filter(log => log.event === 'DeployInstance').map(log => log.args)
 
-  // TODO: get rid of the hard coded gas limit
+    if (deployEvents.length > 1) {
-  kit.newDAO({ gasLimit: 10000000 }).then(result => {
+      callback(new Error("More than one DAO was deployed. Something is wrong"))
-    console.log(result);
+    }
-    fileInject(path.join(addressesPath, 'dao.json'), networkId, result.daoAddress)
+    const daoAddress = deployEvents[0].dao;
 
-    console.log(`\n\nCreated new DAO at: ${result.daoAddress}`)
+    fileInject(path.join(addressesPath, 'dao.json'), networkId, daoAddress)
+
+    console.log(`\n\nCreated new DAO at: ${daoAddress}`)
 
     callback();
   }).catch((err) => {
-    console.log('failed to create a new DAO')
+    console.log('failed to create a new instance')
     callback(err)
   })
 }

scripts/seeds.js

@@ -17,18 +17,13 @@ module.exports = async function(callback) {
   let fundingAmount = 2;
   each(seeds.funds, (address, next) => {
     console.log(`funding ${address} with 2 ETH`);
-    try {
+    web3.eth.sendTransaction({
-      web3.eth.personal.getAccounts().then(accounts => {
-        web3.eth.personal.sendTransaction({
       to: address,
-          from: accounts[0],
+      value: web3.toWei(fundingAmount),
-          value: web3.utils.toWei(new web3.utils.BN(fundingAmount))
+      from: web3.eth.accounts[0]
-        });
+    },
-      });
+    (result) => { next(); }
-    } catch(e) {
+    )
-      console.log('FAILED:', e);
-    }
-    next();
   });
 
   each(seeds.contractCalls, (call, next) => {

scripts/send-funds.js

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

scripts/veto-contribution.js

@@ -1,32 +0,0 @@
-const promptly = require('promptly');
-const { inspect } = require('util');
-
-const initKredits = require('./helpers/init_kredits.js');
-
-module.exports = async function(callback) {
-  let kredits;
-  try { kredits = await initKredits(web3);
-  } catch(e) { callback(e); return; }
-
-  console.log(`Using Contributions at: ${kredits.Contribution.contract.address}\n`);
-
-  let contributionId = await promptly.prompt('Contribution ID: ');
-
-  console.log(`Recording a veto for contribution #${contributionId}`);
-
-  try {
-    kredits.Contribution.functions.veto(contributionId, { gasLimit: 300000 })
-      .then(result => {
-        console.log("\n\nResult:");
-        console.log(result);
-        callback();
-      })
-      .catch(error => {
-        console.log('Failed to veto contribution');
-        callback(inspect(error));
-      });
-  } catch(err) {
-    console.log('Failed to veto contribution');
-    callback(inspect(err));
-  }
-}