Merge branch 'main' into task_pit

.pre-commit-config.yaml

@@ -21,6 +21,13 @@ repos:
         language: system
         require_serial: true
         types_or: [python, pyi]
+  - repo: local
+    hooks:
+      - id: ruff
+        name: Ruff
+        entry: ./activated.py ruff check --fix
+        language: system
+        types: [python]
   - repo: local
     hooks:
       - id: poetry
@@ -71,13 +78,6 @@ repos:
         entry: ./activated.py python chia/util/virtual_project_analysis.py print_cycles --directory chia --config virtual_project.yaml
         language: system
         pass_filenames: false
-  - repo: local
-    hooks:
-      - id: ruff
-        name: Ruff
-        entry: ./activated.py ruff check --fix
-        language: system
-        types: [python]
   - repo: local
     hooks:
       - id: build mypy.ini

CHANGELOG.md

@@ -6,6 +6,22 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project does not yet adhere to [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
 for setuptools_scm/PEP 440 reasons.
 
+## 2.5.0 Chia blockchain 2024-12-12
+
+## What's Changed
+
+### Added
+
+- Implemented CHIP-36: Introduced new soft-fork with CLVM `keccak256` operator
+
+### Changed
+
+- Bump `chia_rs` to `0.16.0`
+
+### Removed
+
+- Python 3.8 support has been removed
+
 ## 2.4.4 Chia blockchain 2024-10-15
 
 ## What's Changed

chia/_tests/cmds/cmd_test_utils.py

@@ -381,8 +381,8 @@ def create_service_and_wallet_client_generators(test_rpc_clients: TestRpcClients
     @asynccontextmanager
     async def test_get_any_service_client(
         client_type: type[_T_RpcClient],
+        root_path: Path,
         rpc_port: Optional[int] = None,
-        root_path: Optional[Path] = None,
         consume_errors: bool = True,
         use_ssl: bool = True,
     ) -> AsyncIterator[tuple[_T_RpcClient, dict[str, Any]]]:
@@ -409,11 +409,11 @@ async def test_get_any_service_client(
 
     @asynccontextmanager
     async def test_get_wallet_client(
+        root_path: Path = default_root,
         wallet_rpc_port: Optional[int] = None,
         fingerprint: Optional[int] = None,
-        root_path: Path = default_root,
     ) -> AsyncIterator[tuple[WalletRpcClient, int, dict[str, Any]]]:
-        async with test_get_any_service_client(WalletRpcClient, wallet_rpc_port, root_path) as (wallet_client, config):
+        async with test_get_any_service_client(WalletRpcClient, root_path, wallet_rpc_port) as (wallet_client, config):
             wallet_client.fingerprint = fingerprint  # type: ignore
             assert fingerprint is not None
             yield wallet_client, fingerprint, config