fix(API): corruption of abridged calldata (#2618)

Author: BowTiedDevil

setup.py

@@ -86,7 +86,7 @@
     },
     include_package_data=True,
     install_requires=[
-        "click>=8.1.6,<9",
+        "click>=8.1.6,<8.2",
         "ijson>=3.1.4,<4",
         "ipython>=8.18.1,<9",
         "lazyasd>=0.1.4",

src/ape/api/transactions.py

@@ -203,25 +203,14 @@ def to_string(self, calldata_repr: Optional["CalldataRepr"] = None) -> str:
             # If was not specified, use the default value from the config.
             calldata_repr = self.local_project.config.display.calldata
 
-        if calldata_repr == "full" or len(data["data"]) <= 9:
-            data["data"] = (
-                to_hex(bytes(data["data"], encoding="utf8"))
-                if isinstance(data["data"], str)
-                else to_hex(bytes(data["data"]))
-            )
-
-        else:
-            # Only want to specify encoding if data["data"] is a string
-            data["data"] = (
-                (
-                    "0x"
-                    + bytes(data["data"][:4], encoding="utf8").hex()
-                    + "..."
-                    + bytes(data["data"][-4:], encoding="utf8").hex()
-                )
-                if isinstance(data["data"], str)
-                else to_hex(bytes(data["data"][:4])) + "..." + to_hex(bytes(data["data"][-4:]))
-            )
+        # Ellide the transaction calldata for abridged representations if the length exceeds 8
+        # (4 bytes for function selector and trailing 4 bytes).
+        calldata = HexBytes(data["data"])
+        data["data"] = (
+            calldata[:4].to_0x_hex() + "..." + calldata[-4:].hex()
+            if calldata_repr == "abridged" and len(calldata) > 8
+            else calldata.to_0x_hex()
+        )
 
         params = "\n  ".join(f"{k}: {v}" for k, v in data.items())
         cls_name = getattr(type(self), "__name__", TransactionAPI.__name__)

tests/functional/test_transaction.py

@@ -315,18 +315,15 @@ def test_str_when_data_is_long_shows_first_4_bytes(vyper_contract_instance):
     txn = vyper_contract_instance.setNumber.as_transaction(123)
     actual = str(txn)
     assert isinstance(actual, str)
-    assert "data: 0x30783366..." in actual
+    assert "data: 0x3fb5c1cb..." in actual
 
 
 def test_str_when_data_is_long_and_configured_full_calldata(project, vyper_contract_instance):
     txn = vyper_contract_instance.setNumber.as_transaction(123)
     with project.temp_config(display={"calldata": "full"}):
         actual = str(txn)
 
-    expected = (
-        "data: 0x3078336662356331636230303030303030303030303030303030303030303030303030"
-        "303030303030303030303030303030303030303030303030303030303030303030303030303762"
-    )
+    expected = "data: 0x3fb5c1cb000000000000000000000000000000000000000000000000000000000000007b"
     assert isinstance(actual, str)
     assert expected in actual