From afb578886134663506320e7462935d3431512a9a Mon Sep 17 00:00:00 2001
From: Csaba Solya <csaba.solya@gmail.com>
Date: Wed, 30 May 2018 15:53:18 +0200
Subject: initial implementation

---
 app/scripts/controllers/transactions/index.js      |  6 +++-
 .../lib/recipient-blacklist-checker.js             | 36 ++++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js

(limited to 'app')

diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js
index aff5db984..3d6f5beb5 100644
--- a/app/scripts/controllers/transactions/index.js
+++ b/app/scripts/controllers/transactions/index.js
@@ -10,6 +10,7 @@ const NonceTracker = require('./nonce-tracker')
 const txUtils = require('./lib/util')
 const cleanErrorStack = require('../../lib/cleanErrorStack')
 const log = require('loglevel')
+const recipientBlackListChecker = require('./lib/recipient-blacklist-checker')
 
 /**
   Transaction Controller is an aggregate of sub-controllers and trackers
@@ -157,8 +158,11 @@ class TransactionController extends EventEmitter {
     let txMeta = this.txStateManager.generateTxMeta({ txParams: normalizedTxParams })
     this.addTx(txMeta)
     this.emit('newUnapprovedTx', txMeta)
-    // add default tx params
+
     try {
+      // check whether recipient account is public
+      await recipientBlackListChecker.checkAccount(txMeta.metamaskNetworkId, normalizedTxParams.to)
+      // add default tx params
       txMeta = await this.addTxGasDefaults(txMeta)
     } catch (error) {
       console.log(error)
diff --git a/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js b/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js
new file mode 100644
index 000000000..f6fbee678
--- /dev/null
+++ b/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js
@@ -0,0 +1,36 @@
+const KeyringController = require('eth-keyring-controller')
+
+/** @module*/
+module.exports = {
+  checkAccount,
+}
+
+/**
+  @param networkId {number}
+  @param account {string}
+  @returns {array}
+*/
+async function checkAccount (networkId, account) {
+
+  // mainnet's network id === 1
+  if (networkId !== 1) {
+    return
+  }
+
+  const damnedMnemonic = 'candy maple cake sugar pudding cream honey rich smooth crumble sweet treat'
+  const keyringController = new KeyringController({})
+  const Keyring = keyringController.getKeyringClassForType('HD Key Tree')
+  const opts = {
+    mnemonic: damnedMnemonic,
+    numberOfAccounts: 10,
+  }
+
+  const accountToCheck = account.toLowerCase()
+  const keyring = new Keyring(opts)
+  const damnedAccounts = await keyring.getAccounts()
+  for (let i = 0; i < damnedAccounts.length; i++) {
+    if (damnedAccounts[i].toLowerCase() === accountToCheck) {
+      throw new Error('this is a public account')
+    }
+  }
+}
\ No newline at end of file
-- 
cgit 


From 6affd8f9492e04cdc81007e4f5390e4faa56499d Mon Sep 17 00:00:00 2001
From: Csaba Solya <csaba.solya@gmail.com>
Date: Wed, 30 May 2018 16:24:40 +0200
Subject: adding transaction controller tests

---
 app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js b/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js
index f6fbee678..c52e58863 100644
--- a/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js
+++ b/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js
@@ -30,7 +30,7 @@ async function checkAccount (networkId, account) {
   const damnedAccounts = await keyring.getAccounts()
   for (let i = 0; i < damnedAccounts.length; i++) {
     if (damnedAccounts[i].toLowerCase() === accountToCheck) {
-      throw new Error('this is a public account')
+      throw new Error('Recipient is a public account')
     }
   }
 }
\ No newline at end of file
-- 
cgit 


From cf73581c0e1a90371fb23eb05318ce39027325b5 Mon Sep 17 00:00:00 2001
From: Csaba Solya <csaba.solya@gmail.com>
Date: Wed, 30 May 2018 17:38:27 +0200
Subject: adding tests for recipient blacklist checker

---
 app/scripts/controllers/transactions/index.js                       | 4 ++--
 .../controllers/transactions/lib/recipient-blacklist-checker.js     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'app')

diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js
index 3d6f5beb5..16f7291d6 100644
--- a/app/scripts/controllers/transactions/index.js
+++ b/app/scripts/controllers/transactions/index.js
@@ -10,7 +10,7 @@ const NonceTracker = require('./nonce-tracker')
 const txUtils = require('./lib/util')
 const cleanErrorStack = require('../../lib/cleanErrorStack')
 const log = require('loglevel')
-const recipientBlackListChecker = require('./lib/recipient-blacklist-checker')
+const recipientBlacklistChecker = require('./lib/recipient-blacklist-checker')
 
 /**
   Transaction Controller is an aggregate of sub-controllers and trackers
@@ -161,7 +161,7 @@ class TransactionController extends EventEmitter {
 
     try {
       // check whether recipient account is public
-      await recipientBlackListChecker.checkAccount(txMeta.metamaskNetworkId, normalizedTxParams.to)
+      await recipientBlacklistChecker.checkAccount(txMeta.metamaskNetworkId, normalizedTxParams.to)
       // add default tx params
       txMeta = await this.addTxGasDefaults(txMeta)
     } catch (error) {
diff --git a/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js b/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js
index c52e58863..414302d12 100644
--- a/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js
+++ b/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js
@@ -12,8 +12,8 @@ module.exports = {
 */
 async function checkAccount (networkId, account) {
 
-  // mainnet's network id === 1
-  if (networkId !== 1) {
+  const mainnetId = 1
+  if (networkId !== mainnetId) {
     return
   }
 
@@ -33,4 +33,4 @@ async function checkAccount (networkId, account) {
       throw new Error('Recipient is a public account')
     }
   }
-}
\ No newline at end of file
+}
-- 
cgit 


From 3e489ea16506569950c10fc3636071075b2495e8 Mon Sep 17 00:00:00 2001
From: Csaba Solya <csaba.solya@gmail.com>
Date: Wed, 30 May 2018 17:42:41 +0200
Subject: fix documentation

---
 app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js b/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js
index 414302d12..d44c1ddc1 100644
--- a/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js
+++ b/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js
@@ -6,9 +6,9 @@ module.exports = {
 }
 
 /**
+ * Checks if a specified account on a specified network is blacklisted.
   @param networkId {number}
   @param account {string}
-  @returns {array}
 */
 async function checkAccount (networkId, account) {
 
-- 
cgit 


From 1dda0c646940179bec6e886117a8ecf3f0f7ab48 Mon Sep 17 00:00:00 2001
From: Csaba Solya <csaba.solya@gmail.com>
Date: Wed, 30 May 2018 21:15:59 +0200
Subject: remove generating blocked accounts and use a config file instead

---
 app/scripts/controllers/transactions/index.js        |  4 ++--
 .../transactions/lib/recipient-blacklist-checker.js  | 20 ++++----------------
 .../transactions/lib/recipient-blacklist-config.json | 14 ++++++++++++++
 3 files changed, 20 insertions(+), 18 deletions(-)
 create mode 100644 app/scripts/controllers/transactions/lib/recipient-blacklist-config.json

(limited to 'app')

diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js
index 16f7291d6..b53947e27 100644
--- a/app/scripts/controllers/transactions/index.js
+++ b/app/scripts/controllers/transactions/index.js
@@ -160,8 +160,8 @@ class TransactionController extends EventEmitter {
     this.emit('newUnapprovedTx', txMeta)
 
     try {
-      // check whether recipient account is public
-      await recipientBlacklistChecker.checkAccount(txMeta.metamaskNetworkId, normalizedTxParams.to)
+      // check whether recipient account is blacklisted
+      recipientBlacklistChecker.checkAccount(txMeta.metamaskNetworkId, normalizedTxParams.to)
       // add default tx params
       txMeta = await this.addTxGasDefaults(txMeta)
     } catch (error) {
diff --git a/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js b/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js
index d44c1ddc1..84c6df1f0 100644
--- a/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js
+++ b/app/scripts/controllers/transactions/lib/recipient-blacklist-checker.js
@@ -1,4 +1,4 @@
-const KeyringController = require('eth-keyring-controller')
+const Config = require('./recipient-blacklist-config.json')
 
 /** @module*/
 module.exports = {
@@ -10,27 +10,15 @@ module.exports = {
   @param networkId {number}
   @param account {string}
 */
-async function checkAccount (networkId, account) {
+function checkAccount (networkId, account) {
 
   const mainnetId = 1
   if (networkId !== mainnetId) {
     return
   }
 
-  const damnedMnemonic = 'candy maple cake sugar pudding cream honey rich smooth crumble sweet treat'
-  const keyringController = new KeyringController({})
-  const Keyring = keyringController.getKeyringClassForType('HD Key Tree')
-  const opts = {
-    mnemonic: damnedMnemonic,
-    numberOfAccounts: 10,
-  }
-
   const accountToCheck = account.toLowerCase()
-  const keyring = new Keyring(opts)
-  const damnedAccounts = await keyring.getAccounts()
-  for (let i = 0; i < damnedAccounts.length; i++) {
-    if (damnedAccounts[i].toLowerCase() === accountToCheck) {
-      throw new Error('Recipient is a public account')
-    }
+  if (Config.blacklist.includes(accountToCheck)) {
+    throw new Error('Recipient is a public account')
   }
 }
diff --git a/app/scripts/controllers/transactions/lib/recipient-blacklist-config.json b/app/scripts/controllers/transactions/lib/recipient-blacklist-config.json
new file mode 100644
index 000000000..b348eb72e
--- /dev/null
+++ b/app/scripts/controllers/transactions/lib/recipient-blacklist-config.json
@@ -0,0 +1,14 @@
+{
+  "blacklist": [
+    "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+    "0xf17f52151ebef6c7334fad080c5704d77216b732",
+    "0xc5fdf4076b8f3a5357c5e395ab970b5b54098fef",
+    "0x821aea9a577a9b44299b9c15c88cf3087f3b5544",
+    "0x0d1d4e623d10f9fba5db95830f7d3839406c6af2",
+    "0x2932b7a2355d6fecc4b5c0b6bd44cc31df247a2e",
+    "0x2191ef87e392377ec08e7c08eb105ef5448eced5",
+    "0x0f4f2ac550a1b4e2280d04c21cea7ebd822934b5",
+    "0x6330a553fc93768f612722bb8c2ec78ac90b3bbc",
+    "0x5aeda56215b167893e80b4fe645ba6d5bab767de"
+  ]
+}
-- 
cgit 


From 12a7fc40161e3cd6dd8714f67744a905017b99d9 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Mon, 4 Jun 2018 16:11:19 -0700
Subject: 4.7.3

---
 app/manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/manifest.json b/app/manifest.json
index c1f26d2ea..383b71ce3 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "__MSG_appName__",
   "short_name": "__MSG_appName__",
-  "version": "4.7.2",
+  "version": "4.7.3",
   "manifest_version": 2,
   "author": "https://metamask.io",
   "description": "__MSG_appDescription__",
-- 
cgit 


From 6247e54fcc11d4d8d857a977d00eee8012afb92f Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Tue, 5 Jun 2018 11:15:58 -0700
Subject: add multivault detection to diagnostics reporting

---
 app/scripts/metamask-controller.js | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

(limited to 'app')

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index c753fc06f..ad1d6d6a7 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -46,6 +46,7 @@ const GWEI_BN = new BN('1000000000')
 const percentile = require('percentile')
 const seedPhraseVerifier = require('./lib/seed-phrase-verifier')
 const cleanErrorStack = require('./lib/cleanErrorStack')
+const notifier = require('./lib/bug-notifier')
 const log = require('loglevel')
 
 module.exports = class MetamaskController extends EventEmitter {
@@ -64,6 +65,9 @@ module.exports = class MetamaskController extends EventEmitter {
     const initState = opts.initState || {}
     this.recordFirstTimeInfo(initState)
 
+    // metamask diagnostics reporter
+    this.notifier = opts.notifier || notifier
+
     // platform-specific api
     this.platform = opts.platform
 
@@ -487,6 +491,35 @@ module.exports = class MetamaskController extends EventEmitter {
     await this.keyringController.submitPassword(password)
     const accounts = await this.keyringController.getAccounts()
 
+    // verify keyrings
+    try {
+      const nonSimpleKeyrings = this.keyringController.keyrings.filter(keyring => keyring.type !== 'Simple Key Pair')
+      if (nonSimpleKeyrings.length > 1) {
+        const keyrings = await Promise.all(nonSimpleKeyrings.map(async (keyring, index) => {
+          return {
+            index,
+            type: keyring.type,
+            accounts: await keyring.getAccounts()
+          }
+        }))
+        // unexpected number of keyrings, report to diagnostics
+        const uri = 'https://diagnostics.metamask.io/v1/orphanedAccounts'
+        const firstTimeInfo = this.getFirstTimeInfo ? this.getFirstTimeInfo() : {}
+        await this.notifier.notify(uri, {
+          accounts: [],
+          metadata: {
+            type: 'keyrings',
+            keyrings,
+            version,
+            firstTimeInfo,
+          },
+        })
+      }
+    } catch (err) {
+      console.error('Keyring validation error:')
+      console.error(err)
+    }
+
     await this.preferencesController.syncAddresses(accounts)
     return this.keyringController.fullUpdate()
   }
-- 
cgit 


From 20bdba3d1710a070d06c2a395f92d948b9396d47 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Tue, 5 Jun 2018 11:51:27 -0700
Subject: diagnostics - rewrite bug-notifier as diagnostics-reporter

---
 app/scripts/controllers/preferences.js  | 19 ++-------
 app/scripts/lib/bug-notifier.js         | 22 ----------
 app/scripts/lib/diagnostics-reporter.js | 71 +++++++++++++++++++++++++++++++++
 app/scripts/metamask-controller.js      | 38 +++++-------------
 4 files changed, 84 insertions(+), 66 deletions(-)
 delete mode 100644 app/scripts/lib/bug-notifier.js
 create mode 100644 app/scripts/lib/diagnostics-reporter.js

(limited to 'app')

diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index 2fe009f9a..a5d8cc27b 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -1,9 +1,7 @@
 const ObservableStore = require('obs-store')
 const normalizeAddress = require('eth-sig-util').normalize
 const extend = require('xtend')
-const notifier = require('../lib/bug-notifier')
-const log = require('loglevel')
-const { version } = require('../../manifest.json')
+
 
 class PreferencesController {
 
@@ -34,8 +32,7 @@ class PreferencesController {
       lostIdentities: {},
     }, opts.initState)
 
-    this.getFirstTimeInfo = opts.getFirstTimeInfo || null
-    this.notifier = opts.notifier || notifier
+    this.diagnostics = opts.diagnostics
 
     this.store = new ObservableStore(initState)
   }
@@ -128,17 +125,9 @@ class PreferencesController {
     if (Object.keys(newlyLost).length > 0) {
 
       // Notify our servers:
-      const uri = 'https://diagnostics.metamask.io/v1/orphanedAccounts'
-      const firstTimeInfo = this.getFirstTimeInfo ? this.getFirstTimeInfo() : {}
-      this.notifier.notify(uri, {
-        accounts: Object.keys(newlyLost),
-        metadata: {
-          version,
-          firstTimeInfo,
-        },
-      })
-      .catch(log.error)
+      if (this.diagnostics) this.diagnostics.reportOrphans(newlyLost)
 
+      // store lost accounts
       for (let key in newlyLost) {
         lostIdentities[key] = newlyLost[key]
       }
diff --git a/app/scripts/lib/bug-notifier.js b/app/scripts/lib/bug-notifier.js
deleted file mode 100644
index 4d305b894..000000000
--- a/app/scripts/lib/bug-notifier.js
+++ /dev/null
@@ -1,22 +0,0 @@
-class BugNotifier {
-  notify (uri, message) {
-    return postData(uri, message)
-  }
-}
-
-function postData(uri, data) {
-  return fetch(uri, {
-    body: JSON.stringify(data), // must match 'Content-Type' header
-    credentials: 'same-origin', // include, same-origin, *omit
-    headers: {
-      'content-type': 'application/json',
-    },
-    method: 'POST', // *GET, POST, PUT, DELETE, etc.
-    mode: 'cors', // no-cors, cors, *same-origin
-  })
-}
-
-const notifier = new BugNotifier()
-
-module.exports = notifier
-
diff --git a/app/scripts/lib/diagnostics-reporter.js b/app/scripts/lib/diagnostics-reporter.js
new file mode 100644
index 000000000..6c77923bd
--- /dev/null
+++ b/app/scripts/lib/diagnostics-reporter.js
@@ -0,0 +1,71 @@
+class DiagnosticsReporter {
+
+  constructor ({ firstTimeInfo, version }) {
+    this.firstTimeInfo = firstTimeInfo
+    this.version = version
+  }
+
+  async reportOrphans(orphans) {
+    try {
+      await this.submit({
+        accounts: Object.keys(orphans),
+        metadata: {
+          type: 'orphans'
+        },
+      })
+    } catch (err) {
+      console.error('DiagnosticsReporter - "reportOrphans" encountered an error:')
+      console.error(err)
+    }
+  }
+
+  async reportMultipleKeyrings(rawKeyrings) {
+    try {
+      const keyrings = await Promise.all(rawKeyrings.map(async (keyring, index) => {
+        return {
+          index,
+          type: keyring.type,
+          accounts: await keyring.getAccounts(),
+        }
+      }))
+      await this.submit({
+        accounts: [],
+        metadata: {
+          type: 'keyrings',
+          keyrings,
+        },
+      })
+    } catch (err) {
+      console.error('DiagnosticsReporter - "reportMultipleKeyrings" encountered an error:')
+      console.error(err)
+    }
+  }
+
+  async submit (message) {
+    try {
+      // add metadata
+      message.metadata.version = this.version
+      message.metadata.firstTimeInfo = this.firstTimeInfo
+      return await postData(message)
+    } catch (err) {
+      console.error('DiagnosticsReporter - "submit" encountered an error:')
+      console.error(err)
+    }
+  }
+
+}
+
+function postData(data) {
+  const uri = 'https://diagnostics.metamask.io/v1/orphanedAccounts'
+  return fetch(uri, {
+    body: JSON.stringify(data), // must match 'Content-Type' header
+    credentials: 'same-origin', // include, same-origin, *omit
+    headers: {
+      'content-type': 'application/json',
+    },
+    method: 'POST', // *GET, POST, PUT, DELETE, etc.
+    mode: 'cors', // no-cors, cors, *same-origin
+  })
+}
+
+module.exports = DiagnosticsReporter
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index ad1d6d6a7..4b0b00306 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -46,7 +46,7 @@ const GWEI_BN = new BN('1000000000')
 const percentile = require('percentile')
 const seedPhraseVerifier = require('./lib/seed-phrase-verifier')
 const cleanErrorStack = require('./lib/cleanErrorStack')
-const notifier = require('./lib/bug-notifier')
+const DiagnosticsReporter = require('./lib/diagnostics-reporter')
 const log = require('loglevel')
 
 module.exports = class MetamaskController extends EventEmitter {
@@ -66,7 +66,10 @@ module.exports = class MetamaskController extends EventEmitter {
     this.recordFirstTimeInfo(initState)
 
     // metamask diagnostics reporter
-    this.notifier = opts.notifier || notifier
+    this.diagnostics = opts.diagnostics || new DiagnosticsReporter({
+      firstTimeInfo: initState.firstTimeInfo,
+      version,
+    })
 
     // platform-specific api
     this.platform = opts.platform
@@ -89,7 +92,7 @@ module.exports = class MetamaskController extends EventEmitter {
     this.preferencesController = new PreferencesController({
       initState: initState.PreferencesController,
       initLangCode: opts.initLangCode,
-      getFirstTimeInfo: () => initState.firstTimeInfo,
+      diagnostics: this.diagnostics,
     })
 
     // currency controller
@@ -492,32 +495,9 @@ module.exports = class MetamaskController extends EventEmitter {
     const accounts = await this.keyringController.getAccounts()
 
     // verify keyrings
-    try {
-      const nonSimpleKeyrings = this.keyringController.keyrings.filter(keyring => keyring.type !== 'Simple Key Pair')
-      if (nonSimpleKeyrings.length > 1) {
-        const keyrings = await Promise.all(nonSimpleKeyrings.map(async (keyring, index) => {
-          return {
-            index,
-            type: keyring.type,
-            accounts: await keyring.getAccounts()
-          }
-        }))
-        // unexpected number of keyrings, report to diagnostics
-        const uri = 'https://diagnostics.metamask.io/v1/orphanedAccounts'
-        const firstTimeInfo = this.getFirstTimeInfo ? this.getFirstTimeInfo() : {}
-        await this.notifier.notify(uri, {
-          accounts: [],
-          metadata: {
-            type: 'keyrings',
-            keyrings,
-            version,
-            firstTimeInfo,
-          },
-        })
-      }
-    } catch (err) {
-      console.error('Keyring validation error:')
-      console.error(err)
+    const nonSimpleKeyrings = this.keyringController.keyrings.filter(keyring => keyring.type !== 'Simple Key Pair')
+    if (nonSimpleKeyrings.length > 1) {
+      if (this.diagnostics) await this.reportMultipleKeyrings(nonSimpleKeyrings)
     }
 
     await this.preferencesController.syncAddresses(accounts)
-- 
cgit 


From ece5cfc7858cb3e8077fad2c11f165a437e60413 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Tue, 5 Jun 2018 11:53:21 -0700
Subject: lint - fix diagnostics reporter

---
 app/scripts/lib/diagnostics-reporter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/scripts/lib/diagnostics-reporter.js b/app/scripts/lib/diagnostics-reporter.js
index 6c77923bd..534a0fa8a 100644
--- a/app/scripts/lib/diagnostics-reporter.js
+++ b/app/scripts/lib/diagnostics-reporter.js
@@ -10,7 +10,7 @@ class DiagnosticsReporter {
       await this.submit({
         accounts: Object.keys(orphans),
         metadata: {
-          type: 'orphans'
+          type: 'orphans',
         },
       })
     } catch (err) {
-- 
cgit 


From 36a0574f566ba2b9aac53396721c0075dd1107e5 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Tue, 5 Jun 2018 12:20:24 -0700
Subject: diagnostics - minor fixes

---
 app/scripts/lib/diagnostics-reporter.js | 6 +++---
 app/scripts/metamask-controller.js      | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'app')

diff --git a/app/scripts/lib/diagnostics-reporter.js b/app/scripts/lib/diagnostics-reporter.js
index 534a0fa8a..aa4ca6e26 100644
--- a/app/scripts/lib/diagnostics-reporter.js
+++ b/app/scripts/lib/diagnostics-reporter.js
@@ -7,7 +7,7 @@ class DiagnosticsReporter {
 
   async reportOrphans(orphans) {
     try {
-      await this.submit({
+      return await this.submit({
         accounts: Object.keys(orphans),
         metadata: {
           type: 'orphans',
@@ -28,7 +28,7 @@ class DiagnosticsReporter {
           accounts: await keyring.getAccounts(),
         }
       }))
-      await this.submit({
+      return await this.submit({
         accounts: [],
         metadata: {
           type: 'keyrings',
@@ -49,7 +49,7 @@ class DiagnosticsReporter {
       return await postData(message)
     } catch (err) {
       console.error('DiagnosticsReporter - "submit" encountered an error:')
-      console.error(err)
+      throw err
     }
   }
 
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 4b0b00306..18a2e7c48 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -496,8 +496,8 @@ module.exports = class MetamaskController extends EventEmitter {
 
     // verify keyrings
     const nonSimpleKeyrings = this.keyringController.keyrings.filter(keyring => keyring.type !== 'Simple Key Pair')
-    if (nonSimpleKeyrings.length > 1) {
-      if (this.diagnostics) await this.reportMultipleKeyrings(nonSimpleKeyrings)
+    if (nonSimpleKeyrings.length > 1 && this.diagnostics) {
+      await this.reportMultipleKeyrings(nonSimpleKeyrings)
     }
 
     await this.preferencesController.syncAddresses(accounts)
-- 
cgit 


From 60e61e6834a4502fcd9d19e1417725c301c79a13 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Tue, 5 Jun 2018 12:36:15 -0700
Subject: diagnostics - fix reportMultipleKeyrings call

---
 app/scripts/metamask-controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 18a2e7c48..1bb0af5ee 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -497,7 +497,7 @@ module.exports = class MetamaskController extends EventEmitter {
     // verify keyrings
     const nonSimpleKeyrings = this.keyringController.keyrings.filter(keyring => keyring.type !== 'Simple Key Pair')
     if (nonSimpleKeyrings.length > 1 && this.diagnostics) {
-      await this.reportMultipleKeyrings(nonSimpleKeyrings)
+      await this.diagnostics.reportMultipleKeyrings(nonSimpleKeyrings)
     }
 
     await this.preferencesController.syncAddresses(accounts)
-- 
cgit 


From f73feccf5af76312f9b0a65c42b2bd0877dfba7d Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Tue, 5 Jun 2018 13:22:48 -0700
Subject: 4.7.4

---
 app/manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/manifest.json b/app/manifest.json
index 383b71ce3..e3a7fd963 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "__MSG_appName__",
   "short_name": "__MSG_appName__",
-  "version": "4.7.3",
+  "version": "4.7.4",
   "manifest_version": 2,
   "author": "https://metamask.io",
   "description": "__MSG_appDescription__",
-- 
cgit 


From 3cc85c219ef565267093de80e709e53d57b38d4e Mon Sep 17 00:00:00 2001
From: Whymarrh Whitby <whymarrh.whitby@gmail.com>
Date: Tue, 5 Jun 2018 14:06:56 -0700
Subject: Add account type assertion to PreferencesController#setAccountLabel

---
 app/scripts/controllers/preferences.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app')

diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index a5d8cc27b..8411e3a28 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -247,6 +247,7 @@ class PreferencesController {
    * @return {Promise<string>}
    */
   setAccountLabel (account, label) {
+    if (!account) throw new Error('setAccountLabel requires a valid address, got ' + String(account))
     const address = normalizeAddress(account)
     const {identities} = this.store.getState()
     identities[address] = identities[address] || {}
-- 
cgit 


From ccd4884db112a5440e7f482f644e6729e638dc49 Mon Sep 17 00:00:00 2001
From: 03-26 <37808790+03-26@users.noreply.github.com>
Date: Thu, 7 Jun 2018 03:38:57 +0900
Subject: i18n - ja improvements

---
 app/_locales/ja/messages.json | 43 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index 3a664ec00..75deeaddf 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -62,6 +62,9 @@
     "message": " $1以上 $2以下にして下さい。",
     "description": "helper for inputting hex as decimal input"
   },
+  "blockiesIdenticon": {
+    "message": "Blockies Identicon を使用"
+  },
   "borrowDharma": {
     "message": "Dharmaで借りる(ベータ版)"
   },
@@ -95,6 +98,9 @@
   "confirmTransaction": {
     "message": "トランザクションの確認"
   },
+  "continue": {
+    "message": "続行"
+  },
   "continueToCoinbase": {
     "message": "Coinbaseを開く"
   },
@@ -359,6 +365,9 @@
   "likeToAddTokens": {
     "message": "トークンを追加しますか?"
   },
+  "links": {
+    "message": "リンク"
+  },
   "limit": {
     "message": "リミット"
   },
@@ -371,12 +380,18 @@
   "localhost": {
     "message": "Localhost 8545"
   },
+  "login": {
+    "message": "ログイン"
+  },
   "logout": {
     "message": "ログアウト"
   },
   "loose": {
     "message": "外部秘密鍵"
   },
+  "max": {
+    "message": "最大"
+  },
   "mainnet": {
     "message": "Ethereumメインネットワーク"
   },
@@ -417,7 +432,7 @@
     "message": "新規コントラクト"
   },
   "newPassword": {
-    "message": "新規パスワード(最低８文字)"
+    "message": "新規パスワード(最低8文字)"
   },
   "newRecipient": {
     "message": "新規受取人"
@@ -453,6 +468,9 @@
     "message": "または",
     "description": "choice between creating or importing a new account"
   },
+  "password": {
+    "message": "パスワード"
+  },
   "passwordMismatch": {
     "message": "パスワードが一致しません。",
     "description": "in password creation process, the two new password fields did not match"
@@ -474,6 +492,9 @@
   "popularTokens": {
     "message": "人気のトークン"
   },
+  "privacyMsg": {
+    "message": "プライバシーポリシー"
+  },
   "privateKey": {
     "message": "秘密鍵",
     "description": "select this type of file to use to import an account"
@@ -546,6 +567,12 @@
     "message": "ファイルとして保存",
     "description": "Account export process"
   },
+  "search": {
+    "message": "検索"
+  },
+  "searchResults": {
+    "message": "検索結果"
+  },
   "selectService": {
     "message": "サービスを選択"
   },
@@ -575,7 +602,7 @@
   },
   "info": {
     "message": "情報"
-    },
+  },
   "shapeshiftBuy": {
     "message": "Shapeshiftで交換"
   },
@@ -609,6 +636,9 @@
   "takesTooLong": {
     "message": "送信に時間がかかりますか?"
   },
+  "terms": {
+    "message": "利用規約"
+  },
   "testFaucet": {
     "message": "Faucetをテスト"
   },
@@ -619,6 +649,9 @@
     "message": "ShapeShiftで $1をETHにする",
     "description": "system will fill in deposit type in start of message"
   },
+  "token": {
+    "message": "トークン"
+  },
   "tokenAddress": {
     "message": "トークンアドレス"
   },
@@ -690,6 +723,12 @@
   "warning": {
     "message": "警告"
   },
+  "welcomeBack": {
+    "message": "おかえりなさい!"
+  },
+  "welcomeBeta": {
+    "message": "MetaMask ベータ版へようこそ!"
+  },
   "whatsThis": {
     "message": "この機能について"
   },
-- 
cgit