Flattened addTx async methods

app/scripts/keyring-controller.js

@@ -1,11 +1,10 @@
 const async = require('async')
-const bind = require('ap').partial
 const ethUtil = require('ethereumjs-util')
 const EthQuery = require('eth-query')
 const bip39 = require('bip39')
 const Transaction = require('ethereumjs-tx')
 const EventEmitter = require('events').EventEmitter
-
+const filter = require('promise-filter')
 const normalize = require('./lib/sig-util').normalize
 const encryptor = require('./lib/encryptor')
 const messageManager = require('./lib/message-manager')
@@ -341,7 +340,6 @@ module.exports = class KeyringController extends EventEmitter {
   // Estimates gas and other preparatory steps.
   // Caches the requesting Dapp's callback, `onTxDoneCb`, for resolution later.
   addUnconfirmedTransaction (txParams, onTxDoneCb, cb) {
-    var self = this
     const configManager = this.configManager
 
     // create txData obj with parameters and meta data
@@ -358,7 +356,6 @@ module.exports = class KeyringController extends EventEmitter {
       metamaskNetworkId: this.getNetwork(),
     }
 
-
     // keep the onTxDoneCb around for after approval/denial (requires user interaction)
     // This onTxDoneCb fires completion to the Dapp's write operation.
     this._unconfTxCbs[txId] = onTxDoneCb
@@ -367,81 +364,80 @@ module.exports = class KeyringController extends EventEmitter {
     var query = new EthQuery(provider)
 
     // calculate metadata for tx
-    async.parallel([
+    this.analyzeTxGasUsage(query, txData, this.txDidComplete.bind(this, txData, cb))
-      analyzeGasUsage,
+  }
-    ], didComplete)
 
-    function analyzeGasUsage (cb) {
+  estimateTxGas (query, txData, blockGasLimitHex, cb) {
-      query.getBlockByNumber('latest', true, function (err, block) {
+    const txParams = txData.txParams
-        if (err) return cb(err)
+    // check if gasLimit is already specified
-        async.waterfall([
+    txData.gasLimitSpecified = Boolean(txParams.gas)
-          bind(estimateGas, query, txData, block.gasLimit),
+    // if not, fallback to block gasLimit
-          bind(checkForGasError, txData),
+    if (!txData.gasLimitSpecified) {
-          bind(setTxGas, txData, block.gasLimit),
+      txParams.gas = blockGasLimitHex
-        ], cb)
-      })
     }
+    // run tx, see if it will OOG
+    query.estimateGas(txParams, cb)
+  }
 
-    function estimateGas (query, txData, blockGasLimitHex, cb) {
+  checkForTxGasError (txData, estimatedGasHex, cb) {
-      const txParams = txData.txParams
+    txData.estimatedGas = estimatedGasHex
-      // check if gasLimit is already specified
+    // all gas used - must be an error
-      txData.gasLimitSpecified = Boolean(txParams.gas)
+    if (estimatedGasHex === txData.txParams.gas) {
-      // if not, fallback to block gasLimit
+      txData.simulationFails = true
-      if (!txData.gasLimitSpecified) {
-        txParams.gas = blockGasLimitHex
-      }
-      // run tx, see if it will OOG
-      query.estimateGas(txParams, cb)
     }
+    cb()
+  }
 
-    function checkForGasError (txData, estimatedGasHex, cb) {
+  setTxGas (txData, blockGasLimitHex, cb) {
-      txData.estimatedGas = estimatedGasHex
+    const txParams = txData.txParams
-      // all gas used - must be an error
+    // if OOG, nothing more to do
-      if (estimatedGasHex === txData.txParams.gas) {
+    if (txData.simulationFails) {
-        txData.simulationFails = true
-      }
-      cb()
-    }
-
-    function 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) {
-        txData.estimatedGas = txParams.gas
-        cb()
-        return
-      }
-      // if gasLimit not originally specified,
-      // try adding an additional gas buffer to our estimation for safety
-      const estimatedGasBn = new BN(ethUtil.stripHexPrefix(txData.estimatedGas), 16)
-      const blockGasLimitBn = new BN(ethUtil.stripHexPrefix(blockGasLimitHex), 16)
-      const estimationWithBuffer = new BN(self.addGasBuffer(estimatedGasBn), 16)
-      // added gas buffer is too high
-      if (estimationWithBuffer.gt(blockGasLimitBn)) {
-        txParams.gas = txData.estimatedGas
-      // added gas buffer is safe
-      } else {
-        const gasWithBufferHex = ethUtil.intToHex(estimationWithBuffer)
-        txParams.gas = gasWithBufferHex
-      }
       cb()
       return
     }
-
+    // if gasLimit was specified and doesnt OOG,
-    function didComplete (err) {
+    // use original specified amount
-      if (err) return cb(err)
+    if (txData.gasLimitSpecified) {
-      configManager.addTx(txData)
+      txData.estimatedGas = txParams.gas
-      // signal update
+      cb()
-      self.emit('update')
+      return
-      // signal completion of add tx
-      cb(null, txData)
     }
+    // if gasLimit not originally specified,
+    // try adding an additional gas buffer to our estimation for safety
+    const estimatedGasBn = new BN(ethUtil.stripHexPrefix(txData.estimatedGas), 16)
+    const blockGasLimitBn = new BN(ethUtil.stripHexPrefix(blockGasLimitHex), 16)
+    const estimationWithBuffer = new BN(this.addGasBuffer(estimatedGasBn), 16)
+    // added gas buffer is too high
+    if (estimationWithBuffer.gt(blockGasLimitBn)) {
+      txParams.gas = txData.estimatedGas
+    // added gas buffer is safe
+    } else {
+      const gasWithBufferHex = ethUtil.intToHex(estimationWithBuffer)
+      txParams.gas = gasWithBufferHex
+    }
+    cb()
+    return
+  }
+
+  txDidComplete (txData, cb, err) {
+    if (err) return cb(err)
+    const configManager = this.configManager
+    configManager.addTx(txData)
+    // signal update
+    this.emit('update')
+    // signal completion of add tx
+    cb(null, txData)
+  }
+
+  analyzeTxGasUsage (query, txData, cb) {
+    query.getBlockByNumber('latest', true, (err, block) => {
+      if (err) return cb(err)
+      async.waterfall([
+        this.estimateTxGas.bind(this, query, txData, block.gasLimit),
+        this.checkForTxGasError.bind(this, txData),
+        this.setTxGas.bind(this, txData, block.gasLimit),
+      ], cb)
+    })
   }
 
   // Cancel Transaction
@@ -488,6 +484,7 @@ module.exports = class KeyringController extends EventEmitter {
     delete this._unconfTxCbs[txId]
     this.emit('update')
   }
+
   signTransaction (txParams, cb) {
     try {
       const address = normalize(txParams.from)
@@ -828,28 +825,23 @@ module.exports = class KeyringController extends EventEmitter {
   // the specified `address` if one exists.
   getKeyringForAccount (address) {
     const hexed = normalize(address)
-    return new Promise((resolve, reject) => {
 
-      // Get all the keyrings, and associate them with their account list:
+    return Promise.all(this.keyrings.map((keyring) => {
-      Promise.all(this.keyrings.map((keyring) => {
+      return Promise.all([
-        const accounts = keyring.getAccounts()
+        keyring,
-        return Promise.all({
+        keyring.getAccounts(),
-          keyring,
+      ])
-          accounts,
+    }))
-        })
+    .then(filter((candidate) => {
-      }))
+      const accounts = candidate[1].map(normalize)
-
+      return accounts.includes(hexed)
-      // Find the keyring with the matching account and return it:
+    }))
-      .then((result) => {
+    .then((winners) => {
-        const match = result.find((candidate) => {
+      if (winners && winners.length > 0) {
-          return candidate.accounts.map(normalize).includes(hexed)
+        return winners[0][0]
-        })
+      } else {
-        if (match) {
+        throw new Error('No keyring found for the requested account.')
-          resolve(match.keyring)
+      }
-        } else {
-          reject('No keyring found for the requested account.')
-        }
-      })
     })
   }
 
@@ -888,4 +880,5 @@ module.exports = class KeyringController extends EventEmitter {
 
 }
 
+
 function noop () {}

package.json

@@ -33,7 +33,6 @@
     ]
   },
   "dependencies": {
-    "ap": "^0.2.0",
     "async": "^1.5.2",
     "bip39": "^2.2.0",
     "browserify-derequire": "^0.9.4",
@@ -67,6 +66,7 @@
     "pojo-migrator": "^2.1.0",
     "polyfill-crypto.getrandomvalues": "^1.0.0",
     "post-message-stream": "^1.0.0",
+    "promise-filter": "^1.1.0",
     "pumpify": "^1.3.4",
     "qrcode-npm": "0.0.3",
     "react": "^15.0.2",