From a534f8ca1ece205c86491af4dcaae0dc3bfbc871 Mon Sep 17 00:00:00 2001 From: lash Date: Wed, 4 May 2022 18:09:01 +0000 Subject: [PATCH] Avoid padding of missing nibble in address --- CHANGELOG | 4 ++++ funga/eth/encoding.py | 6 +++--- requirements.txt | 2 +- setup.py | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 289faa6..ca2ce5e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +* 0.6.1 + - Avoid padding of addresses missing one nibble +* 0.6.0 + - Upgrade confini * 0.5.4 - Add message signer cli - Add pbkdf2 support diff --git a/funga/eth/encoding.py b/funga/eth/encoding.py index db69a21..cd20086 100644 --- a/funga/eth/encoding.py +++ b/funga/eth/encoding.py @@ -41,7 +41,7 @@ def private_key_to_address(pk, result_format='hex'): def is_address(address_hex): try: - address_hex = strip_0x(address_hex) + address_hex = strip_0x(address_hex, pad=False) except ValueError: return False return len(address_hex) == 40 @@ -57,10 +57,10 @@ def is_checksum_address(address_hex): def to_checksum_address(address_hex): - address_hex = strip_0x(address_hex) - address_hex = uniform(address_hex) + address_hex = strip_0x(address_hex, pad=False) if len(address_hex) != 40: raise ValueError('Invalid address length') + address_hex = uniform(address_hex) h = sha3.keccak_256() h.update(address_hex.encode('utf-8')) z = h.digest() diff --git a/requirements.txt b/requirements.txt index dbb2cd6..86cd93e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,6 +5,6 @@ rlp==2.0.1 json-rpc==1.13.0 confini~=0.6.0 coincurve==15.0.0 -hexathon~=0.1.5 +hexathon~=0.1.6 pycryptodome==3.10.1 funga==0.5.2 diff --git a/setup.py b/setup.py index 22b9682..cb51f30 100644 --- a/setup.py +++ b/setup.py @@ -33,7 +33,7 @@ f.close() setup( name="funga-eth", - version="0.6.0", + version="0.6.1", description="Ethereum implementation of the funga keystore and signer", author="Louis Holbrook", author_email="dev@holbrook.no",