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

Make gas calculations on render more consistent

Browse Source
This commit is contained in:
Dan Finlay 2017-03-23 17:00:59 -07:00
parent 9bea31a402
commit 6a46e9ce06
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ui/app/components/pending-tx.js
View File

@ -21,40 +21,46 @@ const MIN_GAS_PRICE_BN = new BN(20000000)
module.exports = connect(mapStateToProps)(PendingTx) module.exports = connect(mapStateToProps)(PendingTx)
function mapStateToProps (state) { function mapStateToProps (state) {
return { return {}
}
} }
inherits(PendingTx, Component) inherits(PendingTx, Component)
function PendingTx () { function PendingTx () {
Component.call(this) Component.call(this)
this.state = { valid: true } this.state = {
valid: true,
gas: null,
gasPrice: null,
txData: null,
}
} }
PendingTx.prototype.render = function () { PendingTx.prototype.render = function () {
const props = this.props const props = this.props
const txData = props.txData
const state = this.state const state = this.state
const txData = state.txData || props.txData
const txParams = txData.txParams || {} const txParams = txData.txParams || {}
const address = txParams.from || props.selectedAddress const address = txParams.from || props.selectedAddress
const identity = props.identities[address] || { address: address } const identity = props.identities[address] || { address: address }
const account = props.accounts[address] const account = props.accounts[address]
const balance = account ? account.balance : '0x0' const balance = account ? account.balance : '0x0'
const gas = state.gas || txParams.gas
const gas = (state.gas === undefined) ? txParams.gas : state.gas const gasPrice = state.gasPrice || txData.gasPrice
const gasPrice = (state.gasPrice === undefined) ? txData.gasPrice : state.gasPrice
const gasBn = new BN(gas, 16) const gasBn = new BN(gas, 16)
const gasPriceBn = new BN(gasPrice, 16) const gasPriceBn = new BN(gasPrice, 16)
const txFeeBn = gasBn.mul(gasPriceBn) const txFeeBn = gasBn.mul(gasPriceBn)
const maxCost = state.maxCost || txData.maxCost || '' const valueBn = new BN(ethUtil.stripHexPrefix(txParams.value), 16)
const maxCost = txFeeBn.add(valueBn)
const dataLength = txParams.data ? (txParams.data.length - 2) / 2 : 0 const dataLength = txParams.data ? (txParams.data.length - 2) / 2 : 0
const imageify = props.imageifyIdenticons === undefined ? true : props.imageifyIdenticons const imageify = props.imageifyIdenticons === undefined ? true : props.imageifyIdenticons
log.info(`rendering pending-tx form with gas limit ${gas.toString()}, gasPrice ${gasPrice.toString()}, `)
this.inputs = [] this.inputs = []
return ( return (