diff options
author | nyatla <nyatla39@gmail.com> | 2018-04-10 16:14:28 +0800 |
---|---|---|
committer | nyatla <nyatla39@gmail.com> | 2018-04-10 16:14:28 +0800 |
commit | cc246528b509b80e560715f3b315acf0764e99e7 (patch) | |
tree | a04cc12e6c11345bf751726f15fa9d3dd6be4733 /app/scripts/lib/tx-gas-utils.js | |
parent | bc0487006c623f1c81c186ba5b2a7137efb940ec (diff) | |
parent | b91bd818c7c2aec2952036a2f69ab05e0690a06e (diff) | |
download | tangerine-wallet-browser-cc246528b509b80e560715f3b315acf0764e99e7.tar.gz tangerine-wallet-browser-cc246528b509b80e560715f3b315acf0764e99e7.tar.zst tangerine-wallet-browser-cc246528b509b80e560715f3b315acf0764e99e7.zip |
Merge tag 'v4.5.5'
# Conflicts:
# app/_locales/ja/messages.json
# package-lock.json
messages.jsonのローカライズ
Diffstat (limited to 'app/scripts/lib/tx-gas-utils.js')
-rw-r--r-- | app/scripts/lib/tx-gas-utils.js | 34 |
1 files changed, 5 insertions, 29 deletions
diff --git a/app/scripts/lib/tx-gas-utils.js b/app/scripts/lib/tx-gas-utils.js index 0fa9dd8d4..c579e462a 100644 --- a/app/scripts/lib/tx-gas-utils.js +++ b/app/scripts/lib/tx-gas-utils.js @@ -4,7 +4,7 @@ const { BnMultiplyByFraction, bnToHex, } = require('./util') -const { addHexPrefix, isValidAddress } = require('ethereumjs-util') +const { addHexPrefix } = require('ethereumjs-util') const SIMPLE_GAS_COST = '0x5208' // Hex for 21000, cost of a simple send. /* @@ -52,7 +52,9 @@ module.exports = class TxGasUtil { // if recipient has no code, gas is 21k max: const recipient = txParams.to const hasRecipient = Boolean(recipient) - const code = await this.query.getCode(recipient) + let code + if (recipient) code = await this.query.getCode(recipient) + if (hasRecipient && (!code || code === '0x')) { txParams.gas = SIMPLE_GAS_COST txMeta.simpleSend = true // Prevents buffer addition @@ -98,30 +100,4 @@ module.exports = class TxGasUtil { // otherwise use blockGasLimit return bnToHex(upperGasLimitBn) } - - async validateTxParams (txParams) { - this.validateRecipient(txParams) - if ('value' in txParams) { - const value = txParams.value.toString() - if (value.includes('-')) { - throw new Error(`Invalid transaction value of ${txParams.value} not a positive number.`) - } - - if (value.includes('.')) { - throw new Error(`Invalid transaction value of ${txParams.value} number must be in wei`) - } - } - } - validateRecipient (txParams) { - if (txParams.to === '0x' || txParams.to === null ) { - if (txParams.data) { - delete txParams.to - } else { - throw new Error('Invalid recipient address') - } - } else if ( txParams.to !== undefined && !isValidAddress(txParams.to) ) { - throw new Error('Invalid recipient address') - } - return txParams - } -} +}
\ No newline at end of file |