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

No longer check network when validating checksum addresses

Browse Source
This commit is contained in:
Thomas Huang 2019-03-11 13:00:03 -05:00
parent 82959b6b0e
commit 22c4fe0469
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/app/util.js
View File

@ -95,7 +95,8 @@ function miniAddressSummary (address) {
function isValidAddress (address, network) { function isValidAddress (address, network) {
var prefixed = ethUtil.addHexPrefix(address) var prefixed = ethUtil.addHexPrefix(address)
if (address === '0x0000000000000000000000000000000000000000') return false if (address === '0x0000000000000000000000000000000000000000') return false
if (!isEthNetwork(network)) return (ethUtil.isValidAddress(prefixed) && address === address.toLowerCase()) // Checksums on non-ETH Blockchains #6001
// if (!isEthNetwork(network)) return (ethUtil.isValidAddress(prefixed) && address === address.toLowerCase())
return (isAllOneCase(prefixed) && ethUtil.isValidAddress(prefixed)) || ethUtil.isValidChecksumAddress(prefixed) return (isAllOneCase(prefixed) && ethUtil.isValidAddress(prefixed)) || ethUtil.isValidChecksumAddress(prefixed)
} }
@ -315,7 +316,9 @@ function getTokenAddressFromTokenObject (token) {
*/ */
function checksumAddress (address, network) { function checksumAddress (address, network) {
const checksummed = address ? ethUtil.toChecksumAddress(address) : '' const checksummed = address ? ethUtil.toChecksumAddress(address) : ''
return checksummed && network && !isEthNetwork(network) ? checksummed.toLowerCase() : checksummed return checksummed
// Checksums on non-ETH Blockchains #6001
// return checksummed && network && !isEthNetwork(network) ? checksummed.toLowerCase() : checksummed
} }
function addressSlicer (address = '') { function addressSlicer (address = '') {