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

create safer isValidAddress method (#11089)

Browse Source
This commit is contained in:
Brad Decker 2021-05-17 14:00:59 -05:00 committed by Dan Miller
parent fac258a38a
commit 19ec45ef35
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/pages/send/send-content/add-recipient/add-recipient.utils.test.js
View File

@ -11,11 +11,13 @@ jest.mock('../../../../helpers/utils/util', () => ({
isDefaultMetaMaskChain: jest.fn().mockReturnValue(true), isDefaultMetaMaskChain: jest.fn().mockReturnValue(true),
isEthNetwork: jest.fn().mockReturnValue(true), isEthNetwork: jest.fn().mockReturnValue(true),
checkExistingAddresses: jest.fn().mockReturnValue(true), checkExistingAddresses: jest.fn().mockReturnValue(true),
isValidDomainName: jest.requireActual('../../../../helpers/utils/util')
.isValidDomainName,
isOriginContractAddress: jest.requireActual('../../../../helpers/utils/util') isOriginContractAddress: jest.requireActual('../../../../helpers/utils/util')
.isOriginContractAddress, .isOriginContractAddress,
})); }));
jest.mock('../../../../../../shared/modules/hexstring-utils', () => ({ jest.mock('../../../../../shared/modules/hexstring-utils', () => ({
isValidHexAddress: jest.fn((to) => isValidHexAddress: jest.fn((to) =>
Boolean(to.match(/^[0xabcdef123456798]+$/u)), Boolean(to.match(/^[0xabcdef123456798]+$/u)),
), ),

4
ui/pages/send/send-content/add-recipient/ens-input.component.js
View File

@ -9,12 +9,12 @@ import networkMap from 'ethereum-ens-network-map';
import log from 'loglevel'; import log from 'loglevel';
import { isHexString } from 'ethereumjs-util'; import { isHexString } from 'ethereumjs-util';
import { ellipsify } from '../../send.utils'; import { ellipsify } from '../../send.utils';
import { isValidDomainName } from '../../../../helpers/utils/util';
import { MAINNET_NETWORK_ID } from '../../../../../shared/constants/network';
import { import {
isBurnAddress, isBurnAddress,
isValidHexAddress, isValidHexAddress,
} from '../../../../../shared/modules/hexstring-utils'; } from '../../../../../shared/modules/hexstring-utils';
import { isValidDomainName } from '../../../../helpers/utils/util';
import { MAINNET_NETWORK_ID } from '../../../../../shared/constants/network';
// Local Constants // Local Constants
const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'; const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';