mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 09:52:26 +01:00
Dissallow transactions to be sent to 0x0000000000000000000000000000000000000000
This commit is contained in:
parent
9eea990425
commit
bb6e41963d
@ -95,6 +95,7 @@ EnsInput.prototype.lookupEnsName = function () {
|
|||||||
log.info(`ENS attempting to resolve name: ${recipient}`)
|
log.info(`ENS attempting to resolve name: ${recipient}`)
|
||||||
this.ens.lookup(recipient.trim())
|
this.ens.lookup(recipient.trim())
|
||||||
.then((address) => {
|
.then((address) => {
|
||||||
|
if (address === '0x0000000000000000000000000000000000000000') throw new Error('No address has been set for this name.')
|
||||||
if (address !== ensResolution) {
|
if (address !== ensResolution) {
|
||||||
this.setState({
|
this.setState({
|
||||||
loadingEns: false,
|
loadingEns: false,
|
||||||
|
@ -44,6 +44,9 @@ PendingTx.prototype.render = function () {
|
|||||||
const account = props.accounts[address]
|
const account = props.accounts[address]
|
||||||
const balance = account ? account.balance : '0x0'
|
const balance = account ? account.balance : '0x0'
|
||||||
|
|
||||||
|
// recipient check
|
||||||
|
const isValidAddress = !(txParams.to === '0x0000000000000000000000000000000000000000')
|
||||||
|
|
||||||
// Gas
|
// Gas
|
||||||
const gas = txParams.gas
|
const gas = txParams.gas
|
||||||
const gasBn = hexToBn(gas)
|
const gasBn = hexToBn(gas)
|
||||||
@ -261,6 +264,15 @@ PendingTx.prototype.render = function () {
|
|||||||
}, 'Transaction Error. Exception thrown in contract code.')
|
}, 'Transaction Error. Exception thrown in contract code.')
|
||||||
: null,
|
: null,
|
||||||
|
|
||||||
|
!isValidAddress ?
|
||||||
|
h('.error', {
|
||||||
|
style: {
|
||||||
|
marginLeft: 50,
|
||||||
|
fontSize: '0.9em',
|
||||||
|
},
|
||||||
|
}, 'Recipient address is invalid sending this transaction will result in a loss of ETH.')
|
||||||
|
: null,
|
||||||
|
|
||||||
insufficientBalance ?
|
insufficientBalance ?
|
||||||
h('span.error', {
|
h('span.error', {
|
||||||
style: {
|
style: {
|
||||||
@ -298,7 +310,7 @@ PendingTx.prototype.render = function () {
|
|||||||
type: 'submit',
|
type: 'submit',
|
||||||
value: 'ACCEPT',
|
value: 'ACCEPT',
|
||||||
style: { marginLeft: '10px' },
|
style: { marginLeft: '10px' },
|
||||||
disabled: insufficientBalance || !this.state.valid,
|
disabled: insufficientBalance || !this.state.valid || !isValidAddress,
|
||||||
}),
|
}),
|
||||||
|
|
||||||
h('button.cancel.btn-red', {
|
h('button.cancel.btn-red', {
|
||||||
|
@ -48,6 +48,7 @@ ConfirmTxScreen.prototype.render = function () {
|
|||||||
var txParams = txData.params || {}
|
var txParams = txData.params || {}
|
||||||
var isNotification = isPopupOrNotification() === 'notification'
|
var isNotification = isPopupOrNotification() === 'notification'
|
||||||
|
|
||||||
|
|
||||||
log.info(`rendering a combined ${unconfTxList.length} unconf msg & txs`)
|
log.info(`rendering a combined ${unconfTxList.length} unconf msg & txs`)
|
||||||
if (unconfTxList.length === 0) return h(Loading, { isLoading: true })
|
if (unconfTxList.length === 0) return h(Loading, { isLoading: true })
|
||||||
|
|
||||||
|
@ -262,7 +262,7 @@ SendTransactionScreen.prototype.onSubmit = function () {
|
|||||||
return this.props.dispatch(actions.displayWarning(message))
|
return this.props.dispatch(actions.displayWarning(message))
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((!util.isValidAddress(recipient) && !txData) || (!recipient && !txData)) {
|
if ((!util.isValidAddress(recipient) && !txData) || (!recipient && !txData) || (recipient === '0x0000000000000000000000000000000000000000')) {
|
||||||
message = 'Recipient address is invalid.'
|
message = 'Recipient address is invalid.'
|
||||||
return this.props.dispatch(actions.displayWarning(message))
|
return this.props.dispatch(actions.displayWarning(message))
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user