merge

2019-08-06 16:40:10 +02:00 · 2019-08-06 16:40:10 +02:00 · fde6a42a21
parent c685122270 db6b53257f
commit fde6a42a21
33 changed files with 2207 additions and 1126 deletions
--- a/.gitignore
+++ b/.gitignore
@ -25,3 +25,5 @@ yarn-error.log*
 # cypress
 cypress/screenshots
 cypress/videos
+cypress/fixtures/did.txt
+artifacts
--- a/.travis.yml
+++ b/.travis.yml
@ -4,7 +4,14 @@ language: node_js
 node_js:
  - '11'

+services:
+  - docker
+
 addons:
+  # required for internal Aquarius-Brizo communication
+  # https://docs.travis-ci.com/user/hosts/
+  hosts:
+    - aquarius
  apt:
    packages:
      # for Cypress
@ -12,25 +19,35 @@ addons:

 env:
  global:
-    # run E2E tests against these values
-    - REACT_APP_NODE_URI="https://pacific.oceanprotocol.com"
-    - REACT_APP_AQUARIUS_URI="https://aquarius.test.oceanprotocol.com"
-    - REACT_APP_BRIZO_URI="https://brizo.test.oceanprotocol.com"
-    - REACT_APP_SECRET_STORE_URI="https://secret-store.oceanprotocol.com"
-    - REACT_APP_FAUCET_URI="https://faucet.oceanprotocol.com"
-    - REACT_APP_BRIZO_ADDRESS="0x0474ed05ba757dde575dfaaaa267d9e7f3643abc"
+    # run E2E tests against local Spree
+    - REACT_APP_NODE_URI="http://localhost:8545"
+    - REACT_APP_AQUARIUS_URI="http://aquarius:5000"
+    - REACT_APP_BRIZO_URI="http://localhost:8030"
+    - REACT_APP_SECRET_STORE_URI="http://localhost:12001"
+    - REACT_APP_FAUCET_URI="http://localhost:3001"
+    - REACT_APP_BRIZO_ADDRESS="0x00bd138abd70e2f00903268f3db08f2d25677c9e"
+    # start Barge with these versions
+    - KEEPER_OWNER_ROLE_ADDRESS="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260"
+    - FAUCET_TIMESPAN=0

 before_install:
  - npm install -g npm
-  - npm install -g codacy-coverage truffle ganache-cli
+  - npm install -g codacy-coverage
  # Fixes an issue where the max file watch count is exceeded, triggering ENOSPC
  # https://stackoverflow.com/questions/22475849/node-js-error-enospc#32600959
  - echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p

+before_script:
+  - git clone https://github.com/oceanprotocol/barge
+  - cd barge
+  - bash -x start_ocean.sh --no-pleuston 2>&1 > start_ocean.log &
+  - cd ..
+
 script:
  # - ./scripts/install.sh # runs automatically with npm ci
  # executing `npm test` scripts individually here, so first one failing will exit the build
  - npm run lint || travis_terminate 1
+  - ./scripts/keeper.sh
  - ./scripts/test.sh || travis_terminate 1
  - ./scripts/coverage.sh
  - npm run test:e2e || travis_terminate 1
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file. Dates are d

 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

+#### [v1.0.1](https://github.com/oceanprotocol/commons/compare/v1.0.0...v1.0.1)
+
+> 18 July 2019
+
+- Update About page [`#180`](https://github.com/oceanprotocol/commons/pull/180)
+- update about text [`8d06a67`](https://github.com/oceanprotocol/commons/commit/8d06a67e7fe24a4e420666e78d173b40feb7818b)
+
 ### [v1.0.0](https://github.com/oceanprotocol/commons/compare/v0.6.3...v1.0.0)

 > 17 July 2019
--- a/README.md
+++ b/README.md
@ -22,21 +22,21 @@

 If you're a developer and want to contribute to, or want to utilize this marketplace's code in your projects, then keep on reading.

- [🏄 Get Started](#-Get-Started)
-  - [🏖 Remote Ocean: Pacific](#-Remote-Ocean-Pacific)
-  - [🐳 Use with Barge](#-Use-with-Barge)
-  - [⛵️ Environment Variables](#️-Environment-Variables)
-    - [Client](#Client)
-    - [Server](#Server)
- [👩‍🔬 Testing](#-Testing)
-  - [Unit Tests](#Unit-Tests)
-  - [End-to-End Integration Tests](#End-to-End-Integration-Tests)
- [✨ Code Style](#-Code-Style)
- [🛳 Production](#-Production)
- [⬆️ Releases](#️-Releases)
- [📜 Changelog](#-Changelog)
- [🎁 Contributing](#-Contributing)
- [🏛 License](#-License)
+- [🏄 Get Started](#-get-started)
+  - [🏖 Remote Ocean: Pacific](#-remote-ocean-pacific)
+  - [🐳 Use with Barge](#-use-with-barge)
+  - [⛵️ Environment Variables](#️-environment-variables)
+    - [Client](#client)
+    - [Server](#server)
+- [👩‍🔬 Testing](#-testing)
+  - [Unit Tests](#unit-tests)
+  - [End-to-End Integration Tests](#end-to-end-integration-tests)
+- [✨ Code Style](#-code-style)
+- [🛳 Production](#-production)
+- [⬆️ Releases](#️-releases)
+- [📜 Changelog](#-changelog)
+- [🎁 Contributing](#-contributing)
+- [🏛 License](#-license)

 ## 🏄 Get Started

@ -68,16 +68,40 @@ By default, the client uses a burner wallet connected to the correct network aut

 ### 🐳 Use with Barge

-If you prefer to connect to locally running components instead of remote connections to Ocean's Nile network, you can spin up [`barge`](https://github.com/oceanprotocol/barge) and use a local network:
+If you prefer to connect to locally running components instead of remote connections to Ocean's Nile network, you can spin up [`barge`](https://github.com/oceanprotocol/barge) and use a local Spree network:

 ```bash
 git clone git@github.com:oceanprotocol/barge.git
 cd barge

-./start_ocean.sh --latest --no-pleuston --local-spree-node
+# startup with local Spree node
+./start_ocean.sh --latest --no-pleuston
 ```

-Modify `./client/src/config.ts` or set environment variables to use those local connections.
+Then set [environment variables](#️-environment-variables) to use those local connections.
+
+Finally, you need to copy the generated contract artifacts out of the Docker container. To do this, execute this script in another terminal:
+
+```bash
+./scripts/keeper.sh
+```
+
+The script will wait for all contracts to be generated in the `keeper-contracts` Docker container, then will copy the artifacts in place.
+
+If you are on macOS, you need to additionally tweak your `/etc/hosts` file so Brizo can connect to Aquarius. This is only required on macOS and is a [known limitation of Docker for Mac](https://docs.docker.com/docker-for-mac/networking/#known-limitations-use-cases-and-workarounds):
+
+```bash
+sudo vi /etc/hosts
+
+# add this line, and save
+127.0.0.1    aquarius
+```
+
+Then use this host for the local Aquarius url in the client config:
+
+```bash
+REACT_APP_AQUARIUS_URI="http://aquarius:5000"
+```

 ### ⛵️ Environment Variables

--- a/client/.env.local.example
+++ b/client/.env.local.example
@ -46,10 +46,11 @@ REACT_APP_BRIZO_ADDRESS="0x0474ed05ba757dde575dfaaaa267d9e7f3643abc"
 # Connect to Spree (local with Barge)
 #
 # REACT_APP_NODE_URI="http://localhost:8545"
-# REACT_APP_AQUARIUS_URI="http://localhost:5000"
+# REACT_APP_AQUARIUS_URI="http://aquarius:5000"
 # REACT_APP_BRIZO_URI="http://localhost:8030"
 # REACT_APP_SECRET_STORE_URI="http://localhost:12001"
 # REACT_APP_FAUCET_URI="http://localhost:3001"
 # REACT_APP_BRIZO_ADDRESS="0x00bd138abd70e2f00903268f3db08f2d25677c9e"

 REACT_APP_REPORT_EMAIL="test@example.com"
+# REACT_APP_ALLOW_PRICING=true
--- a/client/package-lock.json
+++ b/client/package-lock.json
--- a/client/package.json
+++ b/client/package.json
@ -1,7 +1,7 @@
 {
  "name": "commons-client",
  "description": "Ocean Protocol marketplace frontend to explore, download, and publish open data sets.",
-  "version": "1.0.0",
+  "version": "1.0.1",
  "license": "Apache-2.0",
  "scripts": {
    "start": "react-scripts start",
@ -9,11 +9,12 @@
    "test": "react-scripts test --coverage --watchAll=false",
    "test:watch": "react-scripts test --coverage",
    "eject": "react-scripts eject",
-    "coverage": "cat coverage/lcov.info | codacy-coverage --token 8801f827fe1144ffa85cd7da94f2bbf7"
+    "coverage": "cat coverage/lcov.info | codacy-coverage --token 8801f827fe1144ffa85cd7da94f2bbf7",
+    "analyze": "source-map-explorer 'build/static/js/*.js'"
  },
  "dependencies": {
    "@oceanprotocol/art": "^2.2.0",
-    "@oceanprotocol/squid": "^0.6.4",
+    "@oceanprotocol/squid": "^0.6.6",
    "@oceanprotocol/typographies": "^0.1.0",
    "@sindresorhus/slugify": "^0.9.1",
    "axios": "^0.19.0",
@ -24,45 +25,46 @@
    "history": "^4.9.0",
    "is-url": "^1.2.4",
    "moment": "^2.24.0",
-    "query-string": "^6.8.1",
+    "query-string": "^6.8.2",
    "react": "^16.8.6",
-    "react-collapsed": "^2.0.1",
-    "react-datepicker": "^2.7.0",
+    "react-collapsed": "^2.1.1",
+    "react-datepicker": "^2.8.0",
    "react-dom": "^16.8.6",
-    "react-dotdotdot": "^1.3.0",
+    "react-dotdotdot": "^1.3.1",
    "react-ga": "^2.6.0",
    "react-helmet": "^5.2.1",
    "react-markdown": "^4.1.0",
-    "react-modal": "^3.8.2",
+    "react-modal": "^3.9.1",
    "react-moment": "^0.9.2",
    "react-paginate": "^6.3.0",
    "react-popper": "^1.3.3",
    "react-router-dom": "^5.0.1",
-    "react-transition-group": "^4.1.1",
-    "truffle-hdwallet-provider": "^1.0.13",
-    "web3": "1.0.0-beta.37"
+    "react-transition-group": "^4.2.1",
+    "truffle-hdwallet-provider": "1.0.14",
+    "web3": "1.2.0"
  },
  "devDependencies": {
    "@react-mock/state": "^0.1.8",
-    "@testing-library/react": "^8.0.4",
-    "@types/classnames": "^2.2.7",
+    "@testing-library/jest-dom": "^4.0.0",
+    "@testing-library/react": "^8.0.7",
+    "@types/classnames": "^2.2.9",
    "@types/filesize": "^4.1.0",
    "@types/is-url": "^1.2.28",
-    "@types/jest": "^24.0.15",
-    "@types/react": "^16.8.22",
-    "@types/react-datepicker": "^2.3.0",
-    "@types/react-dom": "^16.8.4",
+    "@types/jest": "^24.0.16",
+    "@types/react": "^16.8.23",
+    "@types/react-datepicker": "^2.8.0",
+    "@types/react-dom": "^16.8.5",
    "@types/react-dotdotdot": "^1.2.0",
    "@types/react-helmet": "^5.0.8",
    "@types/react-modal": "^3.8.2",
    "@types/react-paginate": "^6.2.1",
    "@types/react-router-dom": "^4.3.4",
-    "@types/react-transition-group": "^2.9.2",
+    "@types/react-transition-group": "^4.2.0",
    "@types/web3": "^1.0.19",
-    "jest-dom": "^3.5.0",
-    "jest-mock-axios": "^3.0.0",
+    "jest-mock-axios": "^3.1.0",
    "node-sass": "^4.12.0",
    "react-scripts": "^3.0.0",
+    "source-map-explorer": "^2.0.1",
    "typescript": "3.4.5"
  },
  "repository": {
--- a/client/src/components/atoms/Account.tsx
+++ b/client/src/components/atoms/Account.tsx
@ -1,4 +1,4 @@
-import React, { PureComponent } from 'react'
+import React, { PureComponent, MouseEvent } from 'react'
 import Dotdotdot from 'react-dotdotdot'
 import { toDataUrl } from 'ethereum-blockies'
 import styles from './Account.module.scss'
@ -18,7 +18,8 @@ export default class Account extends PureComponent<
        isAccountInfoOpen: false
    }

-    private toggleAccountInfo() {
+    private toggleAccountInfo(event: MouseEvent) {
+        event.preventDefault()
        this.setState({ isAccountInfoOpen: !this.state.isAccountInfoOpen })
    }

@ -61,7 +62,7 @@ export default class Account extends PureComponent<
                    {isBurner ? (
                        <button
                            className={styles.toggle}
-                            onClick={() => this.toggleAccountInfo()}
+                            onClick={event => this.toggleAccountInfo(event)}
                            title="Show More Account Info"
                        >
                            <Caret
--- a/client/src/components/molecules/AssetTeaser.module.scss
+++ b/client/src/components/molecules/AssetTeaser.module.scss
@ -32,6 +32,7 @@
    h1 {
        font-size: $font-size-large;
        margin-top: 0;
+        margin-bottom: $spacer / 4;
    }
 }

@ -89,7 +90,18 @@
 }

 .assetFooter {
-    margin-top: $spacer / 2;
+    margin-top: $spacer;
    font-size: $font-size-small;
    color: $brand-grey-light;
+    display: flex;
+    justify-content: space-between;
+}
+
+.price {
+    font-size: $font-size-mini;
+
+    span {
+        color: $brand-grey;
+        font-size: $font-size-small;
+    }
 }
--- a/client/src/components/molecules/AssetTeaser.tsx
+++ b/client/src/components/molecules/AssetTeaser.tsx
@ -5,6 +5,8 @@ import Dotdotdot from 'react-dotdotdot'
 import cx from 'classnames'
 import styles from './AssetTeaser.module.scss'
 import CategoryImage from '../atoms/CategoryImage'
+import { allowPricing } from '../../config'
+import Web3 from 'web3'

 const AssetTeaser = ({
    asset,
@ -49,6 +51,14 @@ const AssetTeaser = ({
                )}
                <footer className={styles.assetFooter}>
                    {base.categories && <div>{base.categories[0]}</div>}
+                    {allowPricing && (
+                        <div className={styles.price}>
+                            <span>
+                                {Web3.utils.fromWei(base.price.toString())}
+                            </span>{' '}
+                            OCEAN
+                        </div>
+                    )}
                </footer>
            </Link>
        </article>
--- a/client/src/components/molecules/VersionNumbers/VersionTable.module.scss
+++ b/client/src/components/molecules/VersionNumbers/VersionTable.module.scss
@ -40,7 +40,10 @@
    }

    a {
-        color: $brand-grey;
+        &,
+        code {
+            color: $brand-grey;
+        }

        &:hover,
        &:focus {
--- a/client/src/components/molecules/VersionNumbers/index.test.tsx
+++ b/client/src/components/molecules/VersionNumbers/index.test.tsx
@ -58,21 +58,29 @@ const mockResponseFaulty = {

 describe('VersionNumbers', () => {
    it('renders without crashing', () => {
-        const { container } = render(
+        const { container, rerender } = render(
            <User.Provider value={userMockConnected}>
-                <VersionNumbers />
+                <VersionNumbers account="0x00000" />
            </User.Provider>
        )
        mockAxios.mockResponse(mockResponse)
        expect(mockAxios.get).toHaveBeenCalled()
        expect(container.firstChild).toBeInTheDocument()
+
+        rerender(
+            <User.Provider value={userMockConnected}>
+                <VersionNumbers account="0x99999" />
+            </User.Provider>
+        )
+        mockAxios.mockResponse(mockResponse)
+        expect(mockAxios.get).toHaveBeenCalled()
    })

    it('renders without proper component response', () => {
        const { container } = render(
            <User.Provider value={userMockConnected}>
                <StateMock state={stateMockIncomplete}>
-                    <VersionNumbers />
+                    <VersionNumbers account="0x00000" />
                </StateMock>
            </User.Provider>
        )
--- a/client/src/components/molecules/VersionNumbers/index.tsx
+++ b/client/src/components/molecules/VersionNumbers/index.tsx
@ -42,10 +42,16 @@ export default class VersionNumbers extends PureComponent<
    // construct values which are not part of any response
    public commonsVersion =
        process.env.NODE_ENV === 'production' ? version : `${version}-dev`
-    public commonsNetwork = new URL(nodeUri).hostname.split('.')[0]
+    public commonsNetwork = faucetUri.includes('localhost')
+        ? 'Spree'
+        : new URL(nodeUri).hostname.split('.')[0]
    public faucetNetwork = faucetUri.includes('dev-ocean')
        ? new URL(faucetUri).hostname.split('.')[1]
-        : 'Pacific'
+        : faucetUri.includes('oceanprotocol.com')
+        ? 'Pacific'
+        : faucetUri.includes('localhost')
+        ? 'Spree'
+        : 'Unknown'

    // define a minimal default state to fill UI
    public state: VersionNumbersState = {
--- a/client/src/components/organisms/WalletSelector.test.tsx
+++ b/client/src/components/organisms/WalletSelector.test.tsx
@ -7,10 +7,10 @@ import { userMockConnected } from '../../../__mocks__/user-mock'
 import { marketMock } from '../../../__mocks__/market-mock'

 describe('WalletSelector', () => {
-    it('renders without crashing', () => {
+    it('renders without crashing', async () => {
        ReactModal.setAppElement(document.createElement('div'))

-        const { container } = render(
+        const { container, getByText } = render(
            <User.Provider value={userMockConnected}>
                <Market.Provider value={marketMock}>
                    <WalletSelector />
@ -18,6 +18,13 @@ describe('WalletSelector', () => {
            </User.Provider>
        )
        expect(container.firstChild).toBeInTheDocument()
-        fireEvent.click(container.querySelector('button'))
+        fireEvent.click(getByText('Select wallet'))
+
+        const burnerButton = await getByText('Burner Wallet')
+        fireEvent.click(burnerButton)
+
+        fireEvent.click(getByText('Select wallet'))
+        // const metamaskButton = await getByText('MetaMask')
+        // fireEvent.click(metamaskButton)
    })
 })
--- a/client/src/components/templates/Asset/AssetDetails.tsx
+++ b/client/src/components/templates/Asset/AssetDetails.tsx
@ -10,6 +10,8 @@ import AssetFilesDetails from './AssetFilesDetails'
 import Button from '../../atoms/Button'
 import Spinner from '../../atoms/Spinner'
 import Report from './Report'
+import { allowPricing } from '../../../config'
+import Web3 from 'web3'
 import { serviceUri } from '../../../config'

 const { steps } = require('../../../data/form-publish.json') // eslint-disable-line
@ -349,6 +351,21 @@ export default class AssetDetails extends PureComponent<
                                <code>{ddo.id}</code>
                            </span>
                        </li>
+                        {allowPricing ? (
+                            <li>
+                                <span className={styles.metaLabel}>
+                                    <strong>Price</strong>
+                                </span>
+                                <span className={styles.metaValue}>
+                                    {base.price === '0'
+                                        ? 0
+                                        : Web3.utils.fromWei(
+                                              base.price.toString()
+                                          )}{' '}
+                                    OCEAN
+                                </span>
+                            </li>
+                        ) : null}
                    </ul>
                </div>

--- a/client/src/config.ts
+++ b/client/src/config.ts
@ -28,3 +28,4 @@ export const faucetUri =
 //
 export const verbose = true
 export const analyticsId = 'UA-60614729-11'
+export const allowPricing = process.env.REACT_APP_ALLOW_PRICING || false
--- a/client/src/context/BurnerWalletProvider.ts
+++ b/client/src/context/BurnerWalletProvider.ts
@ -37,9 +37,11 @@ export class BurnerWalletProvider {
        localStorage.setItem('logType', 'BurnerWallet')
        const provider = new HDWalletProvider(mnemonic, `${nodeUri}`, 0, 1)
        this.web3 = new Web3(provider)
+        const accounts = await this.web3.eth.getAccounts()
+        const balance = await this.web3.eth.getBalance(accounts[0])

-        // fill with Ether
-        await requestFromFaucet(provider.addresses[0])
+        // fill with Ether if account balance is empty
+        balance === '0' && (await requestFromFaucet(provider.addresses[0]))
    }

    public async logout() {
--- a/client/src/routes/About.tsx
+++ b/client/src/routes/About.tsx
@ -18,24 +18,34 @@ const About = () => {
        >
            <Content>
                <p>
-                    Commons is built on top of the Ocean{' '}
+                    Commons allows you to access thousands of datasets for free
+                    that have been registered on the Ocean Protocol{' '}
                    <a href="https://docs.oceanprotocol.com/concepts/pacific-network/">
-                        {market.network} network
+                        {market.network} Network
                    </a>{' '}
-                    and is targeted at enthusiastic data scientists with some
-                    crypto experience. It can be used with any Web3-capable
-                    browser, like Firefox with MetaMask installed.
+                    and it is targeted at enthusiastic data scientists with some
+                    crypto experience. If you are looking for quality data, you
+                    can easily use the Commons to search for and find publicly
+                    available datasets that are free of charge. If you are
+                    interested in sharing your data, you can use the Commons to
+                    publish data into the {market.network} Network.
                </p>

                <ul>
                    <li>
-                        <a href="https://blog.oceanprotocol.com/the-commons-marketplace-c57a44288314">
-                            Read the blog post →
+                        <a href="https://blog.oceanprotocol.com/the-commons-marketplace-in-pacific-network-4bcf2f595721">
+                            Blog: The Commons Marketplace in Pacific Network →
+                        </a>
+                    </li>
+                    <li>
+                        <a href="https://blog.oceanprotocol.com/the-commons-data-marketplace-c57a44288314">
+                            Blog: The Commons Marketplace →
                        </a>
                    </li>
                    <li>
                        <a href="https://github.com/oceanprotocol/commons">
-                            Check out oceanprotocol/commons on GitHub →
+                            Check out <code>oceanprotocol/commons</code> on
+                            GitHub →
                        </a>
                    </li>
                </ul>
--- a/client/src/routes/Faucet.tsx
+++ b/client/src/routes/Faucet.tsx
@ -66,13 +66,9 @@ class Faucet extends PureComponent<{}, FaucetState> {
        const { network } = this.context
        const { trxHash } = this.state

-        const submarineLink = `https://submarine${
-            network === 'Duero'
-                ? '.duero'
-                : network === 'Pacific'
-                ? '.pacific'
-                : ''
-        }.dev-ocean.com/tx/${trxHash}`
+        const submarineLink = `https://submarine.${
+            network === 'pacific' ? 'oceanprotocol' : `${network}.dev-ocean`
+        }.com/tx/${trxHash}`

        return (
            <div className={styles.success}>
--- a/client/src/routes/Publish/index.tsx
+++ b/client/src/routes/Publish/index.tsx
@ -1,13 +1,14 @@
 import React, { ChangeEvent, Component, FormEvent } from 'react'
 import { Logger } from '@oceanprotocol/squid'
-import ReactGA from 'react-ga'
+import Web3 from 'web3'
 import Route from '../../components/templates/Route'
 import Form from '../../components/atoms/Form/Form'
 import AssetModel from '../../models/AssetModel'
 import { User, Market } from '../../context'
 import Step from './Step'
 import Progress from './Progress'
-
+import ReactGA from 'react-ga'
+import { allowPricing } from '../../config'
 import { steps } from '../../data/form-publish.json'
 import Content from '../../components/atoms/Content'
 import { File } from './Files'
@ -25,7 +26,7 @@ interface PublishState {
    files?: File[]
    type?: AssetType
    copyrightHolder?: string
-    categories?: string[]
+    categories?: string

    currentStep?: number
    publishingStep?: number
@ -36,6 +37,16 @@ interface PublishState {
    validationStatus?: any
 }

+if (allowPricing) {
+    ;(steps as any)[0].fields['price'] = {
+        label: 'Price',
+        placeholder: 'Price in Ocean tokens',
+        type: 'string',
+        required: true,
+        help: 'Enter the price of assets in Ocean tokens.'
+    }
+}
+
 class Publish extends Component<{}, PublishState> {
    public static contextType = User

@ -49,7 +60,7 @@ class Publish extends Component<{}, PublishState> {
        type: 'dataset' as AssetType,
        license: '',
        copyrightHolder: '',
-        categories: [],
+        categories: '',

        currentStep: 1,
        isPublishing: false,
@ -119,7 +130,7 @@ class Publish extends Component<{}, PublishState> {
            type: 'dataset' as AssetType,
            license: '',
            copyrightHolder: '',
-            categories: [],
+            categories: '',
            isPublishing: false,
            isPublished: false,
            publishingStep: 0,
@ -281,7 +292,9 @@ class Publish extends Component<{}, PublishState> {
                license: this.state.license,
                copyrightHolder: this.state.copyrightHolder,
                files,
-                price: this.state.price,
+                price: allowPricing
+                    ? Web3.utils.toWei(this.state.price, 'ether')
+                    : this.state.price,
                type: this.state.type,
                categories: [this.state.categories]
            })
--- a/client/src/setupTests.js
+++ b/client/src/setupTests.js
@ -1,2 +1,2 @@
-import 'jest-dom/extend-expect'
+import '@testing-library/jest-dom/extend-expect'
 import '@testing-library/react/cleanup-after-each'
--- a/client/src/styles/global.scss
+++ b/client/src/styles/global.scss
@ -299,11 +299,15 @@ samp {
    padding-right: .15rem;
 }

+a > code {
+    color: $brand-pink;
+}
+
 pre {
    display: block;
    margin-bottom: $spacer;
    padding: 0;
-    background: $brand-black;
+    background: lighten($brand-grey-lighter, 5%);

    // make 'em scrollable
    overflow: auto;
--- a/cypress.json
+++ b/cypress.json
@ -1,6 +1,3 @@
 {
-  "baseUrl": "http://localhost:3000",
-  "env": {
-    "CONSUME_ASSET": "did:op:3fa4721ad643489bad77e0e52ecefe9b73166873faaf4661a02486b735eea0c8"
-  }
+  "baseUrl": "http://localhost:3000"
 }
--- a/cypress/integration/1_publish.spec.js
+++ b/cypress/integration/1_publish.spec.js
@ -64,5 +64,16 @@ context('Publish', () => {
        cy.contains('Your asset is published!', {
            timeout: 12000
        }).should('be.visible')
+
+        // Store DID
+        cy.get('a')
+            .contains('See published asset')
+            .invoke('attr', 'href')
+            .then(href => {
+                cy.writeFile(
+                    'cypress/fixtures/did.txt',
+                    href.replace('/asset/', '')
+                )
+            })
    })
 })
--- a/cypress/integration/2_search.spec.js
+++ b/cypress/integration/2_search.spec.js
--- a/cypress/integration/3_consume.spec.js
+++ b/cypress/integration/3_consume.spec.js
@ -1,7 +1,9 @@
 /// <reference types="Cypress" />
 context('Consume', () => {
    before(() => {
-        cy.visit(`/asset/${Cypress.env('CONSUME_ASSET')}`)
+        cy.fixture('did').then(did => {
+            cy.visit(`/asset/${did}`)
+        })

        // Alias button selector & wait for end of loading
        cy.get('button[name="Download"]', { timeout: 60000 })
@ -14,6 +16,9 @@ context('Consume', () => {
    })

    it('Consume asset and check if there is no error', () => {
+        // eslint-disable-next-line
+        cy.wait(10000)
+        // Wait for faucet
        // Click consume button
        cy.get('button[name="Download"]').click()
        // Wait consume process to end
@ -26,5 +31,9 @@ context('Consume', () => {
            'not.contain',
            '. Sorry about that, can you try again?'
        )
+        // eslint-disable-next-line
+        cy.wait(10000)
+        // wait for file to download before closing browser
+        // to prevent alert poping up
    })
 })
--- a/cypress/integration/4_faucet.spec.js
+++ b/cypress/integration/4_faucet.spec.js
--- a/cypress/plugins/index.js
+++ b/cypress/plugins/index.js
@ -14,4 +14,11 @@
 module.exports = (on, config) => {
    // `on` is used to hook into various events Cypress emits
    // `config` is the resolved Cypress config
+    require('cypress-log-to-output').install(on, (type, event) => {
+        // only show error events
+        if (event.level === 'error' || event.type === 'error') {
+            return true
+        }
+        return false
+    })
 }
--- a/package-lock.json
+++ b/package-lock.json
@ -1,35 +1,35 @@
 {
  "name": "commons",
-  "version": "1.0.0",
+  "version": "1.0.1",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
    "@babel/code-frame": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
-      "integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
+      "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
      "dev": true,
      "requires": {
        "@babel/highlight": "^7.0.0"
      }
    },
    "@babel/core": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.5.4.tgz",
-      "integrity": "sha512-+DaeBEpYq6b2+ZmHx3tHspC+ZRflrvLqwfv8E3hNr5LVQoyBnL8RPKSBCg+rK2W2My9PWlujBiqd0ZPsR9Q6zQ==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.5.5.tgz",
+      "integrity": "sha512-i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg==",
      "dev": true,
      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/generator": "^7.5.0",
-        "@babel/helpers": "^7.5.4",
-        "@babel/parser": "^7.5.0",
+        "@babel/code-frame": "^7.5.5",
+        "@babel/generator": "^7.5.5",
+        "@babel/helpers": "^7.5.5",
+        "@babel/parser": "^7.5.5",
        "@babel/template": "^7.4.4",
-        "@babel/traverse": "^7.5.0",
-        "@babel/types": "^7.5.0",
+        "@babel/traverse": "^7.5.5",
+        "@babel/types": "^7.5.5",
        "convert-source-map": "^1.1.0",
        "debug": "^4.1.0",
        "json5": "^2.1.0",
-        "lodash": "^4.17.11",
+        "lodash": "^4.17.13",
        "resolve": "^1.3.2",
        "semver": "^5.4.1",
        "source-map": "^0.5.0"
@ -50,14 +50,14 @@
      }
    },
    "@babel/generator": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.5.0.tgz",
-      "integrity": "sha512-1TTVrt7J9rcG5PMjvO7VEG3FrEoEJNHxumRq66GemPmzboLWtIjjcJgk8rokuAS7IiRSpgVSu5Vb9lc99iJkOA==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.5.5.tgz",
+      "integrity": "sha512-ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ==",
      "dev": true,
      "requires": {
-        "@babel/types": "^7.5.0",
+        "@babel/types": "^7.5.5",
        "jsesc": "^2.5.1",
-        "lodash": "^4.17.11",
+        "lodash": "^4.17.13",
        "source-map": "^0.5.0",
        "trim-right": "^1.0.1"
      },
@ -100,14 +100,14 @@
      }
    },
    "@babel/helpers": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.5.4.tgz",
-      "integrity": "sha512-6LJ6xwUEJP51w0sIgKyfvFMJvIb9mWAfohJp0+m6eHJigkFdcH8duZ1sfhn0ltJRzwUIT/yqqhdSfRpCpL7oow==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.5.5.tgz",
+      "integrity": "sha512-nRq2BUhxZFnfEn/ciJuhklHvFOqjJUD5wpx+1bxUF2axL9C+v4DE/dmp5sT2dKnpOs4orZWzpAZqlCy8QqE/7g==",
      "dev": true,
      "requires": {
        "@babel/template": "^7.4.4",
-        "@babel/traverse": "^7.5.0",
-        "@babel/types": "^7.5.0"
+        "@babel/traverse": "^7.5.5",
+        "@babel/types": "^7.5.5"
      }
    },
    "@babel/highlight": {
@ -122,9 +122,9 @@
      }
    },
    "@babel/parser": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.5.0.tgz",
-      "integrity": "sha512-I5nW8AhGpOXGCCNYGc+p7ExQIBxRFnS2fd/d862bNOKvmoEPjYPcfIjsfdy0ujagYOIYPczKgD9l3FsgTkAzKA==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.5.5.tgz",
+      "integrity": "sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g==",
      "dev": true
    },
    "@babel/template": {
@ -139,30 +139,30 @@
      }
    },
    "@babel/traverse": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.0.tgz",
-      "integrity": "sha512-SnA9aLbyOCcnnbQEGwdfBggnc142h/rbqqsXcaATj2hZcegCl903pUD/lfpsNBlBSuWow/YDfRyJuWi2EPR5cg==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.5.tgz",
+      "integrity": "sha512-MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ==",
      "dev": true,
      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/generator": "^7.5.0",
+        "@babel/code-frame": "^7.5.5",
+        "@babel/generator": "^7.5.5",
        "@babel/helper-function-name": "^7.1.0",
        "@babel/helper-split-export-declaration": "^7.4.4",
-        "@babel/parser": "^7.5.0",
-        "@babel/types": "^7.5.0",
+        "@babel/parser": "^7.5.5",
+        "@babel/types": "^7.5.5",
        "debug": "^4.1.0",
        "globals": "^11.1.0",
-        "lodash": "^4.17.11"
+        "lodash": "^4.17.13"
      }
    },
    "@babel/types": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.0.tgz",
-      "integrity": "sha512-UFpDVqRABKsW01bvw7/wSUe56uy6RXM5+VJibVVAybDGxEW25jdwiFJEf7ASvSaC7sN7rbE/l3cLp2izav+CtQ==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz",
+      "integrity": "sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==",
      "dev": true,
      "requires": {
        "esutils": "^2.0.2",
-        "lodash": "^4.17.11",
+        "lodash": "^4.17.13",
        "to-fast-properties": "^2.0.0"
      }
    },
@ -276,6 +276,53 @@
        }
      }
    },
+    "@hapi/address": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.0.0.tgz",
+      "integrity": "sha512-mV6T0IYqb0xL1UALPFplXYQmR0twnXG0M6jUswpquqT2sD12BOiCiLy3EvMp/Fy7s3DZElC4/aPjEjo2jeZpvw==",
+      "dev": true
+    },
+    "@hapi/hoek": {
+      "version": "6.2.4",
+      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-6.2.4.tgz",
+      "integrity": "sha512-HOJ20Kc93DkDVvjwHyHawPwPkX44sIrbXazAUDiUXaY2R9JwQGo2PhFfnQtdrsIe4igjG2fPgMra7NYw7qhy0A==",
+      "dev": true
+    },
+    "@hapi/joi": {
+      "version": "15.1.0",
+      "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.0.tgz",
+      "integrity": "sha512-n6kaRQO8S+kepUTbXL9O/UOL788Odqs38/VOfoCrATDtTvyfiO3fgjlSRaNkHabpTLgM7qru9ifqXlXbXk8SeQ==",
+      "dev": true,
+      "requires": {
+        "@hapi/address": "2.x.x",
+        "@hapi/hoek": "6.x.x",
+        "@hapi/marker": "1.x.x",
+        "@hapi/topo": "3.x.x"
+      }
+    },
+    "@hapi/marker": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@hapi/marker/-/marker-1.0.0.tgz",
+      "integrity": "sha512-JOfdekTXnJexfE8PyhZFyHvHjt81rBFSAbTIRAhF2vv/2Y1JzoKsGqxH/GpZJoF7aEfYok8JVcAHmSz1gkBieA==",
+      "dev": true
+    },
+    "@hapi/topo": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.2.tgz",
+      "integrity": "sha512-r+aumOqJ5QbD6aLPJWqVjMAPsx5pZKz+F5yPqXZ/WWG9JTtHbQqlzrJoknJ0iJxLj9vlXtmpSdjlkszseeG8OA==",
+      "dev": true,
+      "requires": {
+        "@hapi/hoek": "8.x.x"
+      },
+      "dependencies": {
+        "@hapi/hoek": {
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.1.0.tgz",
+          "integrity": "sha512-b1J4jxYnW+n6lC91V6Pqg9imP9BZq0HNCeM+3sbXg05rQsE9cGYrKFpZjyztVesGmNRE6R+QaEoWGATeIiUVjA==",
+          "dev": true
+        }
+      }
+    },
    "@iarna/toml": {
      "version": "2.2.3",
      "resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.3.tgz",
@ -319,32 +366,21 @@
      }
    },
    "@octokit/endpoint": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.2.2.tgz",
-      "integrity": "sha512-VhKxM4CQanIUZDffExqpdpgqu3heF51qbY1wazoNtvIKXAAVoFjqLq2BOhesXkTqxXMO1Ze1XbS8DkIjUxAB+g==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.3.2.tgz",
+      "integrity": "sha512-gRjteEM9I6f4D8vtwU2iGUTn9RX/AJ0SVXiqBUEuYEWVGGAVjSXdT0oNmghH5lvQNWs8mwt6ZaultuG6yXivNw==",
      "dev": true,
      "requires": {
        "deepmerge": "4.0.0",
        "is-plain-object": "^3.0.0",
        "universal-user-agent": "^3.0.0",
        "url-template": "^2.0.8"
-      },
-      "dependencies": {
-        "universal-user-agent": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-3.0.0.tgz",
-          "integrity": "sha512-T3siHThqoj5X0benA5H0qcDnrKGXzU8TKoX15x/tQHw1hQBvIEBHjxQ2klizYsqBOO/Q+WuxoQUihadeeqDnoA==",
-          "dev": true,
-          "requires": {
-            "os-name": "^3.0.0"
-          }
-        }
      }
    },
    "@octokit/request": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.0.1.tgz",
-      "integrity": "sha512-SHOk/APYpfrzV1RNf7Ux8SZi+vZXhMIB2dBr4TQR6ExMX8R4jcy/0gHw26HLe1dWV7Wxe9WzYyDSEC0XwnoCSQ==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.0.2.tgz",
+      "integrity": "sha512-z1BQr43g4kOL4ZrIVBMHwi68Yg9VbkRUyuAgqCp1rU3vbYa69+2gIld/+gHclw15bJWQnhqqyEb7h5a5EqgZ0A==",
      "dev": true,
      "requires": {
        "@octokit/endpoint": "^5.1.0",
@ -354,17 +390,6 @@
        "node-fetch": "^2.3.0",
        "once": "^1.4.0",
        "universal-user-agent": "^3.0.0"
-      },
-      "dependencies": {
-        "universal-user-agent": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-3.0.0.tgz",
-          "integrity": "sha512-T3siHThqoj5X0benA5H0qcDnrKGXzU8TKoX15x/tQHw1hQBvIEBHjxQ2klizYsqBOO/Q+WuxoQUihadeeqDnoA==",
-          "dev": true,
-          "requires": {
-            "os-name": "^3.0.0"
-          }
-        }
      }
    },
    "@octokit/request-error": {
@ -378,9 +403,9 @@
      }
    },
    "@octokit/rest": {
-      "version": "16.28.3",
-      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-16.28.3.tgz",
-      "integrity": "sha512-hzM2VvVn9o0+sS08y2pp33UF5tKy0XdR2z+/AFD583TjhHlX/9Lmdv3SmRiz0UC6rNqNXe1X7BiZ/QNUwVm27Q==",
+      "version": "16.28.6",
+      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-16.28.6.tgz",
+      "integrity": "sha512-ERfzS6g6ZNPJkEUclxLenr+UEncbymCe//IBrWWdp59nslYDeJboq07Ue9brX05Uv0+SY3kwA33cdiVBVPAOMQ==",
      "dev": true,
      "requires": {
        "@octokit/request": "^5.0.0",
@ -394,7 +419,7 @@
        "lodash.uniq": "^4.5.0",
        "octokit-pagination-methods": "^1.1.0",
        "once": "^1.4.0",
-        "universal-user-agent": "^2.0.0",
+        "universal-user-agent": "^3.0.0",
        "url-template": "^2.0.8"
      }
    },
@ -450,6 +475,12 @@
        "@types/node": "*"
      }
    },
+    "@types/json-schema": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.3.tgz",
+      "integrity": "sha512-Il2DtDVRGDcqjDtE+rF8iqg1CArehSK84HZJCT7AMITlyXRBpuPhqGLDQMowraqqu1coEaimg4ZOqggt6L6L+A==",
+      "dev": true
+    },
    "@types/minimatch": {
      "version": "3.0.3",
      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
@ -457,9 +488,9 @@
      "dev": true
    },
    "@types/node": {
-      "version": "12.6.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.6.6.tgz",
-      "integrity": "sha512-SMgj3x28MkJyHdWaMv/g/ca3LYDi5gR7O8mX0VKazvFOnmlDXctSEdd/8jfSqozjKFK1R9If1QZWkafX7yQTpA==",
+      "version": "12.6.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.6.9.tgz",
+      "integrity": "sha512-+YB9FtyxXGyD54p8rXwWaN1EWEyar5L58GlGWgtH2I9rGmLGBQcw63+0jw+ujqVavNuO47S1ByAjm9zdHMnskw==",
      "dev": true
    },
    "@types/unist": {
@ -490,12 +521,12 @@
      }
    },
    "@typescript-eslint/eslint-plugin": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-1.12.0.tgz",
-      "integrity": "sha512-J/ZTZF+pLNqjXBGNfq5fahsoJ4vJOkYbitWPavA05IrZ7BXUaf4XWlhUB/ic1lpOGTRpLWF+PLAePjiHp6dz8g==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-1.13.0.tgz",
+      "integrity": "sha512-WQHCozMnuNADiqMtsNzp96FNox5sOVpU8Xt4meaT4em8lOG1SrOv92/mUbEHQVh90sldKSfcOc/I0FOb/14G1g==",
      "dev": true,
      "requires": {
-        "@typescript-eslint/experimental-utils": "1.12.0",
+        "@typescript-eslint/experimental-utils": "1.13.0",
        "eslint-utils": "^1.3.1",
        "functional-red-black-tree": "^1.0.1",
        "regexpp": "^2.0.1",
@ -503,31 +534,32 @@
      }
    },
    "@typescript-eslint/experimental-utils": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-1.12.0.tgz",
-      "integrity": "sha512-s0soOTMJloytr9GbPteMLNiO2HvJ+qgQkRNplABXiVw6vq7uQRvidkby64Gqt/nA7pys74HksHwRULaB/QRVyw==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-1.13.0.tgz",
+      "integrity": "sha512-zmpS6SyqG4ZF64ffaJ6uah6tWWWgZ8m+c54XXgwFtUv0jNz8aJAVx8chMCvnk7yl6xwn8d+d96+tWp7fXzTuDg==",
      "dev": true,
      "requires": {
-        "@typescript-eslint/typescript-estree": "1.12.0",
+        "@types/json-schema": "^7.0.3",
+        "@typescript-eslint/typescript-estree": "1.13.0",
        "eslint-scope": "^4.0.0"
      }
    },
    "@typescript-eslint/parser": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-1.12.0.tgz",
-      "integrity": "sha512-0uzbaa9ZLCA5yMWJywnJJ7YVENKGWVUhJDV5UrMoldC5HoI54W5kkdPhTfmtFKpPFp93MIwmJj0/61ztvmz5Dw==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-1.13.0.tgz",
+      "integrity": "sha512-ITMBs52PCPgLb2nGPoeT4iU3HdQZHcPaZVw+7CsFagRJHUhyeTgorEwHXhFf3e7Evzi8oujKNpHc8TONth8AdQ==",
      "dev": true,
      "requires": {
        "@types/eslint-visitor-keys": "^1.0.0",
-        "@typescript-eslint/experimental-utils": "1.12.0",
-        "@typescript-eslint/typescript-estree": "1.12.0",
+        "@typescript-eslint/experimental-utils": "1.13.0",
+        "@typescript-eslint/typescript-estree": "1.13.0",
        "eslint-visitor-keys": "^1.0.0"
      }
    },
    "@typescript-eslint/typescript-estree": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-1.12.0.tgz",
-      "integrity": "sha512-nwN6yy//XcVhFs0ZyU+teJHB8tbCm7AIA8mu6E2r5hu6MajwYBY3Uwop7+rPZWUN/IUOHpL8C+iUPMDVYUU3og==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-1.13.0.tgz",
+      "integrity": "sha512-b5rCmd2e6DCC6tCTN9GSUAuxdYwCM/k/2wdjHGrIRGPSJotWMCe/dGpi66u42bhuh8q3QBzqM4TMA1GUUCJvdw==",
      "dev": true,
      "requires": {
        "lodash.unescape": "4.0.1",
@ -543,9 +575,9 @@
      }
    },
    "acorn": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.0.tgz",
-      "integrity": "sha512-8oe72N3WPMjA+2zVG71Ia0nXZ8DpQH+QyyHO+p06jT8eg8FGG3FbcUIi8KziHlAfheJQZeoqbvq1mQSQHXKYLw==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.1.tgz",
+      "integrity": "sha512-JD0xT5FCRDNyjDda3Lrg/IxFscp9q4tiYtxE1/nOzlKCk7hIRuYjhq1kCNkbPjMRMZuFq20HNQn1I9k8Oj0E+Q==",
      "dev": true
    },
    "acorn-jsx": {
@ -727,6 +759,12 @@
        "lodash": "^4.17.10"
      }
    },
+    "async-limiter": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
+      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
+      "dev": true
+    },
    "async-retry": {
      "version": "1.2.3",
      "resolved": "https://registry.npmjs.org/async-retry/-/async-retry-1.2.3.tgz",
@ -1055,9 +1093,9 @@
      }
    },
    "caniuse-lite": {
-      "version": "1.0.30000984",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000984.tgz",
-      "integrity": "sha512-n5tKOjMaZ1fksIpQbjERuqCyfgec/m9pferkFQbLmWtqLUdmt12hNhjSwsmPdqeiG2NkITOQhr1VYIwWSAceiA==",
+      "version": "1.0.30000989",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000989.tgz",
+      "integrity": "sha512-vrMcvSuMz16YY6GSVZ0dWDTJP8jqk3iFQ/Aq5iqblPwxSVVZI+zxDyTX0VPqtQsDnfdrBDcsmhgTEOh5R8Lbpw==",
      "dev": true
    },
    "capture-stack-trace": {
@ -1142,6 +1180,24 @@
      "integrity": "sha1-FCD/sQ/URNz8ebQ4kbv//TKoRgA=",
      "dev": true
    },
+    "chrome-remote-interface": {
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/chrome-remote-interface/-/chrome-remote-interface-0.27.2.tgz",
+      "integrity": "sha512-pVLljQ29SAx8KIv5tSa9sIf8GrEsAZdPJoeWOmY3/nrIzFmE+EryNNHvDkddGod0cmAFTv+GmPG0uvzxi2NWsA==",
+      "dev": true,
+      "requires": {
+        "commander": "2.11.x",
+        "ws": "^6.1.0"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.11.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
+          "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
+          "dev": true
+        }
+      }
+    },
    "ci-info": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
@ -1596,9 +1652,9 @@
      }
    },
    "cypress": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-3.4.0.tgz",
-      "integrity": "sha512-vUE+sK3l23fhs5qTN3dKpveyP0fGr37VmK3FSYaTEjbqC/qh4DbA1Ych/3bLStUpHP4rpE5KAx7i1s/tpdD9vQ==",
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-3.4.1.tgz",
+      "integrity": "sha512-1HBS7t9XXzkt6QHbwfirWYty8vzxNMawGj1yI+Fu6C3/VZJ8UtUngMW6layqwYZzLTZV8tiDpdCNBypn78V4Dg==",
      "dev": true,
      "requires": {
        "@cypress/listr-verbose-renderer": "0.4.1",
@ -1616,12 +1672,11 @@
        "extract-zip": "1.6.7",
        "fs-extra": "5.0.0",
        "getos": "3.1.1",
-        "glob": "7.1.3",
        "is-ci": "1.2.1",
        "is-installed-globally": "0.1.0",
        "lazy-ass": "1.6.0",
        "listr": "0.12.0",
-        "lodash": "4.17.11",
+        "lodash": "4.17.15",
        "log-symbols": "2.2.0",
        "minimist": "1.2.0",
        "moment": "2.24.0",
@ -1676,20 +1731,6 @@
          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
          "dev": true
        },
-        "glob": {
-          "version": "7.1.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
        "is-ci": {
          "version": "1.2.1",
          "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
@ -1699,12 +1740,6 @@
            "ci-info": "^1.5.0"
          }
        },
-        "lodash": {
-          "version": "4.17.11",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
-          "dev": true
-        },
        "supports-color": {
          "version": "5.5.0",
          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@ -1725,6 +1760,16 @@
        }
      }
    },
+    "cypress-log-to-output": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cypress-log-to-output/-/cypress-log-to-output-1.0.4.tgz",
+      "integrity": "sha512-2LBC63YoheoIGjDyTf0xE0WYmG/KcfnE2GKVPSz5QC/Dh3d7wYb0/1qwbdRk2Hd86XOyMSSddR4flWEXMiVdlw==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.4.2",
+        "chrome-remote-interface": "^0.27.1"
+      }
+    },
    "dashdash": {
      "version": "1.14.1",
      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@ -1890,13 +1935,27 @@
      }
    },
    "dom-serializer": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
-      "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.1.tgz",
+      "integrity": "sha512-sK3ujri04WyjwQXVoK4PU3y8ula1stq10GJZpqHIUgoGZdsGzAGu65BnU3d08aTVSvO7mGPZUc0wTEDL+qGE0Q==",
      "dev": true,
      "requires": {
-        "domelementtype": "^1.3.0",
-        "entities": "^1.1.1"
+        "domelementtype": "^2.0.1",
+        "entities": "^2.0.0"
+      },
+      "dependencies": {
+        "domelementtype": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz",
+          "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==",
+          "dev": true
+        },
+        "entities": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz",
+          "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==",
+          "dev": true
+        }
      }
    },
    "domelementtype": {
@ -1956,9 +2015,9 @@
      }
    },
    "electron-to-chromium": {
-      "version": "1.3.193",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.193.tgz",
-      "integrity": "sha512-WX01CG1UoPtTUFaKKwMn+u8nJ63loP6hNxePWtk1pN8ibWMyX1q6TiWPsz1ABBKXezvmaIdtP+0BwzjC1wyCaw==",
+      "version": "1.3.215",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.215.tgz",
+      "integrity": "sha512-ZV3OnwF0FlIygwxAG2H92yt7WGjWBpawyFAFu8e9k7xJatY+BPowID0D0Bs3PMACYAJATEejw/I9cawO27ZvTg==",
      "dev": true
    },
    "elegant-spinner": {
@ -2186,9 +2245,9 @@
      }
    },
    "eslint-module-utils": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.4.0.tgz",
-      "integrity": "sha512-14tltLm38Eu3zS+mt0KvILC3q8jyIAH518MlG+HO0p+yK885Lb1UHTY/UgR91eOyGdmxAPb+OLoW4znqIT6Ndw==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.4.1.tgz",
+      "integrity": "sha512-H6DOj+ejw7Tesdgbfs4jeS4YMFrT8uI8xwd1gtQqXssaR0EQ26L+2O/w6wkYFy2MymON0fTwHmXBvvfLNZVZEw==",
      "dev": true,
      "requires": {
        "debug": "^2.6.8",
@ -2213,9 +2272,9 @@
      }
    },
    "eslint-plugin-cypress": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-2.6.0.tgz",
-      "integrity": "sha512-/YmvhYFqjFLYw7llDl56U9KW+Z25TZJjDofT47aUnAFRRvOhj1y2nxJzZ1ZTnqBO1ja8gwRhtdT7LfTLg9ANJw==",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-2.6.1.tgz",
+      "integrity": "sha512-OVdxKbQ5DGcAGxvgZJRng7g01w/4xqEk65FGc8xELMcTdTjzh1m7FFjEQSglv1Y/TIDsOHaA5b+/ojQp4I2QhA==",
      "dev": true,
      "requires": {
        "globals": "^11.12.0"
@ -2232,9 +2291,9 @@
      }
    },
    "eslint-plugin-import": {
-      "version": "2.18.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.18.0.tgz",
-      "integrity": "sha512-PZpAEC4gj/6DEMMoU2Df01C5c50r7zdGIN52Yfi7CvvWaYssG7Jt5R9nFG5gmqodxNOz9vQS87xk6Izdtpdrig==",
+      "version": "2.18.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz",
+      "integrity": "sha512-5ohpsHAiUBRNaBWAF08izwUGlbrJoJJ+W9/TBwsGoR1MnlgfwMIKrFeSjWbt6moabiXW9xNvtFz+97KHRfI4HQ==",
      "dev": true,
      "requires": {
        "array-includes": "^3.0.3",
@ -2244,8 +2303,8 @@
        "eslint-import-resolver-node": "^0.3.2",
        "eslint-module-utils": "^2.4.0",
        "has": "^1.0.3",
-        "lodash": "^4.17.11",
        "minimatch": "^3.0.4",
+        "object.values": "^1.1.0",
        "read-pkg-up": "^2.0.0",
        "resolve": "^1.11.0"
      },
@ -2315,9 +2374,9 @@
      "dev": true
    },
    "eslint-plugin-react": {
-      "version": "7.14.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.14.2.tgz",
-      "integrity": "sha512-jZdnKe3ip7FQOdjxks9XPN0pjUKZYq48OggNMd16Sk+8VXx6JOvXmlElxROCgp7tiUsTsze3jd78s/9AFJP2mA==",
+      "version": "7.14.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.14.3.tgz",
+      "integrity": "sha512-EzdyyBWC4Uz2hPYBiEJrKCUi2Fn+BJ9B/pJQcjw5X+x/H2Nm59S4MJIvL4O5NEE0+WbnQwEBxWY03oUk+Bc3FA==",
      "dev": true,
      "requires": {
        "array-includes": "^3.0.3",
@ -2424,9 +2483,9 @@
      "dev": true
    },
    "esutils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
      "dev": true
    },
    "event-stream": {
@ -3087,9 +3146,9 @@
      }
    },
    "graceful-fs": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz",
-      "integrity": "sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz",
+      "integrity": "sha512-b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw==",
      "dev": true
    },
    "handlebars": {
@ -3230,17 +3289,31 @@
      "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==",
      "dev": true
    },
-    "hoek": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-5.0.4.tgz",
-      "integrity": "sha512-Alr4ZQgoMlnere5FZJsIyfIjORBqZll5POhDsF4q64dPuJR6rNxXdDxtHSQq8OXRurhmx+PWYEE8bXRROY8h0w==",
-      "dev": true
-    },
    "hosted-git-info": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
-      "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==",
-      "dev": true
+      "version": "2.8.2",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.2.tgz",
+      "integrity": "sha512-CyjlXII6LMsPMyUzxpTt8fzh5QwzGqPmQXgY/Jyf4Zfp27t/FvfhwoE/8laaMUcMy816CkWF20I7NeQhwwY88w==",
+      "dev": true,
+      "requires": {
+        "lru-cache": "^5.1.1"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "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"
+          }
+        },
+        "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
+        }
+      }
    },
    "html-tags": {
      "version": "2.0.0",
@ -3763,15 +3836,6 @@
      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
      "dev": true
    },
-    "isemail": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/isemail/-/isemail-3.2.0.tgz",
-      "integrity": "sha512-zKqkK+O+dGqevc93KNsbZ/TqTUFd46MwWjYOoMrjIMZ51eU7DtQG3Wmd9SQQT7i7RVnuTPEiYEWHU3MSbxC1Tg==",
-      "dev": true,
-      "requires": {
-        "punycode": "2.x.x"
-      }
-    },
    "isexe": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@ -3790,17 +3854,6 @@
      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
      "dev": true
    },
-    "joi": {
-      "version": "13.7.0",
-      "resolved": "https://registry.npmjs.org/joi/-/joi-13.7.0.tgz",
-      "integrity": "sha512-xuY5VkHfeOYK3Hdi91ulocfuFopwgbSORmIwzcwHKESQhC7w1kD5jaVSPnqDxS2I8t3RZ9omCKAxNwXN5zG1/Q==",
-      "dev": true,
-      "requires": {
-        "hoek": "5.x.x",
-        "isemail": "3.x.x",
-        "topo": "3.x.x"
-      }
-    },
    "js-base64": {
      "version": "2.5.1",
      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
@ -4320,9 +4373,9 @@
      }
    },
    "lodash": {
-      "version": "4.17.14",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz",
-      "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==",
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
      "dev": true
    },
    "lodash.castarray": {
@ -4680,9 +4733,9 @@
      }
    },
    "merge2": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz",
-      "integrity": "sha512-gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.4.tgz",
+      "integrity": "sha512-FYE8xI+6pjFOhokZu0We3S5NKCirLbCzSh2Usf3qEyr4X8U+0jNg9P8RZ4qz+V2UoECLVwSyzU3LxXBaLGtD3A==",
      "dev": true
    },
    "micromatch": {
@ -4898,9 +4951,9 @@
      "dev": true
    },
    "node-releases": {
-      "version": "1.1.25",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.25.tgz",
-      "integrity": "sha512-fI5BXuk83lKEoZDdH3gRhtsNgh05/wZacuXkgbiYkceE7+QIMXOg98n9ZV7mz27B+kFHnqHcUpscZZlGRSmTpQ==",
+      "version": "1.1.26",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.26.tgz",
+      "integrity": "sha512-fZPsuhhUHMTlfkhDLGtfY80DSJTjOcx+qD1j5pqPkuhUHVS7xHZIg9EE4DHK8O3f0zTxXHX5VIkDG8pu98/wfQ==",
      "dev": true,
      "requires": {
        "semver": "^5.3.0"
@ -5332,15 +5385,15 @@
      "dev": true
    },
    "package-json": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.4.0.tgz",
-      "integrity": "sha512-bd1T8OBG7hcvMd9c/udgv6u5v9wISP3Oyl9Cm7Weop8EFwrtcQDnS2sb6zhwqus2WslSr5wSTIPiTTpxxmPm7Q==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz",
+      "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==",
      "dev": true,
      "requires": {
        "got": "^9.6.0",
-        "registry-auth-token": "^3.4.0",
+        "registry-auth-token": "^4.0.0",
        "registry-url": "^5.0.0",
-        "semver": "^6.1.1"
+        "semver": "^6.2.0"
      }
    },
    "parent-module": {
@ -5637,9 +5690,9 @@
      }
    },
    "postcss-jsx": {
-      "version": "0.36.1",
-      "resolved": "https://registry.npmjs.org/postcss-jsx/-/postcss-jsx-0.36.1.tgz",
-      "integrity": "sha512-xaZpy01YR7ijsFUtu5rViYCFHurFIPHir+faiOQp8g/NfTfWqZCKDhKrydQZ4d8WlSAmVdXGwLjpFbsNUI26Sw==",
+      "version": "0.36.3",
+      "resolved": "https://registry.npmjs.org/postcss-jsx/-/postcss-jsx-0.36.3.tgz",
+      "integrity": "sha512-yV8Ndo6KzU8eho5mCn7LoLUGPkXrRXRjhMpX4AaYJ9wLJPv099xbtpbRQ8FrPnzVxb/cuMebbPR7LweSt+hTfA==",
      "dev": true,
      "requires": {
        "@babel/core": ">=7.2.2"
@ -6387,6 +6440,16 @@
            "strip-indent": "^2.0.0"
          }
        },
+        "registry-auth-token": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz",
+          "integrity": "sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==",
+          "dev": true,
+          "requires": {
+            "rc": "^1.1.6",
+            "safe-buffer": "^5.0.1"
+          }
+        },
        "registry-url": {
          "version": "3.1.0",
          "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz",
@ -6612,9 +6675,9 @@
      "dev": true
    },
    "psl": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.2.0.tgz",
-      "integrity": "sha512-GEn74ZffufCmkDDLNcl3uuyF/aSD6exEyh1v/ZSdAomB82t6G9hzJVRx0jBmLDW+VfZqks3aScmMw9DszwUalA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.3.0.tgz",
+      "integrity": "sha512-avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag==",
      "dev": true
    },
    "pump": {
@ -6837,9 +6900,9 @@
      }
    },
    "regenerator-runtime": {
-      "version": "0.13.2",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz",
-      "integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==",
+      "version": "0.13.3",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
+      "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==",
      "dev": true
    },
    "regex-cache": {
@ -6868,12 +6931,12 @@
      "dev": true
    },
    "registry-auth-token": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz",
-      "integrity": "sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.0.0.tgz",
+      "integrity": "sha512-lpQkHxd9UL6tb3k/aHAVfnVtn+Bcs9ob5InuFLLEDqSqeq+AljB8GZW9xY0x7F+xYwEcjKe07nyoxzEYz6yvkw==",
      "dev": true,
      "requires": {
-        "rc": "^1.1.6",
+        "rc": "^1.2.8",
        "safe-buffer": "^5.0.1"
      }
    },
@ -6887,13 +6950,13 @@
      }
    },
    "release-it": {
-      "version": "12.3.3",
-      "resolved": "https://registry.npmjs.org/release-it/-/release-it-12.3.3.tgz",
-      "integrity": "sha512-/VAbEt1CRc0qeT7y2m0PC/YujLBKPoFh4nSg6sjppknwB/e43i6UYlJfqf+MwXB82lDeCULyReTHW+Sl1vcGXw==",
+      "version": "12.3.5",
+      "resolved": "https://registry.npmjs.org/release-it/-/release-it-12.3.5.tgz",
+      "integrity": "sha512-0SvHN8Yr6FRgTMihRCNXrbFKrx9PFQJ8Lwz+dKF01zUv/3W05JE/+Lbckcbjv7i4wKkSn0ZY2yu3zB8y1OnuTQ==",
      "dev": true,
      "requires": {
        "@iarna/toml": "2.2.3",
-        "@octokit/rest": "16.28.3",
+        "@octokit/rest": "16.28.6",
        "async-retry": "1.2.3",
        "chalk": "2.4.2",
        "cosmiconfig": "5.2.1",
@ -6908,11 +6971,11 @@
        "import-cwd": "3.0.0",
        "inquirer": "6.5.0",
        "is-ci": "2.0.0",
-        "lodash": "4.17.14",
+        "lodash": "4.17.15",
        "mime-types": "2.1.24",
        "ora": "3.4.0",
        "os-name": "3.1.0",
-        "semver": "6.2.0",
+        "semver": "6.3.0",
        "shelljs": "0.8.3",
        "supports-color": "7.0.0",
        "update-notifier": "3.0.1",
@ -7080,9 +7143,9 @@
      "dev": true
    },
    "resolve": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz",
-      "integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==",
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
+      "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
      "dev": true,
      "requires": {
        "path-parse": "^1.0.6"
@ -7207,9 +7270,9 @@
      "dev": true
    },
    "semver": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz",
-      "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
      "dev": true
    },
    "semver-diff": {
@ -7593,9 +7656,9 @@
      }
    },
    "start-server-and-test": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/start-server-and-test/-/start-server-and-test-1.9.1.tgz",
-      "integrity": "sha512-vRtUxxW34Li+EvemuWtgASyR2KBE+DPoEJ/l5REe+cKxm31jadGm1PSDVBronqQVsvhncRGm4iZc53pFH+FNEA==",
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/start-server-and-test/-/start-server-and-test-1.9.2.tgz",
+      "integrity": "sha512-CFtMw1FlJX2tPA6YSocWZtIlkTdJjK56SVaa4q079TpTcCcHcwAwlFo3Cn3ZgAAogEZjHoj6LrVb6ANdV9sGuA==",
      "dev": true,
      "requires": {
        "bluebird": "3.5.5",
@ -7604,7 +7667,7 @@
        "execa": "0.11.0",
        "lazy-ass": "1.6.0",
        "ps-tree": "1.2.0",
-        "wait-on": "3.2.0"
+        "wait-on": "3.3.0"
      },
      "dependencies": {
        "bluebird": {
@ -7942,9 +8005,9 @@
          },
          "dependencies": {
            "postcss-value-parser": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.0.tgz",
-              "integrity": "sha512-ESPktioptiSUchCKgggAkzdmkgzKfmp0EU8jXH+5kbIUB+unr0Y4CY9SRMvibuvYUBjNh1ACLbxqYNpdTQOteQ==",
+              "version": "4.0.1",
+              "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.1.tgz",
+              "integrity": "sha512-3Jk+/CVH0HBfgSSFWALKm9Hyzf4kumPjZfUxkRYZNcqFztELb2APKxv0nlX8HCdc1/ymePmT/nFf1ST6fjWH2A==",
              "dev": true
            }
          }
@ -8752,9 +8815,9 @@
      "dev": true
    },
    "table": {
-      "version": "5.4.4",
-      "resolved": "https://registry.npmjs.org/table/-/table-5.4.4.tgz",
-      "integrity": "sha512-IIfEAUx5QlODLblLrGTTLJA7Tk0iLSGBvgY8essPRVNGHAzThujww1YqHLs6h3HfTg55h++RzLHH5Xw/rfv+mg==",
+      "version": "5.4.5",
+      "resolved": "https://registry.npmjs.org/table/-/table-5.4.5.tgz",
+      "integrity": "sha512-oGa2Hl7CQjfoaogtrOHEJroOcYILTx7BZWLGsJIlzoWmB2zmguhNfPJZsWPKYek/MgCxfco54gEi31d1uN2hFA==",
      "dev": true,
      "requires": {
        "ajv": "^6.10.2",
@ -8978,23 +9041,6 @@
        "is-number": "^7.0.0"
      }
    },
-    "topo": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/topo/-/topo-3.0.3.tgz",
-      "integrity": "sha512-IgpPtvD4kjrJ7CRA3ov2FhWQADwv+Tdqbsf1ZnPUSAtCJ9e1Z44MmoSGDXGk4IppoZA7jd/QRkNddlLJWlUZsQ==",
-      "dev": true,
-      "requires": {
-        "hoek": "6.x.x"
-      },
-      "dependencies": {
-        "hoek": {
-          "version": "6.1.3",
-          "resolved": "https://registry.npmjs.org/hoek/-/hoek-6.1.3.tgz",
-          "integrity": "sha512-YXXAAhmF9zpQbC7LEcREFtXfGq5K1fmd+4PHkBq8NUqmzW3G+Dq10bI/i0KucLRwss3YYFQ0fSfoxBZYiGUqtQ==",
-          "dev": true
-        }
-      }
-    },
    "tough-cookie": {
      "version": "2.4.3",
      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
@ -9056,9 +9102,9 @@
      "dev": true
    },
    "tsutils": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.14.0.tgz",
-      "integrity": "sha512-SmzGbB0l+8I0QwsPgjooFRaRvHLBLNYM8SeQ0k6rtNDru5sCGeLJcZdwilNndN+GysuFjF5EIYgN8GfFG6UeUw==",
+      "version": "3.17.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.17.0.tgz",
+      "integrity": "sha512-fyveWOtAXfumAxIqkcMHuPaaVyLBKjB8Y00ANZkqh+HITBAQscCbQIHwwBTJdvQq7RykLEbOPcUUnJ16X4NA0g==",
      "dev": true,
      "requires": {
        "tslib": "^1.8.1"
@ -9101,9 +9147,9 @@
      "dev": true
    },
    "typescript": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.2.tgz",
-      "integrity": "sha512-7KxJovlYhTX5RaRbUdkAXN1KUZ8PwWlTzQdHV6xNqvuFOs7+WBo10TQUqT19Q/Jz2hk5v9TQDIhyLhhJY4p5AA==",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.3.tgz",
+      "integrity": "sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==",
      "dev": true
    },
    "uglify-js": {
@ -9217,9 +9263,9 @@
      }
    },
    "universal-user-agent": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-2.1.0.tgz",
-      "integrity": "sha512-8itiX7G05Tu3mGDTdNY2fB4KJ8MgZLS54RdG6PkkfwMAavrXu1mV/lls/GABx9O3Rw4PnTtasxrvbMQoBYY92Q==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-3.0.0.tgz",
+      "integrity": "sha512-T3siHThqoj5X0benA5H0qcDnrKGXzU8TKoX15x/tQHw1hQBvIEBHjxQ2klizYsqBOO/Q+WuxoQUihadeeqDnoA==",
      "dev": true,
      "requires": {
        "os-name": "^3.0.0"
@ -9432,13 +9478,13 @@
      }
    },
    "wait-on": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-3.2.0.tgz",
-      "integrity": "sha512-QUGNKlKLDyY6W/qHdxaRlXUAgLPe+3mLL/tRByHpRNcHs/c7dZXbu+OnJWGNux6tU1WFh/Z8aEwvbuzSAu79Zg==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-3.3.0.tgz",
+      "integrity": "sha512-97dEuUapx4+Y12aknWZn7D25kkjMk16PbWoYzpSdA8bYpVfS6hpl2a2pOWZ3c+Tyt3/i4/pglyZctG3J4V1hWQ==",
      "dev": true,
      "requires": {
-        "core-js": "^2.5.7",
-        "joi": "^13.0.0",
+        "@hapi/joi": "^15.0.3",
+        "core-js": "^2.6.5",
        "minimist": "^1.2.0",
        "request": "^2.88.0",
        "rx": "^4.1.0"
@ -9609,6 +9655,15 @@
        "signal-exit": "^3.0.2"
      }
    },
+    "ws": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
+      "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
+      "dev": true,
+      "requires": {
+        "async-limiter": "~1.0.0"
+      }
+    },
    "x-is-string": {
      "version": "0.1.0",
      "resolved": "https://registry.npmjs.org/x-is-string/-/x-is-string-0.1.0.tgz",
--- a/package.json
+++ b/package.json
@ -1,17 +1,15 @@
 {
  "name": "commons",
  "description": "Ocean Protocol marketplace to explore, download, and publish open data sets.",
-  "version": "1.0.0",
+  "version": "1.0.1",
  "license": "Apache-2.0",
  "scripts": {
    "install": "./scripts/install.sh",
    "start": "concurrently \"cd client && npm start\" \"cd server && npm start\"",
-    "start:commons-and-ganache": "concurrently 'npm run start:ganache' 'npm run start'",
    "build": "./scripts/build.sh",
    "test": "npm run lint && scripts/test.sh && npm run test:e2e",
-    "test:e2e": "start-test start:commons-and-ganache http-get://localhost:3000 cypress:run",
+    "test:e2e": "start-test start http-get://localhost:3000 cypress:run",
    "test:watch": "npm run lint && concurrently \"cd client && npm run test:watch\" \"cd server && npm run test:watch\"",
-    "start:ganache": "ganache-cli -m 'stamp polar cup smart ill agree human episode reform trigger text forget' -i 5777",
    "format:js": "prettier --parser typescript --write '**/*.{js,jsx,ts,tsx}'",
    "format:css": "prettier-stylelint --ignore-path .gitignore --write --quiet '**/*.{css,scss}'",
    "format": "npm run format:js && npm run format:css",
@ -27,25 +25,26 @@
  "dependencies": {},
  "devDependencies": {
    "@release-it/bumper": "^1.0.3",
-    "@typescript-eslint/eslint-plugin": "^1.11.0",
-    "@typescript-eslint/parser": "^1.11.0",
-    "auto-changelog": "^1.13.0",
+    "@typescript-eslint/eslint-plugin": "^1.12.0",
+    "@typescript-eslint/parser": "^1.12.0",
+    "auto-changelog": "^1.14.1",
    "concurrently": "^4.1.1",
-    "cypress": "^3.4.0",
+    "cypress": "^3.4.1",
+    "cypress-log-to-output": "^1.0.4",
    "eslint": "^5.16.0",
    "eslint-config-oceanprotocol": "^1.3.0",
    "eslint-config-prettier": "^6.0.0",
-    "eslint-plugin-cypress": "^2.2.1",
+    "eslint-plugin-cypress": "^2.6.0",
    "eslint-plugin-prettier": "^3.1.0",
    "prettier": "^1.18.2",
    "prettier-stylelint": "^0.4.2",
-    "release-it": "^12.3.0",
+    "release-it": "^12.3.4",
    "start-server-and-test": "^1.9.1",
    "stylelint": "^10.1.0",
    "stylelint-config-bigchaindb": "^1.2.2",
    "stylelint-config-css-modules": "^1.4.0",
    "stylelint-config-standard": "^18.3.0",
-    "typescript": "3.5.2"
+    "typescript": "3.5.3"
  },
  "repository": {
    "type": "git",
--- a/scripts/keeper.sh
+++ b/scripts/keeper.sh
@ -0,0 +1,31 @@
+#!/bin/bash
+
+# Wait for contracts migration and extract Keeper artifacts
+
+RETRY_COUNT=0
+COMMAND_STATUS=1
+
+printf '\n\e[33m◯ Waiting for contracts to be generated...\e[0m\n'
+
+mkdir -p artifacts
+
+until [ $COMMAND_STATUS -eq 0 ] || [ $RETRY_COUNT -eq 120 ]; do
+  keeper_contracts_docker_id=$(docker container ls | grep keeper-contracts | awk '{print $1}')
+  docker cp "${keeper_contracts_docker_id}":/keeper-contracts/artifacts/ready ./artifacts/ > /dev/null 2>&1
+  COMMAND_STATUS=$?
+  sleep 5
+  (( RETRY_COUNT=RETRY_COUNT+1 ))
+done
+
+printf '\e[32m✔ Found new contract artifacts.\e[0m\n'
+
+rm -rf ./artifacts/
+
+if [ $COMMAND_STATUS -ne 0 ]; then
+  echo "Waited for more than two minutes, but keeper contracts have not been migrated yet. Did you run an Ethereum RPC client and the migration script?"
+  exit 1
+fi
+
+docker cp "${keeper_contracts_docker_id}":/keeper-contracts/artifacts/. ./client/node_modules/@oceanprotocol/keeper-contracts/artifacts/
+
+printf '\e[32m✔ Copied new contract artifacts.\e[0m\n'
--- a/server/package-lock.json
+++ b/server/package-lock.json
@ -1,35 +1,35 @@
 {
  "name": "commons-server",
-  "version": "1.0.0",
+  "version": "1.0.1",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
    "@babel/code-frame": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
-      "integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
+      "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
      "dev": true,
      "requires": {
        "@babel/highlight": "^7.0.0"
      }
    },
    "@babel/core": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.5.4.tgz",
-      "integrity": "sha512-+DaeBEpYq6b2+ZmHx3tHspC+ZRflrvLqwfv8E3hNr5LVQoyBnL8RPKSBCg+rK2W2My9PWlujBiqd0ZPsR9Q6zQ==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.5.5.tgz",
+      "integrity": "sha512-i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg==",
      "dev": true,
      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/generator": "^7.5.0",
-        "@babel/helpers": "^7.5.4",
-        "@babel/parser": "^7.5.0",
+        "@babel/code-frame": "^7.5.5",
+        "@babel/generator": "^7.5.5",
+        "@babel/helpers": "^7.5.5",
+        "@babel/parser": "^7.5.5",
        "@babel/template": "^7.4.4",
-        "@babel/traverse": "^7.5.0",
-        "@babel/types": "^7.5.0",
+        "@babel/traverse": "^7.5.5",
+        "@babel/types": "^7.5.5",
        "convert-source-map": "^1.1.0",
        "debug": "^4.1.0",
        "json5": "^2.1.0",
-        "lodash": "^4.17.11",
+        "lodash": "^4.17.13",
        "resolve": "^1.3.2",
        "semver": "^5.4.1",
        "source-map": "^0.5.0"
@ -44,14 +44,14 @@
      }
    },
    "@babel/generator": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.5.0.tgz",
-      "integrity": "sha512-1TTVrt7J9rcG5PMjvO7VEG3FrEoEJNHxumRq66GemPmzboLWtIjjcJgk8rokuAS7IiRSpgVSu5Vb9lc99iJkOA==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.5.5.tgz",
+      "integrity": "sha512-ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ==",
      "dev": true,
      "requires": {
-        "@babel/types": "^7.5.0",
+        "@babel/types": "^7.5.5",
        "jsesc": "^2.5.1",
-        "lodash": "^4.17.11",
+        "lodash": "^4.17.13",
        "source-map": "^0.5.0",
        "trim-right": "^1.0.1"
      },
@ -100,14 +100,14 @@
      }
    },
    "@babel/helpers": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.5.4.tgz",
-      "integrity": "sha512-6LJ6xwUEJP51w0sIgKyfvFMJvIb9mWAfohJp0+m6eHJigkFdcH8duZ1sfhn0ltJRzwUIT/yqqhdSfRpCpL7oow==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.5.5.tgz",
+      "integrity": "sha512-nRq2BUhxZFnfEn/ciJuhklHvFOqjJUD5wpx+1bxUF2axL9C+v4DE/dmp5sT2dKnpOs4orZWzpAZqlCy8QqE/7g==",
      "dev": true,
      "requires": {
        "@babel/template": "^7.4.4",
-        "@babel/traverse": "^7.5.0",
-        "@babel/types": "^7.5.0"
+        "@babel/traverse": "^7.5.5",
+        "@babel/types": "^7.5.5"
      }
    },
    "@babel/highlight": {
@ -122,9 +122,9 @@
      }
    },
    "@babel/parser": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.5.0.tgz",
-      "integrity": "sha512-I5nW8AhGpOXGCCNYGc+p7ExQIBxRFnS2fd/d862bNOKvmoEPjYPcfIjsfdy0ujagYOIYPczKgD9l3FsgTkAzKA==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.5.5.tgz",
+      "integrity": "sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g==",
      "dev": true
    },
    "@babel/plugin-syntax-object-rest-spread": {
@ -148,30 +148,30 @@
      }
    },
    "@babel/traverse": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.0.tgz",
-      "integrity": "sha512-SnA9aLbyOCcnnbQEGwdfBggnc142h/rbqqsXcaATj2hZcegCl903pUD/lfpsNBlBSuWow/YDfRyJuWi2EPR5cg==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.5.tgz",
+      "integrity": "sha512-MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ==",
      "dev": true,
      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/generator": "^7.5.0",
+        "@babel/code-frame": "^7.5.5",
+        "@babel/generator": "^7.5.5",
        "@babel/helper-function-name": "^7.1.0",
        "@babel/helper-split-export-declaration": "^7.4.4",
-        "@babel/parser": "^7.5.0",
-        "@babel/types": "^7.5.0",
+        "@babel/parser": "^7.5.5",
+        "@babel/types": "^7.5.5",
        "debug": "^4.1.0",
        "globals": "^11.1.0",
-        "lodash": "^4.17.11"
+        "lodash": "^4.17.13"
      }
    },
    "@babel/types": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.0.tgz",
-      "integrity": "sha512-UFpDVqRABKsW01bvw7/wSUe56uy6RXM5+VJibVVAybDGxEW25jdwiFJEf7ASvSaC7sN7rbE/l3cLp2izav+CtQ==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz",
+      "integrity": "sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==",
      "dev": true,
      "requires": {
        "esutils": "^2.0.2",
-        "lodash": "^4.17.11",
+        "lodash": "^4.17.13",
        "to-fast-properties": "^2.0.0"
      }
    },
@ -512,9 +512,9 @@
      }
    },
    "@types/jest": {
-      "version": "24.0.15",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.0.15.tgz",
-      "integrity": "sha512-MU1HIvWUme74stAoc3mgAi+aMlgKOudgEvQDIm1v4RkrDudBh1T+NFp5sftpBAdXdx1J0PbdpJ+M2EsSOi1djA==",
+      "version": "24.0.17",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.0.17.tgz",
+      "integrity": "sha512-1cy3xkOAfSYn78dsBWy4M3h/QF/HeWPchNFDjysVtp3GHeTdSmtluNnELfCmfNRRHo0OWEcpf+NsEJQvwQfdqQ==",
      "dev": true,
      "requires": {
        "@types/jest-diff": "*"
@ -533,18 +533,18 @@
      "dev": true
    },
    "@types/morgan": {
-      "version": "1.7.35",
-      "resolved": "https://registry.npmjs.org/@types/morgan/-/morgan-1.7.35.tgz",
-      "integrity": "sha512-E9qFi0seOkdlQnCTPv54brNfGWeFdRaEhI5tSue4pdx/V+xfxvMETsxXhOEcj1cYL+0n/jcTEmj/jD2gjzCwMg==",
+      "version": "1.7.36",
+      "resolved": "https://registry.npmjs.org/@types/morgan/-/morgan-1.7.36.tgz",
+      "integrity": "sha512-Hc2UfTpnqS3gfGZFPk6aaQf/nwxFHboC/o1O25W29UsENPLv8qd/GJUBqzrBuczgaIS3/vZxZRHTfFF28uFNeQ==",
      "dev": true,
      "requires": {
        "@types/express": "*"
      }
    },
    "@types/node": {
-      "version": "12.6.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.6.6.tgz",
-      "integrity": "sha512-SMgj3x28MkJyHdWaMv/g/ca3LYDi5gR7O8mX0VKazvFOnmlDXctSEdd/8jfSqozjKFK1R9If1QZWkafX7yQTpA=="
+      "version": "12.6.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.6.9.tgz",
+      "integrity": "sha512-+YB9FtyxXGyD54p8rXwWaN1EWEyar5L58GlGWgtH2I9rGmLGBQcw63+0jw+ujqVavNuO47S1ByAjm9zdHMnskw=="
    },
    "@types/range-parser": {
      "version": "1.2.3",
@ -637,9 +637,9 @@
      "dev": true
    },
    "acorn-globals": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.2.tgz",
-      "integrity": "sha512-BbzvZhVtZP+Bs1J1HcwrQe8ycfO0wStkSGxuul3He3GkHOIZ6eTqOkPuw9IP1X3+IkOo4wiJmwkobzXYz4wewQ==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.3.tgz",
+      "integrity": "sha512-vkR40VwS2SYO98AIeFvzWWh+xyc2qi9s7OoXSFEGIP/rOJKzjnhykaZJNnHdoq4BL2gGxI5EZOU16z896EYnOQ==",
      "dev": true,
      "requires": {
        "acorn": "^6.0.1",
@ -647,9 +647,9 @@
      },
      "dependencies": {
        "acorn": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.0.tgz",
-          "integrity": "sha512-8oe72N3WPMjA+2zVG71Ia0nXZ8DpQH+QyyHO+p06jT8eg8FGG3FbcUIi8KziHlAfheJQZeoqbvq1mQSQHXKYLw==",
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.1.tgz",
+          "integrity": "sha512-JD0xT5FCRDNyjDda3Lrg/IxFscp9q4tiYtxE1/nOzlKCk7hIRuYjhq1kCNkbPjMRMZuFq20HNQn1I9k8Oj0E+Q==",
          "dev": true
        }
      }
@ -783,9 +783,9 @@
      "dev": true
    },
    "async-limiter": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
-      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
+      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
      "dev": true
    },
    "asynckit": {
@ -825,11 +825,12 @@
      }
    },
    "babel-plugin-istanbul": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-5.1.4.tgz",
-      "integrity": "sha512-dySz4VJMH+dpndj0wjJ8JPs/7i1TdSPb1nRrn56/92pKOF9VKC1FMFJmMXjzlGGusnCAqujP6PBCiKq0sVA+YQ==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz",
+      "integrity": "sha512-5LphC0USA8t4i1zCtjbbNb6jJj/9+X6P37Qfirc/70EQ34xKlMW+a1RHGwxGI+SwWpNwZ27HqvzAobeqaXwiZw==",
      "dev": true,
      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
        "find-up": "^3.0.0",
        "istanbul-lib-instrument": "^3.3.0",
        "test-exclude": "^5.2.3"
@ -1762,9 +1763,9 @@
      "dev": true
    },
    "esutils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
      "dev": true
    },
    "etag": {
@ -2813,9 +2814,9 @@
      }
    },
    "graceful-fs": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz",
-      "integrity": "sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz",
+      "integrity": "sha512-b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw==",
      "dev": true
    },
    "growly": {
@ -2903,10 +2904,13 @@
      }
    },
    "hosted-git-info": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
-      "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==",
-      "dev": true
+      "version": "2.8.2",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.2.tgz",
+      "integrity": "sha512-CyjlXII6LMsPMyUzxpTt8fzh5QwzGqPmQXgY/Jyf4Zfp27t/FvfhwoE/8laaMUcMy816CkWF20I7NeQhwwY88w==",
+      "dev": true,
+      "requires": {
+        "lru-cache": "^5.1.1"
+      }
    },
    "html-encoding-sniffer": {
      "version": "1.0.2",
@ -3308,9 +3312,9 @@
      },
      "dependencies": {
        "semver": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz",
-          "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==",
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
          "dev": true
        }
      }
@ -3942,9 +3946,9 @@
      }
    },
    "lodash": {
-      "version": "4.17.14",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz",
-      "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw=="
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
    },
    "lodash.sortby": {
      "version": "4.7.0",
@ -3968,13 +3972,12 @@
      "dev": true
    },
    "lru-cache": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+      "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": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
+        "yallist": "^3.0.2"
      }
    },
    "make-dir": {
@ -4256,9 +4259,9 @@
      "dev": true
    },
    "node-notifier": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.0.tgz",
-      "integrity": "sha512-SUDEb+o71XR5lXSTyivXd9J7fCloE3SyP4lSgt3lU2oSANiox+SxlNRGPjDKrwU1YN3ix2KN/VGGCg0t01rttQ==",
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.1.tgz",
+      "integrity": "sha512-p52B+onAEHKW1OF9MGO/S7k/ahGEHfhP5/tvwYzog/5XLYOd8ZuD6vdNZdUuWMONRnKPneXV43v3s6Snx1wsCQ==",
      "dev": true,
      "requires": {
        "growly": "^1.3.0",
@ -4715,13 +4718,13 @@
      "dev": true
    },
    "prompts": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.1.0.tgz",
-      "integrity": "sha512-+x5TozgqYdOwWsQFZizE/Tra3fKvAoy037kOyU6cgz84n8f6zxngLOV4O32kTwt9FcLCxAqw0P/c8rOr9y+Gfg==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.2.1.tgz",
+      "integrity": "sha512-VObPvJiWPhpZI6C5m60XOzTfnYg/xc/an+r9VYymj9WJW3B/DIH+REzjpAACPf8brwPeP+7vz3bIim3S+AaMjw==",
      "dev": true,
      "requires": {
-        "kleur": "^3.0.2",
-        "sisteransi": "^1.0.0"
+        "kleur": "^3.0.3",
+        "sisteransi": "^1.0.3"
      }
    },
    "proxy-addr": {
@ -4740,9 +4743,9 @@
      "dev": true
    },
    "psl": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.2.0.tgz",
-      "integrity": "sha512-GEn74ZffufCmkDDLNcl3uuyF/aSD6exEyh1v/ZSdAomB82t6G9hzJVRx0jBmLDW+VfZqks3aScmMw9DszwUalA=="
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.3.0.tgz",
+      "integrity": "sha512-avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag=="
    },
    "pstree.remy": {
      "version": "1.1.7",
@ -4987,9 +4990,9 @@
      "dev": true
    },
    "resolve": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz",
-      "integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==",
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
+      "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
      "dev": true,
      "requires": {
        "path-parse": "^1.0.6"
@ -5209,9 +5212,9 @@
      "dev": true
    },
    "sisteransi": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.2.tgz",
-      "integrity": "sha512-ZcYcZcT69nSLAR2oLN2JwNmLkJEKGooFMCdvOkFrToUt/WfcRWqhIg4P4KwY4dmLbuyXIx4o4YmPsvMRJYJd/w==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.3.tgz",
+      "integrity": "sha512-SbEG75TzH8G7eVXFSN5f9EExILKfly7SUvVY5DhhYLvfhKqhDFY0OzevWa/zwak0RLRfWS5AvfMWpd9gJvr5Yg==",
      "dev": true
    },
    "slash": {
@ -5362,9 +5365,9 @@
      }
    },
    "source-map-support": {
-      "version": "0.5.12",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz",
-      "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
+      "version": "0.5.13",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
      "dev": true,
      "requires": {
        "buffer-from": "^1.0.0",
@ -5669,6 +5672,22 @@
          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
          "dev": true
+        },
+        "lru-cache": {
+          "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"
+          }
+        },
+        "yallist": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+          "dev": true
        }
      }
    },
@ -5874,9 +5893,9 @@
      }
    },
    "typescript": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.2.tgz",
-      "integrity": "sha512-7KxJovlYhTX5RaRbUdkAXN1KUZ8PwWlTzQdHV6xNqvuFOs7+WBo10TQUqT19Q/Jz2hk5v9TQDIhyLhhJY4p5AA==",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.3.tgz",
+      "integrity": "sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==",
      "dev": true
    },
    "uglify-js": {
@ -6280,9 +6299,9 @@
      "dev": true
    },
    "yallist": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+      "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
    },
    "yargs": {
@ -6324,9 +6343,9 @@
      }
    },
    "yn": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.0.tgz",
-      "integrity": "sha512-kKfnnYkbTfrAdd0xICNFw7Atm8nKpLcLv9AZGEt+kczL/WQVai4e2V6ZN8U/O+iI6WrNuJjNNOyu4zfhl9D3Hg==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
      "dev": true
    }
  }
--- a/server/package.json
+++ b/server/package.json
@ -1,7 +1,7 @@
 {
  "name": "commons-server",
  "description": "Ocean Protocol marketplace backend.",
-  "version": "1.0.0",
+  "version": "1.0.1",
  "license": "Apache-2.0",
  "main": "dist/src/server.js",
  "scripts": {
@ -30,15 +30,15 @@
    "@types/express": "^4.17.0",
    "@types/jest": "^24.0.15",
    "@types/morgan": "^1.7.35",
-    "@types/node": "^12.0.12",
-    "@types/request": "^2.48.1",
+    "@types/node": "^12.6.6",
+    "@types/request": "^2.48.2",
    "@types/supertest": "^2.0.8",
    "jest": "^24.8.0",
    "nodemon": "^1.19.1",
    "supertest": "^4.0.2",
    "ts-jest": "^24.0.2",
    "ts-node": "^8.3.0",
-    "typescript": "3.5.2"
+    "typescript": "3.5.3"
  },
  "repository": {
    "type": "git",