chia-blockchain 2.5.0rc2__py3-none-any.whl → 2.5.1rc2__py3-none-any.whl

chia/consensus/blockchain_interface.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Dict, List, Optional, Protocol, Set
+from typing import Optional, Protocol
 
 from chia.consensus.block_record import BlockRecord
 from chia.types.blockchain_format.sized_bytes import bytes32
@@ -21,13 +21,13 @@ class BlockRecordsProtocol(Protocol):
     # given a list of block header hashes, return the header hashes of their
     # previous blocks. This is not limited to the block record cache, but must
     # allow any block in the database to be referenced
-    async def prev_block_hash(self, header_hashes: List[bytes32]) -> List[bytes32]: ...
+    async def prev_block_hash(self, header_hashes: list[bytes32]) -> list[bytes32]: ...
 
 
 class BlocksProtocol(BlockRecordsProtocol, Protocol):
     async def lookup_block_generators(
-        self, header_hash: bytes32, generator_refs: Set[uint32]
-    ) -> Dict[uint32, bytes]: ...
+        self, header_hash: bytes32, generator_refs: set[uint32]
+    ) -> dict[uint32, bytes]: ...
     async def get_block_record_from_db(self, header_hash: bytes32) -> Optional[BlockRecord]: ...
     def add_block_record(self, block_record: BlockRecord) -> None: ...
 
@@ -35,22 +35,22 @@ class BlocksProtocol(BlockRecordsProtocol, Protocol):
 class BlockchainInterface(BlocksProtocol, Protocol):
     def get_peak(self) -> Optional[BlockRecord]: ...
     def get_peak_height(self) -> Optional[uint32]: ...
-    def get_ses_heights(self) -> List[uint32]: ...
+    def get_ses_heights(self) -> list[uint32]: ...
     def get_ses(self, height: uint32) -> SubEpochSummary: ...
     async def contains_block_from_db(self, header_hash: bytes32) -> bool: ...
-    async def get_block_records_in_range(self, start: int, stop: int) -> Dict[bytes32, BlockRecord]: ...
+    async def get_block_records_in_range(self, start: int, stop: int) -> dict[bytes32, BlockRecord]: ...
 
     async def get_header_blocks_in_range(
         self, start: int, stop: int, tx_filter: bool = True
-    ) -> Dict[bytes32, HeaderBlock]: ...
+    ) -> dict[bytes32, HeaderBlock]: ...
 
-    async def get_block_records_at(self, heights: List[uint32]) -> List[BlockRecord]: ...
+    async def get_block_records_at(self, heights: list[uint32]) -> list[BlockRecord]: ...
 
     async def persist_sub_epoch_challenge_segments(
-        self, sub_epoch_summary_hash: bytes32, segments: List[SubEpochChallengeSegment]
+        self, sub_epoch_summary_hash: bytes32, segments: list[SubEpochChallengeSegment]
     ) -> None: ...
 
     async def get_sub_epoch_challenge_segments(
         self,
         sub_epoch_summary_hash: bytes32,
-    ) -> Optional[List[SubEpochChallengeSegment]]: ...
+    ) -> Optional[list[SubEpochChallengeSegment]]: ...

chia/consensus/constants.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import logging
 from typing import Any
 
-from chia_rs import ConsensusConstants as ConsensusConstants
+from chia_rs import ConsensusConstants as ConsensusConstants  # noqa: PLC0414
 
 from chia.util.byte_types import hexstr_to_bytes
 from chia.util.hash import std_hash
@@ -20,7 +20,7 @@ def replace_str_to_bytes(constants: ConsensusConstants, **changes: Any) -> Conse
     for k, v in changes.items():
         if not hasattr(constants, k):
             # NETWORK_TYPE used to be present in default config, but has been removed
-            if k not in ["NETWORK_TYPE"]:
+            if k not in {"NETWORK_TYPE"}:
                 log.warning(f'invalid key in network configuration (config.yaml) "{k}". Ignoring')
             continue
         if isinstance(v, str):

chia/consensus/default_constants.py

@@ -1,13 +1,12 @@
 from __future__ import annotations
 
-from typing import Any, Dict
+from typing import Any
 
+from chia.consensus.constants import ConsensusConstants
 from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.hash import std_hash
 from chia.util.ints import uint8, uint16, uint32, uint64, uint128
 
-from .constants import ConsensusConstants
-
 AGG_SIG_DATA = bytes32.fromhex("ccd5bb71183532bff220ba46c268991a3ff07eb358e8255a65c30a2dce0e5fbb")
 
 DEFAULT_CONSTANTS = ConsensusConstants(
@@ -84,7 +83,7 @@ DEFAULT_CONSTANTS = ConsensusConstants(
 )
 
 
-def update_testnet_overrides(network_id: str, overrides: Dict[str, Any]) -> None:
+def update_testnet_overrides(network_id: str, overrides: dict[str, Any]) -> None:
     if network_id == "testnet11":
         if "SOFT_FORK6_HEIGHT" not in overrides:
             overrides["SOFT_FORK6_HEIGHT"] = 2000000

chia/consensus/difficulty_adjustment.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import List, Optional, Tuple
+from typing import Optional
 
 from chia.consensus.block_record import BlockRecord
 from chia.consensus.blockchain_interface import BlockRecordsProtocol
@@ -15,7 +15,7 @@ def _get_blocks_at_height(
     prev_b: BlockRecord,
     target_height: uint32,
     max_num_blocks: uint32 = uint32(1),
-) -> List[BlockRecord]:
+) -> list[BlockRecord]:
     """
     Return a consecutive list of BlockRecords starting at target_height, returning a maximum of
     max_num_blocks. Assumes all block records are present. Does a slot linear search, if the blocks are not
@@ -33,7 +33,7 @@ def _get_blocks_at_height(
         if header_hash == prev_b.header_hash:
             # Efficient fetching, since we are fetching ancestor blocks within the heaviest chain. We can directly
             # use the height_to_block_record method
-            block_list: List[BlockRecord] = []
+            block_list: list[BlockRecord] = []
             for h in range(target_height, target_height + max_num_blocks):
                 assert blocks.contains_height(uint32(h))
                 block_list.append(blocks.height_to_block_record(uint32(h)))
@@ -141,7 +141,7 @@ def can_finish_sub_and_full_epoch(
     deficit: uint8,
     block_at_height_included_ses: bool,
     prev_ses_block: Optional[BlockRecord] = None,
-) -> Tuple[bool, bool]:
+) -> tuple[bool, bool]:
     """
     Returns a bool tuple
     first bool is true if the next sub-slot after height will form part of a new sub-epoch. Therefore
@@ -359,7 +359,7 @@ def get_next_sub_slot_iters_and_difficulty(
     is_first_in_sub_slot: bool,
     prev_b: Optional[BlockRecord],
     blocks: BlockRecordsProtocol,
-) -> Tuple[uint64, uint64]:
+) -> tuple[uint64, uint64]:
     """
     Retrieves the current sub_slot iters and difficulty of the next block after prev_b.
 

chia/consensus/find_fork_point.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Dict, Tuple, Union
+from typing import Union
 
 from chia.consensus.block_record import BlockRecord
 from chia.consensus.blockchain_interface import BlockRecordsProtocol
@@ -61,10 +61,10 @@ async def find_fork_point_in_chain(
 
 async def lookup_fork_chain(
     blocks: BlockRecordsProtocol,
-    block_1: Tuple[int, bytes32],
-    block_2: Tuple[int, bytes32],
+    block_1: tuple[int, bytes32],
+    block_2: tuple[int, bytes32],
     constants: ConsensusConstants,
-) -> Tuple[Dict[uint32, bytes32], bytes32]:
+) -> tuple[dict[uint32, bytes32], bytes32]:
     """
     Tries to find height where new chain (block_2) diverged from block_1.
     The inputs are (height, header-hash)-tuples.
@@ -82,7 +82,7 @@ async def lookup_fork_chain(
     height_2 = block_2[0]
     bh_2 = block_2[1]
 
-    ret: Dict[uint32, bytes32] = {}
+    ret: dict[uint32, bytes32] = {}
 
     while height_1 > height_2:
         [bh_1] = await blocks.prev_block_hash([bh_1])

chia/consensus/full_block_to_block_record.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import List, Optional, Union
+from typing import Optional, Union
 
 from chia.consensus.block_record import BlockRecord
 from chia.consensus.blockchain_interface import BlockRecordsProtocol
@@ -111,13 +111,13 @@ def header_block_to_sub_block_record(
         icc_output = None
 
     if len(block.finished_sub_slots) > 0:
-        finished_challenge_slot_hashes: Optional[List[bytes32]] = [
+        finished_challenge_slot_hashes: Optional[list[bytes32]] = [
             sub_slot.challenge_chain.get_hash() for sub_slot in block.finished_sub_slots
         ]
-        finished_reward_slot_hashes: Optional[List[bytes32]] = [
+        finished_reward_slot_hashes: Optional[list[bytes32]] = [
             sub_slot.reward_chain.get_hash() for sub_slot in block.finished_sub_slots
         ]
-        finished_infused_challenge_slot_hashes: Optional[List[bytes32]] = [
+        finished_infused_challenge_slot_hashes: Optional[list[bytes32]] = [
             sub_slot.infused_challenge_chain.get_hash()
             for sub_slot in block.finished_sub_slots
             if sub_slot.infused_challenge_chain is not None

chia/consensus/get_block_challenge.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import logging
-from typing import List, Union
+from typing import Union
 
 from chia.consensus.block_record import BlockRecord
 from chia.consensus.blockchain_interface import BlockRecordsProtocol
@@ -89,7 +89,7 @@ def get_block_challenge(
                     challenges_to_look_for = 2
             else:
                 challenges_to_look_for = 1
-            reversed_challenge_hashes: List[bytes32] = []
+            reversed_challenge_hashes: list[bytes32] = []
             curr: BlockRecord = blocks.block_record(header_block.prev_header_hash)
             while len(reversed_challenge_hashes) < challenges_to_look_for:
                 if curr.first_in_sub_slot:

chia/consensus/get_block_generator.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
-from typing import Awaitable, Callable, Dict, Optional, Set
+from collections.abc import Awaitable
+from typing import Callable, Optional
 
 from chia.types.block_protocol import BlockInfo
 from chia.types.blockchain_format.sized_bytes import bytes32
@@ -9,7 +10,7 @@ from chia.util.ints import uint32
 
 
 async def get_block_generator(
-    lookup_block_generators: Callable[[bytes32, Set[uint32]], Awaitable[Dict[uint32, bytes]]],
+    lookup_block_generators: Callable[[bytes32, set[uint32]], Awaitable[dict[uint32, bytes]]],
     block: BlockInfo,
 ) -> Optional[BlockGenerator]:
     ref_list = block.transactions_generator_ref_list
@@ -20,7 +21,7 @@ async def get_block_generator(
         return BlockGenerator(block.transactions_generator, [])
 
     generator_refs = set(ref_list)
-    generators: Dict[uint32, bytes] = await lookup_block_generators(block.prev_header_hash, generator_refs)
+    generators: dict[uint32, bytes] = await lookup_block_generators(block.prev_header_hash, generator_refs)
 
     result = [generators[height] for height in block.transactions_generator_ref_list]
     return BlockGenerator(block.transactions_generator, result)