chia-blockchain 2.5.7rc4__py3-none-any.whl → 2.5.8rc1__py3-none-any.whl

chia/data_layer/data_store.py

@@ -7,12 +7,12 @@ import logging
 import shutil
 import sqlite3
 from collections import defaultdict
-from collections.abc import AsyncIterator, Awaitable, Iterable, Iterator, Sequence
+from collections.abc import AsyncIterator, Awaitable, Callable, Iterable, Iterator, Sequence
 from contextlib import asynccontextmanager, contextmanager
 from dataclasses import dataclass, field, replace
 from hashlib import sha256
 from pathlib import Path
-from typing import Any, BinaryIO, Callable, Optional, Union
+from typing import Any, BinaryIO
 
 import aiosqlite
 import anyio.to_thread
@@ -90,11 +90,11 @@ class DataStore:
     @contextlib.asynccontextmanager
     async def managed(
         cls,
-        database: Union[str, Path],
+        database: str | Path,
         merkle_blobs_path: Path,
         key_value_blobs_path: Path,
         uri: bool = False,
-        sql_log_path: Optional[Path] = None,
+        sql_log_path: Path | None = None,
         cache_capacity: int = 1,
         prefer_db_kv_blob_length: int = default_prefer_file_kv_blob_length,
     ) -> AsyncIterator[DataStore]:
@@ -202,10 +202,10 @@ class DataStore:
     async def insert_into_data_store_from_file(
         self,
         store_id: bytes32,
-        root_hash: Optional[bytes32],
+        root_hash: bytes32 | None,
         filename: Path,
-        delta_reader: Optional[DeltaReader] = None,
-    ) -> Optional[DeltaReader]:
+        delta_reader: DeltaReader | None = None,
+    ) -> DeltaReader | None:
         async with self.db_wrapper.writer():
             with self.manage_kv_files(store_id):
                 if root_hash is None:
@@ -453,7 +453,7 @@ class DataStore:
 
                 expected_synced_generations = synced_generations + len(roots)
                 for root in roots:
-                    recovery_filename: Optional[Path] = None
+                    recovery_filename: Path | None = None
 
                     for group_by_store in (True, False):
                         filename = get_delta_filename_path(
@@ -495,7 +495,7 @@ class DataStore:
     async def get_merkle_blob(
         self,
         store_id: bytes32,
-        root_hash: Optional[bytes32],
+        root_hash: bytes32 | None,
         read_only: bool = False,
         update_cache: bool = True,
     ) -> MerkleBlob:
@@ -532,14 +532,14 @@ class DataStore:
 
         return Path(*segments, raw)
 
-    def get_merkle_path(self, store_id: bytes32, root_hash: Optional[bytes32]) -> Path:
+    def get_merkle_path(self, store_id: bytes32, root_hash: bytes32 | None) -> Path:
         store_root = self.merkle_blobs_path.joinpath(store_id.hex())
         if root_hash is None:
             return store_root
 
         return store_root.joinpath(self.get_bytes_path(bytes_=root_hash))
 
-    def get_key_value_path(self, store_id: bytes32, blob_hash: Optional[bytes32]) -> Path:
+    def get_key_value_path(self, store_id: bytes32, blob_hash: bytes32 | None) -> Path:
         store_root = self.key_value_blobs_path.joinpath(store_id.hex())
         if blob_hash is None:
             return store_root
@@ -551,7 +551,7 @@ class DataStore:
         merkle_blob: MerkleBlob,
         store_id: bytes32,
         status: Status,
-        old_root: Optional[Root] = None,
+        old_root: Root | None = None,
         update_cache: bool = True,
     ) -> Root:
         if not merkle_blob.empty():
@@ -579,7 +579,7 @@ class DataStore:
     def _use_file_for_new_kv_blob(self, blob: bytes) -> bool:
         return len(blob) > self.prefer_db_kv_blob_length
 
-    async def get_kvid(self, blob: bytes, store_id: bytes32) -> Optional[KeyOrValueId]:
+    async def get_kvid(self, blob: bytes, store_id: bytes32) -> KeyOrValueId | None:
         blob_hash = bytes32(sha256(blob).digest())
 
         async with self.db_wrapper.reader() as reader:
@@ -602,7 +602,7 @@ class DataStore:
         # TODO: consider file-system based locking of either the file or the store directory
         return zstd.decompress(self.get_key_value_path(store_id=store_id, blob_hash=blob_hash).read_bytes())  # type: ignore[no-any-return]
 
-    async def get_blob_from_kvid(self, kv_id: KeyOrValueId, store_id: bytes32) -> Optional[bytes]:
+    async def get_blob_from_kvid(self, kv_id: KeyOrValueId, store_id: bytes32) -> bytes | None:
         async with self.db_wrapper.reader() as reader:
             cursor = await reader.execute(
                 "SELECT hash, blob FROM ids WHERE kv_id = ? AND store_id = ?",
@@ -706,9 +706,9 @@ class DataStore:
         self,
         node_hash: bytes32,
         store_id: bytes32,
-        root_hash: Union[bytes32, Unspecified] = unspecified,
+        root_hash: bytes32 | Unspecified = unspecified,
     ) -> TerminalNode:
-        resolved_root_hash: Optional[bytes32]
+        resolved_root_hash: bytes32 | None
         if root_hash is unspecified:
             root = await self.get_tree_root(store_id=store_id)
             resolved_root_hash = root.node_hash
@@ -723,9 +723,9 @@ class DataStore:
         self,
         node_hashes: list[bytes32],
         store_id: bytes32,
-        root_hash: Union[bytes32, Unspecified] = unspecified,
+        root_hash: bytes32 | Unspecified = unspecified,
     ) -> list[TerminalNode]:
-        resolved_root_hash: Optional[bytes32]
+        resolved_root_hash: bytes32 | None
         if root_hash is unspecified:
             root = await self.get_tree_root(store_id=store_id)
             resolved_root_hash = root.node_hash
@@ -762,7 +762,7 @@ class DataStore:
 
         return result
 
-    async def add_node_hashes(self, store_id: bytes32, generation: Optional[int] = None) -> None:
+    async def add_node_hashes(self, store_id: bytes32, generation: int | None = None) -> None:
         root = await self.get_tree_root(store_id=store_id, generation=generation)
         if root.node_hash is None:
             return
@@ -789,9 +789,9 @@ class DataStore:
     async def _insert_root(
         self,
         store_id: bytes32,
-        node_hash: Optional[bytes32],
+        node_hash: bytes32 | None,
         status: Status,
-        generation: Optional[int] = None,
+        generation: int | None = None,
     ) -> Root:
         async with self.db_wrapper.writer_maybe_transaction() as writer:
             if generation is None:
@@ -820,7 +820,7 @@ class DataStore:
             )
             return new_root
 
-    async def get_pending_root(self, store_id: bytes32) -> Optional[Root]:
+    async def get_pending_root(self, store_id: bytes32) -> Root | None:
         async with self.db_wrapper.reader() as reader:
             cursor = await reader.execute(
                 """
@@ -845,7 +845,7 @@ class DataStore:
 
         return Root.from_row(row=row)
 
-    async def clear_pending_roots(self, store_id: bytes32) -> Optional[Root]:
+    async def clear_pending_roots(self, store_id: bytes32) -> Root | None:
         async with self.db_wrapper.writer() as writer:
             pending_root = await self.get_pending_root(store_id=store_id)
 
@@ -931,14 +931,14 @@ class DataStore:
             row = await cursor.fetchone()
 
         if row is not None:
-            generation: Optional[int] = row["MAX(generation)"]
+            generation: int | None = row["MAX(generation)"]
 
             if generation is not None:
                 return generation
 
         raise Exception(f"No generations found for store ID: {store_id.hex()}")
 
-    async def get_tree_root(self, store_id: bytes32, generation: Optional[int] = None) -> Root:
+    async def get_tree_root(self, store_id: bytes32, generation: int | None = None) -> Root:
         async with self.db_wrapper.reader() as reader:
             if generation is None:
                 generation = await self.get_tree_generation(store_id=store_id)
@@ -999,8 +999,8 @@ class DataStore:
         self,
         node_hash: bytes32,
         store_id: bytes32,
-        root_hash: Optional[bytes32] = None,
-        generation: Optional[int] = None,
+        root_hash: bytes32 | None = None,
+        generation: int | None = None,
     ) -> list[InternalNode]:
         async with self.db_wrapper.reader():
             if root_hash is None:
@@ -1030,7 +1030,7 @@ class DataStore:
         self,
         kid: KeyId,
         vid: ValueId,
-        table_blobs: dict[KeyOrValueId, tuple[bytes32, Optional[bytes]]],
+        table_blobs: dict[KeyOrValueId, tuple[bytes32, bytes | None]],
         store_id: bytes32,
     ) -> TerminalNode:
         key = table_blobs[KeyOrValueId(kid.raw)][1]
@@ -1048,10 +1048,10 @@ class DataStore:
     async def get_keys_values(
         self,
         store_id: bytes32,
-        root_hash: Union[bytes32, Unspecified] = unspecified,
+        root_hash: bytes32 | Unspecified = unspecified,
     ) -> list[TerminalNode]:
         async with self.db_wrapper.reader():
-            resolved_root_hash: Optional[bytes32]
+            resolved_root_hash: bytes32 | None
             if root_hash is unspecified:
                 root = await self.get_tree_root(store_id=store_id)
                 resolved_root_hash = root.node_hash
@@ -1076,10 +1076,10 @@ class DataStore:
     async def get_keys_values_compressed(
         self,
         store_id: bytes32,
-        root_hash: Union[bytes32, Unspecified] = unspecified,
+        root_hash: bytes32 | Unspecified = unspecified,
     ) -> KeysValuesCompressed:
         async with self.db_wrapper.reader():
-            resolved_root_hash: Optional[bytes32]
+            resolved_root_hash: bytes32 | None
             if root_hash is unspecified:
                 root = await self.get_tree_root(store_id=store_id)
                 resolved_root_hash = root.node_hash
@@ -1112,7 +1112,7 @@ class DataStore:
         store_id: bytes32,
         page: int,
         max_page_size: int,
-        root_hash: Union[bytes32, Unspecified] = unspecified,
+        root_hash: bytes32 | Unspecified = unspecified,
     ) -> KeysPaginationData:
         keys_values_compressed = await self.get_keys_values_compressed(store_id, root_hash)
         pagination_data = get_hashes_for_page(page, keys_values_compressed.key_hash_to_length, max_page_size)
@@ -1137,7 +1137,7 @@ class DataStore:
         store_id: bytes32,
         page: int,
         max_page_size: int,
-        root_hash: Union[bytes32, Unspecified] = unspecified,
+        root_hash: bytes32 | Unspecified = unspecified,
     ) -> KeysValuesPaginationData:
         keys_values_compressed = await self.get_keys_values_compressed(store_id, root_hash)
         pagination_data = get_hashes_for_page(page, keys_values_compressed.leaf_hash_to_length, max_page_size)
@@ -1211,7 +1211,7 @@ class DataStore:
         value: bytes,
         store_id: bytes32,
         status: Status = Status.PENDING,
-        root: Optional[Root] = None,
+        root: Root | None = None,
     ) -> InsertResult:
         return await self.insert(
             key=key,
@@ -1226,7 +1226,7 @@ class DataStore:
     async def get_keys(
         self,
         store_id: bytes32,
-        root_hash: Union[bytes32, Unspecified] = unspecified,
+        root_hash: bytes32 | Unspecified = unspecified,
     ) -> list[bytes]:
         async with self.db_wrapper.reader():
             if root_hash is unspecified:
@@ -1265,7 +1265,7 @@ class DataStore:
         assert isinstance(raw_node, chia_rs.datalayer.LeafNode)
         return await self.get_terminal_node(raw_node.key, raw_node.value, store_id)
 
-    async def get_terminal_node_for_seed(self, seed: bytes32, store_id: bytes32) -> Optional[TerminalNode]:
+    async def get_terminal_node_for_seed(self, seed: bytes32, store_id: bytes32) -> TerminalNode | None:
         root = await self.get_tree_root(store_id=store_id)
         if root is None or root.node_hash is None:
             return None
@@ -1280,10 +1280,10 @@ class DataStore:
         key: bytes,
         value: bytes,
         store_id: bytes32,
-        reference_node_hash: Optional[bytes32] = None,
-        side: Optional[Side] = None,
+        reference_node_hash: bytes32 | None = None,
+        side: Side | None = None,
         status: Status = Status.PENDING,
-        root: Optional[Root] = None,
+        root: Root | None = None,
     ) -> InsertResult:
         async with self.db_wrapper.writer() as writer:
             with self.manage_kv_files(store_id):
@@ -1315,8 +1315,8 @@ class DataStore:
         key: bytes,
         store_id: bytes32,
         status: Status = Status.PENDING,
-        root: Optional[Root] = None,
-    ) -> Optional[Root]:
+        root: Root | None = None,
+    ) -> Root | None:
         async with self.db_wrapper.writer():
             if root is None:
                 root = await self.get_tree_root(store_id=store_id)
@@ -1336,7 +1336,7 @@ class DataStore:
         new_value: bytes,
         store_id: bytes32,
         status: Status = Status.PENDING,
-        root: Optional[Root] = None,
+        root: Root | None = None,
     ) -> InsertResult:
         async with self.db_wrapper.writer() as writer:
             with self.manage_kv_files(store_id):
@@ -1357,7 +1357,7 @@ class DataStore:
         changelist: list[dict[str, Any]],
         status: Status = Status.PENDING,
         enable_batch_autoinsert: bool = True,
-    ) -> Optional[bytes32]:
+    ) -> bytes32 | None:
         async with self.db_wrapper.writer() as writer:
             with self.manage_kv_files(store_id):
                 old_root = await self.get_tree_root(store_id=store_id)
@@ -1396,7 +1396,7 @@ class DataStore:
 
                         reference_node_hash = change.get("reference_node_hash", None)
                         side = change.get("side", None)
-                        reference_kid: Optional[KeyId] = None
+                        reference_kid: KeyId | None = None
                         if reference_node_hash is not None:
                             reference_kid, _ = merkle_blob.get_node_by_hash(reference_node_hash)
 
@@ -1447,10 +1447,10 @@ class DataStore:
         self,
         key: bytes,
         store_id: bytes32,
-        root_hash: Union[bytes32, Unspecified] = unspecified,
+        root_hash: bytes32 | Unspecified = unspecified,
     ) -> TerminalNode:
         async with self.db_wrapper.reader():
-            resolved_root_hash: Optional[bytes32]
+            resolved_root_hash: bytes32 | None
             if root_hash is unspecified:
                 root = await self.get_tree_root(store_id=store_id)
                 resolved_root_hash = root.node_hash
@@ -1499,7 +1499,7 @@ class DataStore:
         self,
         node_hash: bytes32,
         store_id: bytes32,
-        root_hash: Optional[bytes32] = None,
+        root_hash: bytes32 | None = None,
     ) -> ProofOfInclusion:
         if root_hash is None:
             root = await self.get_tree_root(store_id=store_id)
@@ -1556,8 +1556,8 @@ class DataStore:
 
     async def get_table_blobs(
         self, kv_ids_iter: Iterable[KeyOrValueId], store_id: bytes32
-    ) -> dict[KeyOrValueId, tuple[bytes32, Optional[bytes]]]:
-        result: dict[KeyOrValueId, tuple[bytes32, Optional[bytes]]] = {}
+    ) -> dict[KeyOrValueId, tuple[bytes32, bytes | None]]:
+        result: dict[KeyOrValueId, tuple[bytes32, bytes | None]] = {}
         batch_size = min(500, SQLITE_MAX_VARIABLE_NUMBER - 10)
         kv_ids = list(dict.fromkeys(kv_ids_iter))
 

chia/data_layer/dl_wallet_store.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import dataclasses
-from typing import Optional, Union
 
 from aiosqlite import Row
 from chia_rs.sized_bytes import bytes32
@@ -29,7 +28,7 @@ def _row_to_singleton_record(row: Row) -> SingletonRecord:
     )
 
 
-def _row_to_mirror(row: Row, confirmed_at_height: Optional[uint32]) -> Mirror:
+def _row_to_mirror(row: Row, confirmed_at_height: uint32 | None) -> Mirror:
     urls: list[bytes] = []
     byte_list: bytes = row[3]
     while byte_list != b"":
@@ -133,14 +132,14 @@ class DataLayerStore:
     async def get_all_singletons_for_launcher(
         self,
         launcher_id: bytes32,
-        min_generation: Optional[uint32] = None,
-        max_generation: Optional[uint32] = None,
-        num_results: Optional[uint32] = None,
+        min_generation: uint32 | None = None,
+        max_generation: uint32 | None = None,
+        num_results: uint32 | None = None,
     ) -> list[SingletonRecord]:
         """
         Returns stored singletons with a specific launcher ID.
         """
-        query_params: list[Union[bytes32, uint32]] = [launcher_id]
+        query_params: list[bytes32 | uint32] = [launcher_id]
         for optional_param in (min_generation, max_generation, num_results):
             if optional_param is not None:
                 query_params.append(optional_param)
@@ -163,7 +162,7 @@ class DataLayerStore:
 
         return records
 
-    async def get_singleton_record(self, coin_id: bytes32) -> Optional[SingletonRecord]:
+    async def get_singleton_record(self, coin_id: bytes32) -> SingletonRecord | None:
         """
         Checks DB for SingletonRecord with coin_id: coin_id and returns it.
         """
@@ -178,9 +177,7 @@ class DataLayerStore:
             return _row_to_singleton_record(row)
         return None
 
-    async def get_latest_singleton(
-        self, launcher_id: bytes32, only_confirmed: bool = False
-    ) -> Optional[SingletonRecord]:
+    async def get_latest_singleton(self, launcher_id: bytes32, only_confirmed: bool = False) -> SingletonRecord | None:
         """
         Checks DB for SingletonRecords with launcher_id: launcher_id and returns the most recent.
         """
@@ -238,7 +235,7 @@ class DataLayerStore:
         """
         Updates singleton record to be confirmed.
         """
-        current: Optional[SingletonRecord] = await self.get_singleton_record(coin_id)
+        current: SingletonRecord | None = await self.get_singleton_record(coin_id)
         if current is None or current.confirmed_at_height == height:
             return
 
@@ -268,7 +265,7 @@ class DataLayerStore:
                 (launcher_id, launcher_bytes),
             )
 
-    async def get_launcher(self, launcher_id: bytes32) -> Optional[Coin]:
+    async def get_launcher(self, launcher_id: bytes32) -> Coin | None:
         """
         Checks DB for a launcher with the specified ID and returns it.
         """

chia/data_layer/download_data.py

@@ -5,12 +5,11 @@ import logging
 import time
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Optional
+from typing import Literal
 
 import aiohttp
 from chia_rs.datalayer import DeltaReader
 from chia_rs.sized_bytes import bytes32
-from typing_extensions import Literal
 
 from chia.data_layer.data_layer_util import (
     PluginRemote,
@@ -62,7 +61,7 @@ def is_filename_valid(filename: str, group_by_store: bool = False) -> bool:
 @dataclass
 class WriteFilesResult:
     result: bool
-    full_tree: Optional[Path]
+    full_tree: Path | None
     diff_tree: Path
 
 
@@ -114,8 +113,8 @@ async def download_file(
     root_hash: bytes32,
     generation: int,
     server_info: ServerInfo,
-    proxy_url: Optional[str],
-    downloader: Optional[PluginRemote],
+    proxy_url: str | None,
+    downloader: PluginRemote | None,
     timeout: aiohttp.ClientTimeout,
     client_foldername: Path,
     timestamp: int,
@@ -169,15 +168,15 @@ async def insert_from_delta_file(
     client_foldername: Path,
     timeout: aiohttp.ClientTimeout,
     log: logging.Logger,
-    proxy_url: Optional[str],
-    downloader: Optional[PluginRemote],
+    proxy_url: str | None,
+    downloader: PluginRemote | None,
     group_files_by_store: bool = False,
     maximum_full_file_count: int = 1,
 ) -> bool:
     if group_files_by_store:
         client_foldername.joinpath(f"{store_id}").mkdir(parents=True, exist_ok=True)
 
-    delta_reader: Optional[DeltaReader] = None
+    delta_reader: DeltaReader | None = None
 
     for root_hash in root_hashes:
         timestamp = int(time.time())
@@ -286,7 +285,7 @@ def delete_full_file_if_exists(foldername: Path, store_id: bytes32, root: Root)
 async def http_download(
     target_filename_path: Path,
     filename: str,
-    proxy_url: Optional[str],
+    proxy_url: str | None,
     server_info: ServerInfo,
     timeout: aiohttp.ClientTimeout,
     log: logging.Logger,

chia/data_layer/s3_plugin_service.py

@@ -11,7 +11,7 @@ import sys
 import tempfile
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any, Optional, overload
+from typing import Any, overload
 from urllib.parse import urlparse
 
 import boto3
@@ -30,7 +30,7 @@ plugin_version = "0.1.0"
 @dataclass(frozen=True)
 class StoreConfig:
     id: bytes32
-    bucket: Optional[str]
+    bucket: str | None
     urls: set[str]
 
     @classmethod
@@ -142,9 +142,7 @@ class S3Plugin:
     @overload
     def get_path_for_filename(self, store_id: bytes32, filename: None, group_files_by_store: bool) -> None: ...
 
-    def get_path_for_filename(
-        self, store_id: bytes32, filename: Optional[str], group_files_by_store: bool
-    ) -> Optional[Path]:
+    def get_path_for_filename(self, store_id: bytes32, filename: str | None, group_files_by_store: bool) -> Path | None:
         if filename is None:
             return None
 
@@ -158,9 +156,7 @@ class S3Plugin:
     @overload
     def get_s3_target_from_path(self, store_id: bytes32, path: None, group_files_by_store: bool) -> None: ...
 
-    def get_s3_target_from_path(
-        self, store_id: bytes32, path: Optional[Path], group_files_by_store: bool
-    ) -> Optional[str]:
+    def get_s3_target_from_path(self, store_id: bytes32, path: Path | None, group_files_by_store: bool) -> str | None:
         if path is None:
             return None
 
@@ -174,7 +170,7 @@ class S3Plugin:
             store_id = bytes32.from_hexstr(data["store_id"])
             bucket_str = self.get_bucket(store_id)
             my_bucket = self.boto_resource.Bucket(bucket_str)
-            full_tree_name: Optional[str] = data.get("full_tree_filename", None)
+            full_tree_name: str | None = data.get("full_tree_filename", None)
             diff_name: str = data["diff_filename"]
             group_files_by_store: bool = data.get("group_files_by_store", False)
 

chia/data_layer/start_data_layer.py

@@ -4,11 +4,11 @@ import logging
 import os
 import pathlib
 import sys
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 from chia_rs.sized_ints import uint16
 
-from chia.apis import ApiProtocolRegistry
+from chia.apis import StubMetadataRegistry
 from chia.data_layer.data_layer import DataLayer
 from chia.data_layer.data_layer_api import DataLayerAPI
 from chia.data_layer.data_layer_rpc_api import DataLayerRpcApi
@@ -40,7 +40,7 @@ def create_data_layer_service(
     config: dict[str, Any],
     downloaders: list[PluginRemote],
     uploaders: list[PluginRemote],  # dont add FilesystemUploader to this, it is the default uploader
-    wallet_service: Optional[WalletService] = None,
+    wallet_service: WalletService | None = None,
     connect_to_daemon: bool = True,
 ) -> DataLayerService:
     if uploaders is None:
@@ -72,7 +72,7 @@ def create_data_layer_service(
     )
     peer_api = DataLayerAPI(node)
 
-    rpc_info: Optional[RpcInfo[DataLayerRpcApi]] = None
+    rpc_info: RpcInfo[DataLayerRpcApi] | None = None
     if service_config.get("start_rpc_server", True):
         rpc_info = (DataLayerRpcApi, cast(int, service_config["rpc_port"]))
 
@@ -89,7 +89,7 @@ def create_data_layer_service(
         max_request_body_size=service_config.get("rpc_server_max_request_body_size", 26214400),
         rpc_info=rpc_info,
         connect_to_daemon=connect_to_daemon,
-        class_for_type=ApiProtocolRegistry,
+        stub_metadata_for_type=StubMetadataRegistry,
     )