perf: improve node performances

src/ape/api/networks.py

@@ -173,7 +173,6 @@ def serialize_transaction(self) -> bytes:
         Returns:
             bytes
         """
-
         if not self.signature:
             raise SignatureError("The transaction is not signed.")
 

src/ape/api/transactions.py

@@ -5,9 +5,9 @@
 from typing import IO, TYPE_CHECKING, Any, NoReturn, Optional, Union
 
 from eth_pydantic_types import HexBytes
-from eth_utils import is_0x_prefixed, is_hex, to_int
+from eth_utils import is_0x_prefixed, is_hex, to_hex, to_int
 from ethpm_types.abi import EventABI, MethodABI
-from pydantic import ConfigDict, field_validator
+from pydantic import ConfigDict, field_serializer, field_validator
 from pydantic.fields import Field
 from tqdm import tqdm  # type: ignore
 
@@ -74,6 +74,25 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self._raise_on_revert = raise_on_revert
 
+    @field_serializer("signature", when_used="json")
+    @classmethod
+    def serialize_signature(cls, sig: TransactionSignature):
+        return {"v": sig.v, "r": to_hex(sig.r), "s": to_hex(sig.s)}
+
+    @field_validator("nonce", mode="before")
+    @classmethod
+    def validate_nonce(cls, value):
+        if value is None or isinstance(value, int):
+            return value
+
+        elif isinstance(value, str) and value.startswith("0x"):
+            return to_int(hexstr=value)
+
+        elif isinstance(value, str):
+            return int(value)
+
+        return to_int(value)
+
     @field_validator("gas_limit", mode="before")
     @classmethod
     def validate_gas_limit(cls, value):
@@ -161,12 +180,12 @@ def receipt(self) -> Optional["ReceiptAPI"]:
         """
 
         try:
-            txn_hash = self.txn_hash.hex()
+            txn_hash = to_hex(self.txn_hash)
         except SignatureError:
             return None
 
         try:
-            return self.provider.get_receipt(txn_hash, required_confirmations=0, timeout=0)
+            return self.chain_manager.get_receipt(txn_hash)
         except (TransactionNotFoundError, ProviderNotConnectedError):
             return None
 
@@ -355,7 +374,6 @@ def failed(self) -> bool:
         Ecosystem plugins override this property when their receipts
         are able to be failing.
         """
-
         return False
 
     @property
@@ -450,6 +468,13 @@ def await_confirmations(self) -> "ReceiptAPI":
         Returns:
             :class:`~ape.api.ReceiptAPI`: The receipt that is now confirmed.
         """
+        # perf: avoid *everything* if required_confirmations is 0, as this is likely a
+        #   dev environment or the user doesn't care.
+        if self.required_confirmations == 0:
+            # The transaction might not yet be confirmed but
+            # the user is aware of this. Or, this is a development environment.
+            return self
+
         try:
             self.raise_for_status()
         except TransactionError:
@@ -472,11 +497,6 @@ def await_confirmations(self) -> "ReceiptAPI":
                     if self.transaction.raise_on_revert:
                         raise tx_err
 
-        if self.required_confirmations == 0:
-            # The transaction might not yet be confirmed but
-            # the user is aware of this. Or, this is a development environment.
-            return self
-
         confirmations_occurred = self._confirmations_occurred
         if self.required_confirmations and confirmations_occurred >= self.required_confirmations:
             return self

src/ape/contracts/base.py

@@ -559,12 +559,7 @@ def __len__(self):
     def __call__(self, *args: Any, **kwargs: Any) -> MockContractLog:
         # Create a dictionary from the positional arguments
         event_args: dict[Any, Any] = dict(zip((ipt.name for ipt in self.abi.inputs), args))
-
-        overlapping_keys = set(k for k in event_args.keys() if k is not None) & set(
-            k for k in kwargs.keys() if k is not None
-        )
-
-        if overlapping_keys:
+        if overlapping_keys := set(event_args).intersection(kwargs):
             raise ValueError(
                 f"Overlapping keys found in arguments: '{', '.join(overlapping_keys)}'."
             )
@@ -1137,8 +1132,8 @@ def get_event_by_signature(self, signature: str) -> ContractEvent:
             :class:`~ape.contracts.base.ContractEvent`
         """
 
-        name_from_sig = signature.split("(")[0].strip()
-        options = self._events_.get(name_from_sig, [])
+        name_from_sig = signature.partition("(")[0].strip()
+        options = self._events_.get(name_from_sig.strip(), [])
 
         err = ContractDataError(f"No event found with signature '{signature}'.")
         if not options:
@@ -1162,7 +1157,7 @@ def get_error_by_signature(self, signature: str) -> type[CustomError]:
             :class:`~ape.exceptions.CustomError`
         """
 
-        name_from_sig = signature.split("(")[0].strip()
+        name_from_sig = signature.partition("(")[0].strip()
         options = self._errors_.get(name_from_sig, [])
         err = ContractDataError(f"No error found with signature '{signature}'.")
         if not options:
@@ -1610,7 +1605,7 @@ def _get_name(cc: ContractContainer) -> str:
                 return contract
 
             elif "." in search_name:
-                next_node = search_name.split(".")[0]
+                next_node = search_name.partition(".")[0]
                 if next_node != item:
                     continue
 

src/ape/managers/chain.py

@@ -67,7 +67,6 @@ def head(self) -> BlockAPI:
         """
         The latest block.
         """
-
         return self.provider.get_block("latest")
 
     @property

src/ape/pytest/config.py

@@ -1,9 +1,10 @@
+from functools import cached_property
 from typing import Any, Optional, Union
 
 from _pytest.config import Config as PytestConfig
 
 from ape.types import ContractFunctionPath
-from ape.utils import ManagerAccessMixin, cached_property
+from ape.utils.basemodel import ManagerAccessMixin
 
 
 def _get_config_exclusions(config) -> list[ContractFunctionPath]:
@@ -76,15 +77,12 @@ def gas_exclusions(self) -> list[ContractFunctionPath]:
         """
         The combination of both CLI values and config values.
         """
-
         cli_value = self.pytest_config.getoption("--gas-exclude")
-        exclusions: list[ContractFunctionPath] = []
-        if cli_value:
-            items = cli_value.split(",")
-            for item in items:
-                exclusion = ContractFunctionPath.from_str(item)
-                exclusions.append(exclusion)
-
+        exclusions = (
+            [ContractFunctionPath.from_str(item) for item in cli_value.split(",")]
+            if cli_value
+            else []
+        )
         paths = _get_config_exclusions(self.ape_test_config.gas)
         exclusions.extend(paths)
         return exclusions

src/ape/pytest/coverage.py

@@ -7,7 +7,7 @@
 from ethpm_types.source import ContractSource
 
 from ape.logging import logger
-from ape.managers import ProjectManager
+from ape.managers.project import ProjectManager
 from ape.pytest.config import ConfigWrapper
 from ape.types import (
     ContractFunctionPath,

src/ape/pytest/fixtures.py

@@ -1,19 +1,21 @@
-import copy
 from collections.abc import Iterator
 from fnmatch import fnmatch
+from functools import cached_property
 from typing import Optional
 
 import pytest
 
-from ape.api import ReceiptAPI, TestAccountAPI
+from ape.api.accounts import TestAccountAPI
+from ape.api.transactions import ReceiptAPI
 from ape.exceptions import BlockNotFoundError, ChainError
 from ape.logging import logger
 from ape.managers.chain import ChainManager
 from ape.managers.networks import NetworkManager
 from ape.managers.project import ProjectManager
 from ape.pytest.config import ConfigWrapper
 from ape.types import SnapshotID
-from ape.utils import ManagerAccessMixin, allow_disconnected, cached_property
+from ape.utils.basemodel import ManagerAccessMixin
+from ape.utils.misc import allow_disconnected
 
 
 class PytestApeFixtures(ManagerAccessMixin):
@@ -30,49 +32,45 @@ def __init__(self, config_wrapper: ConfigWrapper, receipt_capture: "ReceiptCaptu
 
     @cached_property
     def _track_transactions(self) -> bool:
-        has_reason = self.config_wrapper.track_gas or self.config_wrapper.track_coverage
         return (
-            self.network_manager.provider is not None and self.provider.is_connected and has_reason
+            self.network_manager.provider is not None
+            and self.provider.is_connected
+            and (self.config_wrapper.track_gas or self.config_wrapper.track_coverage)
         )
 
     @pytest.fixture(scope="session")
     def accounts(self) -> list[TestAccountAPI]:
         """
         A collection of pre-funded accounts.
         """
-
         return self.account_manager.test_accounts
 
     @pytest.fixture(scope="session")
     def compilers(self):
         """
         Access compiler manager directly.
         """
-
         return self.compiler_manager
 
     @pytest.fixture(scope="session")
     def chain(self) -> ChainManager:
         """
         Manipulate the blockchain, such as mine or change the pending timestamp.
         """
-
         return self.chain_manager
 
     @pytest.fixture(scope="session")
     def networks(self) -> NetworkManager:
         """
         Connect to other networks in your tests.
         """
-
         return self.network_manager
 
     @pytest.fixture(scope="session")
     def project(self) -> ProjectManager:
         """
         Access contract types and dependencies.
         """
-
         return self.local_project
 
     @pytest.fixture(scope="session")
@@ -88,7 +86,6 @@ def _isolation(self) -> Iterator[None]:
         Isolation logic used to implement isolation fixtures for each pytest scope.
         When tracing support is available, will also assist in capturing receipts.
         """
-
         try:
             snapshot_id = self._snapshot()
         except BlockNotFoundError:
@@ -174,7 +171,7 @@ def capture_range(self, start_block: int, stop_block: int):
                 txn_hash = txn.txn_hash.hex()
             except Exception:
                 # Might have been from an impersonated account.
-                # Those txns need to be added separatly, same as tracing calls.
+                # Those txns need to be added separately, same as tracing calls.
                 # Likely, it was already accounted before this point.
                 continue
 
@@ -189,14 +186,14 @@ def capture(self, transaction_hash: str):
         if not receipt:
             return
 
-        if not (contract_address := (receipt.receiver or receipt.contract_address)):
+        elif not (contract_address := (receipt.receiver or receipt.contract_address)):
             return
 
-        if not (contract_type := self.chain_manager.contracts.get(contract_address)):
+        elif not (contract_type := self.chain_manager.contracts.get(contract_address)):
             # Not an invoke-transaction or a known address
             return
 
-        if not (source_id := (contract_type.source_id or None)):
+        elif not (source_id := (contract_type.source_id or None)):
             # Not a local or known contract type.
             return
 
@@ -229,7 +226,6 @@ def _exclude_from_gas_report(
         Helper method to determine if a certain contract / method combination should be
         excluded from the gas report.
         """
-
         for exclusion in self.config_wrapper.gas_exclusions:
             # Default to looking at all contracts
             contract_pattern = exclusion.contract_name
@@ -241,15 +237,3 @@ def _exclude_from_gas_report(
                 return True
 
         return False
-
-
-def _build_report(report: dict, contract: str, method: str, usages: list) -> dict:
-    new_dict = copy.deepcopy(report)
-    if contract not in new_dict:
-        new_dict[contract] = {method: usages}
-    elif method not in new_dict[contract]:
-        new_dict[contract][method] = usages
-    else:
-        new_dict[contract][method].extend(usages)
-
-    return new_dict

src/ape/pytest/gas.py

@@ -4,12 +4,11 @@
 from ethpm_types.source import ContractSource
 from evm_trace.gas import merge_reports
 
-from ape.api import TraceAPI
+from ape.api.trace import TraceAPI
 from ape.pytest.config import ConfigWrapper
 from ape.types import AddressType, ContractFunctionPath, GasReport
-from ape.utils import parse_gas_table
 from ape.utils.basemodel import ManagerAccessMixin
-from ape.utils.trace import _exclude_gas
+from ape.utils.trace import _exclude_gas, parse_gas_table
 
 
 class GasTracker(ManagerAccessMixin):