test: use our test action

Author: antazoey

.github/workflows/test.yaml

@@ -15,6 +15,8 @@ jobs:
 
         steps:
         - uses: actions/checkout@v4
+          with:
+            fetch-depth: 0
 
         - name: Setup Python
           uses: actions/setup-python@v5
@@ -40,6 +42,8 @@ jobs:
 
         steps:
         - uses: actions/checkout@v4
+          with:
+            fetch-depth: 0
 
         - name: Setup Python
           uses: actions/setup-python@v5
@@ -85,20 +89,26 @@ jobs:
           with:
             version: 1.15.6
 
+        - name: Setup Ape
+          uses: ApeWorX/github-action@v3
+
         - name: Install Dependencies
           run: |
             python -m pip install --upgrade pip
             pip uninstall eth-ape --yes
             pip install .[test]
 
+        - name: Install Ape Dependencies
+          run: ape pm install
+
         - name: Run Functional Tests
-          run: ape test tests/functional -m "not fuzzing" -s --cov=src --cov-append -n auto --dist loadgroup
+          run: ape test tests/functional -m "not fuzzing" -s --cov=src --cov-append -n auto --dist loadgroup -v ERROR
 
         - name: Run Integration Tests
-          run: ape test tests/integration -m "not fuzzing" -s --cov=src --cov-append -n auto --dist loadgroup
+          run: ape test tests/integration -m "not fuzzing" -s --cov=src --cov-append -n auto --dist loadgroup -v ERROR
 
         - name: Run Performance Tests
-          run: ape test tests/performance -s
+          run: ape test tests/performance -s -v ERROR
 
     fuzzing:
         runs-on: ubuntu-latest
@@ -108,6 +118,8 @@ jobs:
 
         steps:
         - uses: actions/checkout@v4
+          with:
+            fetch-depth: 0
 
         - name: Setup Python
           uses: actions/setup-python@v5

.pre-commit-config.yaml

@@ -5,7 +5,7 @@ repos:
     -   id: check-yaml
 
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.10.0  # Latest ruff version
+    rev: v0.11.2  # Latest ruff version
     hooks:
     -   id: ruff
         args: [--fix, --exit-non-zero-on-fix]

docs/userguides/config.md

@@ -165,7 +165,7 @@ A simple example of configuring dependencies looks like this:
 [[tool.ape.dependencies]]
 name = "openzeppelin"
 github = "OpenZeppelin/openzeppelin-contracts"
-version = "4.4.2"
+version = "4.9.6"
 ```
 
 Or the equivalent YAML:
@@ -174,7 +174,7 @@ Or the equivalent YAML:
 dependencies:
   - name: openzeppelin
     github: OpenZeppelin/openzeppelin-contracts
-    version: 4.4.2
+    version: 4.9.6
 ```
 
 ## Deployments

docs/userguides/dependencies.md

@@ -24,13 +24,13 @@ The following section highlights how to use each of them and what their differen
 
 You can use dependencies from GitHub.
 For example, a common dependency for Solidity projects is [Open Zeppelin](https://github.com/OpenZeppelin/openzeppelin-contracts).
-To use Open Zeppelin version 4.4.2 in your Ape Solidity project, add the following to your `ape-config.yaml` file:
+To use Open Zeppelin version 4.9.6 in your Ape Solidity project, add the following to your `ape-config.yaml` file:
 
 ```yaml
 dependencies:
   - name: OpenZeppelin
     github: OpenZeppelin/openzeppelin-contracts
-    version: 4.4.2
+    version: 4.9.6
 ```
 
 Then, follow the guide below about `remappings` to use the dependency.
@@ -209,7 +209,7 @@ You can also use Python to install dependencies, using `**kwargs` as the same fi
 from ape import project
 
 project.dependencies.install(
-   github="OpenZeppelin/openzeppelin-contracts", name="openzeppelin", version="4.4.2"
+   github="OpenZeppelin/openzeppelin-contracts", name="openzeppelin", version="4.9.6"
 )
 ```
 
@@ -336,7 +336,7 @@ For example, if you are using dependencies like:
 dependencies:
   - name: OpenZeppelin
     github: OpenZeppelin/openzeppelin-contracts
-    version: 4.4.2
+    version: 4.9.6
 ```
 
 And your source files import from `openzeppelin` this way:

docs/userguides/testing.md

@@ -449,7 +449,7 @@ assert x != 0  # dev: invalid value
 Take for example:
 
 ```python
-# @version 0.3.7
+# @version 0.4.0
 
 @external
 def check_value(_value: uint256) -> bool:
@@ -512,12 +512,12 @@ Similarly, if you require dev assertions for non-reentrant functions you must be
 
 ```python
 @internal
-@nonreentrant('lock')
+@nonreentrant
 def _foo_internal():  # dev: correct location
     pass
 
 @external
-@nonreentrant('lock')
+@nonreentrant
 def foo():
     self._foo_internal()  # dev: incorrect location
 ```

pyproject.toml

@@ -2,7 +2,18 @@
 requires = ["setuptools>=75.0.0", "wheel", "setuptools_scm[toml]>=5.0"]
 
 [tool.ape]
-contracts_folder = "tests/functional/data/contracts/ethereum/local"
+name = "ape"
+contracts_folder = "tests/functional/data/contracts"
+
+[[tool.ape.dependencies]]
+name = "openzeppelin"
+version = "4.9.6"
+github = "OpenZeppelin/openzeppelin-contracts"
+
+[[tool.ape.dependencies]]
+name = "openzeppelin"
+version = "5.2.0"
+github = "OpenZeppelin/openzeppelin-contracts"
 
 [tool.ape.test]
 show_internal = true

setup.py

@@ -20,9 +20,11 @@
         "pytest-timeout>=2.2.0,<3",  # For avoiding timing out during tests
         "hypothesis>=6.2.0,<7.0",  # Strategy-based fuzzer
         "hypothesis-jsonschema==0.19.0",  # JSON Schema fuzzer extension
+        "ape-vyper>=0.8.9,<0.9",  # Needed for compiling test contracts
+        "ape-solidity>=0.8.5,<0.9",  # Needed for compiling test contracts
     ],
     "lint": [
-        "ruff>=0.10.0",  # Unified linter and formatter
+        "ruff>=0.11.2",  # Unified linter and formatter
         "mypy>=1.15.0,<1.16.0",  # Static type analyzer
         "types-PyYAML",  # Needed due to mypy typeshed
         "types-requests",  # Needed due to mypy typeshed

src/ape/api/accounts.py

@@ -338,6 +338,7 @@ def declare(self, contract: "ContractContainer", *args, **kwargs) -> ReceiptAPI:
             :class:`~ape.api.transactions.ReceiptAPI`: The receipt of the declare transaction.
         """
 
+        kwargs["sender"] = self
         transaction = self.provider.network.ecosystem.encode_contract_blueprint(
             contract.contract_type, *args, **kwargs
         )

src/ape/api/address.py

@@ -170,15 +170,13 @@ def codesize(self) -> int:
         """
         The number of bytes in the smart contract.
         """
-
         return len(self.code)
 
     @property
     def is_contract(self) -> bool:
         """
         ``True`` when there is code associated with the address.
         """
-
         return len(HexBytes(self.code)) > 0
 
     @cached_property

src/ape/contracts/base.py

@@ -930,7 +930,7 @@ def identifier_lookup(self) -> dict[str, "ABI_W_SELECTOR_T"]:
     def source_path(self) -> Optional[Path]:
         """
         Returns the path to the local contract if determined that this container
-        belongs to the active project by cross checking source_id.
+        belongs to the active project by cross-checking source_id.
         """
         if not (source_id := self.contract_type.source_id):
             return None
@@ -1537,6 +1537,9 @@ def at(
             txn_hash (Union[str, HexBytes]): The hash of the transaction that deployed the
               contract, if available. Defaults to ``None``.
             fetch_from_explorer (bool): Set to ``False`` to avoid fetching from an explorer.
+            proxy_info (:class:`~ape.api.networks.ProxyInfoAPI` | None): Proxy info object to set
+              to avoid detection; defaults to ``None`` which will detect it if ``detect_proxy=True``.
+            detect_proxy (bool): Set to ``False`` to avoid detecting missing proxy info.
 
         Returns:
             :class:`~ape.contracts.ContractInstance`

src/ape/managers/chain.py

@@ -768,7 +768,6 @@ def gas_price(self) -> int:
         """
         The price for what it costs to transact.
         """
-
         return self.provider.gas_price
 
     @property

src/ape/managers/compilers.py

@@ -155,7 +155,7 @@ def compile(
 
                     yield contract
 
-            except CompilerError as err:
+            except Exception as err:
                 # One of the compilers failed. Show the error but carry on.
                 logger.log_debug_stack_trace()
                 errors.append(err)

src/ape/managers/converters.py

@@ -425,7 +425,7 @@ def get_converter(self, name: str) -> ConverterAPI:
 
     def convert_method_args(
         self,
-        abi: Union["MethodABI", "ConstructorABI", "EventABI"],
+        abi: Union["MethodABI", "ConstructorABI", "EventABI", "ConstructorABI"],
         arguments: Sequence[Any],
     ):
         input_types = [i.canonical_type for i in abi.inputs]