Merge branch 'master' into eyeballs

3 files changed, 26 insertions, 9 deletions

diff --git a/app/manifest.json b/app/manifest.json
index ea4535027..9288c3503 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "__MSG_appName__",
   "short_name": "Metamask",
-  "version": "1.8.1",
+  "version": "1.8.2",
   "manifest_version": 2,
   "description": "__MSG_appDescription__",
   "icons": {
diff --git a/app/scripts/lib/migrations.js b/app/scripts/lib/migrations.js
index 0b8e6265c..f026cbe53 100644
--- a/app/scripts/lib/migrations.js
+++ b/app/scripts/lib/migrations.js
@@ -1,10 +1,5 @@
-var path = require('path')
-var fs = require('fs')
-
-var migration2 = require('../migrations/002')
-var migration3 = require('../migrations/003')
-
 module.exports = [
-  migration2,
-  migration3,
+  require('../migrations/002'),
+  require('../migrations/003'),
+  require('../migrations/004'),
 ]
diff --git a/app/scripts/migrations/004.js b/app/scripts/migrations/004.js
new file mode 100644
index 000000000..2e3164baf
--- /dev/null
+++ b/app/scripts/migrations/004.js
@@ -0,0 +1,22 @@
+module.exports = {
+  version: 4,
+
+  migrate: function(data) {
+    try {
+      if (data.config.provider.type !== 'rpc') return data
+      switch (data.config.provider.rpcTarget) {
+        case 'https://testrpc.metamask.io/':
+            data.config.provider = {
+              type: 'testnet'
+            }
+          break
+        case 'https://rpc.metamask.io/':
+            data.config.provider = {
+              type: 'mainnet'
+            }
+          break
+      }
+    } catch (_) {}
+    return data
+  }
+}