Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: trace API changes (again) #2095

Merged
merged 1 commit into from
May 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/ape/api/trace.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import sys
from abc import abstractmethod
from collections.abc import Sequence
from collections.abc import Iterator, Sequence
from typing import IO, Any, Optional

from ape.types import ContractFunctionPath
Expand Down Expand Up @@ -49,7 +49,7 @@ def revert_message(self) -> Optional[str]:
"""

@abstractmethod
def get_raw_frames(self) -> list[dict]:
def get_raw_frames(self) -> Iterator[dict]:
"""
Get raw trace frames for deeper analysis.
"""
Expand Down
25 changes: 16 additions & 9 deletions src/ape_ethereum/trace.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def _repr_pretty_(self, *args, **kwargs):

@property
@abstractmethod
def raw_trace_frames(self) -> list[dict]:
def raw_trace_frames(self) -> Iterator[dict]:
"""
The raw trace frames.
"""
Expand Down Expand Up @@ -202,7 +202,7 @@ def try_get_revert_msg(c) -> Optional[str]:

# Enrichment call-tree not available. Attempt looking in trace-frames.
try:
frames = self.raw_trace_frames
frames = list(self.raw_trace_frames)
except Exception as err:
logger.error(f"Failed getting traceback: {err}")
frames = []
Expand Down Expand Up @@ -288,8 +288,8 @@ def show_gas_report(self, verbose: bool = False, file: IO[str] = sys.stdout):
gas_report = self.get_gas_report()
self.chain_manager._reports.show_gas(gas_report, file=file)

def get_raw_frames(self) -> list[dict]:
return self.raw_trace_frames
def get_raw_frames(self) -> Iterator[dict]:
yield from self.raw_trace_frames

def get_raw_calltree(self) -> dict:
return self.get_calltree().model_dump(mode="json", by_alias=True)
Expand Down Expand Up @@ -323,14 +323,21 @@ def _get_tree(self, verbose: bool = False) -> Tree:
class TransactionTrace(Trace):
transaction_hash: str
debug_trace_transaction_parameters: dict = {"enableMemory": True}
_frames: list[dict] = []

@cached_property
def raw_trace_frames(self) -> list[dict]:
@property
def raw_trace_frames(self) -> Iterator[dict]:
"""
The raw trace ``"structLogs"`` from ``debug_traceTransaction``
for deeper investigation.
"""
return list(self._stream_struct_logs())
if self._frames:
yield from self._frames

else:
for frame in self._stream_struct_logs():
self._frames.append(frame)
yield frame

@cached_property
def transaction(self) -> dict:
Expand Down Expand Up @@ -463,8 +470,8 @@ def _tx_to_dict(cls, value):
return value

@property
def raw_trace_frames(self) -> list[dict]:
return self._traced_call.get("structLogs", [])
def raw_trace_frames(self) -> Iterator[dict]:
yield from self._traced_call.get("structLogs", [])

@property
def return_value(self) -> Any:
Expand Down
Loading