aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2018-03-14 06:43:37 +0800
committerGitHub <noreply@github.com>2018-03-14 06:43:37 +0800
commitdc5fbf5eb28b3221357197d7fe33ecb2f8a1e6fb (patch)
tree3374055e365337973807afd70936afcad070a095 /app
parent28a41c203fdb920ed6af3b9484210c4ad0f6093a (diff)
parentb7a24840f2aa358a174d134d7ed30dc3ff2fc4be (diff)
downloadtangerine-wallet-browser-dc5fbf5eb28b3221357197d7fe33ecb2f8a1e6fb.tar
tangerine-wallet-browser-dc5fbf5eb28b3221357197d7fe33ecb2f8a1e6fb.tar.gz
tangerine-wallet-browser-dc5fbf5eb28b3221357197d7fe33ecb2f8a1e6fb.tar.bz2
tangerine-wallet-browser-dc5fbf5eb28b3221357197d7fe33ecb2f8a1e6fb.tar.lz
tangerine-wallet-browser-dc5fbf5eb28b3221357197d7fe33ecb2f8a1e6fb.tar.xz
tangerine-wallet-browser-dc5fbf5eb28b3221357197d7fe33ecb2f8a1e6fb.tar.zst
tangerine-wallet-browser-dc5fbf5eb28b3221357197d7fe33ecb2f8a1e6fb.zip
Merge branch 'master' into i3076-UseStorageLocalInstead
Diffstat (limited to 'app')
-rw-r--r--app/scripts/lib/tx-gas-utils.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/scripts/lib/tx-gas-utils.js b/app/scripts/lib/tx-gas-utils.js
index 6f6ff7852..0fa9dd8d4 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 = require('ethereumjs-util').addHexPrefix
+const { addHexPrefix, isValidAddress } = require('ethereumjs-util')
const SIMPLE_GAS_COST = '0x5208' // Hex for 21000, cost of a simple send.
/*
@@ -113,12 +113,14 @@ module.exports = class TxGasUtil {
}
}
validateRecipient (txParams) {
- if (txParams.to === '0x') {
+ 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
}