4.0.1

Formatting, whitespace
Update README for install-all script
2019-04-09 12:46:24 +02:00 · 2019-04-09 12:45:20 +02:00 · 2019-04-09 12:45:09 +02:00 · 2019-04-09 09:48:00 +02:00 · 2019-04-09 07:33:42 +00:00 · 2019-04-09 08:43:13 +02:00
38 changed files with 480 additions and 393 deletions
--- a/README.md
+++ b/README.md
@@ -2,12 +2,13 @@

 # Kredits Contracts

-This repository contains the Solidity smart contracts organized as [Aragon](https://hack.aragon.org/) 
-apps and JavaScript API wrapper for [Kosmos Kredits](https://wiki.kosmos.org/Kredits).
+This repository contains the Solidity smart contracts organized as
+[Aragon](https://hack.aragon.org/) apps and JavaScript API wrapper for [Kosmos
+Kredits](https://wiki.kosmos.org/Kredits).

-It is based on [aragonOS](https://hack.aragon.org/docs/aragonos-intro.html) and 
-follows the aragonOS conventions.
-Aragon itself uses the [Truffle framework](http://truffleframework.com/) for some things.
+It is based on [aragonOS](https://hack.aragon.org/docs/aragonos-intro.html) and
+follows the aragonOS conventions.  Aragon itself uses the [Truffle
+framework](http://truffleframework.com/) for some things.

 ## Development

@@ -22,35 +23,36 @@ Each of the aragon apps are separate packages:
    $ cd apps/[app]
    $ npm install

-or use the bootstrap command (see below)
+You can use `npm run install-all` to install all app dependencies at once.

 ### Local development chain

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

-We use the default aragon-cli devchain command to confgure 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: 
+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 
+We default to port 7545 for development to not get in conflict with the default
 Ethereum RPC port.

 ### Bootstrap

 1. Run an Ethereum node and ipfs
-    
+
        $ npm run devchain
        $ ipfs daemon

 2. Deploy each app to the devchain

+        (make sure you've run `npm install` for every app - see installation)
        $ npm run deploy:apps

 3. Deploy a new KreditsKit and create a new DAO with the latest app versions
@@ -58,23 +60,28 @@ Ethereum RPC port.
        $ npm run deploy:kit
        $ npm run deploy:dao

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

        $ npm run seeds

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

+If you want to reset your local setup:
+
+        $ npm run reset // deploys a new kit and a new DAO
+        $ npm run reset:hard // deploys all apps and does reset
+
 ## Contract architecture

-Contracts are organized in independent apps (see `/apps`) and are developed 
-and deployed independently. Each app has a version and can be "installed" 
-on the Kredits DAO independently.
+Contracts are organized in independent apps (see `/apps`) and are developed and
+deployed independently. Each app has a version and can be "installed" on the
+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.

@@ -87,6 +94,8 @@ CLI. _At some point these should be moved into a real nice CLI._
 To run these scripts use `truffle exec`. For example: `truffle exec
 scripts/add-proposal.js`.

+Some scripts are also defined as npm script, see package.json.
+
 ### cli.js

 Call any function on any contract:
@@ -154,7 +163,7 @@ Creates and configures a new DAO instance.
    or
    $ npm run deploy:dao

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

 ### deploy-apps.sh
@@ -165,14 +174,12 @@ Runs `npm install` for each app and publishes a new version.
    or
    $ npm run deploy:apps

-
 ## ACL / Permissions

-
 ## Upgradeable contracts

-We use aragonOS for upgradeablity of the different contracts.
-Refer to the [aragonOS upgradeablity documentation](https://hack.aragon.org/docs/upgradeability-intro) 
+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.

 ### Example
--- a/apps/contribution/contracts/Contribution.sol
+++ b/apps/contribution/contracts/Contribution.sol
@@ -4,7 +4,14 @@ import "@aragon/os/contracts/apps/AragonApp.sol";
 import "@aragon/os/contracts/kernel/IKernel.sol";

 interface IToken {
-  function mintFor(address contributorAccount, uint256 amount, uint256 contributionId) public;
+  function mintFor(address contributorAccount, uint256 amount, uint32 contributionId) public;
+}
+
+interface ContributorInterface {
+  function getContributorAddressById(uint32 contributorId) public view returns (address);
+  function getContributorIdByAddress(address contributorAccount) public view returns (uint32);
+  // TODO Maybe use for validation
+  // function exists(uint32 contributorId) public view returns (bool);
 }

 contract Contribution is AragonApp {
@@ -12,47 +19,70 @@ contract Contribution is AragonApp {
  bytes32 public constant VETO_CONTRIBUTION_ROLE = keccak256("VETO_CONTRIBUTION_ROLE");

  bytes32 public constant KERNEL_APP_ADDR_NAMESPACE = 0xd6f028ca0e8edb4a8c9757ca4fdccab25fa1e0317da1188108f7d2dee14902fb;
+
  // ensure alphabetic order
  enum Apps { Contribution, Contributor, Proposal, Token }
  bytes32[4] public appIds;

  struct ContributionData {
-    address contributor;
-    uint256 amount;
+    uint32 contributorId;
+    uint32 amount;
    bool claimed;
    bytes32 hashDigest;
    uint8 hashFunction;
    uint8 hashSize;
    string tokenMetadataURL;
-    uint claimAfterBlock;
+    uint256 confirmedAtBlock;
    bool vetoed;
    bool exists;
  }
+
  string internal name_;
  string internal symbol_;

-  mapping(uint256 => address) contributionOwner;
-  mapping(address => uint256[]) ownedContributions;
+  // map contribution ID to contributor
+  mapping(uint32 => uint32) public contributionOwner;
+  // map contributor to contribution IDs
+  mapping(uint32 => uint32[]) public ownedContributions;

-  mapping(uint256 => ContributionData) public contributions;
-  uint256 public contributionsCount;
+  mapping(uint32 => ContributionData) public contributions;
+  uint32 public contributionsCount;

-  uint256 public blocksToWait = 0;
+  uint32 public blocksToWait;

-  event ContributionAdded(uint256 id, address indexed contributor, uint256 amount);
-  event ContributionClaimed(uint256 id, address indexed contributor, uint256 amount);
-  event ContributionVetoed(uint256 id, address vetoedByAccount);
+  event ContributionAdded(uint32 id, uint32 indexed contributorId, uint32 amount);
+  event ContributionClaimed(uint32 id, uint32 indexed contributorId, uint32 amount);
+  event ContributionVetoed(uint32 id, address vetoedByAccount);

  function initialize(bytes32[4] _appIds) public onlyInit {
    appIds = _appIds;
+    blocksToWait = 40320; // 7 days; 15 seconds block time
    initialized();
  }

+  // TODO refactor into a single function
  function getTokenContract() public view returns (address) {
    IKernel k = IKernel(kernel());
-
    return k.getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[uint8(Apps.Token)]);
  }
+  function getContributorContract() public view returns (address) {
+    IKernel k = IKernel(kernel());
+    return k.getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[uint8(Apps.Contributor)]);
+  }
+
+  function getContributorIdByAddress(address contributorAccount) public view returns (uint32) {
+    address contributor = getContributorContract();
+    return ContributorInterface(contributor).getContributorIdByAddress(contributorAccount);
+  }
+
+  function getContributorAddressById(uint32 contributorId) public view returns (address) {
+    address contributor = getContributorContract();
+    return ContributorInterface(contributor).getContributorAddressById(contributorId);
+  }
+
+  //
+  // Token standard functions (ERC 721)
+  //

  function name() external view returns (string) {
    return name_;
@@ -62,85 +92,100 @@ contract Contribution is AragonApp {
    return symbol_;
  }

+  // Balance is amount of ERC271 tokens, not amount of kredits
  function balanceOf(address owner) public view returns (uint256) {
    require(owner != address(0));
-    return ownedContributions[owner].length;
+    uint32 contributorId = getContributorIdByAddress(owner);
+    return ownedContributions[contributorId].length;
  }

-  function ownerOf(uint256 contributionId) public view returns (address) {
+  function ownerOf(uint32 contributionId) public view returns (address) {
    require(exists(contributionId));
-    return contributions[contributionId].contributor;
+    uint32 contributorId = contributions[contributionId].contributorId;
+    return getContributorAddressById(contributorId);
  }

-  function tokenOfOwnerByIndex(address contributor, uint256 index) public view returns (uint256) {
-    return ownedContributions[contributor][index];
+  function tokenOfOwnerByIndex(address owner, uint32 index) public view returns (uint32) {
+    uint32 contributorId = getContributorIdByAddress(owner);
+    return ownedContributions[contributorId][index];
  }

-  function tokenMetadata(uint256 contributionId) public view returns (string) {
+  function tokenMetadata(uint32 contributionId) public view returns (string) {
    return contributions[contributionId].tokenMetadataURL;
  }

-  function getContribution(uint256 contributionId) public view returns (uint256 id, address contributor, uint256 amount, bool claimed, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize, uint claimAfterBlock, bool exists, bool vetoed) {
+  //
+  // Custom functions
+  //
+
+  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];
    return (
      id,
-      c.contributor,
-      c.amount, 
-      c.claimed, 
+      c.contributorId,
+      c.amount,
+      c.claimed,
      c.hashDigest,
      c.hashFunction,
      c.hashSize,
-      c.claimAfterBlock,
+      c.confirmedAtBlock,
      c.exists,
      c.vetoed
    );
  }

-  function add(uint256 amount, address contributorAccount, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize) public isInitialized auth(ADD_CONTRIBUTION_ROLE) {
-    //require(canPerform(msg.sender, ADD_CONTRIBUTION_ROLE, new uint256[](0)), 'nope');
-    uint256 contributionId = contributionsCount + 1;
+  function add(uint32 amount, uint32 contributorId, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize) public isInitialized auth(ADD_CONTRIBUTION_ROLE) {
+    //require(canPerform(msg.sender, ADD_CONTRIBUTION_ROLE, new uint32[](0)), 'nope');
+    uint32 contributionId = contributionsCount + 1;
    ContributionData storage c = contributions[contributionId];
    c.exists = true;
    c.amount = amount;
    c.claimed = false;
-    c.contributor = contributorAccount;
+    c.contributorId = contributorId;
    c.hashDigest = hashDigest;
    c.hashFunction = hashFunction;
    c.hashSize = hashSize;
-    c.claimAfterBlock = block.number; // + blocksToWait;
+    if (contributionId < 10) {
+      c.confirmedAtBlock = block.number;
+    } else {
+      c.confirmedAtBlock = block.number + blocksToWait;
+    }

    contributionsCount++;

-    contributionOwner[contributionId] = contributorAccount;
-    ownedContributions[contributorAccount].push(contributionId);
- 
-    emit ContributionAdded(contributionId, contributorAccount, amount);
+    contributionOwner[contributionId] = contributorId;
+    ownedContributions[contributorId].push(contributionId);
+
+    emit ContributionAdded(contributionId, contributorId, amount);
  }

-  function veto(uint256 contributionId) public isInitialized auth(VETO_CONTRIBUTION_ROLE) {
+  function veto(uint32 contributionId) public isInitialized auth(VETO_CONTRIBUTION_ROLE) {
    ContributionData storage c = contributions[contributionId];
    require(c.exists, 'NOT_FOUND');
    require(!c.claimed, 'ALREADY_CLAIMED');
+    require(block.number < c.confirmedAtBlock, 'VETO_PERIOD_ENDED');
    c.vetoed = true;

    emit ContributionVetoed(contributionId, msg.sender);
  }

-  function claim(uint256 contributionId) public isInitialized {
+  function claim(uint32 contributionId) public isInitialized {
    ContributionData storage c = contributions[contributionId];
    require(c.exists, 'NOT_FOUND');
    require(!c.claimed, 'ALREADY_CLAIMED');
    require(!c.vetoed, 'VETOED');
-    require(block.number > c.claimAfterBlock, 'NOT_CLAIMABLE');
+    require(block.number >= c.confirmedAtBlock, 'NOT_CLAIMABLE');

    c.claimed = true;
    address token = getTokenContract();
-    IToken(token).mintFor(c.contributor, c.amount, contributionId);
-    emit ContributionClaimed(contributionId, c.contributor, c.amount);
+    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(uint256 contributionId) view public returns (bool) {
+
+  function exists(uint32 contributionId) view public returns (bool) {
    return contributions[contributionId].exists;
  }
 }
--- a/apps/contributor/contracts/Contributor.sol
+++ b/apps/contributor/contracts/Contributor.sol
@@ -1,80 +1,82 @@
 pragma solidity ^0.4.24;

 import "@aragon/os/contracts/apps/AragonApp.sol";
+import "@aragon/os/contracts/kernel/IKernel.sol";
+
+interface ITokenBalance {
+  function balanceOf(address contributorAccount) public view returns (uint256);
+}

 contract Contributor is AragonApp {
+  bytes32 public constant KERNEL_APP_ADDR_NAMESPACE = 0xd6f028ca0e8edb4a8c9757ca4fdccab25fa1e0317da1188108f7d2dee14902fb;
  bytes32 public constant MANAGE_CONTRIBUTORS_ROLE = keccak256("MANAGE_CONTRIBUTORS_ROLE");

  struct Contributor {
    address account;
-    bytes32 ipfsHash;
+    bytes32 hashDigest;
    uint8 hashFunction;
    uint8 hashSize;
-    bool isCore;
    bool exists;
  }

-  mapping (address => uint) public contributorIds;
-  mapping (uint => Contributor) public contributors;
-  uint256 public contributorsCount;
+  mapping (address => uint32) public contributorIds;
+  mapping (uint32 => Contributor) public contributors;
+  uint32 public contributorsCount;

  // ensure alphabetic order
  enum Apps { Contribution, Contributor, Proposal, Token }
  bytes32[4] public appIds;

-  event ContributorProfileUpdated(uint id, bytes32 oldIpfsHash, bytes32 newIpfsHash);
-  event ContributorAccountUpdated(uint id, address oldAccount, address newAccount);
-  event ContributorAdded(uint id, address account);
+  event ContributorProfileUpdated(uint32 id, bytes32 oldHashDigest, bytes32 newHashDigest); // what should be logged
+  event ContributorAccountUpdated(uint32 id, address oldAccount, address newAccount);
+  event ContributorAdded(uint32 id, address account);

  function initialize(address root,bytes32[4] _appIds) public onlyInit {
-    uint _id = contributorsCount + 1;
-    Contributor storage c = contributors[_id];
-    c.exists = true;
-    c.isCore = true;
-    c.account = root;
-    contributorIds[root] = _id;
-    contributorsCount += 1;
-
    appIds = _appIds;

    initialized();
  }

-  function coreContributorsCount() view public returns (uint) {
-    uint count = 0;
-    for (uint256 i = 1; i <= contributorsCount; i++) {
-      if (contributors[i].isCore) {
+  function getTokenContract() public view returns (address) {
+    IKernel k = IKernel(kernel());
+
+    return k.getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[uint8(Apps.Token)]);
+  }
+
+  function coreContributorsCount() view public returns (uint32) {
+    uint32 count = 0;
+    for (uint32 i = 1; i <= contributorsCount; i++) {
+      if (isCoreTeam(i)) {
        count += 1;
      }
    }
    return count;
  }

-  function updateContributorAccount(uint id, address oldAccount, address newAccount) public auth(MANAGE_CONTRIBUTORS_ROLE) {
+  function updateContributorAccount(uint32 id, address oldAccount, address newAccount) public auth(MANAGE_CONTRIBUTORS_ROLE) {
    contributorIds[oldAccount] = 0;
    contributorIds[newAccount] = id;
    contributors[id].account = newAccount;
    ContributorAccountUpdated(id, oldAccount, newAccount);
  }

-  function updateContributorIpfsHash(uint id, bytes32 ipfsHash, uint8 hashFunction, uint8 hashSize) public isInitialized auth(MANAGE_CONTRIBUTORS_ROLE) {
+  function updateContributorProfileHash(uint32 id, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize) public isInitialized auth(MANAGE_CONTRIBUTORS_ROLE) {
    Contributor storage c = contributors[id];
-    bytes32 oldIpfsHash = c.ipfsHash;
-    c.ipfsHash = ipfsHash;
+    bytes32 oldHashDigest = c.hashDigest;
+    c.hashDigest = hashDigest;
    c.hashFunction = hashFunction;
    c.hashSize = hashSize;

-    ContributorProfileUpdated(id, oldIpfsHash, c.ipfsHash);
+    ContributorProfileUpdated(id, oldHashDigest, c.hashDigest);
  }

-  function addContributor(address account, bytes32 ipfsHash, uint8 hashFunction, uint8 hashSize, bool isCore) public isInitialized auth(MANAGE_CONTRIBUTORS_ROLE) {
+  function addContributor(address account, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize) public isInitialized auth(MANAGE_CONTRIBUTORS_ROLE) {
    require(!addressExists(account));
-    uint _id = contributorsCount + 1;
+    uint32 _id = contributorsCount + 1;
    assert(!contributors[_id].exists); // this can not be acually
    Contributor storage c = contributors[_id];
    c.exists = true;
-    c.isCore = isCore;
-    c.ipfsHash = ipfsHash;
+    c.hashDigest = hashDigest;
    c.hashFunction = hashFunction;
    c.hashSize = hashSize;
    c.account = account;
@@ -84,47 +86,61 @@ contract Contributor is AragonApp {
    emit ContributorAdded(_id, account);
  }

-  function isCore(uint id) view public returns (bool) {
-    return contributors[id].isCore;
+  function isCoreTeam(uint32 id) view public returns (bool) {
+    // TODO: for simplicity we simply define the first contributors as core
+    // later this needs to be changed to something more dynamic
+    return id < 7;
  }

-  function exists(uint id) view public returns (bool) {
+  function exists(uint32 id) view public returns (bool) {
    return contributors[id].exists;
  }

  function addressIsCore(address account) view public returns (bool) {
-    return getContributorByAddress(account).isCore;
+    uint32 id = getContributorIdByAddress(account);
+    return isCoreTeam(id);
  }

  function addressExists(address account) view public returns (bool) {
    return getContributorByAddress(account).exists;
  }

-  function getContributorIdByAddress(address account) view public returns (uint) {
+  function getContributorIdByAddress(address account) view public returns (uint32) {
    return contributorIds[account];
  }

-  function getContributorAddressById(uint id) view public returns (address) {
+  function getContributorAddressById(uint32 id) view public returns (address) {
    return contributors[id].account;
  }

  function getContributorByAddress(address account) internal view returns (Contributor) {
-    uint id = contributorIds[account];
+    uint32 id = contributorIds[account];
    return contributors[id];
  }

-  function getContributorById(uint _id) public view returns (uint id, address account, bytes32 ipfsHash, uint8 hashFunction, uint8 hashSize, bool isCore, 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;
-    ipfsHash = c.ipfsHash;
+    hashDigest = c.hashDigest;
    hashFunction = c.hashFunction;
    hashSize = c.hashSize;
-    isCore = c.isCore;
+    isCore = isCoreTeam(id);
+    address token = getTokenContract();
+    balance = ITokenBalance(token).balanceOf(c.account);
    exists = c.exists;
  }

-  function canPerform(address _who, address _where, bytes32 _what, uint256[] _how) public view returns (bool) {
-    return addressExists(_who);
+  function canPerform(address _who, address _where, bytes32 _what/*, uint256[] memory _how*/) public returns (bool) {
+    address sender = _who;
+    if (sender == address(-1)) {
+      sender = tx.origin;
+    }
+    // _what == keccak256('VOTE_PROPOSAL_ROLE')
+    if (_what == 0xd61216798314d2fc33e42ff2021d66707b1e38517d3f7166798a9d3a196a9c96) {
+      return contributorIds[sender] != uint256(0);
+    }
+
+    return addressIsCore(sender);
  }
 }
--- a/apps/proposal/contracts/Proposal.sol
+++ b/apps/proposal/contracts/Proposal.sol
@@ -4,13 +4,13 @@ import "@aragon/os/contracts/apps/AragonApp.sol";
 import "@aragon/os/contracts/kernel/IKernel.sol";

 interface IContributor {
-  function getContributorAddressById(uint256 contributorId) public view returns (address);
-  function getContributorIdByAddress(address contributorAccount) public view returns (uint256);
-  function exists(uint256 contributorId) public view returns (bool);
+  function getContributorAddressById(uint32 contributorId) public view returns (address);
+  function getContributorIdByAddress(address contributorAccount) public view returns (uint32);
+  function exists(uint32 contributorId) public view returns (bool);
 }

 interface IContribution {
-  function add(uint256 amount, address contributor, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize) public;
+  function add(uint32 amount, uint32 contributorId, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize) public;
 }

 contract Proposal is AragonApp {
@@ -25,26 +25,26 @@ contract Proposal is AragonApp {

  struct Proposal {
    address creatorAccount;
-    uint contributorId;
-    uint votesCount;
-    uint votesNeeded;
-    uint256 amount;
+    uint32 contributorId;
+    uint16 votesCount;
+    uint16 votesNeeded;
+    uint32 amount;
    bool executed;
    bytes32 hashDigest;
    uint8 hashFunction;
    uint8 hashSize;
-    uint256[] voterIds;
-    mapping (uint256 => bool) votes;
+    uint32[] voterIds;
+    mapping (uint32 => bool) votes;
    bool exists;
  }

-  mapping(uint256 => Proposal) public proposals;
-  uint256 public proposalsCount;
+  mapping(uint32 => Proposal) public proposals;
+  uint32 public proposalsCount;

-  event ProposalCreated(uint256 id, address creatorAccount, uint256 contributorId, uint256 amount);
+  event ProposalCreated(uint32 id, address creatorAccount, uint32 contributorId, uint32 amount);

-  event ProposalVoted(uint256 id, uint256 voterId, uint256 totalVotes);
-  event ProposalExecuted(uint256 id, uint256 contributorId, uint256 amount);
+  event ProposalVoted(uint32 id, uint32 voterId, uint16 totalVotes);
+  event ProposalExecuted(uint32 id, uint32 contributorId, uint32 amount);

  function initialize(bytes32[4] _appIds) public onlyInit {
    appIds = _appIds;
@@ -59,11 +59,11 @@ contract Proposal is AragonApp {
    return IKernel(kernel()).getApp(KERNEL_APP_ADDR_NAMESPACE, appIds[uint8(Apps.Contribution)]);
  }

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

-    uint256 proposalId = proposalsCount + 1;
-    uint256 _votesNeeded = 1; //contributorsContract().coreContributorsCount() / 100 * 75;
+    uint32 proposalId = proposalsCount + 1;
+    uint16 _votesNeeded = 1; //contributorsContract().coreContributorsCount() / 100 * 75;

    Proposal storage p = proposals[proposalId];
    p.creatorAccount = msg.sender;
@@ -75,23 +75,23 @@ contract Proposal is AragonApp {
    p.votesCount =  0;
    p.votesNeeded = _votesNeeded;
    p.exists = true;
-   
+
    proposalsCount++;
    emit ProposalCreated(proposalId, msg.sender, p.contributorId, p.amount);
  }

-  function getProposal(uint proposalId) public view returns (uint256 id, address creatorAccount, uint256 contributorId, uint256 votesCount, uint256 votesNeeded, uint256 amount, bool executed, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize, uint256[] voterIds, bool exists) {
+  function getProposal(uint32 proposalId) public view returns (uint32 id, address creatorAccount, uint32 contributorId, uint16 votesCount, uint16 votesNeeded, uint32 amount, bool executed, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize, uint32[] voterIds, bool exists) {
    id = proposalId;
    Proposal storage p = proposals[id];
    return (
      id,
      p.creatorAccount,
-      p.contributorId, 
-      p.votesCount, 
+      p.contributorId,
+      p.votesCount,
      p.votesNeeded,
      p.amount,
-      p.executed, 
-      p.hashDigest, 
+      p.executed,
+      p.hashDigest,
      p.hashFunction,
      p.hashSize,
      p.voterIds,
@@ -99,10 +99,10 @@ contract Proposal is AragonApp {
    );
  }

-  function vote(uint256 proposalId) public isInitialized auth(VOTE_PROPOSAL_ROLE) {
+  function vote(uint32 proposalId) public isInitialized auth(VOTE_PROPOSAL_ROLE) {
    Proposal storage p = proposals[proposalId];
    require(!p.executed, 'ALREADY_EXECUTED');
-    uint256 voterId = IContributor(getContributorContract()).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;
@@ -114,20 +114,19 @@ contract Proposal is AragonApp {
    emit ProposalVoted(proposalId, voterId, p.votesCount);
  }

-  function batchVote(uint256[] _proposalIds) public isInitialized auth(VOTE_PROPOSAL_ROLE) {
-    for (uint256 i = 0; i < _proposalIds.length; i++) {
+  function batchVote(uint32[] _proposalIds) public isInitialized auth(VOTE_PROPOSAL_ROLE) {
+    for (uint32 i = 0; i < _proposalIds.length; i++) {
      vote(_proposalIds[i]);
    }
  }

-  function executeProposal(uint proposalId) private {
+  function executeProposal(uint32 proposalId) private {
    Proposal storage p = proposals[proposalId];
    require(!p.executed, 'ALREADY_EXECUTED');
    require(p.votesCount >= p.votesNeeded, 'MISSING_VOTES');
-    
+
    p.executed = true;
-    address contributorAccount = IContributor(getContributorContract()).getContributorAddressById(p.contributorId);
-    IContribution(getContributionContract()).add(p.amount, contributorAccount, 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);
  }

--- a/apps/token/contracts/Token.sol
+++ b/apps/token/contracts/Token.sol
@@ -9,15 +9,15 @@ contract Token is ERC20Token, AragonApp {
  // ensure alphabetic order
  enum Apps { Contribution, Contributor, Proposal, Token }
  bytes32[4] public appIds;
- 
-  event LogMint(address indexed recipient, uint256 amount, uint256 contributionId);
-  
+
+  event LogMint(address indexed recipient, uint256 amount, uint32 contributionId);
+
  function initialize(bytes32[4] _appIds) public onlyInit {
    appIds = _appIds;
    initialized();
  }

-  function mintFor(address contributorAccount, uint256 amount, uint256 contributionId) public isInitialized auth(MINT_TOKEN_ROLE) {
+  function mintFor(address contributorAccount, uint256 amount, uint32 contributionId) public isInitialized auth(MINT_TOKEN_ROLE) {
    _mint(contributorAccount, amount);
    emit LogMint(contributorAccount, amount, contributionId);
  }
--- a/config/seeds.js
+++ b/config/seeds.js
@@ -1,13 +1,15 @@
-let contractCalls = [
-  ['Contributor', 'add', [{ account: '0x7e8f313c56f809188313aa274fa67ee58c31515d', name: 'bumi', isCore: true, kind: 'preson', url: '', github_username: 'bumi', github_uid: 318, wiki_username: 'bumi' }, {gasLimit: 200000}]],
-  ['Contributor', 'add', [{ account: '0xa502eb4021f3b9ab62f75b57a94e1cfbf81fd827', name: 'raucau', isCore: true, kind: 'person', url: '', github_username: 'skddc', github_uid: 842, wiki_username: 'raucau' }, {gasLimit: 200000}]],
-  ['Proposal', 'addProposal', [{ contributorId: 2, amount: 42, kind: 'code', description: 'runs the seeds', url: '' }, {gasLimit: 350000}]],
-  ['Proposal', 'addProposal', [{ contributorId: 3, amount: 23, kind: 'code', description: 'runs the seeds', url: '' }, {gasLimit: 350000}]],
-  ['Proposal', 'addProposal', [{contributorId: 3, amount: 100, kind: 'code', description: 'hacks on kredits', url: '' }, {gasLimit: 350000}]],
-  ['Proposal', 'vote', [1, {gasLimit: 550000}]],
-  ['Contribution', 'addContribution', [{contributorAccount: '0xa502eb4021f3b9ab62f75b57a94e1cfbf81fd827', amount: 100, kind: 'code', description: 'hacks on kredits', url: '' }, {gasLimit: 350000}]],
+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 }]],
+  ['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', 'claim', [1, { gasLimit: 300000 }]]
 ];
-let funds = [
+const funds = [
  '0x7e8f313c56f809188313aa274fa67ee58c31515d',
  '0xa502eb4021f3b9ab62f75b57a94e1cfbf81fd827'
 ];
--- a/contracts/KreditsKit.sol
+++ b/contracts/KreditsKit.sol
@@ -33,7 +33,7 @@ contract KreditsKit is KitBase  {

        Contributor contributor = Contributor(_installApp(dao, appIds[uint8(Apps.Contributor)]));
        contributor.initialize(root, appIds);
-        acl.createPermission(root, contributor, contributor.MANAGE_CONTRIBUTORS_ROLE(), root);
+        acl.createPermission(root, contributor, contributor.MANAGE_CONTRIBUTORS_ROLE(), this);
        
        Token token = Token(_installApp(dao, appIds[uint8(Apps.Token)]));
        token.initialize(appIds);
@@ -50,20 +50,23 @@ contract KreditsKit is KitBase  {
        
        uint256[] memory params = new uint256[](1);
        params[0] = uint256(203) << 248 | uint256(1) << 240 | uint240(contributor);
-        acl.grantPermissionP(root, contribution, contribution.ADD_CONTRIBUTION_ROLE(), params);
-        acl.grantPermissionP(root, contribution, contribution.VETO_CONTRIBUTION_ROLE(), params);
+        acl.grantPermissionP(acl.ANY_ENTITY(), contribution, contribution.ADD_CONTRIBUTION_ROLE(), params);
+        acl.grantPermissionP(acl.ANY_ENTITY(), contribution, contribution.VETO_CONTRIBUTION_ROLE(), params);
+        acl.grantPermissionP(acl.ANY_ENTITY(), contributor, contributor.MANAGE_CONTRIBUTORS_ROLE(), params);

        //acl.setPermissionManager(this, proposal, proposal.VOTE_PROPOSAL_ROLE();
        acl.createPermission(root, proposal, proposal.VOTE_PROPOSAL_ROLE(), this);
-        acl.grantPermissionP(root, proposal, proposal.VOTE_PROPOSAL_ROLE(), params);
+        acl.grantPermissionP(acl.ANY_ENTITY(), proposal, proposal.VOTE_PROPOSAL_ROLE(), params);
        
        acl.createPermission(root, proposal, proposal.ADD_PROPOSAL_ROLE(), this);
-        acl.grantPermissionP(root, proposal, proposal.ADD_PROPOSAL_ROLE(), params);
+        //acl.grantPermissionP(address(-1), proposal, proposal.ADD_PROPOSAL_ROLE(), params);
+        acl.grantPermission(acl.ANY_ENTITY(), proposal, proposal.ADD_PROPOSAL_ROLE());

        acl.setPermissionManager(root, proposal, proposal.VOTE_PROPOSAL_ROLE());
        acl.setPermissionManager(root, proposal, proposal.ADD_PROPOSAL_ROLE());
        acl.setPermissionManager(root, contribution, contribution.ADD_CONTRIBUTION_ROLE());
        acl.setPermissionManager(root, contribution, contribution.VETO_CONTRIBUTION_ROLE());
+        acl.setPermissionManager(root, contributor, contributor.MANAGE_CONTRIBUTORS_ROLE());
        
        acl.createPermission(root, token, token.MINT_TOKEN_ROLE(), this);
        acl.grantPermission(contribution, token, token.MINT_TOKEN_ROLE());        
--- a/deployments/rinkeby/contribution.md
+++ b/deployments/rinkeby/contribution.md
@@ -1,5 +1,13 @@
 # Contribution deployments

+## 2019-04-04
+
+ ✔ Successfully published kredits-contribution.open.aragonpm.eth v4.0.0: 
+ ℹ Contract address: 0x7485e8fbde0112C53587079db450Eb002D359372
+ ℹ Content (ipfs): QmZKxYPm8wz4phgL4428Gh7MjmbyFFDMP2st7qhNL9qGDQ
+ ℹ Transaction hash: 0x7d9be7920db675be88e8f60ebf08dc62ee77c4e6e454c5fbf0f91f6ac97e4c26
+
+
 ## 2019-03-26

 ### v3.0.0 appids
--- a/deployments/rinkeby/contributor.md
+++ b/deployments/rinkeby/contributor.md
@@ -1,5 +1,12 @@
 # Contributor deployments

+## 2019-04-04
+
+ ✔ Successfully published kredits-contributor.open.aragonpm.eth v3.0.0: 
+ ℹ Contract address: 0x95D8458E28C8de7216279512601A3B9Dc512D70B
+ ℹ Content (ipfs): QmSpHnmsf8FybvqfD49kwxvDixwiBUR7D5yG4BWSnnwCPS
+ ℹ Transaction hash: 0x736f9751b07a91178f453c279ecb57604b3b5686ae5d7115880f3b27fbeb50f2
+
 ## 2019-03-26

 ### v2.0.0 support for appids
--- a/deployments/rinkeby/dao.md
+++ b/deployments/rinkeby/dao.md
@@ -1,5 +1,10 @@
 # Kredits deployment

+## 2019-04-04
+
+Using KreditsKit at: 0x76e069b47b79442657eaf0555a32c6b16fa1b8b4
+Created new DAO at: 0xcd75458fbc4aa2231252d5b21f1391fd031e5cb2
+
 ### 2019-03-26

 kredits/truffle-kredits@aragonos  » truffle exec scripts/new-dao.js --network=rinkeby
--- a/deployments/rinkeby/kreditskit.md
+++ b/deployments/rinkeby/kreditskit.md
@@ -1,5 +1,13 @@
 # KreditsKit deployments

+## 2019-04-04
+
+Deploying to networkId: 4
+Using ENS at: 0x98Df287B6C145399Aaa709692c8D308357bC085D
+Using DAOFactory at: 0x2298d27a9b847c681d2b2c2828ab9d79013f5f1d
+Found apps: [contribution,contributor,proposal,token].open.aragonpm.eth
+Deployed KreditsKit at: 0x76e069b47b79442657eaf0555a32c6b16fa1b8b4
+
 ## 2019-03-26

 Using network 'rinkeby'.
--- a/deployments/rinkeby/proposal.md
+++ b/deployments/rinkeby/proposal.md
@@ -1,5 +1,13 @@
 # Proposal deployments

+## 2019-04-04
+
+ ✔ Successfully published kredits-proposal.open.aragonpm.eth v4.0.0: 
+ ℹ Contract address: 0x4993275362Ba50D76f349A262B7b842e7FbD7490
+ ℹ Content (ipfs): QmesCPKLapASPTB3rnPpSdD7ULkg8BQwRcpdE1B8WwfSh7
+ ℹ Transaction hash: 0xe4be7b1a75b663eb345b957b216a8476b0f75e2bbfc5880943b05c82fab15dff
+
+
 ## 2019-03-26

 ### v3.0.0 appids
--- a/deployments/rinkeby/token.md
+++ b/deployments/rinkeby/token.md
@@ -1,5 +1,13 @@
 # Token deployments

+## 2019-04-04
+
+ ✔ Successfully published kredits-token.open.aragonpm.eth v3.0.0: 
+ ℹ Contract address: 0xd9913A96e087f50E71BF14c62cBCa3b9635392A9
+ ℹ Content (ipfs): QmfZ7LwjkQRuLsEnVjrEF3ryTaHsL6YTxffiiDS5KWmHQG
+ ℹ Transaction hash: 0x102b27e154d1e144ec084f5e8dc78e1626fda9f26c20db3e3b230fac381c317a
+
+
 ## 2019-03-26

 ### v2.0.0 support for appIds
--- a/lib/abis/Contribution.json
+++ b/lib/abis/Contribution.json
--- a/lib/abis/Contributor.json
+++ b/lib/abis/Contributor.json
--- a/lib/abis/Proposal.json
+++ b/lib/abis/Proposal.json
--- a/lib/abis/Token.json
+++ b/lib/abis/Token.json
--- a/lib/addresses/KreditsKit.json
+++ b/lib/addresses/KreditsKit.json
@@ -1,4 +1,4 @@
 {
-  "4": "0x1d6a9c2146a330575ee860eef9a012b5ff7caa68",
+  "4": "0x76e069b47b79442657eaf0555a32c6b16fa1b8b4",
  "41787949": "0xa35aacdfccac54d3d96e0d29050c773b251c2c83"
-}
+}
--- a/lib/addresses/dao.json
+++ b/lib/addresses/dao.json
@@ -1,4 +1,4 @@
 {
-  "4": "0x95a7ce185efc2d1f13efd2a00ee9247c51ea7009",
+  "4": "0xcd75458fbc4aa2231252d5b21f1391fd031e5cb2",
  "41787949": "0x183af3950364390a266edff2a0e7c4c2f95c0691"
-}
+}
--- a/lib/contracts/contribution.js
+++ b/lib/contracts/contribution.js
@@ -1,5 +1,4 @@
 const ethers = require('ethers');
-const RSVP = require('rsvp');

 const ContributionSerializer = require('../serializers/contribution');
 const Base = require('./base');
@@ -7,43 +6,44 @@ const Base = require('./base');
 class Contribution extends Base {
  all() {
    return this.functions.contributionsCount()
-      .then((count) => {
-        count = count.toNumber();
+      .then(async (count) => {
        let contributions = [];

        for (let id = 1; id <= count; id++) {
-          contributions.push(this.getById(id));
+          const contribution = await this.getById(id)
+          contributions.push(contribution);
        }

-        return RSVP.all(contributions);
+        return contributions;
      });
  }

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

  }

-  getByContributor(contributor) {
-    return this.functions.balanceOf(contributor)
-      then((balance) => {
-        count = balance.toNumber();
+  getByContributorId(contributorId) {
+    return this.functions.getContributorAddressById(contributorId)
+      .then(address => this.getByContributorAddress(address));
+  }

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

-        for (let index = 0; index <= count; index++) {
-          this.functions.tokenOfOwnerByIndex(contributor, index)
-            .then((id) => {
-              contributions.push(this.getById(id));
-            });
+        for (let index = 0; index < count; index++) {
+          const id = await this.functions.tokenOfOwnerByIndex(address, index);
+          const contribution = await this.getById(id);
+          contributions.push(contribution);
        }

-        return RSVP.all(contributions);
+        return contributions;
      });
  }

@@ -56,7 +56,7 @@ class Contribution extends Base {
      .then((ipfsHashAttr) => {
        let contribution = [
          contributionAttr.amount,
-          contributionAttr.contributorAccount,
+          contributionAttr.contributorId,
          ipfsHashAttr.hashDigest,
          ipfsHashAttr.hashFunction,
          ipfsHashAttr.hashSize,
--- a/lib/contracts/contributor.js
+++ b/lib/contracts/contributor.js
@@ -7,8 +7,7 @@ const Base = require('./base');
 class Contributor extends Base {
  all() {
    return this.functions.contributorsCount()
-      .then((count) => {
-        count = count.toNumber();
+      .then(count => {
        let contributors = [];

        for (let id = 1; id <= count; id++) {
@@ -20,14 +19,7 @@ class Contributor extends Base {
  }

  getById(id) {
-    id = ethers.utils.bigNumberify(id);
-
    return this.functions.getContributorById(id)
-      .then((data) => {
-        // TODO: remove when naming updated on the contract
-        data.hashDigest = data.ipfsHash;
-        return data;
-      })
      // Fetch IPFS data if available
      .then((data) => {
        return this.ipfs.catAndMerge(data, ContributorSerializer.deserialize);
@@ -70,7 +62,6 @@ class Contributor extends Base {
          ipfsHashAttr.hashDigest,
          ipfsHashAttr.hashFunction,
          ipfsHashAttr.hashSize,
-          contributorAttr.isCore,
        ];

        return this.functions.addContributor(...contributor, callOptions);
--- a/lib/contracts/kernel.js
+++ b/lib/contracts/kernel.js
@@ -1,4 +1,4 @@
-const namehash = require('eth-ens-namehash').hash;
+const namehash = require('ethers').utils.namehash;
 const Base = require('./base');

 const KERNEL_APP_ADDR_NAMESPACE = '0xd6f028ca0e8edb4a8c9757ca4fdccab25fa1e0317da1188108f7d2dee14902fb';
--- a/lib/contracts/proposal.js
+++ b/lib/contracts/proposal.js
@@ -7,8 +7,7 @@ const Base = require('./base');
 class Proposal extends Base {
  all() {
    return this.functions.proposalsCount()
-      .then((count) => {
-        count = count.toNumber();
+      .then(count => {
        let proposals = [];

        for (let id = 1; id <= count; id++) {
@@ -20,10 +19,8 @@ class Proposal extends Base {
  }

  getById(id) {
-    id = ethers.utils.bigNumberify(id);
-
    return this.functions.getProposal(id)
-      .then((data) => {
+      .then(data => {
        return this.ipfs.catAndMerge(data, ContributionSerializer.deserialize);
      });
  }
--- a/lib/utils/ipfs.js
+++ b/lib/utils/ipfs.js
@@ -1,4 +1,4 @@
-const ipfsAPI = require('ipfs-api');
+const ipfsClient = require('ipfs-http-client');
 const multihashes = require('multihashes');

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

@@ -28,7 +28,7 @@ class IPFS {

  add(data) {
    return this._ipfsAPI
-      .add(new this._ipfsAPI.Buffer(data))
+      .add(ipfsClient.Buffer.from(data))
      .then((res) => {
        return this.decodeHash(res[0].hash);
      });
@@ -53,7 +53,7 @@ class IPFS {
  }

  encodeHash(hashData) {
-    let digest = this._ipfsAPI.Buffer.from(hashData.hashDigest.slice(2), 'hex');
+    let digest = ipfsClient.Buffer.from(hashData.hashDigest.slice(2), 'hex');
    return multihashes.encode(digest, hashData.hashFunction, hashData.hashSize);
  }

--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "kredits-contracts",
-  "version": "3.0.2",
+  "version": "4.0.1",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -863,8 +863,7 @@
    "asmcrypto.js": {
      "version": "2.3.2",
      "resolved": "https://registry.npmjs.org/asmcrypto.js/-/asmcrypto.js-2.3.2.tgz",
-      "integrity": "sha512-3FgFARf7RupsZETQ1nHnhLUUvpcttcCq1iZCaVAbJZbCZ5VNRrNyvpDyHTOb0KC3llFcsyOT/a99NZcCbeiEsA==",
-      "dev": true
+      "integrity": "sha512-3FgFARf7RupsZETQ1nHnhLUUvpcttcCq1iZCaVAbJZbCZ5VNRrNyvpDyHTOb0KC3llFcsyOT/a99NZcCbeiEsA=="
    },
    "asn1": {
      "version": "0.2.4",
@@ -1652,7 +1651,8 @@
    "big.js": {
      "version": "5.2.2",
      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+      "dev": true
    },
    "bignumber.js": {
      "version": "7.2.1",
@@ -1703,6 +1703,7 @@
      "version": "1.2.2",
      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
      "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
+      "dev": true,
      "requires": {
        "readable-stream": "^2.3.5",
        "safe-buffer": "^5.1.1"
@@ -1772,7 +1773,6 @@
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/borc/-/borc-2.1.0.tgz",
      "integrity": "sha512-hKTxeYt3AIzIG45epJHv8xJYSF0ktp7nZgFsqi5cPzoL3T8qKMPeUlqydORy6j3NWZvRDANx30PjpTmGho69Gw==",
-      "dev": true,
      "requires": {
        "bignumber.js": "^8.0.1",
        "commander": "^2.15.0",
@@ -1784,14 +1784,12 @@
        "bignumber.js": {
          "version": "8.1.1",
          "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-8.1.1.tgz",
-          "integrity": "sha512-QD46ppGintwPGuL1KqmwhR0O+N2cZUg8JG/VzwI2e28sM9TqHjQB10lI4QAaMHVbLzwVLLAwEglpKPViWX+5NQ==",
-          "dev": true
+          "integrity": "sha512-QD46ppGintwPGuL1KqmwhR0O+N2cZUg8JG/VzwI2e28sM9TqHjQB10lI4QAaMHVbLzwVLLAwEglpKPViWX+5NQ=="
        },
        "commander": {
          "version": "2.19.0",
          "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
-          "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
-          "dev": true
+          "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg=="
        }
      }
    },
@@ -1954,6 +1952,7 @@
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
      "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
+      "dev": true,
      "requires": {
        "buffer-alloc-unsafe": "^1.1.0",
        "buffer-fill": "^1.0.0"
@@ -1962,7 +1961,8 @@
    "buffer-alloc-unsafe": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
-      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="
+      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
+      "dev": true
    },
    "buffer-crc32": {
      "version": "0.2.13",
@@ -1973,17 +1973,20 @@
    "buffer-fill": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
-      "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw="
+      "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=",
+      "dev": true
    },
    "buffer-from": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "dev": true
    },
    "buffer-loader": {
      "version": "0.0.1",
      "resolved": "https://registry.npmjs.org/buffer-loader/-/buffer-loader-0.0.1.tgz",
-      "integrity": "sha1-TWd8qS3YiTEIeLAqL7z6txICTPI="
+      "integrity": "sha1-TWd8qS3YiTEIeLAqL7z6txICTPI=",
+      "dev": true
    },
    "buffer-to-arraybuffer": {
      "version": "0.0.5",
@@ -2260,6 +2263,7 @@
      "version": "1.6.2",
      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "dev": true,
      "requires": {
        "buffer-from": "^1.0.0",
        "inherits": "^2.0.3",
@@ -2315,7 +2319,8 @@
    "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="
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
    },
    "cors": {
      "version": "2.8.5",
@@ -2595,8 +2600,7 @@
    "delimit-stream": {
      "version": "0.1.0",
      "resolved": "https://registry.npmjs.org/delimit-stream/-/delimit-stream-0.1.0.tgz",
-      "integrity": "sha1-m4MZR3wOX4rrPONXrjBfwl6hzSs=",
-      "dev": true
+      "integrity": "sha1-m4MZR3wOX4rrPONXrjBfwl6hzSs="
    },
    "depd": {
      "version": "1.1.2",
@@ -2765,8 +2769,7 @@
    "err-code": {
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz",
-      "integrity": "sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=",
-      "dev": true
+      "integrity": "sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA="
    },
    "errno": {
      "version": "0.1.7",
@@ -2888,6 +2891,7 @@
      "version": "2.0.8",
      "resolved": "https://registry.npmjs.org/eth-ens-namehash/-/eth-ens-namehash-2.0.8.tgz",
      "integrity": "sha1-IprEbsqG1S4MmR58sq74P/D2i88=",
+      "dev": true,
      "requires": {
        "idna-uts46-hx": "^2.3.1",
        "js-sha3": "^0.5.7"
@@ -10174,6 +10178,7 @@
      "version": "2.3.1",
      "resolved": "https://registry.npmjs.org/idna-uts46-hx/-/idna-uts46-hx-2.3.1.tgz",
      "integrity": "sha512-PWoF9Keq6laYdIRwwCdhTPl60xRqAloYNMQLiyUnG42VjT53oW07BXIRM+NK7eQjzXjAk2gUvX9caRxlnF9TAA==",
+      "dev": true,
      "requires": {
        "punycode": "2.1.0"
      }
@@ -10181,8 +10186,7 @@
    "ieee754": {
      "version": "1.1.13",
      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
-      "dev": true
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
    },
    "ignore": {
      "version": "3.3.10",
@@ -10360,8 +10364,7 @@
    "ip-regex": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
-      "dev": true
+      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk="
    },
    "ipaddr.js": {
      "version": "1.8.0",
@@ -10369,47 +10372,11 @@
      "integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4=",
      "dev": true
    },
-    "ipfs-api": {
-      "version": "19.0.0",
-      "resolved": "https://registry.npmjs.org/ipfs-api/-/ipfs-api-19.0.0.tgz",
-      "integrity": "sha512-eDWW66KccHbK/yHlrKdmzw7Tm15tocIgr8Hrwx9xiZinxqtXbsM1AorKTaJ7ZJLls97KiclPRMRIDTIL54q++g==",
-      "requires": {
-        "async": "^2.6.0",
-        "big.js": "^5.0.3",
-        "bs58": "^4.0.1",
-        "cids": "~0.5.3",
-        "concat-stream": "^1.6.2",
-        "detect-node": "^2.0.3",
-        "flatmap": "0.0.3",
-        "glob": "^7.1.2",
-        "ipfs-block": "~0.6.1",
-        "ipfs-unixfs": "~0.1.14",
-        "ipld-dag-pb": "~0.13.1",
-        "is-ipfs": "^0.3.2",
-        "is-stream": "^1.1.0",
-        "lru-cache": "^4.1.2",
-        "multiaddr": "^3.1.0",
-        "multihashes": "~0.4.13",
-        "ndjson": "^1.5.0",
-        "once": "^1.4.0",
-        "peer-id": "~0.10.6",
-        "peer-info": "~0.11.6",
-        "promisify-es6": "^1.0.3",
-        "pull-defer": "^0.2.2",
-        "pull-pushable": "^2.2.0",
-        "pump": "^3.0.0",
-        "qs": "^6.5.1",
-        "readable-stream": "^2.3.5",
-        "stream-http": "^2.8.1",
-        "stream-to-pull-stream": "^1.7.2",
-        "streamifier": "^0.1.1",
-        "tar-stream": "^1.5.5"
-      }
-    },
    "ipfs-block": {
      "version": "0.6.1",
      "resolved": "https://registry.npmjs.org/ipfs-block/-/ipfs-block-0.6.1.tgz",
      "integrity": "sha512-28dgGsb2YsYnFs+To4cVBX8e/lTCb8eWDzGhN5csj3a/sHMOYrHeK8+Ez0IV67CI3lqKGuG/ZD01Cmd6JUvKrQ==",
+      "dev": true,
      "requires": {
        "cids": "^0.5.2"
      }
@@ -10418,7 +10385,6 @@
      "version": "30.1.1",
      "resolved": "https://registry.npmjs.org/ipfs-http-client/-/ipfs-http-client-30.1.1.tgz",
      "integrity": "sha512-tMqSwEhW57VnjHDBLjKKlgtAvlhkqVSR3oIFC0IiGnaM1nzcw7pbFBoHaFzl0PKIuXm40a5bJt85Rm2trYx+Ag==",
-      "dev": true,
      "requires": {
        "async": "^2.6.1",
        "bignumber.js": "^8.0.2",
@@ -10466,14 +10432,12 @@
        "bignumber.js": {
          "version": "8.1.1",
          "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-8.1.1.tgz",
-          "integrity": "sha512-QD46ppGintwPGuL1KqmwhR0O+N2cZUg8JG/VzwI2e28sM9TqHjQB10lI4QAaMHVbLzwVLLAwEglpKPViWX+5NQ==",
-          "dev": true
+          "integrity": "sha512-QD46ppGintwPGuL1KqmwhR0O+N2cZUg8JG/VzwI2e28sM9TqHjQB10lI4QAaMHVbLzwVLLAwEglpKPViWX+5NQ=="
        },
        "bl": {
          "version": "3.0.0",
          "resolved": "https://registry.npmjs.org/bl/-/bl-3.0.0.tgz",
          "integrity": "sha512-EUAyP5UHU5hxF8BPT0LKW8gjYLhq1DQIcneOX/pL/m2Alo+OYDQAJlHq+yseMP50Os2nHXOSic6Ss3vSQeyf4A==",
-          "dev": true,
          "requires": {
            "readable-stream": "^3.0.1"
          }
@@ -10481,7 +10445,6 @@
        "concat-stream": {
          "version": "github:hugomrdias/concat-stream#057bc7b5d6d8df26c8cf00a3f151b6721a0a8034",
          "from": "github:hugomrdias/concat-stream#feat/smaller",
-          "dev": true,
          "requires": {
            "inherits": "^2.0.3",
            "readable-stream": "^3.0.2"
@@ -10491,7 +10454,6 @@
          "version": "4.1.1",
          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
          "requires": {
            "ms": "^2.1.1"
          }
@@ -10500,7 +10462,6 @@
          "version": "0.8.0",
          "resolved": "https://registry.npmjs.org/ipfs-block/-/ipfs-block-0.8.0.tgz",
          "integrity": "sha512-znNtFRxXlJYP1/Q4u0tGFJUceH9pNww8WA+zair6T3y7d28m+vtUDJGn96M7ZlFFSkByQyQsAiq2ssNhKtMzxw==",
-          "dev": true,
          "requires": {
            "cids": "~0.5.5",
            "class-is": "^1.1.0"
@@ -10510,7 +10471,6 @@
          "version": "0.13.1",
          "resolved": "https://registry.npmjs.org/ipld-dag-cbor/-/ipld-dag-cbor-0.13.1.tgz",
          "integrity": "sha512-96KKh5XUq9LrWE/TQ/BOJ5FcQx7UZ892N76ufDdovq+fIwZ4/YpPRTAVssLUuN3crATHoGu80TVZMgevsuTCdQ==",
-          "dev": true,
          "requires": {
            "borc": "^2.1.0",
            "bs58": "^4.0.1",
@@ -10525,7 +10485,6 @@
          "version": "0.15.3",
          "resolved": "https://registry.npmjs.org/ipld-dag-pb/-/ipld-dag-pb-0.15.3.tgz",
          "integrity": "sha512-J1RJzSVCaOpxPmSzXbwVNsAZPHctjY4OjqG1dMIG86Z37CKvuy1QwCFkDhNccUTcQpF3sXfj5e0ZUyMM035vzg==",
-          "dev": true,
          "requires": {
            "async": "^2.6.1",
            "bs58": "^4.0.1",
@@ -10543,7 +10502,6 @@
          "version": "0.6.0",
          "resolved": "https://registry.npmjs.org/is-ipfs/-/is-ipfs-0.6.0.tgz",
          "integrity": "sha512-q/CO69rN+vbw9eGXGQOAa15zXq+pSyhdKvE7mqvuplDu67LyT3H9t3RyYQvKpueN7dL4f6fbyjEMPp9J3rJ4qA==",
-          "dev": true,
          "requires": {
            "bs58": "^4.0.1",
            "cids": "~0.5.6",
@@ -10556,14 +10514,12 @@
        "js-sha3": {
          "version": "0.8.0",
          "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",
-          "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==",
-          "dev": true
+          "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q=="
        },
        "libp2p-crypto": {
          "version": "0.16.1",
          "resolved": "https://registry.npmjs.org/libp2p-crypto/-/libp2p-crypto-0.16.1.tgz",
          "integrity": "sha512-+fxqy+cDjwOKK4KTj44WQmjPE5ep2eR5uAIQWHl/+RKvRSor3+RAY53VWkAecgAEvjX2AswxBsoCIJK1Qk5aIQ==",
-          "dev": true,
          "requires": {
            "asmcrypto.js": "^2.3.2",
            "asn1.js": "^5.0.1",
@@ -10587,7 +10543,6 @@
          "version": "0.3.0",
          "resolved": "https://registry.npmjs.org/libp2p-crypto-secp256k1/-/libp2p-crypto-secp256k1-0.3.0.tgz",
          "integrity": "sha512-+rF3S5p2pzS4JLDwVE6gLWZeaKkpl4NkYwG+0knV6ot29UcRSb73OyCWl07r1h5+g9E3KZC3wpsu+RIK5w8zQA==",
-          "dev": true,
          "requires": {
            "async": "^2.6.1",
            "bs58": "^4.0.1",
@@ -10601,7 +10556,6 @@
          "version": "5.1.1",
          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-          "dev": true,
          "requires": {
            "yallist": "^3.0.2"
          }
@@ -10609,14 +10563,12 @@
        "ms": {
          "version": "2.1.1",
          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-          "dev": true
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
        },
        "multiaddr": {
          "version": "6.0.6",
          "resolved": "https://registry.npmjs.org/multiaddr/-/multiaddr-6.0.6.tgz",
          "integrity": "sha512-nR4s91mi7IKed1jrqUj/4OhZ1VKdAjUG79IuVB5PS6b+qxOZLKPW8nsskHhrfGn4o1Rn1NJWl7znidF/NVQpEA==",
-          "dev": true,
          "requires": {
            "bs58": "^4.0.1",
            "class-is": "^1.1.0",
@@ -10629,7 +10581,6 @@
          "version": "0.5.2",
          "resolved": "https://registry.npmjs.org/multihashing-async/-/multihashing-async-0.5.2.tgz",
          "integrity": "sha512-mmyG6M/FKxrpBh9xQDUvuJ7BbqT93ZeEeH5X6LeMYKoYshYLr9BDdCsvDtZvn+Egf+/Xi+aOznrWL4vp3s+p0Q==",
-          "dev": true,
          "requires": {
            "blakejs": "^1.1.0",
            "js-sha3": "~0.8.0",
@@ -10641,7 +10592,6 @@
        "ndjson": {
          "version": "github:hugomrdias/ndjson#4db16da6b42e5b39bf300c3a7cde62abb3fa3a11",
          "from": "github:hugomrdias/ndjson#feat/readable-stream3",
-          "dev": true,
          "requires": {
            "json-stringify-safe": "^5.0.1",
            "minimist": "^1.2.0",
@@ -10653,7 +10603,6 @@
          "version": "0.12.2",
          "resolved": "https://registry.npmjs.org/peer-id/-/peer-id-0.12.2.tgz",
          "integrity": "sha512-pked3yPLcOcprH21OnYbJAzk9OgI/TDEqjJ0IfRJSVB/61ZyqU5VKO7cw7hul+YD8nTD79wM79xFRWN3f6otNg==",
-          "dev": true,
          "requires": {
            "async": "^2.6.1",
            "class-is": "^1.1.0",
@@ -10665,7 +10614,6 @@
          "version": "0.15.1",
          "resolved": "https://registry.npmjs.org/peer-info/-/peer-info-0.15.1.tgz",
          "integrity": "sha512-Y91Q2tZRC0CpSTPd1UebhGqniOrOAk/aj60uYUcWJXCoLTAnGu+4LJGoiay8ayudS6ice7l3SKhgL/cS62QacA==",
-          "dev": true,
          "requires": {
            "mafmt": "^6.0.2",
            "multiaddr": "^6.0.3",
@@ -10677,7 +10625,6 @@
          "version": "2.0.0",
          "resolved": "https://registry.npmjs.org/pem-jwk/-/pem-jwk-2.0.0.tgz",
          "integrity": "sha512-rFxu7rVoHgQ5H9YsP50dDWf0rHjreVA2z0yPiWr5WdH/UHb29hKtF7h6l8vNd1cbYR1t0QL+JKhW55a2ZV4KtA==",
-          "dev": true,
          "requires": {
            "asn1.js": "^5.0.1"
          }
@@ -10686,7 +10633,6 @@
          "version": "3.3.0",
          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.3.0.tgz",
          "integrity": "sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==",
-          "dev": true,
          "requires": {
            "inherits": "^2.0.3",
            "string_decoder": "^1.1.1",
@@ -10697,7 +10643,6 @@
          "version": "3.1.1",
          "resolved": "https://registry.npmjs.org/split2/-/split2-3.1.1.tgz",
          "integrity": "sha512-emNzr1s7ruq4N+1993yht631/JH+jaj0NYBosuKmLcq+JkGQ9MmTw1RB1fGaTCzUuseRIClrlSLHRNYGwWQ58Q==",
-          "dev": true,
          "requires": {
            "readable-stream": "^3.0.0"
          }
@@ -10706,7 +10651,6 @@
          "version": "2.0.1",
          "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.0.1.tgz",
          "integrity": "sha512-I6OJF7wE62BC6zNPdHDtseK0D0187PBjbKSLYY4ffvVkBM6tyBn2O9plDvVM2229/mozfEL/X3++qSvYYQE2xw==",
-          "dev": true,
          "requires": {
            "bl": "^3.0.0",
            "end-of-stream": "^1.4.1",
@@ -10719,7 +10663,6 @@
          "version": "3.0.1",
          "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
          "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
-          "dev": true,
          "requires": {
            "readable-stream": "2 || 3"
          }
@@ -10727,14 +10670,12 @@
        "traverse": {
          "version": "0.6.6",
          "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz",
-          "integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=",
-          "dev": true
+          "integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc="
        },
        "yallist": {
          "version": "3.0.3",
          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
-          "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
-          "dev": true
+          "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
        }
      }
    },
@@ -10742,6 +10683,7 @@
      "version": "0.1.16",
      "resolved": "https://registry.npmjs.org/ipfs-unixfs/-/ipfs-unixfs-0.1.16.tgz",
      "integrity": "sha512-TX9Dyu77MxpLzGh/LcQne95TofOyvOeW0oOi72aBMMcV1ItP3684e6NTG9KY1qzdrC+ZUR8kT7y18J058n8KXg==",
+      "dev": true,
      "requires": {
        "protons": "^1.0.1"
      }
@@ -10789,25 +10731,6 @@
        }
      }
    },
-    "ipld-dag-pb": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/ipld-dag-pb/-/ipld-dag-pb-0.13.1.tgz",
-      "integrity": "sha512-HxybRQvpY8IQ9T0bImlT5v4LBR3jJAgEnFRA/ZU2UNIiBuRkbirI9+VSX03+WkiYooiFMoZz6Qp/xYMdoogNWg==",
-      "requires": {
-        "async": "^2.6.0",
-        "bs58": "^4.0.1",
-        "buffer-loader": "0.0.1",
-        "cids": "~0.5.2",
-        "ipfs-block": "~0.6.1",
-        "is-ipfs": "~0.3.2",
-        "multihashes": "~0.4.12",
-        "multihashing-async": "~0.4.7",
-        "protons": "^1.0.1",
-        "pull-stream": "^3.6.1",
-        "pull-traverse": "^1.0.3",
-        "stable": "^0.1.6"
-      }
-    },
    "is-arrayish": {
      "version": "0.2.1",
      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -10829,8 +10752,7 @@
    "is-circular": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/is-circular/-/is-circular-1.0.2.tgz",
-      "integrity": "sha512-YttjnrswnUYRVJvxCvu8z+PGMUSzC2JttP0OEXezlAEdp3EXzhf7IZ3j0gRAybJBQupedIZFhY61Tga6E0qASA==",
-      "dev": true
+      "integrity": "sha512-YttjnrswnUYRVJvxCvu8z+PGMUSzC2JttP0OEXezlAEdp3EXzhf7IZ3j0gRAybJBQupedIZFhY61Tga6E0qASA=="
    },
    "is-date-object": {
      "version": "1.0.1",
@@ -10890,7 +10812,6 @@
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/is-ip/-/is-ip-2.0.0.tgz",
      "integrity": "sha1-aO6gfooKCpTC0IDdZ0xzGrKkYas=",
-      "dev": true,
      "requires": {
        "ip-regex": "^2.0.0"
      }
@@ -10899,6 +10820,7 @@
      "version": "0.3.2",
      "resolved": "https://registry.npmjs.org/is-ipfs/-/is-ipfs-0.3.2.tgz",
      "integrity": "sha512-82V1j4LMkYy7H4seQQzOWqo7FiW3I64/1/ryo3dhtWKfOvm7ZolLMRQQfGKs4OXWauh5rAkPnamVcRISHwhmpQ==",
+      "dev": true,
      "requires": {
        "bs58": "^4.0.1",
        "cids": "~0.5.1",
@@ -10954,8 +10876,7 @@
    "is-pull-stream": {
      "version": "0.0.0",
      "resolved": "https://registry.npmjs.org/is-pull-stream/-/is-pull-stream-0.0.0.tgz",
-      "integrity": "sha1-o7w9HG0wVRUcRr3m85nv7SFEDKk=",
-      "dev": true
+      "integrity": "sha1-o7w9HG0wVRUcRr3m85nv7SFEDKk="
    },
    "is-regex": {
      "version": "1.0.4",
@@ -11013,7 +10934,8 @@
    "isarray": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
    },
    "isexe": {
      "version": "2.0.0",
@@ -11024,14 +10946,12 @@
    "iso-random-stream": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/iso-random-stream/-/iso-random-stream-1.1.0.tgz",
-      "integrity": "sha512-ywSWt0KrWcsaK0jVoVJIR30rLyjg9Rw3k2Sm/qp+3tdtSV0SNH7L7KilKnENcENOSoJxDFvpt2idvuMMQohdCQ==",
-      "dev": true
+      "integrity": "sha512-ywSWt0KrWcsaK0jVoVJIR30rLyjg9Rw3k2Sm/qp+3tdtSV0SNH7L7KilKnENcENOSoJxDFvpt2idvuMMQohdCQ=="
    },
    "iso-stream-http": {
      "version": "0.1.2",
      "resolved": "https://registry.npmjs.org/iso-stream-http/-/iso-stream-http-0.1.2.tgz",
      "integrity": "sha512-oHEDNOysIMTNypbg2f1SlydqRBvjl4ZbSE9+0awVxnkx3K2stGTFwB/kpVqnB6UEfF8QD36kAjDwZvqyXBLMnQ==",
-      "dev": true,
      "requires": {
        "builtin-status-codes": "^3.0.0",
        "inherits": "^2.0.1",
@@ -11042,7 +10962,6 @@
          "version": "3.3.0",
          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.3.0.tgz",
          "integrity": "sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==",
-          "dev": true,
          "requires": {
            "inherits": "^2.0.3",
            "string_decoder": "^1.1.1",
@@ -11054,8 +10973,7 @@
    "iso-url": {
      "version": "0.4.6",
      "resolved": "https://registry.npmjs.org/iso-url/-/iso-url-0.4.6.tgz",
-      "integrity": "sha512-YQO7+aIe6l1aSJUKOx+Vrv08DlhZeLFIVfehG2L29KLSEb9RszqPXilxJRVpp57px36BddKR5ZsebacO5qG0tg==",
-      "dev": true
+      "integrity": "sha512-YQO7+aIe6l1aSJUKOx+Vrv08DlhZeLFIVfehG2L29KLSEb9RszqPXilxJRVpp57px36BddKR5ZsebacO5qG0tg=="
    },
    "isomorphic-fetch": {
      "version": "2.2.1",
@@ -11177,7 +11095,6 @@
      "version": "0.1.1",
      "resolved": "https://registry.npmjs.org/json-text-sequence/-/json-text-sequence-0.1.1.tgz",
      "integrity": "sha1-py8hfcSvxGKf/1/rME3BvVGi89I=",
-      "dev": true,
      "requires": {
        "delimit-stream": "0.1.0"
      }
@@ -11218,14 +11135,12 @@
    "just-kebab-case": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/just-kebab-case/-/just-kebab-case-1.1.0.tgz",
-      "integrity": "sha512-QkuwuBMQ9BQHMUEkAtIA4INLrkmnnveqlFB1oFi09gbU0wBdZo6tTnyxNWMR84zHxBuwK7GLAwqN8nrvVxOLTA==",
-      "dev": true
+      "integrity": "sha512-QkuwuBMQ9BQHMUEkAtIA4INLrkmnnveqlFB1oFi09gbU0wBdZo6tTnyxNWMR84zHxBuwK7GLAwqN8nrvVxOLTA=="
    },
    "just-map-keys": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/just-map-keys/-/just-map-keys-1.1.0.tgz",
-      "integrity": "sha512-oNKi+4y7fr8lXnhKYpBbCkiwHRVkAnx0VDkCeTDtKKMzGr1Lz1Yym+RSieKUTKim68emC5Yxrb4YmiF9STDO+g==",
-      "dev": true
+      "integrity": "sha512-oNKi+4y7fr8lXnhKYpBbCkiwHRVkAnx0VDkCeTDtKKMzGr1Lz1Yym+RSieKUTKim68emC5Yxrb4YmiF9STDO+g=="
    },
    "keccak": {
      "version": "1.4.0",
@@ -11397,6 +11312,7 @@
      "version": "0.12.1",
      "resolved": "https://registry.npmjs.org/libp2p-crypto/-/libp2p-crypto-0.12.1.tgz",
      "integrity": "sha512-1/z8rxZ0DcQNreZhEsl7PnLr7DWOioSvYbKBLGkRwNRiNh1JJLgh0PdTySBb44wkrOGT+TxcGRd7iq3/X6Wxwg==",
+      "dev": true,
      "requires": {
        "asn1.js": "^5.0.0",
        "async": "^2.6.0",
@@ -11417,6 +11333,7 @@
      "version": "0.2.3",
      "resolved": "https://registry.npmjs.org/libp2p-crypto-secp256k1/-/libp2p-crypto-secp256k1-0.2.3.tgz",
      "integrity": "sha512-DFrK89VdboacqM3vqWV8yt8FH9Ni181JJAOU2tRkJfUN9tNEV7VfZEg390NJxEQQbLsyH4HZ7on3QTpPHMHQZQ==",
+      "dev": true,
      "requires": {
        "async": "^2.6.1",
        "multihashing-async": "~0.5.1",
@@ -11428,12 +11345,14 @@
        "js-sha3": {
          "version": "0.8.0",
          "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",
-          "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q=="
+          "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==",
+          "dev": true
        },
        "multihashing-async": {
          "version": "0.5.2",
          "resolved": "https://registry.npmjs.org/multihashing-async/-/multihashing-async-0.5.2.tgz",
          "integrity": "sha512-mmyG6M/FKxrpBh9xQDUvuJ7BbqT93ZeEeH5X6LeMYKoYshYLr9BDdCsvDtZvn+Egf+/Xi+aOznrWL4vp3s+p0Q==",
+          "dev": true,
          "requires": {
            "blakejs": "^1.1.0",
            "js-sha3": "~0.8.0",
@@ -11705,7 +11624,8 @@
    "lodash.filter": {
      "version": "4.6.0",
      "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz",
-      "integrity": "sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4="
+      "integrity": "sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4=",
+      "dev": true
    },
    "lodash.find": {
      "version": "4.6.0",
@@ -11722,7 +11642,8 @@
    "lodash.map": {
      "version": "4.6.0",
      "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz",
-      "integrity": "sha1-dx7Hg540c9nEzeKLGTlMNWL09tM="
+      "integrity": "sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=",
+      "dev": true
    },
    "lodash.max": {
      "version": "4.0.1",
@@ -11751,7 +11672,8 @@
    "lodash.uniqby": {
      "version": "4.7.0",
      "resolved": "https://registry.npmjs.org/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz",
-      "integrity": "sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI="
+      "integrity": "sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI=",
+      "dev": true
    },
    "log-symbols": {
      "version": "1.0.2",
@@ -11811,6 +11733,7 @@
      "version": "4.1.5",
      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+      "dev": true,
      "requires": {
        "pseudomap": "^1.0.2",
        "yallist": "^2.1.2"
@@ -11826,7 +11749,6 @@
      "version": "6.0.7",
      "resolved": "https://registry.npmjs.org/mafmt/-/mafmt-6.0.7.tgz",
      "integrity": "sha512-2OG/EGAJZmpZBl7YRT1hD83sZa2gKsUEdegRuURreIOe7B4VeHU1rYYmhgk7BkLzknGL3xGYsDx3bbSgEEzE7g==",
-      "dev": true,
      "requires": {
        "multiaddr": "^6.0.4"
      },
@@ -11835,7 +11757,6 @@
          "version": "6.0.6",
          "resolved": "https://registry.npmjs.org/multiaddr/-/multiaddr-6.0.6.tgz",
          "integrity": "sha512-nR4s91mi7IKed1jrqUj/4OhZ1VKdAjUG79IuVB5PS6b+qxOZLKPW8nsskHhrfGn4o1Rn1NJWl7znidF/NVQpEA==",
-          "dev": true,
          "requires": {
            "bs58": "^4.0.1",
            "class-is": "^1.1.0",
@@ -12213,6 +12134,7 @@
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/multiaddr/-/multiaddr-3.1.0.tgz",
      "integrity": "sha512-QhmsD/TufS5KB7brd1rkzLz2sJqybQlDT9prroiWacaw61DtHoe2X/vcAnOu8mZc7s7ZzevFPvY5tzv3yjBXlQ==",
+      "dev": true,
      "requires": {
        "bs58": "^4.0.1",
        "ip": "^1.1.5",
@@ -12261,6 +12183,7 @@
      "version": "0.4.8",
      "resolved": "https://registry.npmjs.org/multihashing-async/-/multihashing-async-0.4.8.tgz",
      "integrity": "sha512-LCc4lfxmTJOHKIjZjFNgvmfB6nXS/ErLInT9uwU8udFrRm2PH+aTPk3mfCREKmCiSHOlCWiv2O8rlnBx+OjlMw==",
+      "dev": true,
      "requires": {
        "async": "^2.6.0",
        "blakejs": "^1.1.0",
@@ -12273,7 +12196,8 @@
        "js-sha3": {
          "version": "0.7.0",
          "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.7.0.tgz",
-          "integrity": "sha512-Wpks3yBDm0UcL5qlVhwW9Jr9n9i4FfeWBFOOXP5puDS/SiudJGhw7DPyBqn3487qD4F0lsC0q3zxink37f7zeA=="
+          "integrity": "sha512-Wpks3yBDm0UcL5qlVhwW9Jr9n9i4FfeWBFOOXP5puDS/SiudJGhw7DPyBqn3487qD4F0lsC0q3zxink37f7zeA==",
+          "dev": true
        }
      }
    },
@@ -12334,6 +12258,7 @@
      "version": "1.5.0",
      "resolved": "https://registry.npmjs.org/ndjson/-/ndjson-1.5.0.tgz",
      "integrity": "sha1-rmA7NrE0vOw0e0UkIrC/mNWDLsg=",
+      "dev": true,
      "requires": {
        "json-stringify-safe": "^5.0.1",
        "minimist": "^1.2.0",
@@ -12760,6 +12685,7 @@
      "version": "0.10.7",
      "resolved": "https://registry.npmjs.org/peer-id/-/peer-id-0.10.7.tgz",
      "integrity": "sha512-VEpMFcL9q0NQijmR0jsj38OGbY4yzaWMEareVkDahopmlNT+Cpsot8btPgsgBBApP9NiZj2Enwvh8rZN30ocQw==",
+      "dev": true,
      "requires": {
        "async": "^2.6.0",
        "libp2p-crypto": "~0.12.1",
@@ -12771,6 +12697,7 @@
      "version": "0.11.6",
      "resolved": "https://registry.npmjs.org/peer-info/-/peer-info-0.11.6.tgz",
      "integrity": "sha512-xrVNiAF1IhVJNGEg5P2UQN+subaEkszT8YkC3zdy06MK0vTH3cMHB+HH+ZURkoSLssc3HbK58ecXeKpQ/4zq5w==",
+      "dev": true,
      "requires": {
        "lodash.uniqby": "^4.7.0",
        "multiaddr": "^3.0.2",
@@ -12781,6 +12708,7 @@
      "version": "1.5.1",
      "resolved": "https://registry.npmjs.org/pem-jwk/-/pem-jwk-1.5.1.tgz",
      "integrity": "sha1-eoY3/S9nqCflfAxC4cI8P9Us+wE=",
+      "dev": true,
      "requires": {
        "asn1.js": "1.0.3"
      },
@@ -12789,6 +12717,7 @@
          "version": "1.0.3",
          "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-1.0.3.tgz",
          "integrity": "sha1-KBuj7B8kSP52X5Kk7s+IP+E2S1Q=",
+          "dev": true,
          "requires": {
            "bn.js": "^1.0.0",
            "inherits": "^2.0.1",
@@ -12799,6 +12728,7 @@
          "version": "1.3.0",
          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-1.3.0.tgz",
          "integrity": "sha1-DbTL+W+PI7dC9by50ap6mZSgXoM=",
+          "dev": true,
          "optional": true
        }
      }
@@ -12857,7 +12787,8 @@
    "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=="
+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+      "dev": true
    },
    "promise": {
      "version": "1.3.0",
@@ -12935,7 +12866,8 @@
    "pseudomap": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
+      "dev": true
    },
    "psl": {
      "version": "1.1.31",
@@ -12965,7 +12897,8 @@
    "pull-pushable": {
      "version": "2.2.0",
      "resolved": "https://registry.npmjs.org/pull-pushable/-/pull-pushable-2.2.0.tgz",
-      "integrity": "sha1-Xy867UethpGfAbEqLpnW8b13ZYE="
+      "integrity": "sha1-Xy867UethpGfAbEqLpnW8b13ZYE=",
+      "dev": true
    },
    "pull-stream": {
      "version": "3.6.9",
@@ -12982,7 +12915,6 @@
      "version": "0.1.0",
      "resolved": "https://registry.npmjs.org/pull-to-stream/-/pull-to-stream-0.1.0.tgz",
      "integrity": "sha512-LMvdE0JwT7XQZMFjc7JDl/G9gmoZ8Zo8e86SG4ZZUcjuwvod803KxpAK8WrmdxzHsMRK9DETlIzuA0tbEVv6jg==",
-      "dev": true,
      "requires": {
        "readable-stream": "^3.1.1"
      },
@@ -12991,7 +12923,6 @@
          "version": "3.3.0",
          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.3.0.tgz",
          "integrity": "sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==",
-          "dev": true,
          "requires": {
            "inherits": "^2.0.3",
            "string_decoder": "^1.1.1",
@@ -13078,7 +13009,8 @@
    "punycode": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz",
-      "integrity": "sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0="
+      "integrity": "sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0=",
+      "dev": true
    },
    "qs": {
      "version": "6.7.0",
@@ -13226,6 +13158,7 @@
      "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",
@@ -13890,6 +13823,7 @@
      "version": "2.2.0",
      "resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz",
      "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==",
+      "dev": true,
      "requires": {
        "through2": "^2.0.2"
      }
@@ -13940,6 +13874,7 @@
      "version": "2.8.3",
      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+      "dev": true,
      "requires": {
        "builtin-status-codes": "^3.0.0",
        "inherits": "^2.0.1",
@@ -13975,7 +13910,8 @@
    "streamifier": {
      "version": "0.1.1",
      "resolved": "https://registry.npmjs.org/streamifier/-/streamifier-0.1.1.tgz",
-      "integrity": "sha1-l+mNj6TRBdYqJpHR3AfoINuN/E8="
+      "integrity": "sha1-l+mNj6TRBdYqJpHR3AfoINuN/E8=",
+      "dev": true
    },
    "strict-uri-encode": {
      "version": "1.1.0",
@@ -14175,6 +14111,7 @@
      "version": "1.6.2",
      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
      "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
+      "dev": true,
      "requires": {
        "bl": "^1.0.0",
        "buffer-alloc": "^1.2.0",
@@ -14240,6 +14177,7 @@
      "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"
@@ -14273,12 +14211,14 @@
    "to-arraybuffer": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M="
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
+      "dev": true
    },
    "to-buffer": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
-      "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg=="
+      "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==",
+      "dev": true
    },
    "to-fast-properties": {
      "version": "1.0.3",
@@ -14528,7 +14468,8 @@
    "typedarray": {
      "version": "0.0.6",
      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "dev": true
    },
    "typedarray-to-buffer": {
      "version": "3.1.5",
@@ -14564,8 +14505,7 @@
    "unique-by": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/unique-by/-/unique-by-1.0.0.tgz",
-      "integrity": "sha1-UiDIa6e8Vy+3E610ZRRwy2RCEr0=",
-      "dev": true
+      "integrity": "sha1-UiDIa6e8Vy+3E610ZRRwy2RCEr0="
    },
    "universalify": {
      "version": "0.1.2",
@@ -14690,7 +14630,6 @@
      "version": "0.9.10",
      "resolved": "https://registry.npmjs.org/ursa-optional/-/ursa-optional-0.9.10.tgz",
      "integrity": "sha512-RvEbhnxlggX4MXon7KQulTFiJQtLJZpSb9ZSa7ZTkOW0AzqiVTaLjI4vxaSzJBDH9dwZ3ltZadFiBaZslp6haA==",
-      "dev": true,
      "requires": {
        "bindings": "^1.3.0",
        "nan": "^2.11.1"
@@ -15525,7 +15464,8 @@
    },
    "webcrypto-shim": {
      "version": "github:dignifiedquire/webcrypto-shim#190bc9ec341375df6025b17ae12ddb2428ea49c8",
-      "from": "github:dignifiedquire/webcrypto-shim#master"
+      "from": "github:dignifiedquire/webcrypto-shim#master",
+      "dev": true
    },
    "websocket": {
      "version": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2",
@@ -15663,7 +15603,8 @@
    "xtend": {
      "version": "4.0.1",
      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+      "dev": true
    },
    "y18n": {
      "version": "3.2.1",
@@ -15680,7 +15621,8 @@
    "yallist": {
      "version": "2.1.2",
      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+      "dev": true
    },
    "yargs": {
      "version": "12.0.5",
--- a/package.json
+++ b/package.json
@@ -1,21 +1,23 @@
 {
  "name": "kredits-contracts",
-  "version": "3.0.2",
+  "version": "4.0.1",
  "description": "Ethereum contracts and npm wrapper for Kredits",
  "main": "./lib/kredits.js",
  "directories": {
    "test": "test"
  },
  "scripts": {
+    "install-all": "./scripts/every-app.sh \"npm install\"",
    "build-json": "npm run compile-contracts && node ./scripts/build-json.js",
    "repl": "truffle exec scripts/repl.js",
    "seeds": "truffle exec scripts/seeds.js",
    "compile-contracts": "aragon contracts compile --all",
-    "bootstrap": "npm run reset && truffle exec scripts/seeds.js",
-    "reset": "npm run deploy:apps && npm run deploy:kit && npm run deploy:dao",
-    "deploy:kit": "npm run compile-contracts && ENS=0x5f6f7e8cc7346a11ca2def8f827b7a0b612c56a1 aragon contracts exec scripts/deploy-kit.js",
+    "bootstrap": "./scripts/every-app.sh \"npm install \" && npm run reset:hard && npm run seeds",
+    "reset": "npm run deploy:kit && npm run deploy:dao",
+    "reset:hard": "npm run deploy:apps && npm run reset",
+    "deploy:kit": "npm run compile-contracts && aragon contracts exec scripts/deploy-kit.js",
    "deploy:dao": "aragon contracts exec scripts/new-dao.js",
-    "deploy:apps": "./scripts/deploy-apps.sh",
+    "deploy:apps": "./scripts/every-app.sh \"aragon apm publish major\"",
    "devchain": "aragon devchain --port 7545",
    "dao:address": "truffle exec scripts/current-address.js",
    "test": "echo \"Error: no test specified\" && exit 1"
@@ -41,9 +43,8 @@
    "solc": "^0.4.25"
  },
  "dependencies": {
-    "eth-ens-namehash": "^2.0.8",
    "ethers": "^4.0.27",
-    "ipfs-api": "^19.0.0",
+    "ipfs-http-client": "^30.1.1",
    "rsvp": "^4.8.2"
  },
  "keywords": [
--- a/scripts/add-contribution.js
+++ b/scripts/add-contribution.js
@@ -27,7 +27,7 @@ module.exports = async function(callback) {
  console.log(`Creating a contribution for contributor account ${contributorAccount} ID: ${contributorId}`);

  let contributionAttributes = {
-    contributorAccount,
+    contributorId,
    amount: await promptly.prompt('Amount: '),
    description: await promptly.prompt('Description: '),
    kind: await promptly.prompt('Kind: ', { default: 'dev' }),
--- a/scripts/add-contributor.js
+++ b/scripts/add-contributor.js
@@ -23,7 +23,6 @@ module.exports = async function(callback) {
  let contributorAttributes = {
    account: await prompt('Contributor address: ', {}),
    name: await prompt('Name: '),
-    isCore: await prompt('core? y/n') === 'y',
    kind: await prompt('Kind (default person): ', {default: 'person'}),
    url: await prompt('URL: '),
    github_username: await prompt('GitHub username: '),
@@ -34,7 +33,7 @@ module.exports = async function(callback) {
  console.log("\nAdding contributor:");
  console.log(contributorAttributes);

-  kredits.Contributor.add(contributorAttributes, { gasLimit: 250000 }).then((result) => {
+  kredits.Contributor.add(contributorAttributes, { gasLimit: 350000 }).then((result) => {
    console.log("\n\nResult:");
    console.log(result);
    callback();
--- a/scripts/deploy-apps.sh
+++ b/scripts/deploy-apps.sh
@@ -10,13 +10,7 @@ echo "Setting up each aragon app in ./apps"
 echo "a new app version will be deployed"
 echo "----"

-for dir in ./apps/*/; do
-  set -x
-  cd $dir
-  npm install
-  aragon apm publish major 
-  cd $rootDir
-  set +x
-done
+./scripts/every-app.sh "npm install"
+./scripts/every-app.sh "aragon apm publish major"

 echo "Done, new versions of all apps deployed"
--- a/scripts/deploy-kit.js
+++ b/scripts/deploy-kit.js
@@ -3,7 +3,7 @@ const deployDAOFactory = require('@aragon/os/scripts/deploy-daofactory.js')
 const fs = require('fs');
 const path = require('path');
 const argv = require('yargs').argv
-const namehash = require('eth-ens-namehash').hash
+const namehash = require('ethers').utils.namehash;

 const fileInject = require('./helpers/file_inject.js')
 const getNetworkId = require('./helpers/networkid.js')
--- a/scripts/every-app.sh
+++ b/scripts/every-app.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+rootDir=`pwd`
+
+for dir in ./apps/*/; do
+  set -x
+  cd $dir
+  eval $1
+  cd $rootDir
+  set +x
+done
+
--- a/scripts/helpers/init_kredits.js
+++ b/scripts/helpers/init_kredits.js
@@ -20,7 +20,7 @@ module.exports = async function(web3) {
      });
    }).catch(e => {
      console.log(`Signer account not available; readonly connection (${e.message}`);
-      new Kredits(provider, null).init().then(kredits => {
+      new Kredits(provider, null, { apm }).init().then(kredits => {
        resolve(kredits);
      }).catch(e => {
        reject(e);
--- a/scripts/list-contributions.js
+++ b/scripts/list-contributions.js
@@ -14,23 +14,32 @@ module.exports = async function(callback) {

  console.log(`Using Contribution at: ${kredits.Contribution.contract.address}`);

-
  const table = new Table({
-    head: ['ID', 'Contributor account', 'Amount', 'Claimed?', 'Vetoed?', 'Description']
+    head: ['ID', 'Contributor ID', 'Description', 'Amount', 'Confirmed?', 'Vetoed?', 'Claimed?']
  })

-  let contributions = await kredits.Contribution.all()
+  try {
+    let blockNumber = await kredits.provider.getBlockNumber();
+    let contributions = await kredits.Contribution.all()

-  contributions.forEach((c) => {
-    table.push([
-      c.id.toString(),
-      c.contributor,
-      c.amount.toString(),
-      c.claimed,
-      c.vetoed,
-      `${c.description}`
-    ])
-  })
-  console.log(table.toString())
-  callback()
+    contributions.forEach((c) => {
+      const confirmed = !!(c.claimAtBlock < blockNumber)
+
+      table.push([
+        c.id.toString(),
+        c.contributorId,
+        `${c.description}`,
+        c.amount.toString(),
+        confirmed,
+        c.vetoed,
+        c.claimed,
+      ])
+    })
+
+    console.log(table.toString())
+  } catch (err) {
+    console.log(err);
+  }
+
+  callback();
 }
--- a/scripts/list-contributors.js
+++ b/scripts/list-contributors.js
@@ -16,7 +16,7 @@ module.exports = async function(callback) {


  const table = new Table({
-    head: ['ID', 'Account', 'Core?', 'Name']
+    head: ['ID', 'Account', 'Core?', 'Name', 'Balance']
  })

  let contributors = await kredits.Contributor.all()
@@ -26,7 +26,8 @@ module.exports = async function(callback) {
      c.id.toString(),
      c.account,
      c.isCore,
-      `${c.name}`
+      `${c.name}`,
+      c.balance.toString()
    ])
  })
  console.log(table.toString())
--- a/scripts/list-proposals.js
+++ b/scripts/list-proposals.js
@@ -14,7 +14,6 @@ module.exports = async function(callback) {

  console.log(`Using Proposal at: ${kredits.Proposal.contract.address}`);

-
  const table = new Table({
    head: ['ID', 'Contributor ID', 'Amount', 'Votes', 'Executed?', 'Description']
  })
--- a/scripts/seeds.js
+++ b/scripts/seeds.js
@@ -39,8 +39,9 @@ module.exports = async function(callback) {
      console.log(`[OK] kredits.${contractName}.${method}(${JSON.stringify(args)}) => ${result.hash}`);
      next();
    }).catch((error) => {
-      console.log(`[FAILD] kredits.${contractName}.${method}(${JSON.stringify(args)})`);
-      callback(error)
+      console.log(`[FAILED] kredits.${contractName}.${method}(${JSON.stringify(args)})`);
+      console.log(`Error: ${error.message}`);
+      next();
    });
  }, () => { console.log("\nDone!") });

--- a/scripts/upgrade.sh
+++ b/scripts/upgrade.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -e
+
+rootDir=`pwd`
+
+app=$1
+daoAddress=$2
+if [ -z "$2" ]; then
+  daoAddress=$KREDITS_DAO_ADDRESS
+fi
+
+echo "## Deploying $app for $daoAddress"
+
+set -x
+cd "apps/$app"
+aragon apm publish major
+cd $rootDir
+aragon dao upgrade $daoAddress kredits-$app
+npm run build-json
+set +x
+
+echo "Done"
--- a/truffle.js
+++ b/truffle.js
@@ -28,7 +28,7 @@ const providerForNetwork = (network) => (
        let [first, ...rest] = network;
        preset = `infura${first.toUpperCase()}${rest.join('')}`;
      }
-      return provider('frame', 'local', preset);
+      return provider(['frame', 'local', preset]);
    }
  }
 )
Author	SHA1	Message	Date
Sebastian Kippe	ccd4c3410b	4.0.1	2019-04-09 12:46:24 +02:00
Sebastian Kippe	f5564fa923	Formatting, whitespace	2019-04-09 12:45:20 +02:00
Sebastian Kippe	096a9f3cea	Update README for install-all script	2019-04-09 12:45:09 +02:00
Sebastian Kippe	8cbef8458d	Rename postinstall script Prevents it being run when contracts are installed as dependency.	2019-04-09 09:48:00 +02:00
Michael Bumann	9ca0580db6	Merge pull request #85 from 67P/dev/fix_seeds Fix contributor ID in seeds	2019-04-09 07:33:42 +00:00
Sebastian Kippe	377560805f	Fix contributor ID in seeds We have one contributor less, after having removed the initial dummy account recently.	2019-04-09 08:43:13 +02:00
Michael Bumann	65d9cf2a06	Fix bootstrap This runs npm install for every app through a postinstall hook.	2019-04-08 18:10:13 +02:00
Michael Bumann	b35dc2049b	Merge pull request #82 from 67P/dev/list_contributions Improve list-contributions script	2019-04-06 19:40:24 +00:00
Sebastian Kippe	26c2710149	Improve list-contributions script * Improve sort order of table columns * Print if the contribution is confirmed * Log error if something goes wrong	2019-04-06 17:56:48 +02:00
Michael Bumann	cc24c27444	Merge pull request #80 from 67P/chore/rename-ipfshash-1 Rename ipfsHash to hashDigest in Contributor	2019-04-06 13:55:19 +00:00
Michael Bumann	f717968402	Better function naming to update contributor profiles	2019-04-06 15:42:16 +02:00
Michael Bumann	14d7fbd75e	Rename ipfsHash to hashDigest in Contributor naming should be consistent with the other contracts and digest is more correct.	2019-04-06 15:24:44 +02:00
Sebastian Kippe	7eb1fedb42	Merge pull request #76 from 67P/features/dynamic-core-flag Dynamic function to test for core contributor flag	2019-04-06 15:19:01 +02:00
Sebastian Kippe	cbfe39f804	Merge pull request #78 from 67P/feature/veto-period Set contribution veto period to 1 week	2019-04-06 00:30:30 +02:00
Michael Bumann	a0e4f5410d	Set veto period to 1 week This makes a contribution claimable after roughly 7 days	2019-04-05 20:30:02 +02:00
Michael Bumann	766463b57b	Dynamic function to test for core contributor flag This removes the isCore flag and allows us to dynamically calculate the core flag for contributors. For now this is just us (the first 6 contirbutors) Also we do not need the default contributor anymore because the deploy user has the role to manage contributors and can create the first real contributors.	2019-04-05 18:55:21 +02:00
Sebastian Kippe	93e0b30b35	4.0.0	2019-04-05 15:44:51 +02:00
Michael Bumann	6510dca4b1	Fix provider fallbacks for non dev networks This now checks if frame or a local node is running and else uses infura to connect to the ethereum network. Now you can use all the helpers for the testnets/mainnet without running anything (in readonly mode)	2019-04-05 13:51:23 +02:00
Michael Bumann	551edcfa72	Fix init kredits for readonly providers The apm option was not passed on to kredits	2019-04-05 01:05:16 +02:00
Michael Bumann	d58e2d560a	deploy to rinkeby	2019-04-05 00:38:51 +02:00
Michael Bumann	99394e7f14	Merge pull request #73 from 67P/feature/contribution_owner Convert contribution owner to ID, use smaller number formats	2019-04-04 21:40:16 +00:00
Michael Bumann	8ceab08bfc	ups	2019-04-04 23:23:02 +02:00
Sebastian Kippe	896db5e047	Update abi	2019-04-04 23:16:23 +02:00
Sebastian Kippe	d507d7b562	Enable all seeds again	2019-04-04 23:16:01 +02:00
Sebastian Kippe	40c5d2a275	Merge branch 'master' into feature/contribution_owner	2019-04-04 23:12:16 +02:00
Sebastian Kippe	a049f2eedb	Adjust proposals for format changes	2019-04-04 23:11:43 +02:00
Sebastian Kippe	b68b037000	Merge pull request #74 from 67P/chore/npm-scripts Add some helpers to reset a fresh DAO and upgrade an app	2019-04-04 23:11:12 +02:00
Sebastian Kippe	181e6f3c23	Fix/refactor contribution wrapper	2019-04-04 22:56:06 +02:00
Sebastian Kippe	19556349f6	Fix syntax error	2019-04-04 22:30:27 +02:00
Manuel Wiedenmann	a1a1c5ef9f	Get contributor by ID Co-Authored-By: skddc <sebastian@kip.pe>	2019-04-04 22:29:37 +02:00
Michael Bumann	afbd114a36	Add app upgrade helper script This script deploys a new app version, upgrades the given DAO to the latest version of that app and builds the ABI files for the wrapper. usage: scripts/upgrade.sh <app name> <dao address> e.g. scripts/upgrade.sh token 0xfoobar The DAO address can also be set as environment variable $KREDITS_DAO_ADDRESS	2019-04-04 19:51:38 +02:00
Michael Bumann	db312dafbf	Add some helpers to reset a fresh DAO	2019-04-04 19:27:57 +02:00
Sebastian Kippe	e4c3d9a468	Update abi	2019-04-04 16:28:34 +02:00
Sebastian Kippe	5b49f82544	Adjust wrapper and scripts for contract changes	2019-04-04 16:24:37 +02:00
Sebastian Kippe	6088f30cd8	Use smaller numbers for contributor ID 2.2 billion contributors should be enough.	2019-04-04 16:01:08 +02:00
Sebastian Kippe	f1e2c65b9e	Use smaller numbers where appropriate	2019-04-04 15:28:18 +02:00
Sebastian Kippe	786f38cfb7	Print errors in seed contract calls	2019-04-04 15:25:31 +02:00
Sebastian Kippe	197a31b9e1	Remove whitespace	2019-04-04 14:47:25 +02:00
Sebastian Kippe	20acfc70e3	Use ID instead of address for contribution owner	2019-04-04 14:43:38 +02:00
Michael Bumann	732dfe7b29	Merge pull request #71 from 67P/chore/update_seeds Update seeds	2019-04-04 11:32:58 +00:00
Michael Bumann	3ce8f41d32	Merge pull request #72 from 67P/chore/whitespace Remove unnecessary space chars	2019-04-04 11:17:35 +00:00
Sebastian Kippe	e0ff29d1c9	Remove unnecessary space chars	2019-04-04 11:38:18 +02:00
Sebastian Kippe	0ce62839e9	Update seeds Use more realistic data, add more contributions	2019-04-04 11:32:46 +02:00
Sebastian Kippe	cc2c9a7368	Merge pull request #70 from 67P/feature/claim-contribution-in-seeds Update seeds	2019-04-03 21:50:43 +02:00
Sebastian Kippe	1abfc5a265	Merge pull request #69 from 67P/fix/add-contributor-permissions Fix permissions to manage contributors	2019-04-03 21:50:19 +02:00
Michael Bumann	6b9466c348	Update seeds Claim contribution which issues Kredits to the contributor	2019-04-03 21:40:37 +02:00
Michael Bumann	9fffdbfb58	Fix permissions to manage contributors Uses the contributor oracle to decide if somebody has the MANAGE_CONTRIBUTOR_ROLE	2019-04-03 21:22:53 +02:00
Sebastian Kippe	350dadec4d	Merge pull request #68 from 67P/update-ipfs-package Update ipfs package	2019-04-03 21:16:22 +02:00
Michael Bumann	70b9edbcac	Update ipfs package	2019-04-03 21:01:51 +02:00
Sebastian Kippe	92da07dca2	Merge pull request #67 from 67P/feature/contributor-balance-1 Add balance when loading contributor	2019-04-03 20:22:50 +02:00
Michael Bumann	6fed81c0ed	Merge pull request #66 from 67P/chore/seeds Allow seed tx to fail	2019-04-03 17:03:22 +00:00
Michael Bumann	74e61e1393	Show balance in list-contributors helper script	2019-04-03 14:05:16 +02:00
Michael Bumann	6351db3057	Add balance when loading contributor This is a regression introduced by the latest contract updates. Now we return the balance again when loading contributor data.	2019-04-03 13:56:52 +02:00
Sebastian Kippe	ed3e5dd4c4	Allow seed tx to fail This allows for running seeds multiple times, e.g. after adding new ones.	2019-04-03 11:41:55 +02:00
Sebastian Kippe	bd39d0f126	Use new address for raucao seed	2019-04-03 11:41:45 +02:00
Sebastian Kippe	4c8ee69664	Merge pull request #65 from 67P/fix/ethersjs-namehash Use namehash from ethers.utils	2019-04-03 11:39:35 +02:00
Sebastian Kippe	eae8967322	Merge pull request #63 from 67P/fix/contriutor-permissions Fix contributor oracle permission auth	2019-04-03 11:37:10 +02:00
Michael Bumann	9984ca66ba	Use namehash from ethers.utils no need for the additional dependency	2019-04-03 10:24:11 +02:00
Michael Bumann	1b09a30646	Fix contributor oracle permission auth It seems that the entity is either defined by the permission or if we want to use the oracle the permission must be defined for any_entity. In that case the oracle does not get the msg.sender as who/entity thus we will use tx.origin in that case.	2019-04-03 10:06:00 +02:00