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 #3551 from MetaMask/i#3509

Browse Source 
fix for where null is not supported in txParams
This commit is contained in:
kumavis 2018-03-13 15:42:50 -07:00 committed by GitHub
commit b7a24840f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,6 +1,9 @@
# Changelog # Changelog
## Current Master ## Current Master
- Will now throw an error if the `to` field in txParams is not valid.
- Will strip null values from the `to` field.
- Fix flashing to Log in screen after logging in or restoring from seed phrase. - Fix flashing to Log in screen after logging in or restoring from seed phrase.
- Increase tap areas for menu buttons on mobile - Increase tap areas for menu buttons on mobile
- Change all fonts in new-ui onboarding to Roboto, size 400 - Change all fonts in new-ui onboarding to Roboto, size 400

6
app/scripts/lib/tx-gas-utils.js
View File

@ -4,7 +4,7 @@ const {
BnMultiplyByFraction, BnMultiplyByFraction,
bnToHex, bnToHex,
} = require('./util') } = 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. const SIMPLE_GAS_COST = '0x5208' // Hex for 21000, cost of a simple send.
/* /*
@ -113,12 +113,14 @@ module.exports = class TxGasUtil {
} }
} }
validateRecipient (txParams) { validateRecipient (txParams) {
if (txParams.to === '0x') { if (txParams.to === '0x' || txParams.to === null ) {
if (txParams.data) { if (txParams.data) {
delete txParams.to delete txParams.to
} else { } else {
throw new Error('Invalid recipient address') throw new Error('Invalid recipient address')
} }
} else if ( txParams.to !== undefined && !isValidAddress(txParams.to) ) {
throw new Error('Invalid recipient address')
} }
return txParams return txParams
} }