diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2016-11-10 08:42:10 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-10 08:42:10 +0800 |
| commit | 3775a4bf799efc99cfe3d46b35fc0b39a82c94c2 (patch) | |
| tree | 961cea67ce555a778d13f2acd789f05109fe0c84 /app | |
| parent | ebcdb7a4917dae38080b5e73b2ebcf77b7537479 (diff) | |
| parent | e2b2083df03b3bd808193ed38536d07ba155ff58 (diff) | |
| download | tangerine-wallet-browser-3775a4bf799efc99cfe3d46b35fc0b39a82c94c2.tar tangerine-wallet-browser-3775a4bf799efc99cfe3d46b35fc0b39a82c94c2.tar.gz tangerine-wallet-browser-3775a4bf799efc99cfe3d46b35fc0b39a82c94c2.tar.bz2 tangerine-wallet-browser-3775a4bf799efc99cfe3d46b35fc0b39a82c94c2.tar.lz tangerine-wallet-browser-3775a4bf799efc99cfe3d46b35fc0b39a82c94c2.tar.xz tangerine-wallet-browser-3775a4bf799efc99cfe3d46b35fc0b39a82c94c2.tar.zst tangerine-wallet-browser-3775a4bf799efc99cfe3d46b35fc0b39a82c94c2.zip | |
Merge pull request #801 from MetaMask/deadly
Properly implement 20% gas bump
Diffstat (limited to 'app')
| -rw-r--r-- | app/scripts/lib/idStore.js | 1 | ||||
| -rw-r--r-- | app/scripts/metamask-controller.js | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js index 0ce91f471..dd895a6c0 100644 --- a/app/scripts/lib/idStore.js +++ b/app/scripts/lib/idStore.js @@ -262,6 +262,7 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone query.estimateGas(txParams, function(err, result){ if (err) return cb(err) txData.estimatedGas = self.addGasBuffer(result) + txData.txParams.gasLimit = txData.estimatedGas cb() }) } diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 8b593d820..da05e5f5d 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -215,7 +215,6 @@ module.exports = class MetamaskController { let err = this.enforceTxValidations(txParams) if (err) return onTxDoneCb(err) - idStore.addUnconfirmedTransaction(txParams, onTxDoneCb, (err, txData) => { if (err) return onTxDoneCb(err) this.sendUpdate() |