diff options
| author | frankiebee <frankie.diamond@gmail.com> | 2017-04-03 13:26:25 +0800 |
|---|---|---|
| committer | frankiebee <frankie.diamond@gmail.com> | 2017-04-03 13:26:25 +0800 |
| commit | 89c924101e3ff52849c5a82ced7e058e1fa39dfd (patch) | |
| tree | ebc5e65345362b9912d893ee70f3d27a4cf4fd3c /app/scripts/lib/tx-utils.js | |
| parent | 8d49d519c090d287484008346aba1df6d7ad77e7 (diff) | |
| parent | 0a5c634081656c9450d4341b96bab6b4134a0b7a (diff) | |
| download | tangerine-wallet-browser-89c924101e3ff52849c5a82ced7e058e1fa39dfd.tar.gz tangerine-wallet-browser-89c924101e3ff52849c5a82ced7e058e1fa39dfd.tar.zst tangerine-wallet-browser-89c924101e3ff52849c5a82ced7e058e1fa39dfd.zip | |
Merge branch 'master' into mascara
Diffstat (limited to 'app/scripts/lib/tx-utils.js')
| -rw-r--r-- | app/scripts/lib/tx-utils.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/scripts/lib/tx-utils.js b/app/scripts/lib/tx-utils.js index 72df53631..e8e23f8b5 100644 --- a/app/scripts/lib/tx-utils.js +++ b/app/scripts/lib/tx-utils.js @@ -63,14 +63,15 @@ module.exports = class txProviderUtils { addGasBuffer (initialGasLimitHex, blockGasLimitHex) { const initialGasLimitBn = hexToBn(initialGasLimitHex) const blockGasLimitBn = hexToBn(blockGasLimitHex) + const upperGasLimitBn = blockGasLimitBn.muln(0.9) const bufferedGasLimitBn = initialGasLimitBn.muln(1.5) // if initialGasLimit is above blockGasLimit, dont modify it - if (initialGasLimitBn.gt(blockGasLimitBn)) return bnToHex(initialGasLimitBn) + if (initialGasLimitBn.gt(upperGasLimitBn)) return bnToHex(initialGasLimitBn) // if bufferedGasLimit is below blockGasLimit, use bufferedGasLimit - if (bufferedGasLimitBn.lt(blockGasLimitBn)) return bnToHex(bufferedGasLimitBn) + if (bufferedGasLimitBn.lt(upperGasLimitBn)) return bnToHex(bufferedGasLimitBn) // otherwise use blockGasLimit - return bnToHex(blockGasLimitBn) + return bnToHex(upperGasLimitBn) } fillInTxParams (txParams, cb) { |