5.2.0

Add contract calls for total contribution balances

.gitignore

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

README.md

@@ -36,7 +36,7 @@ development ganache.
 
     $ npm run devchain (or aragon devchain --port 7545)
 
-To clear/reset the chain use:
+To clear/reset the chain use (e.g. if you run out of funds on your devchain)
 
     $ npm run devchain -- --reset (or aragon devchain --port 7545 --reset)
 
@@ -79,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 `npm
-run deploy:dao` command. This deploys a new Kredits DAO, installs the latest
-app versions and sets the required permissions.
+A DAO can be deployed using the `scripts/deploy-kit.js` script or with the
+`npm run deploy:dao` command. This deploys a new Kredits DAO, installs the
+latest app versions and sets the required permissions.
 
 See each app in `/apps/*` for details.
 
@@ -115,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-{contributor, contribution, proposal}.js
+### list-{contributors, contributions, proposals}.js
 
 List contract entries
 
-    $ truffle exec scripts/list-{contributor, contribution, proposal}.js
+    $ truffle exec scripts/list-{contributors, contributions, proposals}.js
 
 ### send-funds.js
 
@@ -152,7 +152,7 @@ Deploys a new KreditsKit that allows to create a new DAO
     or
     $ npm run deploy:kit
 
-`ENS` address is required as environment variable.  
+`ENS` address is required as environment variable.
 `DAO_FACTORY` can optionally be set as environment variable. (see aragon)
 
 ### new-dao.js

apps/contribution/contracts/Contribution.sol

@@ -118,6 +118,26 @@ contract Contribution is AragonApp {
   // Custom functions
   //
 
+  function totalKreditsEarned(bool confirmedOnly) public view returns (uint256 count) {
+    for (uint32 i = 1; i <= contributionsCount; i++) {
+      ContributionData memory c = contributions[i];
+      if (block.number >= c.confirmedAtBlock || !confirmedOnly) {
+        count += c.amount; // should use safemath
+      }
+    }
+  }
+
+  function totalKreditsEarnedByContributor(uint32 contributorId, bool confirmedOnly) public view returns (uint256 count) {
+    uint256 tokenBalance = ownedContributions[contributorId].length;
+    for (uint256 i = 0; i < tokenBalance; i++) {
+      uint32 cId = ownedContributions[contributorId][i];
+      ContributionData memory c = contributions[cId];
+      if (block.number >= c.confirmedAtBlock || !confirmedOnly) {
+        count += 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];

apps/contribution/package.json

@@ -11,10 +11,10 @@
     "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": "npm run sync-assets && npm run build:script -- --no-minify && parcel serve app/index.html -p 8001 --out-dir dist/ --no-cache",
+    "start:app": "",
     "test": "aragon contracts test",
     "compile": "aragon contracts compile",
-    "sync-assets": "copy-aragon-ui-assets -n aragon-ui ./dist",
+    "sync-assets": "",
     "build:app": "",
     "build:script": "",
     "build": "",

apps/contribution/test/app.js

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

apps/contributor/contracts/Contributor.sol

@@ -6,6 +6,10 @@ 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 (uint256 count);
+  function balanceOf(address owner) public view returns (uint256);
+}
 
 contract Contributor is AragonApp {
   bytes32 public constant KERNEL_APP_ADDR_NAMESPACE = 0xd6f028ca0e8edb4a8c9757ca4fdccab25fa1e0317da1188108f7d2dee14902fb;
@@ -43,6 +47,12 @@ contract Contributor is AragonApp {
     return k.getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[uint8(Apps.Token)]);
   }
 
+  function getContributionContract() public view returns (address) {
+    IKernel k = IKernel(kernel());
+
+    return k.getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[uint8(Apps.Contribution)]);
+  }
+
   function coreContributorsCount() view public returns (uint32) {
     uint32 count = 0;
     for (uint32 i = 1; i <= contributorsCount; i++) {
@@ -118,7 +128,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, bool exists ) {
+  function getContributorById(uint32 _id) public view returns (uint32 id, address account, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize, bool isCore, uint256 balance, uint256 totalKreditsEarned, uint256 contributionsCount, bool exists ) {
     id = _id;
     Contributor storage c = contributors[_id];
     account = c.account;
@@ -128,6 +138,9 @@ contract Contributor is AragonApp {
     isCore = isCoreTeam(id);
     address token = getTokenContract();
     balance = ITokenBalance(token).balanceOf(c.account);
+    address contribution = getContributionContract();
+    totalKreditsEarned = IContributionBalance(contribution).totalKreditsEarnedByContributor(_id, true);
+    contributionsCount = IContributionBalance(contribution).balanceOf(c.account);
     exists = c.exists;
   }
 

apps/contributor/test/app.js

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

apps/proposal/manifest.json

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

apps/proposal/test/app.js

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

apps/token/manifest.json

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

apps/token/test/app.js

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

config/seeds.js

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

lib/contracts/base.js

@@ -20,4 +20,5 @@ class Base {
     return this.contract.on(type, callback);
   }
 }
+
 module.exports = Base;

lib/contracts/contribution.js

@@ -1,21 +1,9 @@
-const ethers = require('ethers');
-
+const Record = require('./record');
 const ContributionSerializer = require('../serializers/contribution');
-const Base = require('./base');
 
-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);
-        }
-
-        return contributions;
-      });
+class Contribution extends Record {
+  get count () {
+    return this.functions.contributionsCount();
   }
 
   getById(id) {
@@ -47,13 +35,17 @@ class Contribution extends Base {
       });
   }
 
-  addContribution(contributionAttr, callOptions = {}) {
-    let json = ContributionSerializer.serialize(contributionAttr);
-    // TODO: validate against schema
+  async addContribution(contributionAttr, callOptions = {}) {
+    const contribution = new ContributionSerializer(contributionAttr);
+
+    try { await contribution.validate(); }
+    catch (error) { return Promise.reject(error); }
+
+    const jsonStr = contribution.serialize();
 
     return this.ipfs
-      .add(json)
-      .then((ipfsHashAttr) => {
+      .add(jsonStr)
+      .then(ipfsHashAttr => {
         let contribution = [
           contributionAttr.amount,
           contributionAttr.contributorId,

lib/contracts/contributor.js

@@ -1,26 +1,13 @@
-const ethers = require('ethers');
-const RSVP = require('rsvp');
-
+const Record = require('./record');
 const ContributorSerializer = require('../serializers/contributor');
-const Base = require('./base');
 
-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));
-        }
-
-        return RSVP.all(contributors);
-      });
+class Contributor extends Record {
+  get count () {
+    return this.functions.contributorsCount();
   }
 
   getById(id) {
     return this.functions.getContributorById(id)
-      // Fetch IPFS data if available
       .then((data) => {
         return this.ipfs.catAndMerge(data, ContributorSerializer.deserialize);
       });
@@ -50,12 +37,16 @@ class Contributor extends Base {
     });
   }
 
-  add(contributorAttr, callOptions = {}) {
-    let json = ContributorSerializer.serialize(contributorAttr);
-    // TODO: validate against schema
+  async add(contributorAttr, callOptions = {}) {
+    let contributor = new ContributorSerializer(contributorAttr);
+
+    try { await contributor.validate(); }
+    catch (error) { return Promise.reject(error); }
+
+    const jsonStr = contributor.serialize();
 
     return this.ipfs
-      .add(json)
+      .add(jsonStr)
       .then((ipfsHashAttr) => {
         let contributor = [
           contributorAttr.account,
@@ -67,6 +58,30 @@ class Contributor extends Base {
         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/proposal.js

@@ -1,21 +1,9 @@
-const ethers = require('ethers');
-const RSVP = require('rsvp');
-
+const Record = require('./record');
 const ContributionSerializer = require('../serializers/contribution');
-const Base = require('./base');
 
-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));
-        }
-
-        return RSVP.all(proposals);
-      });
+class Proposal extends Record {
+  get count () {
+    return this.functions.proposalsCount();
   }
 
   getById(id) {
@@ -25,12 +13,16 @@ class Proposal extends Base {
       });
   }
 
-  addProposal(proposalAttr, callOptions = {}) {
-    let json = ContributionSerializer.serialize(proposalAttr);
-    // TODO: validate against schema
+  async addProposal(proposalAttr, callOptions = {}) {
+    const contribution = new ContributionSerializer(proposalAttr);
+
+    try { await contribution.validate(); }
+    catch (error) { return Promise.reject(error); }
+
+    const jsonStr = contribution.serialize();
 
     return this.ipfs
-      .add(json)
+      .add(jsonStr)
       .then((ipfsHashAttr) => {
         let proposal = [
           proposalAttr.contributorId,

lib/contracts/record.js

@@ -0,0 +1,14 @@
+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,4 +4,3 @@ class Token extends Base {
 }
 
 module.exports = Token;
-

lib/kredits.js

@@ -1,5 +1,4 @@
 const ethers = require('ethers');
-const RSVP = require('rsvp');
 
 const Preflight = require('./utils/preflight');
 
@@ -57,7 +56,8 @@ class Kredits {
           );
         });
       });
-      return RSVP.all(addressPromises).then(() => { return this });
+
+      return Promise.all(addressPromises).then(() => { return this });
     });
   }
 

lib/serializers/contribution.js

@@ -1,48 +1,33 @@
+const schemas = require('kosmos-schemas');
+const validator = require('../utils/validator');
+
 /**
- * Handle serialization for JSON-LD object of the contribution, according to
- * https://github.com/67P/kosmos-schemas/blob/master/schemas/contribution.json
+ * Serialization and validation for JSON-LD document of the contribution.
  *
  * @class
  * @public
  */
 class Contribution {
- /**
-  * Deserialize JSON to object
-  *
-  * @method
-  * @public
-  */
-  static deserialize(serialized) {
-    let {
-      kind,
-      description,
-      details,
-      url,
-    } = JSON.parse(serialized.toString('utf8'));
 
-    return {
-      kind,
-      description,
-      details,
-      url,
-      ipfsData: serialized,
-    };
+  constructor(attrs) {
+    Object.keys(attrs).forEach(a => this[a] = attrs[a]);
   }
 
- /**
-  * Serialize object to JSON
-  *
-  * @method
-  * @public
-  */
-  static serialize(deserialized) {
+  /**
+   * Serialize object to JSON
+   *
+   * @public
+   */
+  serialize () {
     let {
       contributorIpfsHash,
+      date,
+      time,
       kind,
       description,
       url,
       details
-    } = deserialized;
+    } = this;
 
     let data = {
       "@context": "https://schema.kosmos.org",
@@ -50,6 +35,8 @@ class Contribution {
       "contributor": {
         "ipfs": contributorIpfsHash
       },
+      date,
+      time,
       kind,
       description,
       "details": details || {}
@@ -62,6 +49,44 @@ class Contribution {
     // 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
+   *
+   * @public
+   */
+  static deserialize (serialized) {
+    let {
+      date,
+      time,
+      kind,
+      description,
+      details,
+      url,
+    } = JSON.parse(serialized.toString('utf8'));
+
+    return {
+      date,
+      time,
+      kind,
+      description,
+      details,
+      url,
+      ipfsData: serialized,
+    };
+  }
+
 }
 
 module.exports = Contribution;

lib/serializers/contributor.js

@@ -1,3 +1,5 @@
+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
@@ -6,41 +8,9 @@
  * @public
  */
 class Contributor {
- /**
-  * Deserialize JSON to object
-  *
-  * @method
-  * @public
-  */
-  static deserialize(serialized) {
-    let {
-      name,
-      kind,
-      url,
-      accounts,
-    } = JSON.parse(serialized.toString('utf8'));
 
-    let github_username, github_uid, wiki_username;
-    let github = accounts.find((a) => a.site === 'github.com');
-    let wiki   = accounts.find((a) => a.site === 'wiki.kosmos.org');
-
-    if (github) {
-      (({ username: github_username, uid: github_uid} = github));
-    }
-    if (wiki) {
-      (({ username: wiki_username } = wiki));
-    }
-
-    return {
-      name,
-      kind,
-      url,
-      accounts,
-      github_uid,
-      github_username,
-      wiki_username,
-      ipfsData: serialized,
-    };
+  constructor(attrs) {
+    Object.keys(attrs).forEach(a => this[a] = attrs[a]);
   }
 
  /**
@@ -49,7 +19,7 @@ class Contributor {
   * @method
   * @public
   */
-  static serialize(deserialized) {
+  serialize () {
     let {
       name,
       kind,
@@ -57,7 +27,7 @@ class Contributor {
       github_uid,
       github_username,
       wiki_username,
-    } = deserialized;
+    } = this;
 
     let data = {
       "@context": "https://schema.kosmos.org",
@@ -91,6 +61,55 @@ class Contributor {
     // 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) {
+    let {
+      name,
+      kind,
+      url,
+      accounts,
+    } = JSON.parse(serialized.toString('utf8'));
+
+    let github_username, github_uid, wiki_username;
+    let github = accounts.find((a) => a.site === 'github.com');
+    let wiki   = accounts.find((a) => a.site === 'wiki.kosmos.org');
+
+    if (github) {
+      (({ username: github_username, uid: github_uid} = github));
+    }
+    if (wiki) {
+      (({ username: wiki_username } = wiki));
+    }
+
+    return {
+      name,
+      kind,
+      url,
+      accounts,
+      github_uid,
+      github_username,
+      wiki_username,
+      ipfsData: serialized,
+    };
+  }
+
 }
 
 module.exports = Contributor;

lib/utils/pagination.js

@@ -0,0 +1,46 @@
+function pageNumber(number, size, recordCount) {
+  let numberOfPages = Math.ceil(recordCount / size);
+
+  number = parseInt(number) || 1;
+
+  // Ensure page number is in range
+  number = number < 1 ? 1 : number;
+  number = number > numberOfPages ? numberOfPages : 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/validator.js

@@ -0,0 +1,15 @@
+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-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "kredits-contracts",
-  "version": "4.0.2",
+  "version": "5.2.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -833,14 +833,12 @@
     "ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
     },
     "ansi-styles": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "dev": true
+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
     },
     "any-observable": {
       "version": "0.2.0",
@@ -951,7 +949,6 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
       "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-      "dev": true,
       "requires": {
         "chalk": "^1.1.3",
         "esutils": "^2.0.2",
@@ -962,7 +959,6 @@
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
           "requires": {
             "ansi-styles": "^2.2.1",
             "escape-string-regexp": "^1.0.2",
@@ -977,7 +973,6 @@
       "version": "6.26.3",
       "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz",
       "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
-      "dev": true,
       "requires": {
         "babel-code-frame": "^6.26.0",
         "babel-generator": "^6.26.0",
@@ -1004,7 +999,6 @@
       "version": "6.26.1",
       "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
       "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
-      "dev": true,
       "requires": {
         "babel-messages": "^6.23.0",
         "babel-runtime": "^6.26.0",
@@ -1019,8 +1013,7 @@
         "jsesc": {
           "version": "1.3.0",
           "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
-          "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
-          "dev": true
+          "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s="
         }
       }
     },
@@ -1155,7 +1148,6 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
       "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
-      "dev": true,
       "requires": {
         "babel-runtime": "^6.22.0",
         "babel-template": "^6.24.1"
@@ -1165,7 +1157,6 @@
       "version": "6.23.0",
       "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
       "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
-      "dev": true,
       "requires": {
         "babel-runtime": "^6.22.0"
       }
@@ -1179,6 +1170,23 @@
         "babel-runtime": "^6.22.0"
       }
     },
+    "babel-plugin-static-fs": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-static-fs/-/babel-plugin-static-fs-1.2.0.tgz",
+      "integrity": "sha512-7zsDPvDzCBwfbU53WKym5LxTe1PxQHE/dGo+EfIELlBcn08TpU7SlPJILcc6YVAyTrpVUNioQfWiUyMWk1DJVg==",
+      "requires": {
+        "babel-template": "^6.3.13",
+        "babel-types": "^6.4.1",
+        "events": "^1.1.0"
+      },
+      "dependencies": {
+        "events": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
+          "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
+        }
+      }
+    },
     "babel-plugin-syntax-async-functions": {
       "version": "6.13.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
@@ -1514,7 +1522,6 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
       "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
-      "dev": true,
       "requires": {
         "babel-core": "^6.26.0",
         "babel-runtime": "^6.26.0",
@@ -1529,7 +1536,6 @@
           "version": "0.4.18",
           "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
           "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
-          "dev": true,
           "requires": {
             "source-map": "^0.5.6"
           }
@@ -1540,7 +1546,6 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "dev": true,
       "requires": {
         "core-js": "^2.4.0",
         "regenerator-runtime": "^0.11.0"
@@ -1550,7 +1555,6 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
       "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
-      "dev": true,
       "requires": {
         "babel-runtime": "^6.26.0",
         "babel-traverse": "^6.26.0",
@@ -1563,7 +1567,6 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
       "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
-      "dev": true,
       "requires": {
         "babel-code-frame": "^6.26.0",
         "babel-messages": "^6.23.0",
@@ -1580,7 +1583,6 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
       "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
-      "dev": true,
       "requires": {
         "babel-runtime": "^6.26.0",
         "esutils": "^2.0.2",
@@ -1609,8 +1611,7 @@
     "babylon": {
       "version": "6.18.0",
       "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-      "dev": true
+      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="
     },
     "balanced-match": {
       "version": "1.0.0",
@@ -1802,6 +1803,16 @@
         "concat-map": "0.0.1"
       }
     },
+    "brfs-babel": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/brfs-babel/-/brfs-babel-1.0.0.tgz",
+      "integrity": "sha1-Zy32AGfQKSEMSTKNeLOXnVe1Cxg=",
+      "requires": {
+        "babel-core": "^6.4.0",
+        "babel-plugin-static-fs": "^1.1.0",
+        "through2": "^2.0.0"
+      }
+    },
     "brorand": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
@@ -2287,7 +2298,6 @@
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
       "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
-      "dev": true,
       "requires": {
         "safe-buffer": "~5.1.1"
       }
@@ -2313,14 +2323,12 @@
     "core-js": {
       "version": "2.6.5",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz",
-      "integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==",
-      "dev": true
+      "integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A=="
     },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "cors": {
       "version": "2.8.5",
@@ -2432,7 +2440,6 @@
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
       "requires": {
         "ms": "2.0.0"
       }
@@ -2628,7 +2635,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
       "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
-      "dev": true,
       "requires": {
         "repeating": "^2.0.0"
       }
@@ -2831,14 +2837,12 @@
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "esutils": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
-      "dev": true
+      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs="
     },
     "etag": {
       "version": "1.8.1",
@@ -9899,8 +9903,7 @@
     "globals": {
       "version": "9.18.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-      "dev": true
+      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="
     },
     "go-ipfs": {
       "version": "0.4.17",
@@ -10018,7 +10021,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
       "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dev": true,
       "requires": {
         "ansi-regex": "^2.0.0"
       }
@@ -10100,7 +10102,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
       "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
-      "dev": true,
       "requires": {
         "os-homedir": "^1.0.0",
         "os-tmpdir": "^1.0.1"
@@ -10322,7 +10323,6 @@
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
       "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-      "dev": true,
       "requires": {
         "loose-envify": "^1.0.0"
       }
@@ -10770,7 +10770,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
       "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-      "dev": true,
       "requires": {
         "number-is-nan": "^1.0.0"
       }
@@ -10934,8 +10933,7 @@
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
     },
     "isexe": {
       "version": "2.0.0",
@@ -11021,8 +11019,7 @@
     "js-tokens": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-      "dev": true
+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
     },
     "jsbn": {
       "version": "0.1.1",
@@ -11102,8 +11099,7 @@
     "json5": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
-      "dev": true
+      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE="
     },
     "jsonfile": {
       "version": "2.4.0",
@@ -11178,6 +11174,14 @@
         "graceful-fs": "^4.1.9"
       }
     },
+    "kosmos-schemas": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/kosmos-schemas/-/kosmos-schemas-2.0.0.tgz",
+      "integrity": "sha512-zIjWcDxaN94m1vPgUaI5LRX6y07Ihw9ScPoGKf1NkZ0sLgD/CRV8YIKRyDafH5mThe3uBN2+F6H6Gp5qhNhALg==",
+      "requires": {
+        "brfs-babel": "^1.0.0"
+      }
+    },
     "lcid": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
@@ -11718,7 +11722,6 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
       "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dev": true,
       "requires": {
         "js-tokens": "^3.0.0 || ^4.0.0"
       }
@@ -12026,7 +12029,6 @@
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
       "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "dev": true,
       "requires": {
         "minimist": "0.0.8"
       },
@@ -12034,8 +12036,7 @@
         "minimist": {
           "version": "0.0.8",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
         }
       }
     },
@@ -12127,8 +12128,7 @@
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
     "multiaddr": {
       "version": "3.1.0",
@@ -12322,8 +12322,7 @@
     "number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "dev": true
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
     },
     "number-to-bn": {
       "version": "1.7.0",
@@ -12463,8 +12462,7 @@
     "os-homedir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-      "dev": true
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
     },
     "os-locale": {
       "version": "1.4.0",
@@ -12478,8 +12476,7 @@
     "os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "dev": true
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
     },
     "over": {
       "version": "0.0.5",
@@ -12775,8 +12772,7 @@
     "private": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
-      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
-      "dev": true
+      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="
     },
     "process": {
       "version": "0.5.2",
@@ -12787,8 +12783,7 @@
     "process-nextick-args": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
-      "dev": true
+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
     },
     "promise": {
       "version": "1.3.0",
@@ -13158,7 +13153,6 @@
       "version": "2.3.6",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
       "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-      "dev": true,
       "requires": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -13178,8 +13172,7 @@
     "regenerator-runtime": {
       "version": "0.11.1",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
-      "dev": true
+      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
     },
     "regenerator-transform": {
       "version": "0.10.1",
@@ -13222,7 +13215,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
       "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-      "dev": true,
       "requires": {
         "is-finite": "^1.0.0"
       }
@@ -13663,8 +13655,7 @@
     "slash": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
-      "dev": true
+      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU="
     },
     "slice-ansi": {
       "version": "0.0.4",
@@ -13766,8 +13757,7 @@
     "source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
     },
     "source-map-support": {
       "version": "0.5.11",
@@ -13962,7 +13952,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
       "requires": {
         "ansi-regex": "^2.0.0"
       }
@@ -14003,8 +13992,7 @@
     "supports-color": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-      "dev": true
+      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
     },
     "swarm-js": {
       "version": "0.1.37",
@@ -14177,7 +14165,6 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
       "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "dev": true,
       "requires": {
         "readable-stream": "~2.3.6",
         "xtend": "~4.0.1"
@@ -14223,8 +14210,7 @@
     "to-fast-properties": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
-      "dev": true
+      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc="
     },
     "tough-cookie": {
       "version": "2.4.3",
@@ -14253,8 +14239,7 @@
     "trim-right": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
-      "dev": true
+      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM="
     },
     "truffle": {
       "version": "4.1.14",
@@ -14450,6 +14435,11 @@
         "safe-buffer": "^5.0.1"
       }
     },
+    "tv4": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/tv4/-/tv4-1.3.0.tgz",
+      "integrity": "sha1-0CDIRvrdUMhVq7JeuuzGj8EPeWM="
+    },
     "tweetnacl": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.1.tgz",
@@ -15603,8 +15593,7 @@
     "xtend": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-      "dev": true
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
     },
     "y18n": {
       "version": "3.2.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kredits-contracts",
-  "version": "4.0.2",
+  "version": "5.2.0",
   "description": "Ethereum contracts and npm wrapper for Kredits",
   "main": "./lib/kredits.js",
   "directories": {
@@ -45,7 +45,8 @@
   "dependencies": {
     "ethers": "^4.0.27",
     "ipfs-http-client": "^30.1.1",
-    "rsvp": "^4.8.2"
+    "kosmos-schemas": "^2.0.0",
+    "tv4": "^1.3.0"
   },
   "keywords": [
     "kosmos",

scripts/add-contribution.js

@@ -1,4 +1,5 @@
 const promptly = require('promptly');
+const { inspect } = require('util');
 
 const initKredits = require('./helpers/init_kredits.js');
 
@@ -26,23 +27,32 @@ 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 }).then((result) => {
-    console.log("\n\nResult:");
-    console.log(result);
-    callback();
-  }).catch((error) => {
-    console.log('Failed to create contribution');
-    callback(error);
-  });
+  kredits.Contribution.addContribution(contributionAttributes, { gasLimit: 300000 })
+    .then(result => {
+      console.log("\n\nResult:");
+      console.log(result);
+      callback();
+    })
+    .catch(error => {
+      console.log('Failed to create contribution');
+      callback(inspect(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: await prompt('GitHub UID: '),
+    github_uid: parseInt(await prompt('GitHub UID: ')),
     wiki_username: await prompt('Wiki username: '),
   };
 

scripts/add-proposal.js

@@ -1,4 +1,5 @@
 const promptly = require('promptly');
+const { inspect } = require('util');
 
 const initKredits = require('./helpers/init_kredits.js');
 
@@ -25,23 +26,31 @@ 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 }).then((result) => {
-    console.log("\n\nResult:");
-    console.log(result);
-    callback();
-  }).catch((error) => {
-    console.log('Failed to create proposal');
-    callback(error);
-  });
+  kredits.Proposal.addProposal(contributionAttributes, { gasLimit: 300000 })
+    .then((result) => {
+      console.log("\n\nResult:");
+      console.log(result);
+      callback();
+    }).catch((error) => {
+      console.log('Failed to create proposal');
+      callback(inspect(error));
+    });
 }

scripts/deploy-apm.js

@@ -1,363 +0,0 @@
-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/list-contributions.js

@@ -15,13 +15,14 @@ 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?']
+    head: ['ID', 'Contributor ID', 'Description', 'Amount', 'Confirmed?', 'Vetoed?', 'Claimed?', 'IPFS']
   })
 
   try {
     let blockNumber = await kredits.provider.getBlockNumber();
     let contributions = await kredits.Contribution.all();
 
+    console.log(`Current block number: ${blockNumber}`);
     contributions.forEach((c) => {
       const confirmed = c.confirmedAtBlock <= blockNumber;
 
@@ -30,13 +31,17 @@ module.exports = async function(callback) {
         c.contributorId,
         `${c.description}`,
         c.amount.toString(),
-        confirmed,
+        `${confirmed} (${c.confirmedAtBlock})`,
         c.vetoed,
         c.claimed,
+        c.ipfsHash
       ])
     });
 
     console.log(table.toString());
+
+    let totalContributionBalances = await kredits.Contribution.functions.totalCount(true);
+    console.log(`Total confirmed balance: ${totalContributionBalances}`);
   } catch (err) {
     console.log(err);
   }

scripts/list-contributors.js

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