From 85d5b12f8dd4029bf93a7fb0b5f65b306cbaaa3c Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Tue, 29 Nov 2016 12:44:42 -0800
Subject: Fix tx adding code

Broken in this commit:
https://github.com/MetaMask/metamask-plugin/commit/bc39cd7b894ddf0f3724d4af3cfc30c2638e0939

Synchronous methods were added to an `async.waterfall` array.

This commit also removes the delegate call checking, since we concluded it was misinformed.
---
 app/scripts/keyring-controller.js | 28 +++-------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

(limited to 'app')

diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index e6a69d9ed..0045890be 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -1,7 +1,6 @@
 const async = require('async')
 const bind = require('ap').partial
 const ethUtil = require('ethereumjs-util')
-const ethBinToOps = require('eth-bin-to-ops')
 const EthQuery = require('eth-query')
 const bip39 = require('bip39')
 const Transaction = require('ethereumjs-tx')
@@ -369,30 +368,9 @@ module.exports = class KeyringController extends EventEmitter {
 
     // calculate metadata for tx
     async.parallel([
-      analyzeForDelegateCall,
       analyzeGasUsage,
     ], didComplete)
 
-    // perform static analyis on the target contract code
-    function analyzeForDelegateCall (cb) {
-      if (txParams.to) {
-        query.getCode(txParams.to, function (err, result) {
-          if (err) return cb(err)
-          var code = ethUtil.toBuffer(result)
-          if (code !== '0x') {
-            var ops = ethBinToOps(code)
-            var containsDelegateCall = ops.some((op) => op.name === 'DELEGATECALL')
-            txData.containsDelegateCall = containsDelegateCall
-            cb()
-          } else {
-            cb()
-          }
-        })
-      } else {
-        cb()
-      }
-    }
-
     function analyzeGasUsage (cb) {
       query.getBlockByNumber('latest', true, function (err, block) {
         if (err) return cb(err)
@@ -416,7 +394,7 @@ module.exports = class KeyringController extends EventEmitter {
       query.estimateGas(txParams, cb)
     }
 
-    function checkForGasError (txData, estimatedGasHex) {
+    function checkForGasError (txData, estimatedGasHex, cb) {
       txData.estimatedGas = estimatedGasHex
       // all gas used - must be an error
       if (estimatedGasHex === txData.txParams.gas) {
@@ -425,7 +403,7 @@ module.exports = class KeyringController extends EventEmitter {
       cb()
     }
 
-    function setTxGas (txData, blockGasLimitHex) {
+    function setTxGas (txData, blockGasLimitHex, cb) {
       const txParams = txData.txParams
       // if OOG, nothing more to do
       if (txData.simulationFails) {
@@ -443,7 +421,7 @@ module.exports = class KeyringController extends EventEmitter {
       // 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 = self.addGasBuffer(estimatedGasBn)
+      const estimationWithBuffer = new BN(self.addGasBuffer(estimatedGasBn), 16)
       // added gas buffer is too high
       if (estimationWithBuffer.gt(blockGasLimitBn)) {
         txParams.gas = txData.estimatedGas
-- 
cgit