Merge branch 'dev' into gulp1

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - Remove certain non-essential permissions from certain builds.
 - Add a check for when a tx is included in a block.
+- Fix bug where browser-solidity would sometimes warn of a contract creation error when there was none.
 - Minor modifications to network display.
 - Network now displays properly for pending transactions.
 - Implement replay attack protections allowed by EIP 155.

app/scripts/lib/config-manager.js

@@ -1,7 +1,6 @@
 const Migrator = require('pojo-migrator')
 const MetamaskConfig = require('../config.js')
 const migrations = require('./migrations')
-const rp = require('request-promise')
 const ethUtil = require('ethereumjs-util')
 const normalize = require('./sig-util').normalize
 
@@ -301,9 +300,9 @@ ConfigManager.prototype.getCurrentFiat = function () {
 
 ConfigManager.prototype.updateConversionRate = function () {
   var data = this.getData()
-  return rp(`https://www.cryptonator.com/api/ticker/eth-${data.fiatCurrency}`)
-  .then((response) => {
-    const parsedResponse = JSON.parse(response)
+  return fetch(`https://www.cryptonator.com/api/ticker/eth-${data.fiatCurrency}`)
+  .then(response => response.json())
+  .then((parsedResponse) => {
     this.setConversionPrice(parsedResponse.ticker.price)
     this.setConversionDate(parsedResponse.timestamp)
   }).catch((err) => {

app/scripts/lib/tx-utils.js

@@ -20,7 +20,6 @@ module.exports = class txProviderUtils {
       if (err) return cb(err)
       async.waterfall([
         self.estimateTxGas.bind(self, txData, block.gasLimit),
-        self.checkForTxGasError.bind(self, txData),
         self.setTxGas.bind(self, txData, block.gasLimit),
       ], cb)
     })
@@ -38,22 +37,10 @@ module.exports = class txProviderUtils {
     this.query.estimateGas(txParams, cb)
   }
 
-  checkForTxGasError (txData, estimatedGasHex, cb) {
+  setTxGas (txData, blockGasLimitHex, estimatedGasHex, cb) {
     txData.estimatedGas = estimatedGasHex
-    // all gas used - must be an error
-    if (estimatedGasHex === txData.txParams.gas) {
-      txData.simulationFails = true
-    }
-    cb()
-  }
-
-  setTxGas (txData, blockGasLimitHex, cb) {
     const txParams = txData.txParams
-    // if OOG, nothing more to do
-    if (txData.simulationFails) {
-      cb()
-      return
-    }
+
     // if gasLimit was specified and doesnt OOG,
     // use original specified amount
     if (txData.gasLimitSpecified) {

package.json

@@ -88,7 +88,6 @@
     "redux": "^3.0.5",
     "redux-logger": "^2.3.1",
     "redux-thunk": "^1.0.2",
-    "request-promise": "^4.1.1",
     "sandwich-expando": "^1.0.5",
     "textarea-caret": "^3.0.1",
     "three.js": "^0.73.2",
@@ -120,6 +119,7 @@
     "gulp-util": "^3.0.7",
     "gulp-watch": "^4.3.5",
     "gulp-zip": "^3.2.0",
+    "isomorphic-fetch": "^2.2.1",
     "jsdom": "^8.1.0",
     "jsdom-global": "^1.7.0",
     "jshint-stylish": "~0.1.5",

test/unit/config-manager-test.js

@@ -1,8 +1,10 @@
+// polyfill fetch
+global.fetch = global.fetch || require('isomorphic-fetch')
 const assert = require('assert')
 const extend = require('xtend')
 const rp = require('request-promise')
 const nock = require('nock')
-var configManagerGen = require('../lib/mock-config-manager')
+const configManagerGen = require('../lib/mock-config-manager')
 const STORAGE_KEY = 'metamask-persistance-key'
 
 describe('config-manager', function() {