transactions move validation of the to field to validateRecipient

feature/default_network_editable
frankiebee 7 years ago
parent a2c14ad02b
commit e5a83d3f1a
  1. 10
      app/scripts/lib/tx-gas-utils.js

@ -101,12 +101,6 @@ module.exports = class TxGasUtil {
async validateTxParams (txParams) {
this.validateRecipient(txParams)
if ('to' in txParams) {
if ( txParams.to === null ) delete txParams.to
else if ( txParams.to !== undefined && !isValidAddress(txParams.to) ) {
throw new Error(`Invalid recipient address`)
}
}
if ('value' in txParams) {
const value = txParams.value.toString()
if (value.includes('-')) {
@ -119,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
}

Loading…
Cancel
Save