fix: decoding issues that affect tracing features such as coverage (#…

…1803)
ApeWorX · Jan 3, 2024 · 2c30c3a · 2c30c3a
1 parent 6555fa2
commit 2c30c3a
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 10 deletions.
diff --git a/src/ape_ethereum/ecosystem.py b/src/ape_ethereum/ecosystem.py
@@ -448,13 +448,13 @@ def decode_calldata(self, abi: Union[ConstructorABI, MethodABI], calldata: bytes
         input_types = [parse_type(i.model_dump(mode="json")) for i in abi.inputs]
 
         try:
-            raw_input_values = decode(raw_input_types, calldata)
-            input_values = [
-                self.decode_primitive_value(v, t) for v, t in zip(raw_input_values, input_types)
-            ]
+            raw_input_values = decode(raw_input_types, calldata, strict=False)
         except InsufficientDataBytes as err:
             raise DecodingError(str(err)) from err
 
+        input_values = [
+            self.decode_primitive_value(v, t) for v, t in zip(raw_input_values, input_types)
+        ]
         arguments = {}
         index = 0
         for i, v in zip(abi.inputs, input_values):
@@ -467,10 +467,14 @@ def decode_calldata(self, abi: Union[ConstructorABI, MethodABI], calldata: bytes
     def decode_returndata(self, abi: MethodABI, raw_data: bytes) -> Tuple[Any, ...]:
         output_types_str_ls = [o.canonical_type for o in abi.outputs]
 
-        try:
-            vm_return_values = decode(output_types_str_ls, raw_data)
-        except (InsufficientDataBytes, NonEmptyPaddingBytes) as err:
-            raise DecodingError(str(err)) from err
+        if raw_data:
+            try:
+                vm_return_values = decode(output_types_str_ls, raw_data, strict=False)
+            except (InsufficientDataBytes, NonEmptyPaddingBytes) as err:
+                raise DecodingError(str(err)) from err
+        else:
+            # Use all zeroes.
+            vm_return_values = tuple([0 for _ in output_types_str_ls])
 
         if not vm_return_values:
             return vm_return_values

diff --git a/tests/functional/test_ecosystem.py b/tests/functional/test_ecosystem.py
@@ -1,7 +1,7 @@
 from typing import Any, Dict
 
 import pytest
-from eth_pydantic_types import HexBytes
+from eth_pydantic_types import HashBytes32, HexBytes
 from eth_typing import HexAddress, HexStr
 from ethpm_types.abi import ABIType, EventABI, MethodABI
 
@@ -351,7 +351,22 @@ def test_encode_blueprint_contract(ethereum, vyper_contract_type):
     assert actual.data == HexBytes(expected)
 
 
-def test_decode_return_data_non_empty_padding_bytes(ethereum):
+def test_decode_returndata(ethereum):
+    abi = MethodABI.model_validate(
+        {
+            "type": "function",
+            "name": "doThing",
+            "stateMutability": "nonpayable",
+            "inputs": [],
+            "outputs": [{"name": "", "type": "bool"}],
+        }
+    )
+    data = HashBytes32.__eth_pydantic_validate__(0)
+    actual = ethereum.decode_returndata(abi, data)
+    assert actual == (False,)
+
+
+def test_decode_returndata_non_empty_padding_bytes(ethereum):
     raw_data = HexBytes(
         "0x08c379a000000000000000000000000000000000000000000000000000000000000000200"
         "000000000000000000000000000000000000000000000000000000000000012696e73756666"
@@ -373,6 +388,20 @@ def test_decode_return_data_non_empty_padding_bytes(ethereum):
         ethereum.decode_returndata(abi, raw_data)
 
 
+def test_decode_returndata_no_bytes_returns_zero(ethereum):
+    abi = MethodABI.model_validate(
+        {
+            "type": "function",
+            "name": "doThing",
+            "stateMutability": "nonpayable",
+            "inputs": [],
+            "outputs": [{"name": "", "type": "bool"}],
+        }
+    )
+    actual = ethereum.decode_returndata(abi, b"")
+    assert actual == (0,)
+
+
 @pytest.mark.parametrize("tx_type", TransactionType)
 def test_create_transaction_uses_network_gas_limit(tx_type, ethereum, eth_tester_provider, owner):
     tx = ethereum.create_transaction(type=tx_type.value, sender=owner.address)