aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorFrankie <frankie.pangilinan@consensys.net>2016-11-11 08:53:47 +0800
committerFrankie <frankie.pangilinan@consensys.net>2016-11-11 08:53:47 +0800
commitf665b779cbc0f503198e67c5e10bccd2e0e0d2bb (patch)
tree71e1657d744f8fbf3f55a70d713d6a7701833a9f /app
parent161ff62fdcf6f76f7243a1e865dd0cccbc89121f (diff)
parent3775a4bf799efc99cfe3d46b35fc0b39a82c94c2 (diff)
downloadtangerine-wallet-browser-f665b779cbc0f503198e67c5e10bccd2e0e0d2bb.tar
tangerine-wallet-browser-f665b779cbc0f503198e67c5e10bccd2e0e0d2bb.tar.gz
tangerine-wallet-browser-f665b779cbc0f503198e67c5e10bccd2e0e0d2bb.tar.bz2
tangerine-wallet-browser-f665b779cbc0f503198e67c5e10bccd2e0e0d2bb.tar.lz
tangerine-wallet-browser-f665b779cbc0f503198e67c5e10bccd2e0e0d2bb.tar.xz
tangerine-wallet-browser-f665b779cbc0f503198e67c5e10bccd2e0e0d2bb.tar.zst
tangerine-wallet-browser-f665b779cbc0f503198e67c5e10bccd2e0e0d2bb.zip
Merge branch 'master' into i328-MultiVault
Diffstat (limited to 'app')
-rw-r--r--app/manifest.json2
-rw-r--r--app/scripts/lib/idStore.js4
-rw-r--r--app/scripts/metamask-controller.js1
3 files changed, 4 insertions, 3 deletions
diff --git a/app/manifest.json b/app/manifest.json
index e35f2918d..a21809ce8 100644
--- a/app/manifest.json
+++ b/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",
diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js
index ef2416cdf..23b14524e 100644
--- a/app/scripts/lib/idStore.js
+++ b/app/scripts/lib/idStore.js
@@ -260,6 +260,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()
})
}
@@ -285,9 +286,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))
}
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index a165a2e2a..4c01b23d8 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -218,7 +218,6 @@ module.exports = class MetamaskController {
let err = this.enforceTxValidations(txParams)
if (err) return onTxDoneCb(err)
-
keyringController.addUnconfirmedTransaction(txParams, onTxDoneCb, (err, txData) => {
if (err) return onTxDoneCb(err)
this.sendUpdate()