Merge branch 'master' into qrPrefix

.gitignore

@@ -1,21 +1,27 @@
-dist
 npm-debug.log
 node_modules
-temp
-.tmp
-.sass-cache
+package-lock.json
+
 app/bower_components
 test/bower_components
 package
+
+temp
+.tmp
+.sass-cache
 .DS_Store
+app/.DS_Store
+
+dist
 builds/
 disc/
-notes.txt
-app/.DS_Store
-development/bundle.js
 builds.zip
-test/integration/bundle.js
+
+development/bundle.js
 development/states.js
+test/integration/bundle.js
 test/background.js
 test/bundle.js
 test/test-bundle.js
+
+notes.txt

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Current Master
 
 - Add a `ethereum:` prefix to the QR code address
+- The default network on installation is now MainNet
 - Fix currency API URL from cryptonator.
 - Update gasLimit params with every new block seen.
 

app/scripts/first-time-state.js

@@ -1,12 +1,15 @@
+// test and development environment variables
+const env = process.env.METAMASK_ENV
+const METAMASK_DEBUG = 'GULP_METAMASK_DEBUG'
+
 //
 // The default state of MetaMask
 //
-
 module.exports = {
   config: {},
   NetworkController: {
     provider: {
-      type: 'rinkeby',
+      type: (METAMASK_DEBUG || env === 'test') ? 'rinkeby' : 'mainnet',
     },
   },
 }

app/scripts/lib/migrator/index.js

@@ -14,8 +14,8 @@ class Migrator {
   async migrateData (versionedData = this.generateInitialState()) {
     const pendingMigrations = this.migrations.filter(migrationIsPending)
 
-    for (let index in pendingMigrations) {
-      let migration = pendingMigrations[index]
+    for (const index in pendingMigrations) {
+      const migration = pendingMigrations[index]
       versionedData = await migration.migrate(versionedData)
       if (!versionedData.data) throw new Error('Migrator - migration returned empty data')
       if (versionedData.version !== undefined && versionedData.meta.version !== migration.version) throw new Error('Migrator - Migration did not update version number correctly')

package.json

@@ -123,7 +123,7 @@
     "valid-url": "^1.0.9",
     "vreme": "^3.0.2",
     "web3": "0.18.2",
-    "web3-provider-engine": "^12.2.3",
+    "web3-provider-engine": "^12.2.4",
     "web3-stream-provider": "^2.0.6",
     "xtend": "^4.0.1"
   },

test/unit/components/bn-as-decimal-input-test.js

@@ -18,7 +18,7 @@ describe('BnInput', function () {
     }
     const value = new BN(valueStr, 10)
 
-    let inputStr = '2.3'
+    const inputStr = '2.3'
 
     let targetStr = '23'
     while (targetStr.length < 19) {

test/unit/components/pending-tx-test.js

@@ -31,7 +31,6 @@ describe('PendingTx', function () {
 
 
   it('should use updated values when edited.', function (done) {
-
     const renderer = ReactTestUtils.createRenderer()
     const newGasPrice = '0x77359400'
 
@@ -40,7 +39,6 @@ describe('PendingTx', function () {
       accounts: identities,
       txData,
       sendTransaction: (txMeta, event) => {
-
         // Assert changes:
         const result = ethUtil.addHexPrefix(txMeta.txParams.gasPrice)
         assert.notEqual(result, gasPrice, 'gas price should change')
@@ -70,7 +68,6 @@ describe('PendingTx', function () {
       ReactTestUtils.Simulate.submit(form, { preventDefault () {}, target: { checkValidity () {
         return true
       } } })
-
     } catch (e) {
       console.log('WHAAAA')
       console.error(e)

test/unit/explorer-link-test.js

@@ -11,5 +11,4 @@ describe('explorer-link', function () {
     var result = linkGen('hash', '42')
     assert.notEqual(result.indexOf('kovan'), -1, 'kovan injected')
   })
-
 })

test/unit/network-contoller-test.js

@@ -37,7 +37,7 @@ describe('# Network Controller', function () {
     })
     describe('#getNetworkState', function () {
       it('should return loading when new', function () {
-        let networkState = networkController.getNetworkState()
+        const networkState = networkController.getNetworkState()
         assert.equal(networkState, 'loading', 'network is loading')
       })
     })
@@ -45,14 +45,14 @@ describe('# Network Controller', function () {
     describe('#setNetworkState', function () {
       it('should update the network', function () {
         networkController.setNetworkState(1)
-        let networkState = networkController.getNetworkState()
+        const networkState = networkController.getNetworkState()
         assert.equal(networkState, 1, 'network is 1')
       })
     })
 
     describe('#getRpcAddressForType', function () {
       it('should return the right rpc address', function () {
-        let rpcTarget = networkController.getRpcAddressForType('mainnet')
+        const rpcTarget = networkController.getRpcAddressForType('mainnet')
         assert.equal(rpcTarget, 'https://mainnet.infura.io/metamask', 'returns the right rpcAddress')
       })
     })

test/unit/tx-controller-test.js

@@ -320,5 +320,4 @@ describe('Transaction Controller', function () {
       })
     })
   })
-
 })