Merge pull request #4954 from MetaMask/v4.9.0

V4.9.0

3 files changed, 288 insertions, 0 deletions

diff --git a/ui/app/helpers/confirm-transaction/util.js b/ui/app/helpers/confirm-transaction/util.js
new file mode 100644
index 000000000..a37778c19
--- /dev/null
+++ b/ui/app/helpers/confirm-transaction/util.js
@@ -0,0 +1,148 @@
+import currencyFormatter from 'currency-formatter'
+import currencies from 'currency-formatter/currencies'
+import abi from 'human-standard-token-abi'
+import abiDecoder from 'abi-decoder'
+import ethUtil from 'ethereumjs-util'
+import BigNumber from 'bignumber.js'
+
+abiDecoder.addABI(abi)
+
+import MethodRegistry from 'eth-method-registry'
+const registry = new MethodRegistry({ provider: global.ethereumProvider })
+
+import {
+  conversionUtil,
+  addCurrencies,
+  multiplyCurrencies,
+  conversionGreaterThan,
+} from '../../conversion-util'
+
+import { unconfirmedTransactionsCountSelector } from '../../selectors/confirm-transaction'
+
+export function getTokenData (data = {}) {
+  return abiDecoder.decodeMethod(data)
+}
+
+export async function getMethodData (data = {}) {
+  const prefixedData = ethUtil.addHexPrefix(data)
+  const fourBytePrefix = prefixedData.slice(0, 10)
+  const sig = await registry.lookup(fourBytePrefix)
+  const parsedResult = registry.parse(sig)
+
+  return {
+    name: parsedResult.name,
+    params: parsedResult.args,
+  }
+}
+
+export function increaseLastGasPrice (lastGasPrice) {
+  return ethUtil.addHexPrefix(multiplyCurrencies(lastGasPrice, 1.1, {
+    multiplicandBase: 16,
+    multiplierBase: 10,
+    toNumericBase: 'hex',
+  }))
+}
+
+export function hexGreaterThan (a, b) {
+  return conversionGreaterThan(
+    { value: a, fromNumericBase: 'hex' },
+    { value: b, fromNumericBase: 'hex' },
+  )
+}
+
+export function getHexGasTotal ({ gasLimit, gasPrice }) {
+  return ethUtil.addHexPrefix(multiplyCurrencies(gasLimit, gasPrice, {
+    toNumericBase: 'hex',
+    multiplicandBase: 16,
+    multiplierBase: 16,
+  }))
+}
+
+export function addEth (...args) {
+  return args.reduce((acc, base) => {
+    return addCurrencies(acc, base, {
+      toNumericBase: 'dec',
+      numberOfDecimals: 6,
+    })
+  })
+}
+
+export function addFiat (...args) {
+  return args.reduce((acc, base) => {
+    return addCurrencies(acc, base, {
+      toNumericBase: 'dec',
+      numberOfDecimals: 2,
+    })
+  })
+}
+
+export function getTransactionAmount ({
+  value,
+  toCurrency,
+  conversionRate,
+  numberOfDecimals,
+}) {
+  return conversionUtil(value, {
+    fromNumericBase: 'hex',
+    toNumericBase: 'dec',
+    fromCurrency: 'ETH',
+    toCurrency,
+    numberOfDecimals,
+    fromDenomination: 'WEI',
+    conversionRate,
+  })
+}
+
+export function getTransactionFee ({
+  value,
+  toCurrency,
+  conversionRate,
+  numberOfDecimals,
+}) {
+  return conversionUtil(value, {
+    fromNumericBase: 'BN',
+    toNumericBase: 'dec',
+    fromDenomination: 'WEI',
+    fromCurrency: 'ETH',
+    toCurrency,
+    numberOfDecimals,
+    conversionRate,
+  })
+}
+
+export function formatCurrency (value, currencyCode) {
+  const upperCaseCurrencyCode = currencyCode.toUpperCase()
+
+  return currencies.find(currency => currency.code === upperCaseCurrencyCode)
+    ? currencyFormatter.format(Number(value), { code: upperCaseCurrencyCode })
+    : value
+}
+
+export function convertTokenToFiat ({
+  value,
+  toCurrency,
+  conversionRate,
+  contractExchangeRate,
+}) {
+  const totalExchangeRate = conversionRate * contractExchangeRate
+
+  return conversionUtil(value, {
+    fromNumericBase: 'dec',
+    toNumericBase: 'dec',
+    toCurrency,
+    numberOfDecimals: 2,
+    conversionRate: totalExchangeRate,
+  })
+}
+
+export function hasUnconfirmedTransactions (state) {
+  return unconfirmedTransactionsCountSelector(state) > 0
+}
+
+export function roundExponential (value) {
+  const PRECISION = 4
+  const bigNumberValue = new BigNumber(value)
+
+  // In JS, numbers with exponentials greater than 20 get displayed as an exponential.
+  return bigNumberValue.e > 20 ? Number(bigNumberValue.toPrecision(PRECISION)) : value
+}
diff --git a/ui/app/helpers/confirm-transaction/util.test.js b/ui/app/helpers/confirm-transaction/util.test.js
new file mode 100644
index 000000000..a9c8fae34
--- /dev/null
+++ b/ui/app/helpers/confirm-transaction/util.test.js
@@ -0,0 +1,137 @@
+import * as utils from './util'
+import assert from 'assert'
+
+describe('Confirm Transaction utils', () => {
+  describe('increaseLastGasPrice', () => {
+    it('should increase the gasPrice by 10%', () => {
+      const increasedGasPrice = utils.increaseLastGasPrice('0xa')
+      assert.equal(increasedGasPrice, '0xb')
+    })
+
+    it('should prefix the result with 0x', () => {
+      const increasedGasPrice = utils.increaseLastGasPrice('a')
+      assert.equal(increasedGasPrice, '0xb')
+    })
+  })
+
+  describe('hexGreaterThan', () => {
+    it('should return true if the first value is greater than the second value', () => {
+      assert.equal(
+        utils.hexGreaterThan('0xb', '0xa'),
+        true
+      )
+    })
+
+    it('should return false if the first value is less than the second value', () => {
+      assert.equal(
+        utils.hexGreaterThan('0xa', '0xb'),
+        false
+      )
+    })
+
+    it('should return false if the first value is equal to the second value', () => {
+      assert.equal(
+        utils.hexGreaterThan('0xa', '0xa'),
+        false
+      )
+    })
+
+    it('should correctly compare prefixed and non-prefixed hex values', () => {
+      assert.equal(
+        utils.hexGreaterThan('0xb', 'a'),
+        true
+      )
+    })
+  })
+
+  describe('getHexGasTotal', () => {
+    it('should multiply the hex gasLimit and hex gasPrice values together', () => {
+      assert.equal(
+        utils.getHexGasTotal({ gasLimit: '0x5208', gasPrice: '0x3b9aca00' }),
+        '0x1319718a5000'
+      )
+    })
+
+    it('should prefix the result with 0x', () => {
+      assert.equal(
+        utils.getHexGasTotal({ gasLimit: '5208', gasPrice: '3b9aca00' }),
+        '0x1319718a5000'
+      )
+    })
+  })
+
+  describe('addEth', () => {
+    it('should add two values together rounding to 6 decimal places', () => {
+      assert.equal(
+        utils.addEth('0.12345678', '0'),
+        '0.123457'
+      )
+    })
+
+    it('should add any number of values together rounding to 6 decimal places', () => {
+      assert.equal(
+        utils.addEth('0.1', '0.02', '0.003', '0.0004', '0.00005', '0.000006', '0.0000007'),
+        '0.123457'
+      )
+    })
+  })
+
+  describe('addFiat', () => {
+    it('should add two values together rounding to 2 decimal places', () => {
+      assert.equal(
+        utils.addFiat('0.12345678', '0'),
+        '0.12'
+      )
+    })
+
+    it('should add any number of values together rounding to 2 decimal places', () => {
+      assert.equal(
+        utils.addFiat('0.1', '0.02', '0.003', '0.0004', '0.00005', '0.000006', '0.0000007'),
+        '0.12'
+      )
+    })
+  })
+
+  describe('getTransactionAmount', () => {
+    it('should get the transaction amount in ETH', () => {
+      const ethTransactionAmount = utils.getTransactionAmount({
+        value: '0xde0b6b3a7640000', toCurrency: 'ETH', conversionRate: 468.58, numberOfDecimals: 6,
+      })
+
+      assert.equal(ethTransactionAmount, '1')
+    })
+
+    it('should get the transaction amount in fiat', () => {
+      const fiatTransactionAmount = utils.getTransactionAmount({
+        value: '0xde0b6b3a7640000', toCurrency: 'usd', conversionRate: 468.58, numberOfDecimals: 2,
+      })
+
+      assert.equal(fiatTransactionAmount, '468.58')
+    })
+  })
+
+  describe('getTransactionFee', () => {
+    it('should get the transaction fee in ETH', () => {
+      const ethTransactionFee = utils.getTransactionFee({
+        value: '0x1319718a5000', toCurrency: 'ETH', conversionRate: 468.58, numberOfDecimals: 6,
+      })
+
+      assert.equal(ethTransactionFee, '0.000021')
+    })
+
+    it('should get the transaction fee in fiat', () => {
+      const fiatTransactionFee = utils.getTransactionFee({
+        value: '0x1319718a5000', toCurrency: 'usd', conversionRate: 468.58, numberOfDecimals: 2,
+      })
+
+      assert.equal(fiatTransactionFee, '0.01')
+    })
+  })
+
+  describe('formatCurrency', () => {
+    it('should format USD values', () => {
+      const value = utils.formatCurrency('123.45', 'usd')
+      assert.equal(value, '$123.45')
+    })
+  })
+})
diff --git a/ui/app/helpers/with-token-tracker.js b/ui/app/helpers/with-token-tracker.js
index e24517c18..8608b15f4 100644
--- a/ui/app/helpers/with-token-tracker.js
+++ b/ui/app/helpers/with-token-tracker.js
@@ -75,6 +75,9 @@ const withTokenTracker = WrappedComponent => {
     }
 
     updateBalance (tokens = []) {
+      if (!this.tracker.running) {
+        return
+      }
       const [{ string, symbol }] = tokens
       this.setState({ string, symbol, error: null })
     }