m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge pull request #1293 from MetaMask/ImproveGasEstimates

Browse Source 
tx-utils - gas buffer ceiling at 90% of block gas limit
This commit is contained in:
Kevin Serrano 2017-03-30 09:25:28 -04:00 committed by GitHub
commit 9a6b84644a
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/scripts/lib/tx-utils.js
View File

@ -63,14 +63,15 @@ module.exports = class txProviderUtils {
addGasBuffer (initialGasLimitHex, blockGasLimitHex) { addGasBuffer (initialGasLimitHex, blockGasLimitHex) {
const initialGasLimitBn = hexToBn(initialGasLimitHex) const initialGasLimitBn = hexToBn(initialGasLimitHex)
const blockGasLimitBn = hexToBn(blockGasLimitHex) const blockGasLimitBn = hexToBn(blockGasLimitHex)
const upperGasLimitBn = blockGasLimitBn.muln(0.9)
const bufferedGasLimitBn = initialGasLimitBn.muln(1.5) const bufferedGasLimitBn = initialGasLimitBn.muln(1.5)
// if initialGasLimit is above blockGasLimit, dont modify it // 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 bufferedGasLimit is below blockGasLimit, use bufferedGasLimit
if (bufferedGasLimitBn.lt(blockGasLimitBn)) return bnToHex(bufferedGasLimitBn) if (bufferedGasLimitBn.lt(upperGasLimitBn)) return bnToHex(bufferedGasLimitBn)
// otherwise use blockGasLimit // otherwise use blockGasLimit
return bnToHex(blockGasLimitBn) return bnToHex(upperGasLimitBn)
} }
fillInTxParams (txParams, cb) { fillInTxParams (txParams, cb) {

28
test/unit/tx-utils-test.js
View File

@ -14,8 +14,8 @@ describe('txUtils', function() {
describe('addGasBuffer', function() { describe('addGasBuffer', function() {
it('multiplies by 1.5, when within block gas limit', function() { it('multiplies by 1.5, when within block gas limit', function() {
// naive estimatedGas: 0x123fad (~1.2 mil) // naive estimatedGas: 0x16e360 (1.5 mil)
const inputHex = '0x123fad' const inputHex = '0x16e360'
// dummy gas limit: 0x3d4c52 (4 mil) // dummy gas limit: 0x3d4c52 (4 mil)
const blockGasLimitHex = '0x3d4c52' const blockGasLimitHex = '0x3d4c52'
const output = txUtils.addGasBuffer(inputHex, blockGasLimitHex) const output = txUtils.addGasBuffer(inputHex, blockGasLimitHex)
@ -26,8 +26,8 @@ describe('txUtils', function() {
}) })
it('uses original estimatedGas, when above block gas limit', function() { it('uses original estimatedGas, when above block gas limit', function() {
// naive estimatedGas: 0x123fad (~1.2 mil) // naive estimatedGas: 0x16e360 (1.5 mil)
const inputHex = '0x123fad' const inputHex = '0x16e360'
// dummy gas limit: 0x0f4240 (1 mil) // dummy gas limit: 0x0f4240 (1 mil)
const blockGasLimitHex = '0x0f4240' const blockGasLimitHex = '0x0f4240'
const output = txUtils.addGasBuffer(inputHex, blockGasLimitHex) const output = txUtils.addGasBuffer(inputHex, blockGasLimitHex)
@ -37,16 +37,18 @@ describe('txUtils', function() {
assert(outputBn.eq(expectedBn), 'returns the original estimatedGas value') assert(outputBn.eq(expectedBn), 'returns the original estimatedGas value')
}) })
it('buffers up to block gas limit', function() { it('buffers up to reccomend gas limit reccomended ceiling', function() {
// naive estimatedGas: 0x123fad (~1.2 mil) // naive estimatedGas: 0x16e360 (1.5 mil)
const inputHex = '0x1e8480' const inputHex = '0x16e360'
// dummy gas limit: 0x1e8480 (2 mil) // dummy gas limit: 0x1e8480 (2 mil)
const blockGasLimitHex = '0x1e8480' const blockGasLimitHex = '0x1e8480'
const blockGasLimitBn = hexToBn(blockGasLimitHex)
const ceilGasLimitBn = blockGasLimitBn.muln(0.9)
const output = txUtils.addGasBuffer(inputHex, blockGasLimitHex) const output = txUtils.addGasBuffer(inputHex, blockGasLimitHex)
const inputBn = hexToBn(inputHex) // const inputBn = hexToBn(inputHex)
const outputBn = hexToBn(output) // const outputBn = hexToBn(output)
const expectedBn = hexToBn(blockGasLimitHex) const expectedHex = bnToHex(ceilGasLimitBn)
assert(outputBn.eq(expectedBn), 'returns the block gas limit value') assert.equal(output, expectedHex, 'returns the gas limit reccomended ceiling value')
}) })
}) })
}) })
@ -56,3 +58,7 @@ describe('txUtils', function() {
function hexToBn(inputHex) { function hexToBn(inputHex) {
return new BN(ethUtil.stripHexPrefix(inputHex), 16) return new BN(ethUtil.stripHexPrefix(inputHex), 16)
} }
function bnToHex(inputBn) {
return ethUtil.addHexPrefix(inputBn.toString(16))
}