Merge branch 'master' into Version-3.13.7

CHANGELOG.md

@@ -5,7 +5,8 @@
 ## 3.13.7 2018-1-22
 
 - Add ability to bypass gas estimation loading indicator.
-- Re-add changes from 3.13.4
+- Forward failed transactions to Sentry error reporting service
+- Re-add changes from 3.13.5
 
 ## 3.13.6 2017-1-18
 

app/scripts/background.js

@@ -27,7 +27,7 @@ global.METAMASK_NOTIFIER = notificationManager
 
 // setup sentry error reporting
 const release = platform.getVersion()
-setupRaven({ release })
+const raven = setupRaven({ release })
 
 let popupIsOpen = false
 
@@ -77,6 +77,16 @@ function setupController (initState) {
   })
   global.metamaskController = controller
 
+  // report failed transactions to Sentry
+  controller.txController.on(`tx:status-update`, (txId, status) => {
+    if (status !== 'failed') return
+    const txMeta = controller.txController.txStateManager.getTx(txId)
+    raven.captureMessage('Transaction Failed', {
+      // "extra" key is required by Sentry
+      extra: txMeta,
+    })
+  })
+
   // setup state persistence
   pump(
     asStream(controller.store),

app/scripts/setupRaven.js

@@ -21,4 +21,6 @@ function setupRaven(opts) {
   Raven.config(ravenTarget, {
     release,
   }).install()
+
+  return Raven
 }