Skip to content

Commit

Permalink
No longer check network when validating checksum addresses
Browse files Browse the repository at this point in the history
  • Loading branch information
tmashuang committed Mar 11, 2019
1 parent 82959b6 commit 22c4fe0
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions ui/app/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ function miniAddressSummary (address) {
function isValidAddress (address, network) {
var prefixed = ethUtil.addHexPrefix(address)
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)
}

Expand Down Expand Up @@ -315,7 +316,9 @@ function getTokenAddressFromTokenObject (token) {
*/
function checksumAddress (address, network) {
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 = '') {
Expand Down

0 comments on commit 22c4fe0

Please sign in to comment.