misc: fix tests

see: ethereum/eth-abi#161

.github/workflows/build-ci.yml

@@ -11,7 +11,7 @@ jobs:
       matrix:
         #os: [windows-2019, macos-10.15, ubuntu-18.04, ubuntu-20.04]
         os: [windows-latest, ubuntu-20.04]
-        python-version: ["3.8", "3.9", "^3"]
+        python-version: ["3.8", "3.9", "3.11"]
         include:
           - os: ubuntu-22.04
             python-version: 3.9

pyproject.toml

@@ -44,7 +44,7 @@ r2libr = { version = "^5.7.4", optional = true }
 [tool.poetry.extras]
 evm = ["blake2b-py", "eth-keys", "eth-typing", "eth-utils", "eth_abi", "lru-dict", "py-ecc", "rlp", "trie", "numpy", "rich", "cmd2", "eth-hash"]
 fuzz = ["unicornafl", "fuzzercorn"]
-re = ["r2libr"]
+RE = ["r2libr"]
 
 [build-system]
 requires = ["poetry-core"]

qiling/arch/evm/abi.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from eth_abi import encode_abi, decode_abi, encode_single, decode_single
+from eth_abi import encode, decode
 from eth_utils.abi import collapse_if_tuple
 from eth_utils import function_signature_to_4byte_selector, function_abi_to_4byte_selector, decode_hex, encode_hex
 from .vm.utils import bytecode_to_bytes
@@ -20,11 +20,11 @@ def encode_params(datatypes:list, values:list) -> str:
                 elif isinstance(values[idx], str):
                     values[idx] = bytecode_to_bytes(values[idx])
 
-        return encode_abi(datatypes, values).hex()
+        return encode(datatypes, values).hex()
 
     @staticmethod
     def decode_params(datatypes:list, value:str) -> list:
-        return decode_abi(datatypes, value)
+        return decode(datatypes, value)
 
     @staticmethod
     def encode_function_call(abi:str, params:list) -> str:
@@ -33,7 +33,7 @@ def encode_function_call(abi:str, params:list) -> str:
             raise ValueError(f'Function signature must contain "(" and ")": {abi}')
         signature = function_signature_to_4byte_selector(abi)
         inputs = abi[abi.index('('):]
-        params = encode_single(inputs, params)
+        params = encode((inputs,), (params,))
         return encode_hex(signature + params)
 
     @staticmethod
@@ -42,5 +42,5 @@ def encode_function_call_abi(abi:dict, params:list) -> str:
         inputs = ",".join(
             [collapse_if_tuple(abi_input) for abi_input in abi.get("inputs", [])]
         )
-        params = encode_single(f"({inputs})", params)
-        return encode_hex(signature + params)
+        params = encode((f"({inputs})",), (params,))
+        return encode_hex(signature + params)