diff --git a/src/validators/crypto_addresses/eth_address.py b/src/validators/crypto_addresses/eth_address.py index 1d259ad0..4d507aff 100644 --- a/src/validators/crypto_addresses/eth_address.py +++ b/src/validators/crypto_addresses/eth_address.py @@ -16,11 +16,11 @@ def _validate_eth_checksum_address(addr: str): """Validate ETH type checksum address.""" - addr = addr.replace("0x", "") - - if not re.fullmatch(r"[0-9a-fA-F]{40}", addr): + if not re.fullmatch(r"0x[0-9a-fA-F]{40}", addr): return False + addr = addr[2:] + addr_hash = keccak.new(addr.lower().encode("ascii")).digest().hex() # type: ignore for i in range(0, 40): diff --git a/tests/crypto_addresses/test_eth_address.py b/tests/crypto_addresses/test_eth_address.py index de2fd313..afcb29fa 100644 --- a/tests/crypto_addresses/test_eth_address.py +++ b/tests/crypto_addresses/test_eth_address.py @@ -39,6 +39,11 @@ def test_returns_true_on_valid_eth_address(value: str): "validators.eth", # non-hex characters (the checksum path used to accept these) "0x" + "*" * 40, + # checksum addresses without the 0x prefix or with extra 0x markers + "5AEDA56215b167893e80B4fE645BA6d5Bab767DE", + "0x0x5AEDA56215b167893e80B4fE645BA6d5Bab767DE", + "0x5AEDA56215b1670x893e80B4fE645BA6d5Bab767DE", + "0x5AEDA56215b167893e80B4fE645BA6d5Bab767DE0x", ], ) def test_returns_failed_validation_on_invalid_eth_address(value: str):