Add checksum address validation

Orlanduis · Jan 23, 2023 · 676279e · 676279e
1 parent 3b7e144
commit 676279e
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/staking_deposit/intl/en/utils/validation.json b/staking_deposit/intl/en/utils/validation.json
@@ -13,7 +13,8 @@
     },
     "validate_eth1_withdrawal_address": {
         "err_invalid_ECDSA_hex_addr": "The given Eth1 address is not in hexadecimal encoded form.",
-        "msg_ECDSA_addr_withdrawal": "**[Warning] you are setting an Eth1 address as your withdrawal address. Please ensure that you have control over this address.**"
+        "err_invalid_ECDSA_hex_addr_checksum": "The given Eth1 address is not in checksum form.",
+        "msg_ECDSA_hex_addr_withdrawal": "**[Warning] you are setting an Eth1 address as your withdrawal address. Please ensure that you have control over this address.**"
     },
     "validate_bls_withdrawal_credentials": {
         "err_not_bls_form": "The given withdrawal credentials is not in BLS_WITHDRAWAL_PREFIX form."

diff --git a/staking_deposit/intl/tr/utils/validation.json b/staking_deposit/intl/tr/utils/validation.json
@@ -13,6 +13,6 @@
     },
     "validate_eth1_withdrawal_address": {
         "err_invalid_ECDSA_hex_addr": "Girilen Eth1 adresi onaltılık sistemde kodlanmamıştır.",
-        "msg_ECDSA_addr_withdrawal": "**[Uyarı] bir Eth1 adresini varlık çekme adresi olarak giriyorsunuz. Lütfen bu adresin kontrolünün sizde olduğundan emin olun.**"
+        "msg_ECDSA_hex_addr_withdrawal": "**[Uyarı] bir Eth1 adresini varlık çekme adresi olarak giriyorsunuz. Lütfen bu adresin kontrolünün sizde olduğundan emin olun.**"
     }
 }
diff --git a/staking_deposit/utils/validation.py b/staking_deposit/utils/validation.py
@@ -8,7 +8,7 @@
     BLSSignature,
     HexAddress,
 )
-from eth_utils import is_hex_address, to_normalized_address, decode_hex
+from eth_utils import is_hex_address, is_checksum_address, to_normalized_address, decode_hex
 from py_ecc.bls import G2ProofOfPossession as bls
 
 from staking_deposit.exceptions import ValidationError
@@ -125,14 +125,15 @@ def validate_int_range(num: Any, low: int, high: int) -> int:
 
 
 def validate_eth1_withdrawal_address(cts: click.Context, param: Any, address: str) -> HexAddress:
-    # TODO: checksum
     if address is None:
         return None
     if not is_hex_address(address):
         raise ValueError(load_text(['err_invalid_ECDSA_hex_addr']))
+    if not is_checksum_address(address):
+        raise ValueError(load_text(['err_invalid_ECDSA_hex_addr_checksum']))
 
     normalized_address = to_normalized_address(address)
-    click.echo('\n%s\n' % load_text(['msg_ECDSA_addr_withdrawal']))
+    click.echo('\n%s\n' % load_text(['msg_ECDSA_hex_addr_withdrawal']))
     return normalized_address
 
 #

diff --git a/tests/test_cli/test_existing_menmonic.py b/tests/test_cli/test_existing_menmonic.py
@@ -67,7 +67,7 @@ def test_existing_mnemonic_eth1_address_withdrawal() -> None:
         'abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about',
         '2', '2', '5', 'mainnet', 'MyPassword', 'MyPassword']
     data = '\n'.join(inputs)
-    eth1_withdrawal_address = '0x00000000219ab540356cbb839cbe05303d7705fa'
+    eth1_withdrawal_address = '0x00000000219ab540356cBB839Cbe05303d7705Fa'
     arguments = [
         '--language', 'english',
         'existing-mnemonic',

diff --git a/tests/test_cli/test_generate_bls_to_execution_change.py b/tests/test_cli/test_generate_bls_to_execution_change.py
@@ -27,7 +27,7 @@ def test_existing_mnemonic_bls_withdrawal() -> None:
         '--bls_withdrawal_credentials_list', '0x00bd0b5a34de5fb17df08410b5e615dda87caf4fb72d0aac91ce5e52fc6aa8de',
         '--validator_start_index', '0',
         '--validator_indices', '1',
-        '--execution_address', '3434343434343434343434343434343434343434',
+        '--execution_address', '0x3434343434343434343434343434343434343434',
     ]
     result = runner.invoke(cli, arguments, input=data)
     assert result.exit_code == 0

diff --git a/tests/test_cli/test_new_mnemonic.py b/tests/test_cli/test_new_mnemonic.py
@@ -72,7 +72,7 @@ def mock_get_mnemonic(language, words_path, entropy=None) -> str:
     inputs = ['english', '1', 'mainnet', 'MyPassword', 'MyPassword',
               'abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about']
     data = '\n'.join(inputs)
-    eth1_withdrawal_address = '0x00000000219ab540356cbb839cbe05303d7705fa'
+    eth1_withdrawal_address = '0x00000000219ab540356cBB839Cbe05303d7705Fa'
     arguments = [
         '--language', 'english',
         'new-mnemonic',