From d1734b8d7cc6cc96b133f3638783b153026b8618 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.b.huang@gmail.com>
Date: Fri, 27 Jul 2018 14:10:18 -0700
Subject: [PATCH 01/13] Update Phishing Html

---
 app/phishing.html | 49 +++++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 23 deletions(-)
diff --git a/app/phishing.html b/app/phishing.html
index 86f2985cc..e20c9ac9c 100644
--- a/app/phishing.html
+++ b/app/phishing.html
@@ -3,26 +3,29 @@
 <html>
 
   <head>
-    <title>Phishing Warning</title>
+    <title>Dangerous Website Warning</title>
 
     <style>
-body {
-  background: #c50000;
-  padding: 50px;
-  display: flex;
-  justify-content: center;
-  font-family: sans-serif;
-}
-.centered {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  color: white;
-  max-width: 600px;
-}
-a {
-  color: white;
-}
+      body {
+        background: #c50000;
+        padding: 50px;
+        display: flex;
+        justify-content: center;
+        font-family: sans-serif;
+      }
+
+      .centered {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        color: white;
+        max-width: 600px;
+      }
+
+      a {
+        color: white;
+      }
+
     </style>
 
     <script>
@@ -50,11 +53,11 @@ a {
 
       <img src="/images/ethereum-metamask-chrome.png" style="width:100%">
       <h3>ATTENTION</h3>
-      <p>MetaMask believes this domain to have malicious intent and has prevented you from interacting with it.</p>
-      <p>This is because the site tested positive on the <a href="https://github.com/metamask/eth-phishing-detect">Ethereum Phishing Detector</a>.</p>
-      <p>You can turn MetaMask off to interact with this site, but it's advised not to.</p>
-      <p>If you think this domain is incorrectly flagged, <a href="https://github.com/metamask/eth-phishing-detect/issues/new">please file an issue</a>.</p>
+      <p>MetaMask believes this domain could currently compromise your security and has prevented you from interacting with it.</p>
+      <p>This is because the site tested positive on the <a href="https://github.com/metamask/eth-phishing-detect">Ethereum Phishing Detector</a>. This includes outright malicious websites and legitimate websites that have been compromised by a malicious actor.</p>
+      <p>You can turn MetaMask off to interact with this site, but it is advised not to.</p>
+      <p>If you think this domain is incorrectly flagged or if a blocked legitimate website has resolved its security issues, <a href="https://github.com/metamask/eth-phishing-detect/issues/new">please file an issue</a>.</p>
 
     </div>
   </body>
-</html>
\ No newline at end of file
+</html>

From 0ff0a9c1976d726cb18379e3ac06a8677c928659 Mon Sep 17 00:00:00 2001
From: Dan Miller <danjm.com@gmail.com>
Date: Tue, 31 Jul 2018 16:02:29 -0230
Subject: [PATCH 02/13] Show the retry button on latest tx of earliest nonce.

---
 old-ui/app/components/transaction-list-item.js | 8 ++++----
 ui/app/components/tx-list-item.js              | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/old-ui/app/components/transaction-list-item.js b/old-ui/app/components/transaction-list-item.js
index f479ce666..015ef6ba6 100644
--- a/old-ui/app/components/transaction-list-item.js
+++ b/old-ui/app/components/transaction-list-item.js
@@ -36,7 +36,7 @@ TransactionListItem.prototype.showRetryButton = function () {
     return false
   }
 
-  let currentTxIsLatest = false
+  let currentTxSharesEarliestNonce = false
   const currentNonce = txParams.nonce
   const currentNonceTxs = transactions.filter(tx => tx.txParams.nonce === currentNonce)
   const currentNonceSubmittedTxs = currentNonceTxs.filter(tx => tx.status === 'submitted')
@@ -45,14 +45,14 @@ TransactionListItem.prototype.showRetryButton = function () {
   const currentTxIsLatestWithNonce = lastSubmittedTxWithCurrentNonce &&
     lastSubmittedTxWithCurrentNonce.id === transaction.id
   if (currentSubmittedTxs.length > 0) {
-    const lastTx = currentSubmittedTxs.reduce((tx1, tx2) => {
+    const earliestSubmitted = currentSubmittedTxs.reduce((tx1, tx2) => {
       if (tx1.submittedTime < tx2.submittedTime) return tx1
       return tx2
     })
-    currentTxIsLatest = lastTx.id === transaction.id
+    currentTxSharesEarliestNonce = currentNonce === earliestSubmitted.txParams.nonce
   }
 
-  return currentTxIsLatestWithNonce && Date.now() - submittedTime > 30000 && currentTxIsLatest
+  return currentTxSharesEarliestNonce && currentTxIsLatestWithNonce && Date.now() - submittedTime > 30000
 }
 
 TransactionListItem.prototype.render = function () {
diff --git a/ui/app/components/tx-list-item.js b/ui/app/components/tx-list-item.js
index 1a639d0b9..7513ba267 100644
--- a/ui/app/components/tx-list-item.js
+++ b/ui/app/components/tx-list-item.js
@@ -213,7 +213,7 @@ TxListItem.prototype.showRetryButton = function () {
   if (!txParams) {
     return false
   }
-  let currentTxIsLatest = false
+  let currentTxSharesEarliestNonce = false
   const currentNonce = txParams.nonce
   const currentNonceTxs = selectedAddressTxList.filter(tx => tx.txParams.nonce === currentNonce)
   const currentNonceSubmittedTxs = currentNonceTxs.filter(tx => tx.status === 'submitted')
@@ -222,14 +222,14 @@ TxListItem.prototype.showRetryButton = function () {
   const currentTxIsLatestWithNonce = lastSubmittedTxWithCurrentNonce &&
     lastSubmittedTxWithCurrentNonce.id === transactionId
   if (currentSubmittedTxs.length > 0) {
-    const lastTx = currentSubmittedTxs.reduce((tx1, tx2) => {
+    const earliestSubmitted = currentSubmittedTxs.reduce((tx1, tx2) => {
       if (tx1.submittedTime < tx2.submittedTime) return tx1
       return tx2
     })
-    currentTxIsLatest = lastTx.id === transactionId
+    currentTxSharesEarliestNonce = currentNonce === earliestSubmitted.txParams.nonce
   }
 
-  return currentTxIsLatestWithNonce && Date.now() - transactionSubmittedTime > 30000 && currentTxIsLatest
+  return currentTxSharesEarliestNonce && currentTxIsLatestWithNonce && Date.now() - transactionSubmittedTime > 30000
 }
 
 TxListItem.prototype.setSelectedToken = function (tokenAddress) {

From 6d76d4e228512e44e881cc91673de75e5e86798f Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@gmail.com>
Date: Fri, 3 Aug 2018 14:44:57 -0700
Subject: [PATCH 03/13] Disable Confirm button on subsequent clicks to prevent
 confirming multiple times

---
 .../confirm-page-container.component.js       |  6 +++---
 .../confirm-transaction-base.component.js     | 21 ++++++++++++++++---
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/ui/app/components/confirm-page-container/confirm-page-container.component.js b/ui/app/components/confirm-page-container/confirm-page-container.component.js
index 93e4ae7bf..24ff05353 100644
--- a/ui/app/components/confirm-page-container/confirm-page-container.component.js
+++ b/ui/app/components/confirm-page-container/confirm-page-container.component.js
@@ -43,7 +43,7 @@ export default class ConfirmPageContainer extends Component {
     // Footer
     onCancel: PropTypes.func,
     onSubmit: PropTypes.func,
-    valid: PropTypes.bool,
+    disabled: PropTypes.bool,
   }
 
   render () {
@@ -54,7 +54,7 @@ export default class ConfirmPageContainer extends Component {
       fromAddress,
       toName,
       toAddress,
-      valid,
+      disabled,
       errorKey,
       errorMessage,
       contentComponent,
@@ -110,7 +110,7 @@ export default class ConfirmPageContainer extends Component {
           onSubmit={() => onSubmit()}
           submitText={this.context.t('confirm')}
           submitButtonType="confirm"
-          disabled={!valid}
+          disabled={disabled}
         />
       </div>
     )
diff --git a/ui/app/components/pages/confirm-transaction-base/confirm-transaction-base.component.js b/ui/app/components/pages/confirm-transaction-base/confirm-transaction-base.component.js
index e1bf2210f..b170880b4 100644
--- a/ui/app/components/pages/confirm-transaction-base/confirm-transaction-base.component.js
+++ b/ui/app/components/pages/confirm-transaction-base/confirm-transaction-base.component.js
@@ -71,6 +71,10 @@ export default class ConfirmTransactionBase extends Component {
     warning: PropTypes.string,
   }
 
+  state = {
+    submitting: false,
+  }
+
   componentDidUpdate () {
     const {
       transactionStatus,
@@ -258,15 +262,25 @@ export default class ConfirmTransactionBase extends Component {
 
   handleSubmit () {
     const { sendTransaction, clearConfirmTransaction, txData, history, onSubmit } = this.props
+    const { submitting } = this.state
+
+    if (submitting) {
+      return
+    }
+
+    this.setState({ submitting: true })
 
     if (onSubmit) {
-      onSubmit(txData)
+      Promise.resolve(onSubmit(txData))
+        .then(this.setState({ submitting: false }))
     } else {
       sendTransaction(txData)
         .then(() => {
           clearConfirmTransaction()
+          this.setState({ submitting: false })
           history.push(DEFAULT_ROUTE)
         })
+        .catch(() => this.setState({ submitting: false }))
     }
   }
 
@@ -280,7 +294,7 @@ export default class ConfirmTransactionBase extends Component {
       methodData,
       ethTransactionAmount,
       fiatTransactionAmount,
-      valid: propsValid,
+      valid: propsValid = true,
       errorMessage,
       errorKey: propsErrorKey,
       currentCurrency,
@@ -295,6 +309,7 @@ export default class ConfirmTransactionBase extends Component {
       nonce,
       warning,
     } = this.props
+    const { submitting } = this.state
 
     const { name } = methodData
     const fiatConvertedAmount = formatCurrency(fiatTransactionAmount, currentCurrency)
@@ -320,7 +335,7 @@ export default class ConfirmTransactionBase extends Component {
         errorMessage={errorMessage}
         errorKey={propsErrorKey || errorKey}
         warning={warning}
-        valid={propsValid || valid}
+        disabled={!propsValid || !valid || submitting}
         onEdit={() => this.handleEdit()}
         onCancel={() => this.handleCancel()}
         onSubmit={() => this.handleSubmit()}

From 8e3f0b42024314b395b575840563297c35aa61ba Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@gmail.com>
Date: Fri, 3 Aug 2018 16:47:50 -0700
Subject: [PATCH 04/13] Update Font in Account Selector

---
 ui/app/components/dropdowns/components/dropdown.js | 1 -
 ui/app/components/dropdowns/network-dropdown.js    | 3 ---
 ui/app/css/itcss/components/network.scss           | 1 -
 3 files changed, 5 deletions(-)

diff --git a/ui/app/components/dropdowns/components/dropdown.js b/ui/app/components/dropdowns/components/dropdown.js
index 0336dbb8b..149f063a7 100644
--- a/ui/app/components/dropdowns/components/dropdown.js
+++ b/ui/app/components/dropdowns/components/dropdown.js
@@ -87,7 +87,6 @@ class DropdownMenuItem extends Component {
           padding: '8px 0px',
           fontSize: '18px',
           fontStyle: 'normal',
-          fontFamily: 'Montserrat Regular',
           cursor: 'pointer',
           display: 'flex',
           justifyContent: 'flex-start',
diff --git a/ui/app/components/dropdowns/network-dropdown.js b/ui/app/components/dropdowns/network-dropdown.js
index dcd6b4370..e5363ff56 100644
--- a/ui/app/components/dropdowns/network-dropdown.js
+++ b/ui/app/components/dropdowns/network-dropdown.js
@@ -71,7 +71,6 @@ NetworkDropdown.prototype.render = function () {
   const rpcList = props.frequentRpcList
   const isOpen = this.props.networkDropdownOpen
   const dropdownMenuItemStyle = {
-    fontFamily: 'DIN OT',
     fontSize: '16px',
     lineHeight: '20px',
     padding: '12px 0',
@@ -286,7 +285,6 @@ NetworkDropdown.prototype.renderCommonRpc = function (rpcList, provider) {
           closeMenu: () => this.props.hideNetworkDropdown(),
           onClick: () => props.setRpcTarget(rpc),
           style: {
-            fontFamily: 'DIN OT',
             fontSize: '16px',
             lineHeight: '20px',
             padding: '12px 0',
@@ -325,7 +323,6 @@ NetworkDropdown.prototype.renderCustomOption = function (provider) {
           onClick: () => props.setRpcTarget(rpcTarget),
           closeMenu: () => this.props.hideNetworkDropdown(),
           style: {
-            fontFamily: 'DIN OT',
             fontSize: '16px',
             lineHeight: '20px',
             padding: '12px 0',
diff --git a/ui/app/css/itcss/components/network.scss b/ui/app/css/itcss/components/network.scss
index 545a2a940..b23876d01 100644
--- a/ui/app/css/itcss/components/network.scss
+++ b/ui/app/css/itcss/components/network.scss
@@ -76,7 +76,6 @@
 }
 
 .network-name-item {
-  font-weight: 100;
   flex: 1;
   color: $dusty-gray;
   text-overflow: ellipsis;

From 74e2225f36fb8ab10f701eb4b86ad9dab1a83474 Mon Sep 17 00:00:00 2001
From: Dan Miller <danjm.com@gmail.com>
Date: Tue, 24 Jul 2018 14:54:13 -0230
Subject: [PATCH 05/13] Improve waits for new tx-list-items after first
 contract method call in e2e beta tests.

---
 test/e2e/beta/contract-test/contract.js |  5 +++++
 test/e2e/beta/contract-test/index.html  |  3 +++
 test/e2e/beta/metamask-beta-ui.spec.js  | 12 +++++++++---
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/test/e2e/beta/contract-test/contract.js b/test/e2e/beta/contract-test/contract.js
index 8af008dce..51891ea21 100644
--- a/test/e2e/beta/contract-test/contract.js
+++ b/test/e2e/beta/contract-test/contract.js
@@ -50,15 +50,20 @@ deployButton.addEventListener('click', async function (event) {
 
         console.log(`contract`, contract)
 
+        document.getElementById('contractStatus').innerHTML = 'Deployed'
+
         depositButton.addEventListener('click', function (event) {
+          document.getElementById('contractStatus').innerHTML = 'Deposit initiated'
           contract.deposit({ from: web3.eth.accounts[0], value: '0x3782dace9d900000' }, function (result) {
             console.log(result)
+            document.getElementById('contractStatus').innerHTML = 'Deposit completed'
           })
         })
 
         withdrawButton.addEventListener('click', function (event) {
           contract.withdraw('0xde0b6b3a7640000', { from: web3.eth.accounts[0] }, function (result) {
             console.log(result)
+            document.getElementById('contractStatus').innerHTML = 'Withdrawn'
           })
         })
       }
diff --git a/test/e2e/beta/contract-test/index.html b/test/e2e/beta/contract-test/index.html
index 0d63fd940..f6e6f44c7 100644
--- a/test/e2e/beta/contract-test/index.html
+++ b/test/e2e/beta/contract-test/index.html
@@ -10,6 +10,9 @@
       <button id="depositButton">Deposit</button>
       <button id="withdrawButton">Withdraw</button>
     </div>
+    <div id="contractStatus" style="display: flex; font-size: 1rem;">
+      Not yet deployed
+    </div>
   </div>
   <div style="display: flex; flex-flow: column;">
     <div style="display: flex; font-size: 1.25rem;">Send eth</div>
diff --git a/test/e2e/beta/metamask-beta-ui.spec.js b/test/e2e/beta/metamask-beta-ui.spec.js
index 98132e68c..f5bda4e68 100644
--- a/test/e2e/beta/metamask-beta-ui.spec.js
+++ b/test/e2e/beta/metamask-beta-ui.spec.js
@@ -516,7 +516,7 @@ describe('MetaMask', function () {
 
     it('displays the contract creation data', async () => {
       const dataTab = await findElement(driver, By.xpath(`//li[contains(text(), 'Data')]`))
-      dataTab.click()
+      await dataTab.click()
       await delay(regularDelayMs)
 
       await findElement(driver, By.xpath(`//div[contains(text(), '127.0.0.1')]`))
@@ -526,7 +526,7 @@ describe('MetaMask', function () {
       assert.equal(confirmDataText.match(/0x608060405234801561001057600080fd5b5033600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff/))
 
       const detailsTab = await findElement(driver, By.xpath(`//li[contains(text(), 'Details')]`))
-      detailsTab.click()
+      await detailsTab.click()
       await delay(regularDelayMs)
     })
 
@@ -547,9 +547,15 @@ describe('MetaMask', function () {
       await driver.switchTo().window(dapp)
       await delay(regularDelayMs)
 
+      let contractStatus = await driver.findElement(By.css('#contractStatus'))
+      await driver.wait(until.elementTextMatches(contractStatus, /Deployed/))
+
       const depositButton = await findElement(driver, By.css('#depositButton'))
       await depositButton.click()
-      await delay(regularDelayMs)
+      await delay(largeDelayMs)
+
+      contractStatus = await driver.findElement(By.css('#contractStatus'))
+      await driver.wait(until.elementTextMatches(contractStatus, /Deposit\sinitiated/))
 
       await driver.switchTo().window(extension)
       await delay(largeDelayMs)

From aff66f4b07156d9b69994fd404fe210a3af102bc Mon Sep 17 00:00:00 2001
From: Dan Miller <danjm.com@gmail.com>
Date: Mon, 6 Aug 2018 11:01:52 -0230
Subject: [PATCH 06/13] Use unmodified constant for test delay in
 from-import-beta-spec.

---
 test/e2e/beta/from-import-beta-ui.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/e2e/beta/from-import-beta-ui.spec.js b/test/e2e/beta/from-import-beta-ui.spec.js
index 06e669e5b..5582d4697 100644
--- a/test/e2e/beta/from-import-beta-ui.spec.js
+++ b/test/e2e/beta/from-import-beta-ui.spec.js
@@ -232,7 +232,7 @@ describe('Using MetaMask with an existing account', function () {
 
       const [localhost] = await findElements(driver, By.xpath(`//span[contains(text(), 'Localhost')]`))
       await localhost.click()
-      await delay(largeDelayMs * 2)
+      await delay(largeDelayMs)
     })
 
     it('choose Create Account from the account menu', async () => {

From 7de2a0687dfdd7e36c8653f31e6e84f12396bf13 Mon Sep 17 00:00:00 2001
From: Dan Miller <danjm.com@gmail.com>
Date: Mon, 6 Aug 2018 11:41:40 -0230
Subject: [PATCH 07/13] Fix seed word confirmation step of e2e beta tests.

---
 .../src/app/first-time/confirm-seed-screen.js |  1 +
 test/e2e/beta/metamask-beta-ui.spec.js        | 88 ++++++-------------
 2 files changed, 29 insertions(+), 60 deletions(-)

diff --git a/mascara/src/app/first-time/confirm-seed-screen.js b/mascara/src/app/first-time/confirm-seed-screen.js
index 7c0431431..dfbaffe33 100644
--- a/mascara/src/app/first-time/confirm-seed-screen.js
+++ b/mascara/src/app/first-time/confirm-seed-screen.js
@@ -106,6 +106,7 @@ class ConfirmSeedScreen extends Component {
                               key={i}
                               className={classnames('backup-phrase__confirm-seed-option', {
                                 'backup-phrase__confirm-seed-option--selected': isSelected,
+                                'backup-phrase__confirm-seed-option--unselected': !isSelected,
                               })}
                               onClick={() => {
                                 if (!isSelected) {
diff --git a/test/e2e/beta/metamask-beta-ui.spec.js b/test/e2e/beta/metamask-beta-ui.spec.js
index f5bda4e68..3ad5c2d61 100644
--- a/test/e2e/beta/metamask-beta-ui.spec.js
+++ b/test/e2e/beta/metamask-beta-ui.spec.js
@@ -195,7 +195,16 @@ describe('MetaMask', function () {
       await delay(regularDelayMs)
     })
 
-    async function retypeSeedPhrase (words, wasReloaded) {
+    async function clickWordAndWait (word) {
+      const xpathClass = 'backup-phrase__confirm-seed-option backup-phrase__confirm-seed-option--unselected'
+      const xpath = `//button[@class='${xpathClass}' and contains(text(), '${word}')]`
+      const word0 = await findElement(driver, By.xpath(xpath), 10000)
+
+      await word0.click()
+      await delay(tinyDelayMs)
+    }
+
+    async function retypeSeedPhrase (words, wasReloaded, count = 0) {
       try {
         if (wasReloaded) {
           const byRevealButton = By.css('.backup-phrase__secret-blocker .backup-phrase__reveal-button')
@@ -209,67 +218,26 @@ describe('MetaMask', function () {
           await delay(regularDelayMs)
         }
 
-        const word0 = await findElement(driver, By.xpath(`//button[contains(text(), '${words[0]}')]`), 10000)
-
-        await word0.click()
-        await delay(tinyDelayMs)
-
-        const word1 = await findElement(driver, By.xpath(`//button[contains(text(), '${words[1]}')]`), 10000)
-
-        await word1.click()
-        await delay(tinyDelayMs)
-
-        const word2 = await findElement(driver, By.xpath(`//button[contains(text(), '${words[2]}')]`), 10000)
-
-        await word2.click()
-        await delay(tinyDelayMs)
-
-        const word3 = await findElement(driver, By.xpath(`//button[contains(text(), '${words[3]}')]`), 10000)
-
-        await word3.click()
-        await delay(tinyDelayMs)
-
-        const word4 = await findElement(driver, By.xpath(`//button[contains(text(), '${words[4]}')]`), 10000)
-
-        await word4.click()
-        await delay(tinyDelayMs)
-
-        const word5 = await findElement(driver, By.xpath(`//button[contains(text(), '${words[5]}')]`), 10000)
+        await clickWordAndWait(words[0])
+        await clickWordAndWait(words[1])
+        await clickWordAndWait(words[2])
+        await clickWordAndWait(words[3])
+        await clickWordAndWait(words[4])
+        await clickWordAndWait(words[5])
+        await clickWordAndWait(words[6])
+        await clickWordAndWait(words[7])
+        await clickWordAndWait(words[8])
+        await clickWordAndWait(words[9])
+        await clickWordAndWait(words[10])
+        await clickWordAndWait(words[11])
 
-        await word5.click()
-        await delay(tinyDelayMs)
-
-        const word6 = await findElement(driver, By.xpath(`//button[contains(text(), '${words[6]}')]`), 10000)
-
-        await word6.click()
-        await delay(tinyDelayMs)
-
-        const word7 = await findElement(driver, By.xpath(`//button[contains(text(), '${words[7]}')]`), 10000)
-
-        await word7.click()
-        await delay(tinyDelayMs)
-
-        const word8 = await findElement(driver, By.xpath(`//button[contains(text(), '${words[8]}')]`), 10000)
-
-        await word8.click()
-        await delay(tinyDelayMs)
-
-        const word9 = await findElement(driver, By.xpath(`//button[contains(text(), '${words[9]}')]`), 10000)
-
-        await word9.click()
-        await delay(tinyDelayMs)
-
-        const word10 = await findElement(driver, By.xpath(`//button[contains(text(), '${words[10]}')]`), 10000)
-
-        await word10.click()
-        await delay(tinyDelayMs)
-
-        const word11 = await findElement(driver, By.xpath(`//button[contains(text(), '${words[11]}')]`), 10000)
-        await word11.click()
-        await delay(tinyDelayMs)
       } catch (e) {
-        await loadExtension(driver, extensionId)
-        await retypeSeedPhrase(words, true)
+        if (count > 2) {
+          throw e
+        } else {
+          await loadExtension(driver, extensionId)
+          await retypeSeedPhrase(words, true, count + 1)
+        }
       }
     }
 

From c3ed8e56ab4e127dd96907edbd6c281369ef2258 Mon Sep 17 00:00:00 2001
From: Whymarrh Whitby <whymarrh.whitby@gmail.com>
Date: Mon, 6 Aug 2018 12:18:02 -0230
Subject: [PATCH 08/13] Refresh package-lock.json file with npm@6.3.0

---
 package-lock.json | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 074e90cce..1a2897a9e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8397,13 +8397,12 @@
                     "resolved": "https://registry.npmjs.org/eth-sig-util/-/eth-sig-util-2.0.1.tgz",
                     "integrity": "sha512-lxHZOQspexk3DaGj4RBbWy4C/qNOWRnxpaJzNnYD3WEmC8shcJ4tHs7Xv878rzvILfJnSFSCCiKQhng1m80oBQ==",
                     "requires": {
-                        "ethereumjs-abi": "git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7",
                         "ethereumjs-util": "^5.1.1"
                     },
                     "dependencies": {
                         "ethereumjs-abi": {
                             "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7",
-                            "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git",
+                            "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7",
                             "requires": {
                                 "bn.js": "^4.10.0",
                                 "ethereumjs-util": "^5.0.0"
@@ -8728,14 +8727,12 @@
                     "integrity": "sha512-lxHZOQspexk3DaGj4RBbWy4C/qNOWRnxpaJzNnYD3WEmC8shcJ4tHs7Xv878rzvILfJnSFSCCiKQhng1m80oBQ==",
                     "dev": true,
                     "requires": {
-                        "ethereumjs-abi": "git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7",
                         "ethereumjs-util": "^5.1.1"
                     },
                     "dependencies": {
                         "ethereumjs-abi": {
                             "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7",
-                            "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git",
-                            "dev": true,
+                            "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7",
                             "requires": {
                                 "bn.js": "^4.10.0",
                                 "ethereumjs-util": "^5.0.0"
@@ -8747,7 +8744,6 @@
                     "version": "5.2.0",
                     "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz",
                     "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==",
-                    "dev": true,
                     "requires": {
                         "bn.js": "^4.11.0",
                         "create-hash": "^1.1.2",
@@ -30695,7 +30691,6 @@
             "version": "3.1.5",
             "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
             "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-            "dev": true,
             "requires": {
                 "is-typedarray": "^1.0.0"
             }
@@ -31719,7 +31714,6 @@
             "resolved": "https://registry.npmjs.org/web3/-/web3-0.20.3.tgz",
             "integrity": "sha1-yqRDc9yIFayHZ73ba6cwc5ZMqos=",
             "requires": {
-                "bignumber.js": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934",
                 "crypto-js": "^3.1.4",
                 "utf8": "^2.1.1",
                 "xhr2": "*",
@@ -31728,7 +31722,7 @@
             "dependencies": {
                 "bignumber.js": {
                     "version": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934",
-                    "from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git"
+                    "from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934"
                 }
             }
         },
@@ -32227,8 +32221,7 @@
             "dev": true,
             "requires": {
                 "underscore": "1.8.3",
-                "web3-core-helpers": "1.0.0-beta.34",
-                "websocket": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2"
+                "web3-core-helpers": "1.0.0-beta.34"
             },
             "dependencies": {
                 "underscore": {
@@ -32239,8 +32232,7 @@
                 },
                 "websocket": {
                     "version": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2",
-                    "from": "git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible",
-                    "dev": true,
+                    "from": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2",
                     "requires": {
                         "debug": "^2.2.0",
                         "nan": "^2.3.3",
@@ -33596,8 +33588,7 @@
         "yaeti": {
             "version": "0.0.6",
             "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz",
-            "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc=",
-            "dev": true
+            "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc="
         },
         "yallist": {
             "version": "2.1.2",

From 61322383024a6e5b198d9f1dab46a10cb7814c38 Mon Sep 17 00:00:00 2001
From: Whymarrh Whitby <whymarrh.whitby@gmail.com>
Date: Mon, 6 Aug 2018 12:53:52 -0230
Subject: [PATCH 09/13] Remove superstatic package

Install and uninstalling superstatic doesn't work on Node 8 at the time of
writing:

    $ npm install -D superstatic@6
    npm ERR! code ENOTSUP
    npm ERR! notsup Unsupported engine for got@5.7.1: wanted: {"node":">=0.10.0 <7"} (current: {"node":"8.11.3","npm":"6.3.0"})
    npm ERR! notsup Not compatible with your version of node/npm: got@5.7.1
    npm ERR! notsup Not compatible with your version of node/npm: got@5.7.1
    npm ERR! notsup Required: {"node":">=0.10.0 <7"}
    npm ERR! notsup Actual:   {"npm":"6.3.0","node":"8.11.3"}

This commit removes the package (using Node 6!) and it will have to be replaced.
---
 package-lock.json | 549 +++-------------------------------------------
 package.json      |   1 -
 2 files changed, 26 insertions(+), 524 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1a2897a9e..72ff88526 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1986,14 +1986,6 @@
                 }
             }
         },
-        "ansi-align": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-1.1.0.tgz",
-            "integrity": "sha1-LwwWWIKXOa3V67FeawxuNCPwFro=",
-            "requires": {
-                "string-width": "^1.0.1"
-            }
-        },
         "ansi-colors": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.0.1.tgz",
@@ -2318,11 +2310,6 @@
             "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
             "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
         },
-        "as-array": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/as-array/-/as-array-2.0.0.tgz",
-            "integrity": "sha1-TwSAXYf4/OjlEbwhCPjl46KH1Uc="
-        },
         "asap": {
             "version": "2.0.6",
             "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
@@ -3970,19 +3957,6 @@
             "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=",
             "dev": true
         },
-        "basic-auth": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.0.tgz",
-            "integrity": "sha1-AV2z81PgLlY3d1X5YnQuiYHnu7o=",
-            "requires": {
-                "safe-buffer": "5.1.1"
-            }
-        },
-        "basic-auth-connect": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz",
-            "integrity": "sha1-/bC0OWLKe0BFanwrtI/hc9otISI="
-        },
         "bcrypt-pbkdf": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
@@ -4251,29 +4225,6 @@
             "integrity": "sha512-/gp96UlcFw5DbV2KQPCqTqi0Mb9gZRyDAHiDsGEH+4B/KOQjeoE5lM1PxlVX8DQDvfEfitmC1rW2Oy8fk/XBDg==",
             "dev": true
         },
-        "boxen": {
-            "version": "0.6.0",
-            "resolved": "https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz",
-            "integrity": "sha1-g2TUJIrDT/DvGy8r9JpsYM4NgbY=",
-            "requires": {
-                "ansi-align": "^1.1.0",
-                "camelcase": "^2.1.0",
-                "chalk": "^1.1.1",
-                "cli-boxes": "^1.0.0",
-                "filled-array": "^1.0.0",
-                "object-assign": "^4.0.1",
-                "repeating": "^2.0.0",
-                "string-width": "^1.0.1",
-                "widest-line": "^1.0.0"
-            },
-            "dependencies": {
-                "camelcase": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-                    "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8="
-                }
-            }
-        },
         "brace-expansion": {
             "version": "1.1.8",
             "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
@@ -5010,7 +4961,8 @@
         "capture-stack-trace": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz",
-            "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0="
+            "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0=",
+            "dev": true
         },
         "case-sensitive-paths-webpack-plugin": {
             "version": "2.1.2",
@@ -5084,11 +5036,6 @@
             "resolved": "https://registry.npmjs.org/change-emitter/-/change-emitter-0.1.6.tgz",
             "integrity": "sha1-6LL+PX8at9aaMhma/5HqaTFAlRU="
         },
-        "char-spinner": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/char-spinner/-/char-spinner-1.0.1.tgz",
-            "integrity": "sha1-5upnvSR+EHESmDt6sEee02KAAIE="
-        },
         "character-entities": {
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.1.tgz",
@@ -5312,11 +5259,6 @@
                 "glob": "^7.1.1"
             }
         },
-        "cli-boxes": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz",
-            "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM="
-        },
         "cli-cursor": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
@@ -5810,14 +5752,6 @@
                 }
             }
         },
-        "compare-semver": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/compare-semver/-/compare-semver-1.1.0.tgz",
-            "integrity": "sha1-fAp5onu4C2xplERfgpWCWdPQIVM=",
-            "requires": {
-                "semver": "^5.0.1"
-            }
-        },
         "component-bind": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
@@ -5839,6 +5773,7 @@
             "version": "2.0.12",
             "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.12.tgz",
             "integrity": "sha1-xZpcmdt2dn6YdlAOJx72OzSTvWY=",
+            "dev": true,
             "requires": {
                 "mime-db": ">= 1.30.0 < 2"
             }
@@ -5847,6 +5782,7 @@
             "version": "1.7.1",
             "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.1.tgz",
             "integrity": "sha1-7/JgPvwuIs+G810uuTWJ+YdTc9s=",
+            "dev": true,
             "requires": {
                 "accepts": "~1.3.4",
                 "bytes": "3.0.0",
@@ -5882,26 +5818,11 @@
                 "proto-list": "~1.2.1"
             }
         },
-        "configstore": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz",
-            "integrity": "sha1-c3o6cDbpiGECqmCZ5HuzOrGroaE=",
-            "requires": {
-                "dot-prop": "^3.0.0",
-                "graceful-fs": "^4.1.2",
-                "mkdirp": "^0.5.0",
-                "object-assign": "^4.0.1",
-                "os-tmpdir": "^1.0.0",
-                "osenv": "^0.1.0",
-                "uuid": "^2.0.1",
-                "write-file-atomic": "^1.1.2",
-                "xdg-basedir": "^2.0.0"
-            }
-        },
         "connect": {
             "version": "3.6.6",
             "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz",
             "integrity": "sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=",
+            "dev": true,
             "requires": {
                 "debug": "2.6.9",
                 "finalhandler": "1.1.0",
@@ -5909,21 +5830,6 @@
                 "utils-merge": "1.0.1"
             }
         },
-        "connect-query": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/connect-query/-/connect-query-1.0.0.tgz",
-            "integrity": "sha1-3kT1dyCdokBNH8BGktGkEY5YIRk=",
-            "requires": {
-                "qs": "~6.4.0"
-            },
-            "dependencies": {
-                "qs": {
-                    "version": "6.4.0",
-                    "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-                    "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM="
-                }
-            }
-        },
         "console-browserify": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
@@ -6085,6 +5991,7 @@
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
             "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
+            "dev": true,
             "requires": {
                 "capture-stack-trace": "^1.0.0"
             }
@@ -7476,14 +7383,6 @@
             "integrity": "sha1-9k0h7b5v8xFJlfEGGmGpNcMAIEs=",
             "dev": true
         },
-        "dot-prop": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz",
-            "integrity": "sha1-G3CK8JSknJoOfbyteQq6U52sEXc=",
-            "requires": {
-                "is-obj": "^1.0.0"
-            }
-        },
         "dotenv": {
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-5.0.1.tgz",
@@ -10399,14 +10298,6 @@
             "integrity": "sha512-h2avnhux4p3tXTA9xR7ntnQSFQdY4hAkyNj8wDXlVT2Die38JxVCInnrieuktdxzRevRWa3dBjN+SbQe1os0GQ==",
             "dev": true
         },
-        "fast-url-parser": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/fast-url-parser/-/fast-url-parser-1.1.3.tgz",
-            "integrity": "sha1-9K8+qfNNiicc9YrSs3WfQx8LMY0=",
-            "requires": {
-                "punycode": "^1.3.2"
-            }
-        },
         "fastparse": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz",
@@ -10580,11 +10471,6 @@
                 "repeat-string": "^1.5.2"
             }
         },
-        "filled-array": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz",
-            "integrity": "sha1-w8T2xmO5I0WamqKZEtLQMfFQf4Q="
-        },
         "finalhandler": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
@@ -10999,49 +10885,6 @@
             "resolved": "https://registry.npmjs.org/flat/-/flat-1.0.0.tgz",
             "integrity": "sha1-Ad/dW8vBScZrNe1AHh11PxqtjVk="
         },
-        "flat-arguments": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/flat-arguments/-/flat-arguments-1.0.2.tgz",
-            "integrity": "sha1-m6p4Ct8FAfKC1ybJxqA426ROp28=",
-            "requires": {
-                "array-flatten": "^1.0.0",
-                "as-array": "^1.0.0",
-                "lodash.isarguments": "^3.0.0",
-                "lodash.isobject": "^3.0.0"
-            },
-            "dependencies": {
-                "as-array": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/as-array/-/as-array-1.0.0.tgz",
-                    "integrity": "sha1-KKbu6qVynx9OyiBH316d4avaDtE=",
-                    "requires": {
-                        "lodash.isarguments": "2.4.x",
-                        "lodash.isobject": "^2.4.1",
-                        "lodash.values": "^2.4.1"
-                    },
-                    "dependencies": {
-                        "lodash.isarguments": {
-                            "version": "2.4.1",
-                            "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-2.4.1.tgz",
-                            "integrity": "sha1-STGpwIJTrfCRrnyhkiWKlzh27Mo="
-                        },
-                        "lodash.isobject": {
-                            "version": "2.4.1",
-                            "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
-                            "integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=",
-                            "requires": {
-                                "lodash._objecttypes": "~2.4.1"
-                            }
-                        }
-                    }
-                },
-                "lodash.isobject": {
-                    "version": "3.0.2",
-                    "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
-                    "integrity": "sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0="
-                }
-            }
-        },
         "flat-cache": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz",
@@ -12752,21 +12595,6 @@
                 "is-glob": "^2.0.0"
             }
         },
-        "glob-slash": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/glob-slash/-/glob-slash-1.0.0.tgz",
-            "integrity": "sha1-/lLvpDMjP3Si/mTHq7m8hIICq5U="
-        },
-        "glob-slasher": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/glob-slasher/-/glob-slasher-1.0.1.tgz",
-            "integrity": "sha1-dHoOW7IiZC7hDT4FRD4QlJPLD44=",
-            "requires": {
-                "glob-slash": "^1.0.0",
-                "lodash.isobject": "^2.4.1",
-                "toxic": "^1.0.0"
-            }
-        },
         "glob-stream": {
             "version": "6.1.0",
             "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
@@ -12914,56 +12742,6 @@
                 "sparkles": "^1.0.0"
             }
         },
-        "got": {
-            "version": "5.7.1",
-            "resolved": "https://registry.npmjs.org/got/-/got-5.7.1.tgz",
-            "integrity": "sha1-X4FjWmHkplifGAVp6k44FoClHzU=",
-            "requires": {
-                "create-error-class": "^3.0.1",
-                "duplexer2": "^0.1.4",
-                "is-redirect": "^1.0.0",
-                "is-retry-allowed": "^1.0.0",
-                "is-stream": "^1.0.0",
-                "lowercase-keys": "^1.0.0",
-                "node-status-codes": "^1.0.0",
-                "object-assign": "^4.0.1",
-                "parse-json": "^2.1.0",
-                "pinkie-promise": "^2.0.0",
-                "read-all-stream": "^3.0.0",
-                "readable-stream": "^2.0.5",
-                "timed-out": "^3.0.0",
-                "unzip-response": "^1.0.2",
-                "url-parse-lax": "^1.0.0"
-            },
-            "dependencies": {
-                "duplexer2": {
-                    "version": "0.1.4",
-                    "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
-                    "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
-                    "requires": {
-                        "readable-stream": "^2.0.2"
-                    }
-                },
-                "prepend-http": {
-                    "version": "1.0.4",
-                    "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
-                    "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw="
-                },
-                "timed-out": {
-                    "version": "3.1.3",
-                    "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz",
-                    "integrity": "sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc="
-                },
-                "url-parse-lax": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
-                    "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
-                    "requires": {
-                        "prepend-http": "^1.0.1"
-                    }
-                }
-            }
-        },
         "graceful-fs": {
             "version": "4.1.11",
             "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
@@ -14625,11 +14403,6 @@
             "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.3.1.tgz",
             "integrity": "sha1-ND24TGAYxlB3iJgkATWhQg7iLOA="
         },
-        "home-dir": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/home-dir/-/home-dir-1.0.0.tgz",
-            "integrity": "sha1-KRfrRL3JByztqUJXlUOEfjAX/k4="
-        },
         "home-or-tmp": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
@@ -15888,11 +15661,6 @@
             "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
             "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI="
         },
-        "is-npm": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz",
-            "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ="
-        },
         "is-number": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
@@ -15999,7 +15767,8 @@
         "is-redirect": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
-            "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ="
+            "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
+            "dev": true
         },
         "is-regex": {
             "version": "1.0.4",
@@ -16030,7 +15799,8 @@
         "is-retry-allowed": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
-            "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ="
+            "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
+            "dev": true
         },
         "is-root": {
             "version": "1.0.0",
@@ -16105,11 +15875,6 @@
                 "unc-path-regex": "^0.1.2"
             }
         },
-        "is-url": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
-            "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww=="
-        },
         "is-utf8": {
             "version": "0.2.1",
             "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
@@ -16329,16 +16094,6 @@
                 "raphael": "^2.2.0"
             }
         },
-        "join-path": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/join-path/-/join-path-1.1.1.tgz",
-            "integrity": "sha1-EFNaEm0ky9Zff/zfFe8uYxB2tQU=",
-            "requires": {
-                "as-array": "^2.0.0",
-                "url-join": "0.0.1",
-                "valid-url": "^1"
-            }
-        },
         "js-base64": {
             "version": "2.4.3",
             "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.3.tgz",
@@ -17716,19 +17471,6 @@
                 "es6-weak-map": "^2.0.1"
             }
         },
-        "latest-version": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz",
-            "integrity": "sha1-VvjWE5YghHuAF/jx9NeOIRMkFos=",
-            "requires": {
-                "package-json": "^2.0.0"
-            }
-        },
-        "lazy-req": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/lazy-req/-/lazy-req-1.1.0.tgz",
-            "integrity": "sha1-va6+rTD42CQDnODOFJ1Nqge6H6w="
-        },
         "lazystream": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
@@ -18394,16 +18136,6 @@
             "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
             "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw="
         },
-        "lodash._isnative": {
-            "version": "2.4.1",
-            "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz",
-            "integrity": "sha1-PqZAS3hKe+g2x7V1gOHN95sUgyw="
-        },
-        "lodash._objecttypes": {
-            "version": "2.4.1",
-            "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
-            "integrity": "sha1-fAt/admKH3ZSn4kLDNsbTf7BHBE="
-        },
         "lodash._reescape": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
@@ -18424,14 +18156,6 @@
             "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
             "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI="
         },
-        "lodash._shimkeys": {
-            "version": "2.4.1",
-            "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz",
-            "integrity": "sha1-bpzJZm/wgfC1psl4uD4kLmlJ0gM=",
-            "requires": {
-                "lodash._objecttypes": "~2.4.1"
-            }
-        },
         "lodash.assign": {
             "version": "4.2.0",
             "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
@@ -18521,14 +18245,6 @@
             "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
             "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U="
         },
-        "lodash.isobject": {
-            "version": "2.4.1",
-            "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
-            "integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=",
-            "requires": {
-                "lodash._objecttypes": "~2.4.1"
-            }
-        },
         "lodash.isplainobject": {
             "version": "4.0.6",
             "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
@@ -18630,26 +18346,6 @@
             "resolved": "https://registry.npmjs.org/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz",
             "integrity": "sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI="
         },
-        "lodash.values": {
-            "version": "2.4.1",
-            "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz",
-            "integrity": "sha1-q/UUQ2s8twUAFieXjLzzCxKA7qQ=",
-            "requires": {
-                "lodash.keys": "~2.4.1"
-            },
-            "dependencies": {
-                "lodash.keys": {
-                    "version": "2.4.1",
-                    "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-                    "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-                    "requires": {
-                        "lodash._isnative": "~2.4.1",
-                        "lodash._shimkeys": "~2.4.1",
-                        "lodash.isobject": "~2.4.1"
-                    }
-                }
-            }
-        },
         "log-driver": {
             "version": "1.2.5",
             "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.5.tgz",
@@ -18948,7 +18644,8 @@
         "lowercase-keys": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-            "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="
+            "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+            "dev": true
         },
         "lru-cache": {
             "version": "4.1.1",
@@ -20163,18 +19860,6 @@
             "integrity": "sha512-shJkRTSebXvsVqk56I+lkb2latjBs8I+pc2TzWc545y2iFnSjm7Wg0QMh+ZWcdSLQyGEau5jI8ocnmkyTgr9YQ==",
             "dev": true
         },
-        "morgan": {
-            "version": "1.9.0",
-            "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.9.0.tgz",
-            "integrity": "sha1-0B+mxlhZt2/PMbPLU6OCGjEdgFE=",
-            "requires": {
-                "basic-auth": "~2.0.0",
-                "debug": "2.6.9",
-                "depd": "~1.1.1",
-                "on-finished": "~2.3.0",
-                "on-headers": "~1.0.1"
-            }
-        },
         "mout": {
             "version": "0.11.1",
             "resolved": "https://registry.npmjs.org/mout/-/mout-0.11.1.tgz",
@@ -20377,29 +20062,6 @@
                 }
             }
         },
-        "nash": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/nash/-/nash-2.0.4.tgz",
-            "integrity": "sha1-y5ZHkc79N21Zz6zYAQknRhaqFdI=",
-            "requires": {
-                "async": "^1.3.0",
-                "flat-arguments": "^1.0.0",
-                "lodash": "^3.10.0",
-                "minimist": "^1.1.0"
-            },
-            "dependencies": {
-                "async": {
-                    "version": "1.5.2",
-                    "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-                    "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
-                },
-                "lodash": {
-                    "version": "3.10.1",
-                    "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
-                    "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y="
-                }
-            }
-        },
         "natural-compare": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -20713,7 +20375,8 @@
         "node-status-codes": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz",
-            "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8="
+            "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8=",
+            "dev": true
         },
         "node-uuid": {
             "version": "1.4.8",
@@ -22591,7 +22254,8 @@
         "on-headers": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz",
-            "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c="
+            "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=",
+            "dev": true
         },
         "once": {
             "version": "1.4.0",
@@ -22901,17 +22565,6 @@
                 "thunkify": "^2.1.2"
             }
         },
-        "package-json": {
-            "version": "2.4.0",
-            "resolved": "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz",
-            "integrity": "sha1-DRW9Z9HLvduyyiIv8u24a8sxqLs=",
-            "requires": {
-                "got": "^5.0.0",
-                "registry-auth-token": "^3.0.1",
-                "registry-url": "^3.0.3",
-                "semver": "^5.1.0"
-            }
-        },
         "pako": {
             "version": "1.0.6",
             "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz",
@@ -25665,6 +25318,7 @@
             "version": "1.2.8",
             "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
             "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+            "optional": true,
             "requires": {
                 "deep-extend": "^0.6.0",
                 "ini": "~1.3.0",
@@ -25675,7 +25329,8 @@
                 "deep-extend": {
                     "version": "0.6.0",
                     "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-                    "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
+                    "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+                    "optional": true
                 }
             }
         },
@@ -26248,6 +25903,7 @@
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
             "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=",
+            "dev": true,
             "requires": {
                 "pinkie-promise": "^2.0.0",
                 "readable-stream": "^2.0.0"
@@ -26580,23 +26236,6 @@
                 "regjsparser": "^0.1.4"
             }
         },
-        "registry-auth-token": {
-            "version": "3.3.2",
-            "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz",
-            "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==",
-            "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",
-            "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
-            "requires": {
-                "rc": "^1.0.1"
-            }
-        },
         "regjsgen": {
             "version": "0.2.0",
             "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
@@ -27125,27 +26764,6 @@
             "resolved": "https://registry.npmjs.org/rlp/-/rlp-2.0.0.tgz",
             "integrity": "sha1-nbOE/0uJqPYVY9kjldhiWxjzr7A="
         },
-        "router": {
-            "version": "1.3.2",
-            "resolved": "https://registry.npmjs.org/router/-/router-1.3.2.tgz",
-            "integrity": "sha1-v6oWiIpSg9XuQNmZ2nqfoVKWpgw=",
-            "requires": {
-                "array-flatten": "2.1.1",
-                "debug": "2.6.9",
-                "methods": "~1.1.2",
-                "parseurl": "~1.3.2",
-                "path-to-regexp": "0.1.7",
-                "setprototypeof": "1.1.0",
-                "utils-merge": "1.0.1"
-            },
-            "dependencies": {
-                "array-flatten": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz",
-                    "integrity": "sha1-Qmu52oQJDBg42BLIFQryCoMx4pY="
-                }
-            }
-        },
         "rst-selector-parser": {
             "version": "2.2.3",
             "resolved": "https://registry.npmjs.org/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz",
@@ -27156,11 +26774,6 @@
                 "nearley": "^2.7.10"
             }
         },
-        "rsvp": {
-            "version": "3.6.2",
-            "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
-            "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw=="
-        },
         "run-async": {
             "version": "2.3.0",
             "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
@@ -27553,14 +27166,6 @@
             "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
             "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
         },
-        "semver-diff": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz",
-            "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=",
-            "requires": {
-                "semver": "^5.0.3"
-            }
-        },
         "semver-greatest-satisfied-range": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz",
@@ -28010,7 +27615,8 @@
         "slide": {
             "version": "1.1.6",
             "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
-            "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc="
+            "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=",
+            "dev": true
         },
         "smart-buffer": {
             "version": "1.1.15",
@@ -28857,6 +28463,7 @@
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz",
             "integrity": "sha1-VpcPscOFWOnnC3KL894mmsRa36w=",
+            "dev": true,
             "requires": {
                 "strip-ansi": "^3.0.0"
             }
@@ -29562,63 +29169,6 @@
                 }
             }
         },
-        "superstatic": {
-            "version": "5.0.2",
-            "resolved": "https://registry.npmjs.org/superstatic/-/superstatic-5.0.2.tgz",
-            "integrity": "sha1-186TKe4w2qp2KwHUO1SNC3MGulQ=",
-            "requires": {
-                "as-array": "^2.0.0",
-                "async": "^1.5.2",
-                "basic-auth-connect": "^1.0.0",
-                "chalk": "^1.1.3",
-                "char-spinner": "^1.0.1",
-                "compare-semver": "^1.0.0",
-                "compression": "^1.7.0",
-                "connect": "^3.6.2",
-                "connect-query": "^1.0.0",
-                "destroy": "^1.0.4",
-                "fast-url-parser": "^1.1.3",
-                "fs-extra": "^0.30.0",
-                "glob": "^7.1.2",
-                "glob-slasher": "^1.0.1",
-                "home-dir": "^1.0.0",
-                "is-url": "^1.2.2",
-                "join-path": "^1.1.1",
-                "lodash": "^4.17.4",
-                "mime-types": "^2.1.16",
-                "minimatch": "^3.0.4",
-                "morgan": "^1.8.2",
-                "nash": "^2.0.4",
-                "on-finished": "^2.2.0",
-                "on-headers": "^1.0.0",
-                "path-to-regexp": "^1.7.0",
-                "router": "^1.3.1",
-                "rsvp": "^3.6.2",
-                "string-length": "^1.0.0",
-                "try-require": "^1.0.0",
-                "update-notifier": "^1.0.3"
-            },
-            "dependencies": {
-                "async": {
-                    "version": "1.5.2",
-                    "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-                    "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
-                },
-                "isarray": {
-                    "version": "0.0.1",
-                    "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-                    "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
-                },
-                "path-to-regexp": {
-                    "version": "1.7.0",
-                    "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz",
-                    "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=",
-                    "requires": {
-                        "isarray": "0.0.1"
-                    }
-                }
-            }
-        },
         "supports-color": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
@@ -30481,14 +30031,6 @@
                 "punycode": "^1.4.1"
             }
         },
-        "toxic": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/toxic/-/toxic-1.0.1.tgz",
-            "integrity": "sha512-WI3rIGdcaKULYg7KVoB0zcjikqvcYYvcuT6D89bFPz2rVR0Rl0PK6x8/X62rtdLtBKIE985NzVf/auTtGegIIg==",
-            "requires": {
-                "lodash": "^4.17.10"
-            }
-        },
         "tr46": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
@@ -30622,11 +30164,6 @@
                 }
             }
         },
-        "try-require": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/try-require/-/try-require-1.2.1.tgz",
-            "integrity": "sha1-NEiaLKwMCcHMEO2RugEVlNQzO+I="
-        },
         "tslib": {
             "version": "1.9.2",
             "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.2.tgz",
@@ -31144,7 +30681,8 @@
         "unzip-response": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz",
-            "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4="
+            "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=",
+            "dev": true
         },
         "upath": {
             "version": "1.0.4",
@@ -31152,21 +30690,6 @@
             "integrity": "sha512-d4SJySNBXDaQp+DPrziv3xGS6w3d2Xt69FijJr86zMPBy23JEloMCEOUBBzuN7xCtjLCnmB9tI/z7SBCahHBOw==",
             "dev": true
         },
-        "update-notifier": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.3.tgz",
-            "integrity": "sha1-j5LFFUgr1oMbfJMBPnD4dVLHz1o=",
-            "requires": {
-                "boxen": "^0.6.0",
-                "chalk": "^1.0.0",
-                "configstore": "^2.0.0",
-                "is-npm": "^1.0.0",
-                "latest-version": "^2.0.0",
-                "lazy-req": "^1.1.0",
-                "semver-diff": "^2.0.0",
-                "xdg-basedir": "^2.0.0"
-            }
-        },
         "upper-case": {
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
@@ -31209,11 +30732,6 @@
                 }
             }
         },
-        "url-join": {
-            "version": "0.0.1",
-            "resolved": "https://registry.npmjs.org/url-join/-/url-join-0.0.1.tgz",
-            "integrity": "sha1-HbSK1CLTQCRpqH99l73r/k+x48g="
-        },
         "url-loader": {
             "version": "0.6.2",
             "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.6.2.tgz",
@@ -33309,14 +32827,6 @@
                 "string-width": "^1.0.2"
             }
         },
-        "widest-line": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz",
-            "integrity": "sha1-DAnIXCqUaD0Nfq+O4JfVZL8OEFw=",
-            "requires": {
-                "string-width": "^1.0.1"
-            }
-        },
         "window-size": {
             "version": "0.2.0",
             "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz",
@@ -33442,6 +32952,7 @@
             "version": "1.3.4",
             "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz",
             "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=",
+            "dev": true,
             "requires": {
                 "graceful-fs": "^4.1.11",
                 "imurmurhash": "^0.1.4",
@@ -33475,14 +32986,6 @@
             "resolved": "https://registry.npmjs.org/x-is-string/-/x-is-string-0.1.0.tgz",
             "integrity": "sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI="
         },
-        "xdg-basedir": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz",
-            "integrity": "sha1-7byQPMOF/ARSPZZqM1UEtVBNG9I=",
-            "requires": {
-                "os-homedir": "^1.0.0"
-            }
-        },
         "xhr": {
             "version": "2.4.1",
             "resolved": "https://registry.npmjs.org/xhr/-/xhr-2.4.1.tgz",
diff --git a/package.json b/package.json
index 96b0829db..7953f7fda 100644
--- a/package.json
+++ b/package.json
@@ -198,7 +198,6 @@
     "semaphore": "^1.0.5",
     "semver": "^5.4.1",
     "shallow-copy": "0.0.1",
-    "superstatic": "^5.0.2",
     "sw-controller": "^1.0.3",
     "sw-stream": "^2.0.2",
     "textarea-caret": "^3.0.1",

From 29488b2c5338717d804d0ce8bd75093d6ad5dcb5 Mon Sep 17 00:00:00 2001
From: Whymarrh Whitby <whymarrh.whitby@gmail.com>
Date: Mon, 6 Aug 2018 13:38:41 -0230
Subject: [PATCH 10/13] Add static-server devDependency

---
 package-lock.json | 94 +++++++++++++++++++++++++++++++++++++++++++----
 package.json      |  1 +
 2 files changed, 88 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 72ff88526..19de0039f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8296,12 +8296,13 @@
                     "resolved": "https://registry.npmjs.org/eth-sig-util/-/eth-sig-util-2.0.1.tgz",
                     "integrity": "sha512-lxHZOQspexk3DaGj4RBbWy4C/qNOWRnxpaJzNnYD3WEmC8shcJ4tHs7Xv878rzvILfJnSFSCCiKQhng1m80oBQ==",
                     "requires": {
+                        "ethereumjs-abi": "git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7",
                         "ethereumjs-util": "^5.1.1"
                     },
                     "dependencies": {
                         "ethereumjs-abi": {
                             "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7",
-                            "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7",
+                            "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git",
                             "requires": {
                                 "bn.js": "^4.10.0",
                                 "ethereumjs-util": "^5.0.0"
@@ -8579,12 +8580,13 @@
             "resolved": "https://registry.npmjs.org/eth-sig-util/-/eth-sig-util-1.4.2.tgz",
             "integrity": "sha1-jZWCAsftuq6Dlwf7pvCf8ydgYhA=",
             "requires": {
+                "ethereumjs-abi": "git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7",
                 "ethereumjs-util": "^5.1.1"
             },
             "dependencies": {
                 "ethereumjs-abi": {
                     "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7",
-                    "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7",
+                    "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git",
                     "requires": {
                         "bn.js": "^4.10.0",
                         "ethereumjs-util": "^5.0.0"
@@ -8626,12 +8628,14 @@
                     "integrity": "sha512-lxHZOQspexk3DaGj4RBbWy4C/qNOWRnxpaJzNnYD3WEmC8shcJ4tHs7Xv878rzvILfJnSFSCCiKQhng1m80oBQ==",
                     "dev": true,
                     "requires": {
+                        "ethereumjs-abi": "git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7",
                         "ethereumjs-util": "^5.1.1"
                     },
                     "dependencies": {
                         "ethereumjs-abi": {
                             "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7",
-                            "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7",
+                            "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git",
+                            "dev": true,
                             "requires": {
                                 "bn.js": "^4.10.0",
                                 "ethereumjs-util": "^5.0.0"
@@ -8643,6 +8647,7 @@
                     "version": "5.2.0",
                     "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz",
                     "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==",
+                    "dev": true,
                     "requires": {
                         "bn.js": "^4.11.0",
                         "create-hash": "^1.1.2",
@@ -10388,6 +10393,12 @@
                 }
             }
         },
+        "file-size": {
+            "version": "0.0.5",
+            "resolved": "https://registry.npmjs.org/file-size/-/file-size-0.0.5.tgz",
+            "integrity": "sha1-BX1Dw6Ptc12j+Q1gUqs4Dx5tXjs=",
+            "dev": true
+        },
         "file-tree": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/file-tree/-/file-tree-1.0.0.tgz",
@@ -28263,6 +28274,70 @@
                 }
             }
         },
+        "static-server": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/static-server/-/static-server-2.2.1.tgz",
+            "integrity": "sha512-j5eeW6higxYNmXMIT8iHjsdiViTpQDthg7o+SHsRtqdbxscdHqBHXwrXjHC8hL3F0Tsu34ApUpDkwzMBPBsrLw==",
+            "dev": true,
+            "requires": {
+                "chalk": "^0.5.1",
+                "commander": "^2.3.0",
+                "file-size": "0.0.5",
+                "mime": "^1.2.11",
+                "opn": "^5.2.0"
+            },
+            "dependencies": {
+                "ansi-regex": {
+                    "version": "0.2.1",
+                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+                    "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=",
+                    "dev": true
+                },
+                "ansi-styles": {
+                    "version": "1.1.0",
+                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
+                    "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=",
+                    "dev": true
+                },
+                "chalk": {
+                    "version": "0.5.1",
+                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
+                    "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=",
+                    "dev": true,
+                    "requires": {
+                        "ansi-styles": "^1.1.0",
+                        "escape-string-regexp": "^1.0.0",
+                        "has-ansi": "^0.1.0",
+                        "strip-ansi": "^0.3.0",
+                        "supports-color": "^0.2.0"
+                    }
+                },
+                "has-ansi": {
+                    "version": "0.1.0",
+                    "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
+                    "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=",
+                    "dev": true,
+                    "requires": {
+                        "ansi-regex": "^0.2.0"
+                    }
+                },
+                "strip-ansi": {
+                    "version": "0.3.0",
+                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
+                    "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=",
+                    "dev": true,
+                    "requires": {
+                        "ansi-regex": "^0.2.1"
+                    }
+                },
+                "supports-color": {
+                    "version": "0.2.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
+                    "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=",
+                    "dev": true
+                }
+            }
+        },
         "statuses": {
             "version": "1.3.1",
             "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
@@ -30228,6 +30303,7 @@
             "version": "3.1.5",
             "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
             "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+            "dev": true,
             "requires": {
                 "is-typedarray": "^1.0.0"
             }
@@ -31232,6 +31308,7 @@
             "resolved": "https://registry.npmjs.org/web3/-/web3-0.20.3.tgz",
             "integrity": "sha1-yqRDc9yIFayHZ73ba6cwc5ZMqos=",
             "requires": {
+                "bignumber.js": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934",
                 "crypto-js": "^3.1.4",
                 "utf8": "^2.1.1",
                 "xhr2": "*",
@@ -31240,7 +31317,7 @@
             "dependencies": {
                 "bignumber.js": {
                     "version": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934",
-                    "from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934"
+                    "from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git"
                 }
             }
         },
@@ -31739,7 +31816,8 @@
             "dev": true,
             "requires": {
                 "underscore": "1.8.3",
-                "web3-core-helpers": "1.0.0-beta.34"
+                "web3-core-helpers": "1.0.0-beta.34",
+                "websocket": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2"
             },
             "dependencies": {
                 "underscore": {
@@ -31750,7 +31828,8 @@
                 },
                 "websocket": {
                     "version": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2",
-                    "from": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2",
+                    "from": "git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible",
+                    "dev": true,
                     "requires": {
                         "debug": "^2.2.0",
                         "nan": "^2.3.3",
@@ -33091,7 +33170,8 @@
         "yaeti": {
             "version": "0.0.6",
             "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz",
-            "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc="
+            "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc=",
+            "dev": true
         },
         "yallist": {
             "version": "2.1.2",
diff --git a/package.json b/package.json
index 7953f7fda..b011785f4 100644
--- a/package.json
+++ b/package.json
@@ -307,6 +307,7 @@
     "shell-parallel": "^1.0.3",
     "sinon": "^5.0.0",
     "source-map": "^0.7.2",
+    "static-server": "^2.2.1",
     "style-loader": "^0.21.0",
     "stylelint-config-standard": "^18.2.0",
     "tape": "^4.5.1",

From d1435fb883395115e2f7d7df3bcbb5ea8b873474 Mon Sep 17 00:00:00 2001
From: Whymarrh Whitby <whymarrh.whitby@gmail.com>
Date: Mon, 6 Aug 2018 13:40:02 -0230
Subject: [PATCH 11/13] Switch superstatic for static-server pkg

---
 test/e2e/beta/run-all.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/e2e/beta/run-all.sh b/test/e2e/beta/run-all.sh
index 493e1360a..7da61e504 100755
--- a/test/e2e/beta/run-all.sh
+++ b/test/e2e/beta/run-all.sh
@@ -6,5 +6,5 @@ set -o pipefail
 
 export PATH="$PATH:./node_modules/.bin"
 
-shell-parallel -s 'npm run ganache:start' -x 'sleep 5 && superstatic test/e2e/beta/contract-test/ --port 8080 --host 127.0.0.1' -x 'sleep 5 && mocha test/e2e/beta/metamask-beta-ui.spec'
-shell-parallel -s 'npm run ganache:start -- -d'  -x 'sleep 5 && superstatic test/e2e/beta/contract-test/ --port 8080 --host 127.0.0.1' -x 'sleep 5 && mocha test/e2e/beta/from-import-beta-ui.spec'
+shell-parallel -s 'npm run ganache:start' -x 'sleep 5 && static-server test/e2e/beta/contract-test/ --port 8080' -x 'sleep 5 && mocha test/e2e/beta/metamask-beta-ui.spec'
+shell-parallel -s 'npm run ganache:start -- -d'  -x 'sleep 5 && static-server test/e2e/beta/contract-test/ --port 8080' -x 'sleep 5 && mocha test/e2e/beta/from-import-beta-ui.spec'

From 46046c6915ba112d17f48aa5af8938616e4988fc Mon Sep 17 00:00:00 2001
From: Whymarrh Whitby <whymarrh.whitby@gmail.com>
Date: Mon, 6 Aug 2018 13:46:39 -0230
Subject: [PATCH 12/13] Update chromedriver pkg

---
 package-lock.json | 41 ++++++++++++++++++++++-------------------
 package.json      |  2 +-
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 19de0039f..0efe9b481 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5116,16 +5116,16 @@
             "dev": true
         },
         "chromedriver": {
-            "version": "2.36.0",
-            "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-2.36.0.tgz",
-            "integrity": "sha512-Lq2HrigCJ4RVdIdCmchenv1rVrejNSJ7EUCQojycQo12ww3FedQx4nb+GgTdqMhjbOMTqq5+ziaiZlrEN2z1gQ==",
+            "version": "2.41.0",
+            "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-2.41.0.tgz",
+            "integrity": "sha512-6O9HxvrSuHqmRlIgMzi0/05GsDNHqs8kaF5gNTIyaZNwRzb/RBUWH1xNNXKNxyhXSnGSalH8hWsKP5mc/npSQQ==",
             "dev": true,
             "requires": {
                 "del": "^3.0.0",
-                "extract-zip": "^1.6.5",
+                "extract-zip": "^1.6.7",
                 "kew": "^0.7.0",
                 "mkdirp": "^0.5.1",
-                "request": "^2.83.0"
+                "request": "^2.87.0"
             }
         },
         "cipher-base": {
@@ -9839,30 +9839,33 @@
             }
         },
         "extract-zip": {
-            "version": "1.6.6",
-            "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.6.tgz",
-            "integrity": "sha1-EpDt6NINCHK0Kf0/NRyhKOxe+Fw=",
+            "version": "1.6.7",
+            "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz",
+            "integrity": "sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=",
             "dev": true,
             "requires": {
-                "concat-stream": "1.6.0",
+                "concat-stream": "1.6.2",
                 "debug": "2.6.9",
-                "mkdirp": "0.5.0",
+                "mkdirp": "0.5.1",
                 "yauzl": "2.4.1"
             },
             "dependencies": {
-                "minimist": {
-                    "version": "0.0.8",
-                    "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-                    "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+                "buffer-from": {
+                    "version": "1.1.1",
+                    "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+                    "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
                     "dev": true
                 },
-                "mkdirp": {
-                    "version": "0.5.0",
-                    "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
-                    "integrity": "sha1-HXMHam35hs2TROFecfzAWkyavxI=",
+                "concat-stream": {
+                    "version": "1.6.2",
+                    "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+                    "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
                     "dev": true,
                     "requires": {
-                        "minimist": "0.0.8"
+                        "buffer-from": "^1.0.0",
+                        "inherits": "^2.0.3",
+                        "readable-stream": "^2.2.2",
+                        "typedarray": "^0.0.6"
                     }
                 }
             }
diff --git a/package.json b/package.json
index b011785f4..4536546f4 100644
--- a/package.json
+++ b/package.json
@@ -227,7 +227,7 @@
     "brfs": "^1.6.1",
     "browserify": "^16.1.1",
     "chai": "^4.1.0",
-    "chromedriver": "2.36.0",
+    "chromedriver": "^2.41.0",
     "clipboardy": "^1.2.3",
     "compression": "^1.7.1",
     "coveralls": "^3.0.0",

From d0611741a2ca0ef027238bc9022c728e973ce827 Mon Sep 17 00:00:00 2001
From: Whymarrh Whitby <whymarrh.whitby@gmail.com>
Date: Tue, 7 Aug 2018 02:07:16 -0230
Subject: [PATCH 13/13] Show invalid seed phrase error when importing new
 account

---
 app/_locales/en/messages.json                           | 3 +++
 mascara/src/app/first-time/import-seed-phrase-screen.js | 9 +++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 8d65bc596..1b0183c92 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -510,6 +510,9 @@
   "invalidRPC": {
     "message": "Invalid RPC URI"
   },
+  "invalidSeedPhrase": {
+    "message": "Invalid seed phrase"
+  },
   "jsonFail": {
     "message": "Something went wrong. Please make sure your JSON file is properly formatted."
   },
diff --git a/mascara/src/app/first-time/import-seed-phrase-screen.js b/mascara/src/app/first-time/import-seed-phrase-screen.js
index fd2516ad4..883893e88 100644
--- a/mascara/src/app/first-time/import-seed-phrase-screen.js
+++ b/mascara/src/app/first-time/import-seed-phrase-screen.js
@@ -1,3 +1,4 @@
+import {validateMnemonic} from 'bip39'
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import {connect} from 'react-redux'
@@ -39,8 +40,12 @@ class ImportSeedPhraseScreen extends Component {
   handleSeedPhraseChange (seedPhrase) {
     let seedPhraseError = null
 
-    if (seedPhrase && this.parseSeedPhrase(seedPhrase).split(' ').length !== 12) {
-      seedPhraseError = this.context.t('seedPhraseReq')
+    if (seedPhrase) {
+      if (this.parseSeedPhrase(seedPhrase).split(' ').length !== 12) {
+        seedPhraseError = this.context.t('seedPhraseReq')
+      } else if (!validateMnemonic(seedPhrase)) {
+        seedPhraseError = this.context.t('invalidSeedPhrase')
+      }
     }
 
     this.setState({ seedPhrase, seedPhraseError })
