TheDude
/
ciphermask
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6280 from MetaMask/network-checksum-disable

Browse Source 
No longer check network when validating checksum addresses
feature/default_network_editable
Thomas Huang 6 years ago committed by GitHub
parent 5abcce2be7 ef7ac90bca
commit c44f7857a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 3
      ui/app/util.js

3
ui/app/util.js
Unescape View File

@ -95,7 +95,6 @@ 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())
return (isAllOneCase(prefixed) && ethUtil.isValidAddress(prefixed)) || ethUtil.isValidChecksumAddress(prefixed) return (isAllOneCase(prefixed) && ethUtil.isValidAddress(prefixed)) || ethUtil.isValidChecksumAddress(prefixed)
} }
@ -315,7 +314,7 @@ 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
} }
function addressSlicer (address = '') { function addressSlicer (address = '') {

Write Preview
Loading…
Cancel
Save