Merge pull request #843 from eth-brownie/fix-revert-msg

fix: handle undecodable revert message in subcalls
eth-brownie · Nov 11, 2020 · 3fad0bd · 3fad0bd
2 parents 6ab8f6d + 20086b4
commit 3fad0bd
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/brownie/network/transaction.py b/brownie/network/transaction.py
@@ -645,9 +645,12 @@ def _expand_trace(self) -> None:
                     subcall["selfdestruct"] = True
                 else:
                     if opcode == "REVERT":
-                        data = _get_memory(trace[i], -1)[4:]
-                        if data:
-                            subcall["revert_msg"] = decode_abi(["string"], data)[0]
+                        data = _get_memory(trace[i], -1)
+                        if len(data) > 4:
+                            try:
+                                subcall["revert_msg"] = decode_abi(["string"], data[4:])[0]
+                            except Exception:
+                                subcall["revert_msg"] = data.hex()
                     if "revert_msg" not in subcall and "dev" in pc:
                         subcall["revert_msg"] = pc["dev"]