Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault

.eslintrc

@@ -127,7 +127,7 @@
     "no-whitespace-before-property": 2,
     "no-with": 2,
     "one-var": [2, { "initialized": "never" }],
-    "operator-linebreak": [1, "after", { "overrides": { "?": "before", ":": "before" } }],
+    "operator-linebreak": [1, "after", { "overrides": { "?": "ignore", ":": "ignore" } }],
     "padded-blocks": [1, "never"],
     "quotes": [2, "single", {"avoidEscape": true, "allowTemplateLiterals": true}],
     "semi": [2, "never"],

CHANGELOG.md

@@ -1,8 +1,14 @@
 # Changelog
 
 ## Current Master
+- Show a warning when a transaction fails during simulation.
+- Fix bug where 20% of gas estimate was not being added properly.
+- Render error messages in our confirmation screen more gracefully.
 
-- Fix gas estimation bug.
+## 2.13.7 2016-11-8
+
+- Fix bug where gas estimate would sometimes be very high.
+- Increased our gas estimate from 100k gas to 20% of estimate.
 - Fix github link on info page to point at current repository.
 
 ## 2.13.6 2016-10-26

app/manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "MetaMask",
   "short_name": "Metamask",
-  "version": "2.13.6",
+  "version": "2.13.7",
   "manifest_version": 2,
   "author": "https://metamask.io",
   "description": "Ethereum Browser Extension",

app/scripts/contentscript.js

@@ -6,7 +6,7 @@ const extension = require('./lib/extension')
 
 const fs = require('fs')
 const path = require('path')
-const inpageText = fs.readFileSync(path.join(__dirname + '/inpage.js')).toString()
+const inpageText = fs.readFileSync(path.join(__dirname, 'inpage.js')).toString()
 
 // Eventually this streaming injection could be replaced with:
 // https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XPCOM/Language_Bindings/Components.utils.exportFunction
@@ -20,9 +20,8 @@ if (shouldInjectWeb3()) {
   setupStreams()
 }
 
-function setupInjection(){
+function setupInjection () {
   try {
-
     // inject in-page script
     var scriptTag = document.createElement('script')
     scriptTag.src = extension.extension.getURL('scripts/inpage.js')
@@ -31,14 +30,12 @@ function setupInjection(){
     var container = document.head || document.documentElement
     // append as first child
     container.insertBefore(scriptTag, container.children[0])
-
   } catch (e) {
     console.error('Metamask injection failed.', e)
   }
 }
 
-function setupStreams(){
-
+function setupStreams () {
   // setup communication to page and plugin
   var pageStream = new LocalMessageDuplexStream({
     name: 'contentscript',
@@ -65,14 +62,13 @@ function setupStreams(){
   mx.ignoreStream('provider')
   mx.ignoreStream('publicConfig')
   mx.ignoreStream('reload')
-
 }
 
-function shouldInjectWeb3(){
+function shouldInjectWeb3 () {
   return isAllowedSuffix(window.location.href)
 }
 
-function isAllowedSuffix(testCase) {
+function isAllowedSuffix (testCase) {
   var prohibitedTypes = ['xml', 'pdf']
   var currentUrl = window.location.href
   var currentRegex

app/scripts/inpage.js

@@ -43,7 +43,7 @@ reloadStream.once('data', triggerReload)
 var pingChannel = inpageProvider.multiStream.createStream('pingpong')
 var pingStream = new PingStream({ objectMode: true })
 // wait for first successful reponse
-metamaskStream.once('_data', function(){
+metamaskStream.once('_data', function () {
   pingStream.pipe(pingChannel).pipe(pingStream)
 })
 endOfStream(pingStream, triggerReload)

app/scripts/keyring-controller.js

@@ -1,17 +1,17 @@
 const async = require('async')
-const EventEmitter = require('events').EventEmitter
-const encryptor = require('./lib/encryptor')
-const messageManager = require('./lib/message-manager')
 const ethUtil = require('ethereumjs-util')
 const ethBinToOps = require('eth-bin-to-ops')
 const EthQuery = require('eth-query')
-const BN = ethUtil.BN
-const Transaction = require('ethereumjs-tx')
-const autoFaucet = require('./lib/auto-faucet')
 const bip39 = require('bip39')
+const Transaction = require('ethereumjs-tx')
+const EventEmitter = require('events').EventEmitter
 
-// TEMPORARY UNTIL FULL DEPRECATION:
+const normalize = require('./lib/sig-util').normalize
+const encryptor = require('./lib/encryptor')
+const messageManager = require('./lib/message-manager')
+const autoFaucet = require('./lib/auto-faucet')
 const IdStoreMigrator = require('./lib/idStore-migrator')
+const BN = ethUtil.BN
 
 // Keyrings:
 const SimpleKeyring = require('./keyrings/simple')
@@ -27,7 +27,6 @@ module.exports = class KeyringController extends EventEmitter {
 
   constructor (opts) {
     super()
-    this.web3 = opts.web3
     this.configManager = opts.configManager
     this.ethStore = opts.ethStore
     this.encryptor = encryptor
@@ -39,7 +38,7 @@ module.exports = class KeyringController extends EventEmitter {
     this._unconfTxCbs = {}
     this._unconfMsgCbs = {}
 
-    this.network = opts.network
+    this.getNetwork = opts.getNetwork
 
     // TEMPORARY UNTIL FULL DEPRECATION:
     this.idStoreMigrator = new IdStoreMigrator({
@@ -47,7 +46,7 @@ module.exports = class KeyringController extends EventEmitter {
     })
   }
 
-  getState() {
+  getState () {
     const configManager = this.configManager
     const address = configManager.getSelectedAccount()
     const wallet = configManager.getWallet() // old style vault
@@ -57,7 +56,7 @@ module.exports = class KeyringController extends EventEmitter {
       seedWords: this.configManager.getSeedWords(),
       isInitialized: (!!wallet || !!vault),
       isUnlocked: !!this.key,
-      isConfirmed: true, // AUDIT this.configManager.getConfirmed(),
+      isDisclaimerConfirmed: this.configManager.getConfirmedDisclaimer(), // AUDIT this.configManager.getConfirmedDisclaimer(),
       unconfTxs: this.configManager.unconfirmedTxs(),
       transactions: this.configManager.getTxList(),
       unconfMsgs: messageManager.unconfirmedMsgs(),
@@ -73,18 +72,18 @@ module.exports = class KeyringController extends EventEmitter {
     }
   }
 
-  setStore(ethStore) {
+  setStore (ethStore) {
     this.ethStore = ethStore
   }
 
-  createNewVaultAndKeychain(password, entropy, cb) {
+  createNewVaultAndKeychain (password, entropy, cb) {
     this.createNewVault(password, entropy, (err) => {
       if (err) return cb(err)
       this.createFirstKeyTree(password, cb)
     })
   }
 
-  createNewVaultAndRestore(password, seed, cb) {
+  createNewVaultAndRestore (password, seed, cb) {
     if (typeof password !== 'string') {
       return cb('Password must be text.')
     }
@@ -99,7 +98,7 @@ module.exports = class KeyringController extends EventEmitter {
       if (err) return cb(err)
       this.addNewKeyring('HD Key Tree', {
         mnemonic: seed,
-        n: 1,
+        numberOfAccounts: 1,
       }, (err) => {
         if (err) return cb(err)
         const firstKeyring = this.keyrings[0]
@@ -110,12 +109,12 @@ module.exports = class KeyringController extends EventEmitter {
         this.setupAccounts(accounts)
 
         this.emit('update')
-        cb(null, this.getState())
+        cb()
       })
     })
   }
 
-  migrateAndGetKey(password) {
+  migrateAndGetKey (password) {
     let key
     const shouldMigrate = !!this.configManager.getWallet() && !this.configManager.getVault()
 
@@ -135,7 +134,7 @@ module.exports = class KeyringController extends EventEmitter {
     })
   }
 
-  createNewVault(password, entropy, cb) {
+  createNewVault (password, entropy, cb) {
     const configManager = this.configManager
     const salt = this.encryptor.generateSalt()
     configManager.setSalt(salt)
@@ -145,28 +144,27 @@ module.exports = class KeyringController extends EventEmitter {
       return this.persistAllKeyrings()
     })
     .then(() => {
-      cb(null)
+      cb()
     })
     .catch((err) => {
       cb(err)
     })
   }
 
-  createFirstKeyTree(password, cb) {
+  createFirstKeyTree (password, cb) {
     this.clearKeyrings()
-    this.addNewKeyring('HD Key Tree', {n: 1}, (err) => {
-      const firstKeyring = this.keyrings[0]
-      const accounts = firstKeyring.getAccounts()
+    this.addNewKeyring('HD Key Tree', {numberOfAccounts: 1}, (err) => {
+      const accounts = this.keyrings[0].getAccounts()
       const firstAccount = accounts[0]
       const hexAccount = normalize(firstAccount)
-      const seedWords = firstKeyring.serialize().mnemonic
       this.configManager.setSelectedAccount(firstAccount)
-      this.configManager.setSeedWords(seedWords)
+
+      this.placeSeedWords()
       autoFaucet(hexAccount)
       this.setupAccounts(accounts)
       this.persistAllKeyrings()
       .then(() => {
-        cb(err, this.getState())
+        cb(err)
       })
       .catch((reason) => {
         cb(reason)
@@ -174,13 +172,13 @@ module.exports = class KeyringController extends EventEmitter {
     })
   }
 
-  placeSeedWords (cb) {
+  placeSeedWords () {
     const firstKeyring = this.keyrings[0]
     const seedWords = firstKeyring.serialize().mnemonic
     this.configManager.setSeedWords(seedWords)
   }
 
-  submitPassword(password, cb) {
+  submitPassword (password, cb) {
     this.migrateAndGetKey(password)
     .then((key) => {
       return this.unlockKeyrings(key)
@@ -197,7 +195,7 @@ module.exports = class KeyringController extends EventEmitter {
     })
   }
 
-  loadKey(password) {
+  loadKey (password) {
     const salt = this.configManager.getSalt() || this.encryptor.generateSalt()
     return this.encryptor.keyFromPassword(password + salt)
     .then((key) => {
@@ -207,7 +205,7 @@ module.exports = class KeyringController extends EventEmitter {
     })
   }
 
-  addNewKeyring(type, opts, cb) {
+  addNewKeyring (type, opts, cb) {
     const Keyring = this.getKeyringClassForType(type)
     const keyring = new Keyring(opts)
     const accounts = keyring.getAccounts()
@@ -216,42 +214,42 @@ module.exports = class KeyringController extends EventEmitter {
     this.setupAccounts(accounts)
     this.persistAllKeyrings()
     .then(() => {
-      cb(null, this.getState())
+      cb()
     })
     .catch((reason) => {
       cb(reason)
     })
   }
 
-  addNewAccount(keyRingNum = 0, cb) {
+  addNewAccount (keyRingNum = 0, cb) {
     const ring = this.keyrings[keyRingNum]
     const accounts = ring.addAccounts(1)
     this.setupAccounts(accounts)
     this.persistAllKeyrings()
     .then(() => {
-      cb(null, this.getState())
+      cb()
     })
     .catch((reason) => {
       cb(reason)
     })
   }
 
-  setupAccounts(accounts) {
+  setupAccounts (accounts) {
     var arr = accounts || this.getAccounts()
     arr.forEach((account) => {
-      this.loadBalanceAndNickname(account)
+      this.getBalanceAndNickname(account)
     })
   }
 
   // Takes an account address and an iterator representing
   // the current number of named accounts.
-  loadBalanceAndNickname(account) {
+  getBalanceAndNickname (account) {
     const address = normalize(account)
     this.ethStore.addAccount(address)
     this.createNickname(address)
   }
 
-  createNickname(address) {
+  createNickname (address) {
     const hexAddress = normalize(address)
     var i = Object.keys(this.identities).length
     const oldNickname = this.configManager.nicknameForWallet(address)
@@ -275,7 +273,7 @@ module.exports = class KeyringController extends EventEmitter {
     }
   }
 
-  persistAllKeyrings() {
+  persistAllKeyrings () {
     const serialized = this.keyrings.map((k) => {
       return {
         type: k.type,
@@ -290,7 +288,7 @@ module.exports = class KeyringController extends EventEmitter {
     })
   }
 
-  unlockKeyrings(key) {
+  unlockKeyrings (key) {
     const encryptedVault = this.configManager.getVault()
     return this.encryptor.decryptWithKey(key, encryptedVault)
     .then((vault) => {
@@ -299,7 +297,7 @@ module.exports = class KeyringController extends EventEmitter {
     })
   }
 
-  restoreKeyring(serialized) {
+  restoreKeyring (serialized) {
     const { type, data } = serialized
     const Keyring = this.getKeyringClassForType(type)
     const keyring = new Keyring()
@@ -312,7 +310,7 @@ module.exports = class KeyringController extends EventEmitter {
     return keyring
   }
 
-  getKeyringClassForType(type) {
+  getKeyringClassForType (type) {
     const Keyring = this.keyringTypes.reduce((res, kr) => {
       if (kr.type() === type) {
         return kr
@@ -323,7 +321,7 @@ module.exports = class KeyringController extends EventEmitter {
     return Keyring
   }
 
-  getAccounts() {
+  getAccounts () {
     const keyrings = this.keyrings || []
     return keyrings.map(kr => kr.getAccounts())
     .reduce((res, arr) => {
@@ -331,13 +329,13 @@ module.exports = class KeyringController extends EventEmitter {
     }, [])
   }
 
-  setSelectedAddress(address, cb) {
+  setSelectedAddress (address, cb) {
     var addr = normalize(address)
     this.configManager.setSelectedAccount(addr)
     cb(null, addr)
   }
 
-  addUnconfirmedTransaction(txParams, onTxDoneCb, cb) {
+  addUnconfirmedTransaction (txParams, onTxDoneCb, cb) {
     var self = this
     const configManager = this.configManager
 
@@ -345,13 +343,14 @@ module.exports = class KeyringController extends EventEmitter {
     var time = (new Date()).getTime()
     var txId = createId()
     txParams.metamaskId = txId
-    txParams.metamaskNetworkId = this.network
+    txParams.metamaskNetworkId = this.getNetwork()
     var txData = {
       id: txId,
       txParams: txParams,
       time: time,
       status: 'unconfirmed',
       gasMultiplier: configManager.getGasMultiplier() || 1,
+      metamaskNetworkId: this.getNetwork(),
     }
 
 
@@ -369,7 +368,7 @@ module.exports = class KeyringController extends EventEmitter {
     ], didComplete)
 
     // perform static analyis on the target contract code
-    function analyzeForDelegateCall(cb){
+    function analyzeForDelegateCall (cb) {
       if (txParams.to) {
         query.getCode(txParams.to, function (err, result) {
           if (err) return cb(err)
@@ -388,8 +387,8 @@ module.exports = class KeyringController extends EventEmitter {
       }
     }
 
-    function estimateGas(cb){
-      query.estimateGas(txParams, function(err, result){
+    function estimateGas (cb) {
+      query.estimateGas(txParams, function (err, result) {
         if (err) return cb(err)
         txData.estimatedGas = self.addGasBuffer(result)
         cb()
@@ -406,7 +405,7 @@ module.exports = class KeyringController extends EventEmitter {
     }
   }
 
-  addUnconfirmedMessage(msgParams, cb) {
+  addUnconfirmedMessage (msgParams, cb) {
     // create txData obj with parameters and meta data
     var time = (new Date()).getTime()
     var msgId = createId()
@@ -428,7 +427,7 @@ module.exports = class KeyringController extends EventEmitter {
     return msgId
   }
 
-  approveTransaction(txId, cb) {
+  approveTransaction (txId, cb) {
     const configManager = this.configManager
     var approvalCb = this._unconfTxCbs[txId] || noop
 
@@ -441,7 +440,7 @@ module.exports = class KeyringController extends EventEmitter {
     this.emit('update')
   }
 
-  cancelTransaction(txId, cb) {
+  cancelTransaction (txId, cb) {
     const configManager = this.configManager
     var approvalCb = this._unconfTxCbs[txId] || noop
 
@@ -456,7 +455,7 @@ module.exports = class KeyringController extends EventEmitter {
     }
   }
 
-  signTransaction(txParams, cb) {
+  signTransaction (txParams, cb) {
     try {
       const address = normalize(txParams.from)
       const keyring = this.getKeyringForAccount(address)
@@ -492,7 +491,7 @@ module.exports = class KeyringController extends EventEmitter {
     }
   }
 
-  signMessage(msgParams, cb) {
+  signMessage (msgParams, cb) {
     try {
       const keyring = this.getKeyringForAccount(msgParams.from)
       const address = normalize(msgParams.from)
@@ -503,7 +502,7 @@ module.exports = class KeyringController extends EventEmitter {
     }
   }
 
-  getKeyringForAccount(address) {
+  getKeyringForAccount (address) {
     const hexed = normalize(address)
     return this.keyrings.find((ring) => {
       return ring.getAccounts()
@@ -512,19 +511,20 @@ module.exports = class KeyringController extends EventEmitter {
     })
   }
 
-  cancelMessage(msgId, cb) {
+  cancelMessage (msgId, cb) {
     if (cb && typeof cb === 'function') {
       cb()
     }
   }
 
-  setLocked(cb) {
+  setLocked (cb) {
     this.key = null
     this.keyrings = []
+    this.emit('update')
     cb()
   }
 
-  exportAccount(address, cb) {
+  exportAccount (address, cb) {
     try {
       const keyring = this.getKeyringForAccount(address)
       const privateKey = keyring.exportAccount(normalize(address))
@@ -534,19 +534,19 @@ module.exports = class KeyringController extends EventEmitter {
     }
   }
 
-  addGasBuffer(gas) {
+  addGasBuffer (gas) {
     const gasBuffer = new BN('100000', 10)
     const bnGas = new BN(ethUtil.stripHexPrefix(gas), 16)
     const correct = bnGas.add(gasBuffer)
     return ethUtil.addHexPrefix(correct.toString(16))
   }
 
-  clearSeedWordCache(cb) {
+  clearSeedWordCache (cb) {
     this.configManager.setSeedWords(null)
     cb(null, this.configManager.getSelectedAccount())
   }
 
-  clearKeyrings() {
+  clearKeyrings () {
     let accounts
     try {
       accounts = Object.keys(this.ethStore._currentState.accounts)
@@ -564,9 +564,4 @@ module.exports = class KeyringController extends EventEmitter {
 
 }
 
-function normalize(address) {
-  if (!address) return
-  return ethUtil.addHexPrefix(address.toLowerCase())
-}
-
 function noop () {}

app/scripts/keyrings/hd.js

@@ -2,24 +2,25 @@ const EventEmitter = require('events').EventEmitter
 const hdkey = require('ethereumjs-wallet/hdkey')
 const bip39 = require('bip39')
 const ethUtil = require('ethereumjs-util')
-const type = 'HD Key Tree'
 const sigUtil = require('../lib/sig-util')
 
+const type = 'HD Key Tree'
+
 const hdPathString = `m/44'/60'/0'/0`
 
 module.exports = class HdKeyring extends EventEmitter {
 
-  static type() {
+  static type () {
     return type
   }
 
-  constructor(opts = {}) {
+  constructor (opts = {}) {
     super()
     this.type = type
     this.deserialize(opts)
   }
 
-  deserialize(opts = {}) {
+  deserialize (opts = {}) {
     this.opts = opts || {}
     this.wallets = []
     this.mnemonic = null
@@ -29,38 +30,38 @@ module.exports = class HdKeyring extends EventEmitter {
       this.initFromMnemonic(opts.mnemonic)
     }
 
-    if ('n' in opts) {
-      this.addAccounts(opts.n)
+    if ('numberOfAccounts' in opts) {
+      this.addAccounts(opts.numberOfAccounts)
     }
   }
 
-  initFromMnemonic(mnemonic) {
+  initFromMnemonic (mnemonic) {
     this.mnemonic = mnemonic
     const seed = bip39.mnemonicToSeed(mnemonic)
     this.hdWallet = hdkey.fromMasterSeed(seed)
     this.root = this.hdWallet.derivePath(hdPathString)
   }
 
-  serialize() {
+  serialize () {
     return {
       mnemonic: this.mnemonic,
-      n: this.wallets.length,
+      numberOfAccounts: this.wallets.length,
     }
   }
 
-  exportAccount(address) {
+  exportAccount (address) {
     const wallet = this.getWalletForAccount(address)
     return wallet.getPrivateKey().toString('hex')
   }
 
-  addAccounts(n = 1) {
+  addAccounts (numberOfAccounts = 1) {
     if (!this.root) {
       this.initFromMnemonic(bip39.generateMnemonic())
     }
 
     const oldLen = this.wallets.length
     const newWallets = []
-    for (let i = oldLen; i < n + oldLen; i++) {
+    for (let i = oldLen; i < numberOfAccounts + oldLen; i++) {
       const child = this.root.deriveChild(i)
       const wallet = child.getWallet()
       newWallets.push(wallet)
@@ -69,12 +70,12 @@ module.exports = class HdKeyring extends EventEmitter {
     return newWallets.map(w => w.getAddress().toString('hex'))
   }
 
-  getAccounts() {
+  getAccounts () {
     return this.wallets.map(w => w.getAddress().toString('hex'))
   }
 
   // tx is an instance of the ethereumjs-transaction class.
-  signTransaction(address, tx) {
+  signTransaction (address, tx) {
     const wallet = this.getWalletForAccount(address)
     var privKey = wallet.getPrivateKey()
     tx.sign(privKey)
@@ -82,7 +83,7 @@ module.exports = class HdKeyring extends EventEmitter {
   }
 
   // For eth_sign, we need to sign transactions:
-  signMessage(withAccount, data) {
+  signMessage (withAccount, data) {
     const wallet = this.getWalletForAccount(withAccount)
     const message = ethUtil.removeHexPrefix(data)
     var privKey = wallet.getPrivateKey()
@@ -91,17 +92,10 @@ module.exports = class HdKeyring extends EventEmitter {
     return rawMsgSig
   }
 
-  getWalletForAccount(account) {
+  getWalletForAccount (account) {
     return this.wallets.find((w) => {
       const address = w.getAddress().toString('hex')
-      return ((address === account) || (normalize(address) === account))
+      return ((address === account) || (sigUtil.normalize(address) === account))
     })
   }
-
-
-
-}
-
-function normalize(address) {
-  return ethUtil.addHexPrefix(address.toLowerCase())
 }

app/scripts/keyrings/simple.js

@@ -6,22 +6,22 @@ const sigUtil = require('../lib/sig-util')
 
 module.exports = class SimpleKeyring extends EventEmitter {
 
-  static type() {
+  static type () {
     return type
   }
 
-  constructor(opts) {
+  constructor (opts) {
     super()
     this.type = type
     this.opts = opts || {}
     this.wallets = []
   }
 
-  serialize() {
+  serialize () {
     return this.wallets.map(w => w.getPrivateKey().toString('hex'))
   }
 
-  deserialize(wallets = []) {
+  deserialize (wallets = []) {
     this.wallets = wallets.map((w) => {
       var b = new Buffer(w, 'hex')
       const wallet = Wallet.fromPrivateKey(b)
@@ -29,7 +29,7 @@ module.exports = class SimpleKeyring extends EventEmitter {
     })
   }
 
-  addAccounts(n = 1) {
+  addAccounts (n = 1) {
     var newWallets = []
     for (var i = 0; i < n; i++) {
       newWallets.push(Wallet.generate())
@@ -38,12 +38,12 @@ module.exports = class SimpleKeyring extends EventEmitter {
     return newWallets.map(w => w.getAddress().toString('hex'))
   }
 
-  getAccounts() {
+  getAccounts () {
     return this.wallets.map(w => w.getAddress().toString('hex'))
   }
 
   // tx is an instance of the ethereumjs-transaction class.
-  signTransaction(address, tx) {
+  signTransaction (address, tx) {
     const wallet = this.getWalletForAccount(address)
     var privKey = wallet.getPrivateKey()
     tx.sign(privKey)
@@ -51,7 +51,7 @@ module.exports = class SimpleKeyring extends EventEmitter {
   }
 
   // For eth_sign, we need to sign transactions:
-  signMessage(withAccount, data) {
+  signMessage (withAccount, data) {
     const wallet = this.getWalletForAccount(withAccount)
     const message = ethUtil.removeHexPrefix(data)
     var privKey = wallet.getPrivateKey()
@@ -60,9 +60,8 @@ module.exports = class SimpleKeyring extends EventEmitter {
     return rawMsgSig
   }
 
-  getWalletForAccount(account) {
+  getWalletForAccount (account) {
     return this.wallets.find(w => w.getAddress().toString('hex') === account)
   }
 
 }
-

app/scripts/lib/auto-reload.js

@@ -18,17 +18,16 @@ function setupDappAutoReload (web3) {
 
   return handleResetRequest
 
-  function handleResetRequest() {
+  function handleResetRequest () {
     resetWasRequested = true
     // ignore if web3 was not used
     if (!pageIsUsingWeb3) return
     // reload after short timeout
     setTimeout(triggerReset, 500)
   }
-
 }
 
 // reload the page
 function triggerReset () {
   global.location.reload()
-}
+}

app/scripts/lib/config-manager.js

@@ -290,7 +290,7 @@ ConfigManager.prototype.getSalt = function () {
   return ('salt' in data) && data.salt
 }
 
-ConfigManager.prototype.setSalt = function(salt) {
+ConfigManager.prototype.setSalt = function (salt) {
   var data = this.getData()
   data.salt = salt
   this.setData(data)
@@ -313,15 +313,15 @@ ConfigManager.prototype._emitUpdates = function (state) {
   })
 }
 
-ConfigManager.prototype.setConfirmed = function (confirmed) {
+ConfigManager.prototype.setConfirmedDisclaimer = function (confirmed) {
   var data = this.getData()
-  data.isConfirmed = confirmed
+  data.isDisclaimerConfirmed = confirmed
   this.setData(data)
 }
 
-ConfigManager.prototype.getConfirmed = function () {
+ConfigManager.prototype.getConfirmedDisclaimer = function () {
   var data = this.getData()
-  return ('isConfirmed' in data) && data.isConfirmed
+  return ('isDisclaimerConfirmed' in data) && data.isDisclaimerConfirmed
 }
 
 ConfigManager.prototype.setTOSHash = function (hash) {
@@ -358,7 +358,6 @@ ConfigManager.prototype.updateConversionRate = function () {
     this.setConversionPrice(0)
     this.setConversionDate('N/A')
   })
-
 }
 
 ConfigManager.prototype.setConversionPrice = function (price) {

app/scripts/lib/encryptor.js

@@ -26,7 +26,7 @@ module.exports = {
   generateSalt,
 }
 
-// Takes a Pojo, returns encrypted text.
+// Takes a Pojo, returns cypher text.
 function encrypt (password, dataObj) {
   return keyFromPassword(password)
   .then(function (passwordDerivedKey) {
@@ -42,7 +42,7 @@ function encryptWithKey (key, dataObj) {
   return global.crypto.subtle.encrypt({
     name: 'AES-GCM',
     iv: vector,
-  }, key, dataBuffer).then(function(buf){
+  }, key, dataBuffer).then(function (buf) {
     var buffer = new Uint8Array(buf)
     var vectorStr = encodeBufferToBase64(vector)
     var vaultStr = encodeBufferToBase64(buffer)
@@ -63,13 +63,13 @@ function decryptWithKey (key, text) {
   const encryptedData = decodeBase64ToBuffer(parts[0])
   const vector = decodeBase64ToBuffer(parts[1])
   return crypto.subtle.decrypt({name: 'AES-GCM', iv: vector}, key, encryptedData)
-  .then(function(result){
+  .then(function (result) {
     const decryptedData = new Uint8Array(result)
     const decryptedStr = convertArrayBufferViewtoString(decryptedData)
     const decryptedObj = JSON.parse(decryptedStr)
     return decryptedObj
   })
-  .catch(function(reason) {
+  .catch(function (reason) {
     throw new Error('Incorrect password')
   })
 }
@@ -95,7 +95,7 @@ function convertArrayBufferViewtoString (buffer) {
 function keyFromPassword (password) {
   var passBuffer = convertStringToArrayBufferView(password)
   return global.crypto.subtle.digest('SHA-256', passBuffer)
-  .then(function (passHash){
+  .then(function (passHash) {
     return global.crypto.subtle.importKey('raw', passHash, {name: 'AES-GCM'}, false, ['encrypt', 'decrypt'])
   })
 }
@@ -135,7 +135,7 @@ function encodeBufferToBase64 (buf) {
 
 function decodeBase64ToBuffer (base64) {
   var buf = new Uint8Array(atob(base64).split('')
-  .map(function(c) {
+  .map(function (c) {
     return c.charCodeAt(0)
   }))
   return buf

app/scripts/lib/idStore-migrator.js

@@ -11,7 +11,7 @@ module.exports = class IdentityStoreMigrator {
     }
   }
 
-  oldSeedForPassword( password ) {
+  oldSeedForPassword (password) {
     const hasOldVault = this.hasOldVault()
     const configManager = this.configManager
 
@@ -35,7 +35,7 @@ module.exports = class IdentityStoreMigrator {
     })
   }
 
-  serializeVault() {
+  serializeVault () {
     const mnemonic = this.idStore._idmgmt.getSeed()
     const n = this.idStore._getAddresses().length
 
@@ -45,7 +45,7 @@ module.exports = class IdentityStoreMigrator {
     }
   }
 
-  hasOldVault() {
+  hasOldVault () {
     const wallet = this.configManager.getWallet()
     return wallet
   }

app/scripts/lib/idStore.js

@@ -102,7 +102,7 @@ IdentityStore.prototype.getState = function () {
     isInitialized: !!configManager.getWallet() && !seedWords,
     isUnlocked: this._isUnlocked(),
     seedWords: seedWords,
-    isConfirmed: configManager.getConfirmed(),
+    isDisclaimerConfirmed: configManager.getConfirmedDisclaimer(),
     unconfTxs: configManager.unconfirmedTxs(),
     transactions: configManager.getTxList(),
     unconfMsgs: messageManager.unconfirmedMsgs(),
@@ -243,10 +243,10 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone
   ], didComplete)
 
   // perform static analyis on the target contract code
-  function analyzeForDelegateCall(cb){
+  function analyzeForDelegateCall (cb) {
     if (txParams.to) {
       query.getCode(txParams.to, (err, result) => {
-        if (err) return cb(err)
+        if (err) return cb(err.message || err)
         var containsDelegateCall = self.checkForDelegateCall(result)
         txData.containsDelegateCall = containsDelegateCall
         cb()
@@ -256,16 +256,31 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone
     }
   }
 
-  function estimateGas(cb){
-    query.estimateGas(txParams, function(err, result){
-      if (err) return cb(err)
+  function estimateGas (cb) {
+    var estimationParams = extend(txParams)
+    // 1 billion gas for estimation
+    var gasLimit = '0x3b9aca00'
+    estimationParams.gas = gasLimit
+    query.estimateGas(estimationParams, function (err, result) {
+      if (err) return cb(err.message || err)
+      if (result === estimationParams.gas) {
+        txData.simulationFails = true
+        query.getBlockByNumber('latest', true, function (err, block) {
+          if (err) return cb(err)
+          txData.estimatedGas = block.gasLimit
+          txData.txParams.gas = block.gasLimit
+          cb()
+        })
+        return
+      }
       txData.estimatedGas = self.addGasBuffer(result)
+      txData.txParams.gas = txData.estimatedGas
       cb()
     })
   }
 
   function didComplete (err) {
-    if (err) return cb(err)
+    if (err) return cb(err.message || err)
     configManager.addTx(txData)
     // signal update
     self._didUpdate()
@@ -285,9 +300,10 @@ IdentityStore.prototype.checkForDelegateCall = function (codeHex) {
   }
 }
 
-const gasBuffer = new BN('100000', 10)
 IdentityStore.prototype.addGasBuffer = function (gas) {
   const bnGas = new BN(ethUtil.stripHexPrefix(gas), 16)
+  const five = new BN('5', 10)
+  const gasBuffer = bnGas.div(five)
   const correct = bnGas.add(gasBuffer)
   return ethUtil.addHexPrefix(correct.toString(16))
 }

app/scripts/lib/inpage-provider.js

@@ -40,7 +40,7 @@ function MetamaskInpageProvider (connectionStream) {
 
   self.idMap = {}
   // handle sendAsync requests via asyncProvider
-  self.sendAsync = function(payload, cb){
+  self.sendAsync = function (payload, cb) {
     // rewrite request ids
     var request = eachJsonMessage(payload, (message) => {
       var newId = createRandomId()
@@ -49,7 +49,7 @@ function MetamaskInpageProvider (connectionStream) {
       return message
     })
     // forward to asyncProvider
-    asyncProvider.sendAsync(request, function(err, res){
+    asyncProvider.sendAsync(request, function (err, res) {
       if (err) return cb(err)
       // transform messages to original ids
       eachJsonMessage(res, (message) => {

app/scripts/lib/is-popup-or-notification.js

@@ -1,4 +1,4 @@
-module.exports = function isPopupOrNotification() {
+module.exports = function isPopupOrNotification () {
   const url = window.location.href
   if (url.match(/popup.html$/)) {
     return 'popup'

app/scripts/lib/notifications.js

@@ -15,12 +15,9 @@ function show () {
     if (err) throw err
 
     if (popup) {
-
       // bring focus to existing popup
       extension.windows.update(popup.id, { focused: true })
-
     } else {
-
       // create new popup
       extension.windows.create({
         url: 'notification.html',
@@ -29,12 +26,11 @@ function show () {
         width,
         height,
       })
-
     }
   })
 }
 
-function getWindows(cb) {
+function getWindows (cb) {
   // Ignore in test environment
   if (!extension.windows) {
     return cb()
@@ -45,14 +41,14 @@ function getWindows(cb) {
   })
 }
 
-function getPopup(cb) {
+function getPopup (cb) {
   getWindows((err, windows) => {
     if (err) throw err
     cb(null, getPopupIn(windows))
   })
 }
 
-function getPopupIn(windows) {
+function getPopupIn (windows) {
   return windows ? windows.find((win) => {
     return (win && win.type === 'popup' &&
       win.height === height &&
@@ -60,7 +56,7 @@ function getPopupIn(windows) {
   }) : null
 }
 
-function closePopup() {
+function closePopup () {
   getPopup((err, popup) => {
     if (err) throw err
     if (!popup) return

app/scripts/lib/sig-util.js

@@ -12,6 +12,11 @@ module.exports = {
     return ethUtil.addHexPrefix(rStr.concat(sStr, vStr)).toString('hex')
   },
 
+  normalize: function (address) {
+    if (!address) return
+    return ethUtil.addHexPrefix(address.toLowerCase())
+  },
+
 }
 
 function padWithZeroes (number, length) {

app/scripts/metamask-controller.js

@@ -17,6 +17,7 @@ module.exports = class MetamaskController {
     this.configManager = new ConfigManager(opts)
     this.keyringController = new KeyringController({
       configManager: this.configManager,
+      getNetwork: this.getStateNetwork.bind(this),
     })
     this.provider = this.initializeProvider(opts)
     this.ethStore = new EthStore(this.provider)
@@ -86,23 +87,6 @@ module.exports = class MetamaskController {
   }
 
   onRpcRequest (stream, originDomain, request) {
-
-    /* Commented out for Parity compliance
-     * Parity does not permit additional keys, like `origin`,
-     * and Infura is not currently filtering this key out.
-    var payloads = Array.isArray(request) ? request : [request]
-    payloads.forEach(function (payload) {
-      // Append origin to rpc payload
-      payload.origin = originDomain
-      // Append origin to signature request
-      if (payload.method === 'eth_sendTransaction') {
-        payload.params[0].origin = originDomain
-      } else if (payload.method === 'eth_sign') {
-        payload.params.push({ origin: originDomain })
-      }
-    })
-    */
-
     // handle rpc request
     this.provider.sendAsync(request, function onPayloadHandled (err, response) {
       logger(err, request, response)
@@ -215,10 +199,8 @@ module.exports = class MetamaskController {
 
   newUnsignedTransaction (txParams, onTxDoneCb) {
     const keyringController = this.keyringController
-
-    let err = this.enforceTxValidations(txParams)
+    const err = this.enforceTxValidations(txParams)
     if (err) return onTxDoneCb(err)
-
     keyringController.addUnconfirmedTransaction(txParams, onTxDoneCb, (err, txData) => {
       if (err) return onTxDoneCb(err)
       this.sendUpdate()
@@ -291,12 +273,11 @@ module.exports = class MetamaskController {
     } catch (e) {
       console.error('Error in checking TOS change.')
     }
-
   }
 
   agreeToDisclaimer (cb) {
     try {
-      this.configManager.setConfirmed(true)
+      this.configManager.setConfirmedDisclaimer(true)
       cb()
     } catch (e) {
       cb(e)
@@ -305,7 +286,7 @@ module.exports = class MetamaskController {
 
   resetDisclaimer () {
     try {
-      this.configManager.setConfirmed(false)
+      this.configManager.setConfirmedDisclaimer(false)
     } catch (e) {
       console.error(e)
     }
@@ -373,7 +354,7 @@ module.exports = class MetamaskController {
     this.configManager.createShapeShiftTx(depositAddress, depositType)
   }
 
-  getNetwork(err) {
+  getNetwork (err) {
     if (err) {
       this.state.network = 'loading'
       this.sendUpdate()
@@ -400,4 +381,8 @@ module.exports = class MetamaskController {
       cb(e)
     }
   }
+
+  getStateNetwork () {
+    return this.state.network
+  }
 }

app/scripts/popup-core.js

@@ -9,7 +9,7 @@ const setupMultiplex = require('./lib/stream-utils.js').setupMultiplex
 module.exports = initializePopup
 
 
-function initializePopup(connectionStream){
+function initializePopup (connectionStream) {
   // setup app
   connectToAccountManager(connectionStream, setupApp)
 }
@@ -32,7 +32,7 @@ function setupWeb3Connection (connectionStream) {
 }
 
 function setupControllerConnection (connectionStream, cb) {
-  // this is a really sneaky way of adding EventEmitter api 
+  // this is a really sneaky way of adding EventEmitter api
   // to a bi-directional dnode instance
   var eventEmitter = new EventEmitter()
   var accountManagerDnode = Dnode({

app/scripts/popup.js

@@ -18,7 +18,7 @@ var portStream = new PortStream(pluginPort)
 
 startPopup(portStream)
 
-function closePopupIfOpen(name) {
+function closePopupIfOpen (name) {
   if (name !== 'notification') {
     notification.closePopup()
   }

development/states/account-detail-with-shapeshift-tx.json

@@ -136,7 +136,7 @@
     "selectedAddress": "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc",
     "network": "1",
     "seedWords": null,
-    "isConfirmed": true,
+    "isDisclaimerConfirmed": true,
     "unconfMsgs": {},
     "messages": [],
     "provider": {

development/states/account-detail-with-transaction-history.json

@@ -102,7 +102,7 @@
     "selectedAddress": "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc",
     "network": "2",
     "seedWords": null,
-    "isConfirmed": true,
+    "isDisclaimerConfirmed": true,
     "unconfMsgs": {},
     "messages": [],
     "provider": {

development/states/account-detail.json

@@ -60,7 +60,7 @@
     "selectedAddress": "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc",
     "network": "2",
     "seedWords": null,
-    "isConfirmed": true,
+    "isDisclaimerConfirmed": true,
     "unconfMsgs": {},
     "messages": [],
     "provider": {

development/states/accounts.json

@@ -91,7 +91,7 @@
     "transactions": [],
     "selectedAddress": "0x0abdd95cafcabec9b3e99dcd09fc4b441037cb80",
     "network": "2",
-    "isConfirmed": true,
+    "isDisclaimerConfirmed": true,
     "unconfMsgs": {},
     "messages": [],
     "shapeShiftTxList": [],

development/states/config.json

@@ -59,7 +59,7 @@
     "transactions": [],
     "selectedAddress": "0x843963b837841dad3b0f5969ff271108776616df",
     "network": "2",
-    "isConfirmed": true,
+    "isDisclaimerConfirmed": true,
     "unconfMsgs": {},
     "messages": [],
     "provider": {

development/states/create-vault-password.json

@@ -10,7 +10,7 @@
     "transactions": [],
     "network": "2",
     "seedWords": null,
-    "isConfirmed": true,
+    "isDisclaimerConfirmed": true,
     "unconfMsgs": {},
     "messages": [],
     "provider": {

development/states/custom-rpc.json

@@ -160,7 +160,7 @@
     "selectedAddress": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
     "network": "166",
     "seedWords": null,
-    "isConfirmed": true,
+    "isDisclaimerConfirmed": true,
     "unconfMsgs": {},
     "messages": [],
     "provider": {

development/states/empty-account-detail.json

@@ -57,7 +57,7 @@
     "selectedAddress": "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc",
     "network": "2",
     "seedWords": null,
-    "isConfirmed": true,
+    "isDisclaimerConfirmed": true,
     "unconfMsgs": {},
     "messages": [],
     "provider": {

development/states/first-time.json

@@ -11,7 +11,7 @@
     "network": null,
     "accounts": {},
     "transactions": [],
-    "isConfirmed": true,
+    "isDisclaimerConfirmed": true,
     "unconfMsgs": {},
     "messages": [],
     "shapeShiftTxList": [],

development/states/help.json

@@ -55,7 +55,7 @@
     },
     "transactions": [],
     "network": "2",
-    "isConfirmed": true,
+    "isDisclaimerConfirmed": true,
     "unconfMsgs": {},
     "messages": [],
     "provider": {

development/states/locked.json

@@ -14,7 +14,7 @@
     "selectedAddress": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
     "network": "1473186153102",
     "seedWords": null,
-    "isConfirmed": true,
+    "isDisclaimerConfirmed": true,
     "unconfMsgs": {},
     "messages": [],
     "shapeShiftTxList": [],

development/states/new-vault.json

@@ -10,7 +10,7 @@
     "transactions": [],
     "network": "2",
     "seedWords": null,
-    "isConfirmed": false,
+    "isDisclaimerConfirmed": false,
     "unconfMsgs": {},
     "messages": [],
     "provider": {

development/states/pending-signature.json

@@ -354,7 +354,7 @@
     "selectedAddress": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
     "network": "1471904489432",
     "seedWords": null,
-    "isConfirmed": true,
+    "isDisclaimerConfirmed": true,
     "unconfMsgs": {
       "1472076978535283": {
         "id": 1472076978535283,

development/states/pending-tx-send-coin.json

@@ -1 +1 @@
-{"metamask":{"isInitialized":true,"isUnlocked":true,"currentDomain":"example.com","rpcTarget":"https://rawtestrpc.metamask.io/","identities":{"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825":{"name":"Wallet 1","address":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825","mayBeFauceting":false},"0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb":{"name":"Wallet 2","address":"0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb","mayBeFauceting":false},"0x2f8d4a878cfa04a6e60d46362f5644deab66572d":{"name":"Wallet 3","address":"0x2f8d4a878cfa04a6e60d46362f5644deab66572d","mayBeFauceting":false}},"unconfTxs":{"1467868023090690":{"id":1467868023090690,"txParams":{"data":"0xa9059cbb0000000000000000000000008deb4d106090c3eb8f1950f727e87c4f884fb06f0000000000000000000000000000000000000000000000000000000000000064","from":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825","value":"0x16345785d8a0000","to":"0xbeb0ed3034c4155f3d16a64a5c5e7c8d4ea9e9c9","origin":"MetaMask","metamaskId":1467868023090690,"metamaskNetworkId":"2"},"time":1467868023090,"status":"unconfirmed","containsDelegateCall":false}},"accounts":{"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825":{"code":"0x","balance":"0x38326dc32cf80800","nonce":"0x10000c","address":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825"},"0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb":{"code":"0x","balance":"0x15e578bd8e9c8000","nonce":"0x100000","address":"0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb"},"0x2f8d4a878cfa04a6e60d46362f5644deab66572d":{"code":"0x","nonce":"0x100000","balance":"0x2386f26fc10000","address":"0x2f8d4a878cfa04a6e60d46362f5644deab66572d"}},"transactions":[],"selectedAddress":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825","network":"2","seedWords":null,"isConfirmed":true,"unconfMsgs":{},"messages":[],"provider":{"type":"testnet"},"selectedAccount":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825"},"appState":{"menuOpen":false,"currentView":{"name":"confTx","context":0},"accountDetail":{"subview":"transactions"},"currentDomain":"extensions","transForward":true,"isLoading":false,"warning":null},"identities":{}}
+{"metamask":{"isInitialized":true,"isUnlocked":true,"currentDomain":"example.com","rpcTarget":"https://rawtestrpc.metamask.io/","identities":{"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825":{"name":"Wallet 1","address":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825","mayBeFauceting":false},"0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb":{"name":"Wallet 2","address":"0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb","mayBeFauceting":false},"0x2f8d4a878cfa04a6e60d46362f5644deab66572d":{"name":"Wallet 3","address":"0x2f8d4a878cfa04a6e60d46362f5644deab66572d","mayBeFauceting":false}},"unconfTxs":{"1467868023090690":{"id":1467868023090690,"txParams":{"data":"0xa9059cbb0000000000000000000000008deb4d106090c3eb8f1950f727e87c4f884fb06f0000000000000000000000000000000000000000000000000000000000000064","from":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825","value":"0x16345785d8a0000","to":"0xbeb0ed3034c4155f3d16a64a5c5e7c8d4ea9e9c9","origin":"MetaMask","metamaskId":1467868023090690,"metamaskNetworkId":"2"},"time":1467868023090,"status":"unconfirmed","containsDelegateCall":false}},"accounts":{"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825":{"code":"0x","balance":"0x38326dc32cf80800","nonce":"0x10000c","address":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825"},"0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb":{"code":"0x","balance":"0x15e578bd8e9c8000","nonce":"0x100000","address":"0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb"},"0x2f8d4a878cfa04a6e60d46362f5644deab66572d":{"code":"0x","nonce":"0x100000","balance":"0x2386f26fc10000","address":"0x2f8d4a878cfa04a6e60d46362f5644deab66572d"}},"transactions":[],"selectedAddress":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825","network":"2","seedWords":null,"isDisclaimerConfirmed":true,"unconfMsgs":{},"messages":[],"provider":{"type":"testnet"},"selectedAccount":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825"},"appState":{"menuOpen":false,"currentView":{"name":"confTx","context":0},"accountDetail":{"subview":"transactions"},"currentDomain":"extensions","transForward":true,"isLoading":false,"warning":null},"identities":{}}

development/states/restore-vault.json

@@ -12,7 +12,7 @@
     "accounts": {},
     "transactions": [],
     "seedWords": null,
-    "isConfirmed": true,
+    "isDisclaimerConfirmed": true,
     "unconfMsgs": {},
     "messages": [],
     "shapeShiftTxList": [],

development/states/send.json

@@ -48,7 +48,7 @@
     "transactions": [],
     "network": "2",
     "seedWords": null,
-    "isConfirmed": true,
+    "isDisclaimerConfirmed": true,
     "unconfMsgs": {},
     "messages": [],
     "shapeShiftTxList": [],

development/states/shapeshift.json

@@ -49,7 +49,7 @@
     "selectedAddress": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
     "network": "1",
     "seedWords": null,
-    "isConfirmed": true,
+    "isDisclaimerConfirmed": true,
     "unconfMsgs": {},
     "messages": [],
     "shapeShiftTxList": [],

development/states/show-seed-words.json

@@ -45,7 +45,7 @@
     "transactions": [],
     "network": "2",
     "seedWords": "debris dizzy just program just float decrease vacant alarm reduce speak stadium",
-    "isConfirmed": true,
+    "isDisclaimerConfirmed": true,
     "unconfMsgs": {},
     "messages": [],
     "provider": {

test/unit/config-manager-test.js

@@ -100,31 +100,31 @@ describe('config-manager', function() {
 
   describe('confirmation', function() {
 
-    describe('#getConfirmed', function() {
+    describe('#getConfirmedDisclaimer', function() {
       it('should return false if no previous key exists', function() {
-        var result = configManager.getConfirmed()
+        var result = configManager.getConfirmedDisclaimer()
         assert.ok(!result)
       })
     })
 
-    describe('#setConfirmed', function() {
-      it('should make getConfirmed return true once set', function() {
-        assert.equal(configManager.getConfirmed(), false)
-        configManager.setConfirmed(true)
-        var result = configManager.getConfirmed()
+    describe('#setConfirmedDisclaimer', function() {
+      it('should make getConfirmedDisclaimer return true once set', function() {
+        assert.equal(configManager.getConfirmedDisclaimer(), false)
+        configManager.setConfirmedDisclaimer(true)
+        var result = configManager.getConfirmedDisclaimer()
         assert.equal(result, true)
       })
 
       it('should be able to set false', function() {
-        configManager.setConfirmed(false)
-        var result = configManager.getConfirmed()
+        configManager.setConfirmedDisclaimer(false)
+        var result = configManager.getConfirmedDisclaimer()
         assert.equal(result, false)
       })
 
       it('should persist to local storage', function() {
-        configManager.setConfirmed(true)
+        configManager.setConfirmedDisclaimer(true)
         var data = configManager.getData()
-        assert.equal(data.isConfirmed, true)
+        assert.equal(data.isDisclaimerConfirmed, true)
       })
     })
   })
@@ -153,7 +153,7 @@ describe('config-manager', function() {
           rpcTarget: 'foobar'
         },
       }
-      configManager.setConfirmed(true)
+      configManager.setConfirmedDisclaimer(true)
       configManager.setConfig(testConfig)
 
       var testWallet = {
@@ -164,7 +164,7 @@ describe('config-manager', function() {
       var result = configManager.getData()
       assert.equal(result.wallet.name, testWallet.name, 'wallet name is set')
       assert.equal(result.config.provider.rpcTarget, testConfig.provider.rpcTarget)
-      assert.equal(configManager.getConfirmed(), true)
+      assert.equal(configManager.getConfirmedDisclaimer(), true)
 
       testConfig.provider.type = 'something else!'
       configManager.setConfig(testConfig)
@@ -173,7 +173,7 @@ describe('config-manager', function() {
       assert.equal(result.wallet.name, testWallet.name, 'wallet name is set')
       assert.equal(result.config.provider.rpcTarget, testConfig.provider.rpcTarget)
       assert.equal(result.config.provider.type, testConfig.provider.type)
-      assert.equal(configManager.getConfirmed(), true)
+      assert.equal(configManager.getConfirmedDisclaimer(), true)
     })
   })
 

test/unit/idStore-test.js

@@ -159,7 +159,7 @@ describe('IdentityStore', function() {
       assert.equal(result.indexOf('0x'), 0, 'include hex prefix')
     })
 
-    it('buffers reasonably', function() {
+    it('buffers 20%', function() {
       const idStore = new IdentityStore({
         configManager: configManagerGen(),
         ethStore: {
@@ -168,20 +168,18 @@ describe('IdentityStore', function() {
       })
 
       const gas = '0x04ee59' // Actual estimated gas example
-      const tooBigOutput = '0x80674f9' // Actual bad output
       const bnGas = new BN(ethUtil.stripHexPrefix(gas), 16)
-      const correctBuffer = new BN('100000', 10)
+      const five = new BN('5', 10)
+      const correctBuffer = bnGas.div(five)
       const correct = bnGas.add(correctBuffer)
 
-      const tooBig = new BN(tooBigOutput, 16)
       const result = idStore.addGasBuffer(gas)
       const bnResult = new BN(ethUtil.stripHexPrefix(result), 16)
 
       assert.equal(result.indexOf('0x'), 0, 'included hex prefix')
       assert(bnResult.gt(bnGas), 'Estimate increased in value.')
-      assert.equal(bnResult.sub(bnGas).toString(10), '100000', 'added 100k gas')
+      assert.equal(bnResult.sub(bnGas).toString(10), correctBuffer.toString(10), 'added 20% gas')
       assert.equal(result, '0x' + correct.toString(16), 'Added the right amount')
-      assert.notEqual(result, tooBigOutput, 'not that bad estimate')
     })
   })
 

test/unit/keyring-controller-test.js

@@ -67,12 +67,12 @@ describe('KeyringController', function() {
         type: 'HD Key Tree',
         data: {
           mnemonic: seedWords,
-          n: 1,
+          numberOfAccounts: 1,
         }
       }
       const mock = this.sinon.mock(keyringController)
 
-      mock.expects('loadBalanceAndNickname')
+      mock.expects('getBalanceAndNickname')
       .exactly(1)
 
       var keyring = keyringController.restoreKeyring(mockSerialized)
@@ -170,4 +170,3 @@ describe('KeyringController', function() {
     })
   })
 })
-

test/unit/keyrings/hd-test.js

@@ -19,7 +19,7 @@ describe('hd-keyring', function() {
   describe('constructor', function() {
     keyring = new HdKeyring({
       mnemonic: sampleMnemonic,
-      n: 2,
+      numberOfAccounts: 2,
     })
 
     const accounts = keyring.getAccounts()
@@ -45,7 +45,7 @@ describe('hd-keyring', function() {
   describe('#serialize empty wallets.', function() {
     it('serializes a new mnemonic', function() {
       const output = keyring.serialize()
-      assert.equal(output.n, 0)
+      assert.equal(output.numberOfAccounts, 0)
       assert.equal(output.mnemonic, null)
     })
   })
@@ -54,7 +54,7 @@ describe('hd-keyring', function() {
     it('serializes what it deserializes', function() {
       keyring.deserialize({
         mnemonic: sampleMnemonic,
-        n: 1
+        numberOfAccounts: 1
       })
       assert.equal(keyring.wallets.length, 1, 'restores two accounts')
       keyring.addAccounts(1)

ui/app/actions.js

@@ -44,7 +44,6 @@ var actions = {
   unlockInProgress: unlockInProgress,
   // error handling
   displayWarning: displayWarning,
-  showWarning: showWarning, // alias
   DISPLAY_WARNING: 'DISPLAY_WARNING',
   HIDE_WARNING: 'HIDE_WARNING',
   hideWarning: hideWarning,
@@ -146,7 +145,7 @@ var actions = {
 module.exports = actions
 
 var background = null
-function _setBackgroundConnection(backgroundConnection) {
+function _setBackgroundConnection (backgroundConnection) {
   background = backgroundConnection
 }
 
@@ -167,7 +166,6 @@ function tryUnlockMetamask (password) {
       if (err) {
         dispatch(actions.unlockFailed(err.message))
       } else {
-        dispatch(this.updateMetamaskState(newState))
         let selectedAccount
         try {
           selectedAccount = newState.metamask.selectedAccount
@@ -184,7 +182,7 @@ function confirmSeedWords () {
     background.clearSeedWordCache((err, account) => {
       dispatch(actions.hideLoadingIndication())
       if (err) {
-        return dispatch(actions.showWarning(err.message))
+        return dispatch(actions.displayWarning(err.message))
       }
 
       console.log('Seed word cache cleared. ' + account)
@@ -196,23 +194,19 @@ function confirmSeedWords () {
 function createNewVaultAndRestore (password, seed) {
   return (dispatch) => {
     dispatch(actions.showLoadingIndication())
-    background.createNewVaultAndRestore(password, seed, (err, newState) => {
+    background.createNewVaultAndRestore(password, seed, (err) => {
       dispatch(actions.hideLoadingIndication())
       if (err) return dispatch(actions.displayWarning(err.message))
-      dispatch(this.updateMetamaskState(newState))
     })
   }
 }
 
 function createNewVaultAndKeychain (password, entropy) {
   return (dispatch) => {
-    background.createNewVaultAndKeychain(password, entropy, (err, newState) => {
+    background.createNewVaultAndKeychain(password, entropy, (err) => {
       if (err) {
         return dispatch(actions.showWarning(err.message))
       }
-
-      dispatch(this.updateMetamaskState(newState))
-      dispatch(this.showNewVaultSeed())
     })
   }
 }
@@ -226,11 +220,10 @@ function revealSeedConfirmation () {
 function requestRevealSeed (password) {
   return (dispatch) => {
     dispatch(actions.showLoadingIndication())
-    background.submitPassword(password, (err, newState) => {
+    background.submitPassword(password, (err) => {
       dispatch(actions.hideLoadingIndication())
       if (err) return dispatch(actions.displayWarning(err.message))
       background.placeSeedWords()
-      dispatch(actions.showNewVaultSeed())
     })
   }
 }
@@ -239,13 +232,11 @@ function requestRevealSeed (password) {
 function addNewKeyring (type, opts) {
   return (dispatch) => {
     dispatch(actions.showLoadingIndication())
-    background.addNewKeyring(type, opts, (err, newState) => {
+    background.addNewKeyring(type, opts, (err) => {
       dispatch(this.hideLoadingIndication())
       if (err) {
         return dispatch(actions.showWarning(err))
       }
-      dispatch(this.updateMetamaskState(newState))
-      dispatch(this.showAccountsPage())
     })
   }
 }
@@ -253,12 +244,11 @@ function addNewKeyring (type, opts) {
 function addNewAccount (ringNumber = 0) {
   return (dispatch) => {
     dispatch(actions.showLoadingIndication())
-    background.addNewAccount(ringNumber, (err, newState) => {
+    background.addNewAccount(ringNumber, (err) => {
       dispatch(this.hideLoadingIndication())
       if (err) {
         return dispatch(actions.showWarning(err))
       }
-      dispatch(this.updateMetamaskState(newState))
     })
   }
 }
@@ -384,7 +374,7 @@ function agreeToDisclaimer () {
     dispatch(this.showLoadingIndication())
     background.agreeToDisclaimer((err) => {
       if (err) {
-        return dispatch(actions.showWarning(err.message))
+        return dispatch(actions.displayWarning(err.message))
       }
 
       dispatch(this.hideLoadingIndication())
@@ -456,12 +446,8 @@ function lockMetamask () {
     background.setLocked((err) => {
       dispatch(actions.hideLoadingIndication())
       if (err) {
-        return dispatch(actions.showWarning(err.message))
+        return dispatch(actions.displayWarning(err.message))
       }
-
-      dispatch({
-        type: actions.LOCK_METAMASK,
-      })
     })
   }
 }
@@ -472,7 +458,7 @@ function showAccountDetail (address) {
     background.setSelectedAddress(address, (err, address) => {
       dispatch(actions.hideLoadingIndication())
       if (err) {
-        return dispatch(actions.showWarning(err.message))
+        return dispatch(actions.displayWarning(err.message))
       }
 
       dispatch({
@@ -586,10 +572,6 @@ function hideSubLoadingIndication () {
   }
 }
 
-function showWarning (text) {
-  return this.displayWarning(text)
-}
-
 function displayWarning (text) {
   return {
     type: actions.DISPLAY_WARNING,
@@ -641,7 +623,7 @@ function saveAccountLabel (account, label) {
     background.saveAccountLabel(account, label, (err) => {
       dispatch(actions.hideLoadingIndication())
       if (err) {
-        return dispatch(actions.showWarning(err.message))
+        return dispatch(actions.displayWarning(err.message))
       }
       dispatch({
         type: actions.SAVE_ACCOUNT_LABEL,
@@ -717,7 +699,7 @@ function shapeShiftSubview (network) {
     shapeShiftRequest('marketinfo', {pair}, (mktResponse) => {
       shapeShiftRequest('getcoins', {}, (response) => {
         dispatch(actions.hideSubLoadingIndication())
-        if (mktResponse.error) return dispatch(actions.showWarning(mktResponse.error))
+        if (mktResponse.error) return dispatch(actions.displayWarning(mktResponse.error))
         dispatch({
           type: actions.SHAPESHIFT_SUBVIEW,
           value: {
@@ -734,7 +716,7 @@ function coinShiftRquest (data, marketData) {
   return (dispatch) => {
     dispatch(actions.showLoadingIndication())
     shapeShiftRequest('shift', { method: 'POST', data}, (response) => {
-      if (response.error) return dispatch(actions.showWarning(response.error))
+      if (response.error) return dispatch(actions.displayWarning(response.error))
       var message = `
         Deposit your ${response.depositType} to the address bellow:`
       background.createShapeShiftTx(response.deposit, response.depositType)
@@ -756,7 +738,7 @@ function reshowQrCode (data, coin) {
   return (dispatch) => {
     dispatch(actions.showLoadingIndication())
     shapeShiftRequest('marketinfo', {pair: `${coin.toLowerCase()}_eth`}, (mktResponse) => {
-      if (mktResponse.error) return dispatch(actions.showWarning(mktResponse.error))
+      if (mktResponse.error) return dispatch(actions.displayWarning(mktResponse.error))
 
       var message = [
         `Deposit your ${coin} to the address bellow:`,

ui/app/app.js

@@ -39,7 +39,7 @@ function mapStateToProps (state) {
   return {
     // state from plugin
     isLoading: state.appState.isLoading,
-    isConfirmed: state.metamask.isConfirmed,
+    isDisclaimerConfirmed: state.metamask.isDisclaimerConfirmed,
     isInitialized: state.metamask.isInitialized,
     isUnlocked: state.metamask.isUnlocked,
     currentView: state.appState.currentView,
@@ -98,7 +98,6 @@ App.prototype.render = function () {
 }
 
 App.prototype.renderAppBar = function () {
-
   if (window.METAMASK_UI_TYPE === 'notification') {
     return null
   }
@@ -324,7 +323,7 @@ App.prototype.renderBackButton = function (style, justArrow = false) {
 App.prototype.renderBackToInitButton = function () {
   var props = this.props
   var button = null
-  if (!props.isConfirmed) return button
+  if (!props.isDisclaimerConfirmed) return button
 
   if (!props.isUnlocked) {
     if (props.currentView.name === 'InitMenu') {
@@ -357,7 +356,7 @@ App.prototype.renderBackToInitButton = function () {
 App.prototype.renderPrimary = function () {
   var props = this.props
 
-  if (!props.isConfirmed) {
+  if (!props.isDisclaimerConfirmed) {
     return h(DisclaimerScreen, {key: 'disclaimerScreen'})
   }
 
@@ -367,7 +366,6 @@ App.prototype.renderPrimary = function () {
 
   // show initialize screen
   if (!props.isInitialized || props.forgottenPassword) {
-
     // show current view
     switch (props.currentView.name) {
 

ui/app/components/coinbase-form.js

@@ -7,7 +7,7 @@ const actions = require('../actions')
 const isValidAddress = require('../util').isValidAddress
 module.exports = connect(mapStateToProps)(CoinbaseForm)
 
-function mapStateToProps(state) {
+function mapStateToProps (state) {
   return {
     selectedAccount: state.selectedAccount,
     warning: state.appState.warning,
@@ -16,7 +16,7 @@ function mapStateToProps(state) {
 
 inherits(CoinbaseForm, Component)
 
-function CoinbaseForm() {
+function CoinbaseForm () {
   Component.call(this)
 }
 
@@ -116,15 +116,14 @@ CoinbaseForm.prototype.toCoinbase = function () {
     props.dispatch(actions.buyEth(address, props.buyView.amount))
   } else if (!isValidAmountforCoinBase(amount).valid) {
     message = isValidAmountforCoinBase(amount).message
-    return props.dispatch(actions.showWarning(message))
+    return props.dispatch(actions.displayWarning(message))
   } else {
     message = 'Receiving address is invalid.'
-    return props.dispatch(actions.showWarning(message))
+    return props.dispatch(actions.displayWarning(message))
   }
 }
 
 CoinbaseForm.prototype.renderLoading = function () {
-
   return h('img', {
     style: {
       width: '27px',
@@ -134,9 +133,8 @@ CoinbaseForm.prototype.renderLoading = function () {
   })
 }
 
-function isValidAmountforCoinBase(amount) {
+function isValidAmountforCoinBase (amount) {
   amount = parseFloat(amount)
-
   if (amount) {
     if (amount <= 5 && amount > 0) {
       return {

ui/app/components/copyButton.js

@@ -50,12 +50,10 @@ CopyButton.prototype.render = function () {
   ])
 }
 
-CopyButton.prototype.debounceRestore = function() {
-
+CopyButton.prototype.debounceRestore = function () {
   this.setState({ copied: true })
   clearTimeout(this.timeout)
   this.timeout = setTimeout(() => {
     this.setState({ copied: false })
   }, 850)
-
 }

ui/app/components/drop-menu-item.js

@@ -32,9 +32,9 @@ DropMenuItem.prototype.render = function () {
 }
 
 DropMenuItem.prototype.activeNetworkRender = function () {
-  let activeNetwork = this.props.activeNetworkRender
-  let { provider } = this.props
-  let providerType = provider ? provider.type : null
+  const activeNetwork = this.props.activeNetworkRender
+  const { provider } = this.props
+  const providerType = provider ? provider.type : null
   if (activeNetwork === undefined) return
 
   switch (this.props.label) {

ui/app/components/network.js

@@ -22,7 +22,6 @@ Network.prototype.render = function () {
   let iconName, hoverText
 
   if (networkNumber === 'loading') {
-
     return h('img.network-indicator', {
       title: 'Attempting to connect to blockchain.',
       onClick: (event) => this.props.onClick(event),
@@ -32,7 +31,6 @@ Network.prototype.render = function () {
       },
       src: 'images/loading.svg',
     })
-
   } else if (providerName === 'mainnet') {
     hoverText = 'Main Ethereum Network'
     iconName = 'ethereum-network'

ui/app/components/pending-tx.js

@@ -30,6 +30,15 @@ PendingTx.prototype.render = function () {
         }
       `),
 
+      txData.simulationFails ?
+        h('.error', {
+          style: {
+            marginLeft: 50,
+            fontSize: '0.9em',
+          },
+        }, 'Transaction Error. Exception thrown in contract code.')
+      : null,
+
       state.insufficientBalance ?
         h('span.error', {
           style: {

ui/app/components/shapeshift-form.js

@@ -8,7 +8,7 @@ const Qr = require('./qr-code')
 const isValidAddress = require('../util').isValidAddress
 module.exports = connect(mapStateToProps)(ShapeshiftForm)
 
-function mapStateToProps(state) {
+function mapStateToProps (state) {
   return {
     selectedAccount: state.selectedAccount,
     warning: state.appState.warning,
@@ -25,7 +25,6 @@ function ShapeshiftForm () {
 }
 
 ShapeshiftForm.prototype.render = function () {
-
   return h(ReactCSSTransitionGroup, {
     className: 'css-transition-group',
     transitionName: 'main',
@@ -34,7 +33,6 @@ ShapeshiftForm.prototype.render = function () {
   }, [
     this.props.qrRequested ? h(Qr, {key: 'qr'}) : this.renderMain(),
   ])
-
 }
 
 ShapeshiftForm.prototype.renderMain = function () {
@@ -244,7 +242,7 @@ ShapeshiftForm.prototype.updateCoin = function (event) {
 
   if (!coinOptions[coin.toUpperCase()] || coin.toUpperCase() === 'ETH') {
     var message = 'Not a valid coin'
-    return props.dispatch(actions.showWarning(message))
+    return props.dispatch(actions.displayWarning(message))
   } else {
     return props.dispatch(actions.pairUpdate(coin))
   }

ui/app/components/shift-list-item.js

@@ -26,7 +26,6 @@ function ShiftListItem () {
 }
 
 ShiftListItem.prototype.render = function () {
-
   return (
     h('.transaction-list-item.flex-row', {
       style: {

ui/app/components/tooltip.js

@@ -11,7 +11,6 @@ function Tooltip () {
 }
 
 Tooltip.prototype.render = function () {
-
   const props = this.props
   const { position, title, children } = props
 
@@ -20,5 +19,4 @@ Tooltip.prototype.render = function () {
     title,
     fixed: false,
   }, children)
-
 }

ui/app/components/transaction-list-item.js

@@ -63,7 +63,7 @@ TransactionListItem.prototype.render = function () {
           style: {
             fontSize: '27px',
           },
-        }) : h( '.pop-hover', {
+        }) : h('.pop-hover', {
           onClick: (event) => {
             event.stopPropagation()
             if (!isTx || isPending) return

ui/app/conf-tx.js

@@ -170,6 +170,10 @@ function warningIfExists (warning) {
   if (warning &&
       // Do not display user rejections on this screen:
      warning.indexOf('User denied transaction signature') === -1) {
-    return h('span.error', { style: { margin: 'auto' } }, warning)
+    return h('.error', {
+      style: {
+        margin: 'auto',
+      },
+    }, warning)
   }
 }

ui/app/keychains/hd/recover-seed/confirmation.js

@@ -5,10 +5,10 @@ const connect = require('react-redux').connect
 const h = require('react-hyperscript')
 const actions = require('../../../actions')
 
-module.exports = connect(mapStateToProps)(RevealSeedConfirmatoin)
+module.exports = connect(mapStateToProps)(RevealSeedConfirmation)
 
-inherits(RevealSeedConfirmatoin, Component)
-function RevealSeedConfirmatoin () {
+inherits(RevealSeedConfirmation, Component)
+function RevealSeedConfirmation () {
   Component.call(this)
 }
 
@@ -18,9 +18,9 @@ function mapStateToProps (state) {
   }
 }
 
-RevealSeedConfirmatoin.prototype.confirmationPhrase = 'I understand'
+RevealSeedConfirmation.prototype.confirmationPhrase = 'I understand'
 
-RevealSeedConfirmatoin.prototype.render = function () {
+RevealSeedConfirmation.prototype.render = function () {
   const props = this.props
   const state = this.state
 
@@ -116,24 +116,24 @@ RevealSeedConfirmatoin.prototype.render = function () {
   )
 }
 
-RevealSeedConfirmatoin.prototype.componentDidMount = function () {
+RevealSeedConfirmation.prototype.componentDidMount = function () {
   document.getElementById('password-box').focus()
 }
 
-RevealSeedConfirmatoin.prototype.goHome = function () {
+RevealSeedConfirmation.prototype.goHome = function () {
   this.props.dispatch(actions.showConfigPage(false))
 }
 
 // create vault
 
-RevealSeedConfirmatoin.prototype.checkConfirmation = function (event) {
+RevealSeedConfirmation.prototype.checkConfirmation = function (event) {
   if (event.key === 'Enter') {
     event.preventDefault()
     this.revealSeedWords()
   }
 }
 
-RevealSeedConfirmatoin.prototype.revealSeedWords = function () {
+RevealSeedConfirmation.prototype.revealSeedWords = function () {
   this.setState({ confirmationWrong: false })
 
   const confirmBox = document.getElementById('confirm-box')

ui/app/reducers.js

@@ -41,7 +41,7 @@ function rootReducer (state, action) {
   return state
 }
 
-window.logState = function() {
+window.logState = function () {
   var stateString = JSON.stringify(window.METAMASK_CACHED_LOG_STATE, null, 2)
   console.log(stateString)
 }

ui/app/reducers/app.js

@@ -278,7 +278,6 @@ function reduceApp (state, action) {
           warning: null,
         })
       } else {
-
         notification.closePopup()
 
         return extend(appState, {

ui/app/reducers/metamask.js

@@ -30,7 +30,7 @@ function reduceMetamask (state, action) {
 
     case actions.AGREE_TO_DISCLAIMER:
       return extend(metamaskState, {
-        isConfirmed: true,
+        isDisclaimerConfirmed: true,
       })
 
     case actions.UNLOCK_METAMASK:

ui/lib/account-link.js

@@ -1,4 +1,4 @@
-module.exports = function(address, network) {
+module.exports = function (address, network) {
   const net = parseInt(network)
   let link
 

ui/lib/contract-namer.js

@@ -8,23 +8,22 @@
 // Nickname keys must be stored in lower case.
 const nicknames = {}
 
-module.exports = function(addr, identities = {}) {
-
+module.exports = function (addr, identities = {}) {
   const address = addr.toLowerCase()
   const ids = hashFromIdentities(identities)
 
   return addrFromHash(address, ids) || addrFromHash(address, nicknames)
 }
 
-function hashFromIdentities(identities) {
+function hashFromIdentities (identities) {
   const result = {}
-  for (let key in identities) {
+  for (const key in identities) {
     result[key] = identities[key].name
   }
   return result
 }
 
-function addrFromHash(addr, hash) {
+function addrFromHash (addr, hash) {
   const address = addr.toLowerCase()
   return hash[address] || null
 }

ui/lib/icon-factory.js

@@ -55,6 +55,6 @@ function jsNumberForAddress (address) {
   return seed
 }
 
-function toDataUri(identiconSrc){
+function toDataUri (identiconSrc) {
   return 'data:image/svg+xml;charset=utf-8,' + encodeURIComponent(identiconSrc)
-}
+}