feat: allow hex address as contract function input. Resolves #52

conflux_web3/_utils/abi.py

@@ -13,9 +13,8 @@
     build_non_strict_registry, 
     AddressEncoder,
 )
-from cfx_address import (
-    Base32Address,
-    validate_base32
+from cfx_address.utils import (
+    normalize_to
 )
 from cfx_utils.exceptions import (
     InvalidBase32Address
@@ -26,16 +25,16 @@
 
 class Base32AddressEncoder(AddressEncoder):
 
-    encode_fn = lambda self, address: AddressEncoder.encode_fn(Base32Address(address).hex_address)
+    encode_fn = lambda self, address: AddressEncoder.encode_fn(normalize_to(address, None))
 
     @classmethod
     def validate_value(cls, value: Any) -> None:
         if is_cns_name(value):
             return
         try:
-            validate_base32(value)
+            normalize_to(value, None)
         except InvalidBase32Address:
-            raise EncodingError(InvalidBase32Address)
+            raise EncodingError(f"Not a valid Base32 address nor hex address: {value}")
 
 class CfxAddressDecoder(AddressDecoder):
     decode_fn = lambda x: x

tests/transaction/contract/test_encoding.py

@@ -0,0 +1,10 @@
+from conflux_web3 import Web3
+
+
+def test_encode_function(w3: Web3):
+    contract = w3.cfx.contract(name="ERC20", with_deployment_info=False)("0x8888888888888888888888888888888888888888")
+    account = w3.cfx.account.create()
+
+    assert contract.functions.transfer(account.base32_address, 1000000000000000000)._encode_transaction_data() == contract.functions.transfer(account.hex_address, 1000000000000000000)._encode_transaction_data()
+
+