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

chia/full_node/block_store.py

@@ -4,7 +4,6 @@ import dataclasses
 import logging
 import sqlite3
 from contextlib import AbstractAsyncContextManager
-from typing import Optional
 
 import aiosqlite
 import typing_extensions
@@ -134,7 +133,7 @@ class BlockStore:
     async def add_full_block(self, header_hash: bytes32, block: FullBlock, block_record: BlockRecord) -> None:
         self.block_cache.put(header_hash, block)
 
-        ses: Optional[bytes] = (
+        ses: bytes | None = (
             None if block_record.sub_epoch_summary_included is None else bytes(block_record.sub_epoch_summary_included)
         )
 
@@ -174,8 +173,8 @@ class BlockStore:
     async def get_sub_epoch_challenge_segments(
         self,
         ses_block_hash: bytes32,
-    ) -> Optional[list[SubEpochChallengeSegment]]:
-        cached: Optional[list[SubEpochChallengeSegment]] = self.ses_challenge_cache.get(ses_block_hash)
+    ) -> list[SubEpochChallengeSegment] | None:
+        cached: list[SubEpochChallengeSegment] | None = self.ses_challenge_cache.get(ses_block_hash)
         if cached is not None:
             return cached
 
@@ -195,7 +194,7 @@ class BlockStore:
     def transaction(self) -> AbstractAsyncContextManager[aiosqlite.Connection]:
         return self.db_wrapper.writer()
 
-    def get_block_from_cache(self, header_hash: bytes32) -> Optional[FullBlock]:
+    def get_block_from_cache(self, header_hash: bytes32) -> FullBlock | None:
         return self.block_cache.get(header_hash)
 
     def rollback_cache_block(self, header_hash: bytes32) -> None:
@@ -206,8 +205,8 @@ class BlockStore:
             # block to the cache yet
             pass
 
-    async def get_full_block(self, header_hash: bytes32) -> Optional[FullBlock]:
-        cached: Optional[FullBlock] = self.block_cache.get(header_hash)
+    async def get_full_block(self, header_hash: bytes32) -> FullBlock | None:
+        cached: FullBlock | None = self.block_cache.get(header_hash)
         if cached is not None:
             return cached
         async with self.db_wrapper.reader_no_transaction() as conn:
@@ -219,7 +218,7 @@ class BlockStore:
             return block
         return None
 
-    async def get_full_block_bytes(self, header_hash: bytes32) -> Optional[bytes]:
+    async def get_full_block_bytes(self, header_hash: bytes32) -> bytes | None:
         cached = self.block_cache.get(header_hash)
         if cached is not None:
             return bytes(cached)
@@ -247,7 +246,7 @@ class BlockStore:
                     ret.append(decompress(row[0]))
                 return ret
 
-    async def get_block_info(self, header_hash: bytes32) -> Optional[GeneratorBlockInfo]:
+    async def get_block_info(self, header_hash: bytes32) -> GeneratorBlockInfo | None:
         cached = self.block_cache.get(header_hash)
         if cached is not None:
             return GeneratorBlockInfo(
@@ -273,7 +272,7 @@ class BlockStore:
                     b.foliage.prev_block_hash, b.transactions_generator, b.transactions_generator_ref_list
                 )
 
-    async def get_generator(self, header_hash: bytes32) -> Optional[bytes]:
+    async def get_generator(self, header_hash: bytes32) -> bytes | None:
         cached = self.block_cache.get(header_hash)
         if cached is not None:
             return None if cached.transactions_generator is None else bytes(cached.transactions_generator)
@@ -429,7 +428,7 @@ class BlockStore:
             ret.append(all_blocks[hh])
         return ret
 
-    async def get_block_record(self, header_hash: bytes32) -> Optional[BlockRecord]:
+    async def get_block_record(self, header_hash: bytes32) -> BlockRecord | None:
         async with self.db_wrapper.reader_no_transaction() as conn:
             async with conn.execute(
                 "SELECT block_record FROM full_blocks WHERE header_hash=?",
@@ -489,7 +488,7 @@ class BlockStore:
                     raise ValueError(f"Some blocks in range {start}-{stop} were not found.")
                 return [decompress_blob(row[0]) for row in rows]
 
-    async def get_peak(self) -> Optional[tuple[bytes32, uint32]]:
+    async def get_peak(self) -> tuple[bytes32, uint32] | None:
         async with self.db_wrapper.reader_no_transaction() as conn:
             async with conn.execute("SELECT hash FROM current_peak WHERE key = 0") as cursor:
                 peak_row = await cursor.fetchone()
@@ -502,9 +501,7 @@ class BlockStore:
             return None
         return bytes32(peak_row[0]), uint32(peak_height[0])
 
-    async def get_block_records_close_to_peak(
-        self, blocks_n: int
-    ) -> tuple[dict[bytes32, BlockRecord], Optional[bytes32]]:
+    async def get_block_records_close_to_peak(self, blocks_n: int) -> tuple[dict[bytes32, BlockRecord], bytes32 | None]:
         """
         Returns a dictionary with all blocks that have height >= peak height - blocks_n, as well as the
         peak header hash. Only blocks that are part of the main chain/current peak are included.
@@ -534,7 +531,7 @@ class BlockStore:
         async with self.db_wrapper.writer_maybe_transaction() as conn:
             await conn.execute("INSERT OR REPLACE INTO current_peak VALUES(?, ?)", (0, header_hash))
 
-    async def is_fully_compactified(self, header_hash: bytes32) -> Optional[bool]:
+    async def is_fully_compactified(self, header_hash: bytes32) -> bool | None:
         async with self.db_wrapper.writer_maybe_transaction() as conn:
             async with conn.execute(
                 "SELECT is_fully_compactified from full_blocks WHERE header_hash=?", (header_hash,)

chia/full_node/check_fork_next_block.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Awaitable
-from typing import Callable
+from collections.abc import Awaitable, Callable
 
 from chia_rs.sized_ints import uint32
 

chia/full_node/coin_store.py

@@ -5,16 +5,15 @@ import logging
 import sqlite3
 import time
 from collections.abc import Collection
-from typing import Any, ClassVar, Optional
+from typing import Any, ClassVar
 
 import typing_extensions
 from aiosqlite import Cursor
-from chia_rs import CoinState
+from chia_rs import CoinRecord, CoinState
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint32, uint64
 
 from chia.types.blockchain_format.coin import Coin
-from chia.types.coin_record import CoinRecord
 from chia.types.mempool_item import UnspentLineageInfo
 from chia.util.batches import to_batches
 from chia.util.db_wrapper import SQLITE_MAX_VARIABLE_NUMBER, DBWrapper2
@@ -179,7 +178,7 @@ class CoinStore:
         log.log(level, message)
 
     # Checks DB and DiffStores for CoinRecord with coin_name and returns it
-    async def get_coin_record(self, coin_name: bytes32) -> Optional[CoinRecord]:
+    async def get_coin_record(self, coin_name: bytes32) -> CoinRecord | None:
         async with self.db_wrapper.reader_no_transaction() as conn:
             async with conn.execute(
                 "SELECT confirmed_index, spent_index, coinbase, puzzle_hash, "
@@ -190,7 +189,7 @@ class CoinStore:
                 if row is not None:
                     coin = self.row_to_coin(row)
                     spent_index = uint32(0) if row[1] <= 0 else uint32(row[1])
-                    return CoinRecord(coin, row[0], spent_index, row[2], row[6])
+                    return CoinRecord(coin, row[0], spent_index, row[2] != 0, row[6])
         return None
 
     async def get_coin_records(self, names: Collection[bytes32]) -> list[CoinRecord]:
@@ -216,7 +215,7 @@ class CoinStore:
                 for row in await cursor.fetchall():
                     coin = self.row_to_coin(row)
                     spent_index = uint32(0) if row[1] <= 0 else uint32(row[1])
-                    record = CoinRecord(coin, row[0], spent_index, row[2], row[6])
+                    record = CoinRecord(coin, row[0], spent_index, row[2] != 0, row[6])
                     coins.append(record)
 
         return coins
@@ -233,7 +232,7 @@ class CoinStore:
                 for row in rows:
                     coin = self.row_to_coin(row)
                     spent_index = uint32(0) if row[1] <= 0 else uint32(row[1])
-                    coins.append(CoinRecord(coin, row[0], spent_index, row[2], row[6]))
+                    coins.append(CoinRecord(coin, row[0], spent_index, row[2] != 0, row[6]))
                 return coins
 
     async def get_coins_removed_at_height(self, height: uint32) -> list[CoinRecord]:
@@ -250,7 +249,7 @@ class CoinStore:
                 for row in await cursor.fetchall():
                     if row[1] > 0:
                         coin = self.row_to_coin(row)
-                        coin_record = CoinRecord(coin, row[0], row[1], row[2], row[6])
+                        coin_record = CoinRecord(coin, row[0], row[1], row[2] != 0, row[6])
                         coins.append(coin_record)
                 return coins
 
@@ -275,7 +274,7 @@ class CoinStore:
                 for row in await cursor.fetchall():
                     coin = self.row_to_coin(row)
                     spent_index = uint32(0) if row[1] <= 0 else uint32(row[1])
-                    coins.add(CoinRecord(coin, row[0], spent_index, row[2], row[6]))
+                    coins.add(CoinRecord(coin, row[0], spent_index, row[2] != 0, row[6]))
                 return list(coins)
 
     async def get_coin_records_by_puzzle_hashes(
@@ -304,7 +303,7 @@ class CoinStore:
                 for row in await cursor.fetchall():
                     coin = self.row_to_coin(row)
                     spent_index = uint32(0) if row[1] <= 0 else uint32(row[1])
-                    coins.add(CoinRecord(coin, row[0], spent_index, row[2], row[6]))
+                    coins.add(CoinRecord(coin, row[0], spent_index, row[2] != 0, row[6]))
                 return list(coins)
 
     async def get_coin_records_by_names(
@@ -331,7 +330,7 @@ class CoinStore:
                 for row in await cursor.fetchall():
                     coin = self.row_to_coin(row)
                     spent_index = uint32(0) if row[1] <= 0 else uint32(row[1])
-                    coins.add(CoinRecord(coin, row[0], spent_index, row[2], row[6]))
+                    coins.add(CoinRecord(coin, row[0], spent_index, row[2] != 0, row[6]))
 
         return list(coins)
 
@@ -402,7 +401,7 @@ class CoinStore:
                     async for row in cursor:
                         coin = self.row_to_coin(row)
                         spent_index = uint32(0) if row[1] <= 0 else uint32(row[1])
-                        coins.add(CoinRecord(coin, row[0], spent_index, row[2], row[6]))
+                        coins.add(CoinRecord(coin, row[0], spent_index, row[2] != 0, row[6]))
 
         return list(coins)
 
@@ -454,7 +453,7 @@ class CoinStore:
         include_hinted: bool = True,
         min_amount: uint64 = uint64(0),
         max_items: int = 50000,
-    ) -> tuple[list[CoinState], Optional[uint32]]:
+    ) -> tuple[list[CoinState], uint32 | None]:
         """
         Returns the coin states, as well as the next block height (or `None` if finished).
         You cannot exceed `CoinStore.MAX_PUZZLE_HASH_BATCH_SIZE` puzzle hashes in the query.
@@ -576,7 +575,7 @@ class CoinStore:
             for row in rows:
                 coin = self.row_to_coin(row)
                 spent_index = uint32(0) if row[1] <= 0 else uint32(row[1])
-                record = CoinRecord(coin, uint32(0), spent_index, row[2], uint64(0))
+                record = CoinRecord(coin, uint32(0), spent_index, row[2] != 0, uint64(0))
                 coin_name = bytes32(row[7])
                 coin_changes[coin_name] = record
 
@@ -591,7 +590,7 @@ class CoinStore:
             )
             for row in rows:
                 coin = self.row_to_coin(row)
-                record = CoinRecord(coin, row[0], uint32(0), row[2], row[6])
+                record = CoinRecord(coin, row[0], uint32(0), row[2] != 0, row[6])
                 coin_name = bytes32(row[7])
                 if coin_name not in coin_changes:
                     coin_changes[coin_name] = record
@@ -649,7 +648,7 @@ class CoinStore:
                 )
 
     # Lookup the most recent unspent lineage that matches a puzzle hash
-    async def get_unspent_lineage_info_for_puzzle_hash(self, puzzle_hash: bytes32) -> Optional[UnspentLineageInfo]:
+    async def get_unspent_lineage_info_for_puzzle_hash(self, puzzle_hash: bytes32) -> UnspentLineageInfo | None:
         async with self.db_wrapper.reader_no_transaction() as conn:
             async with conn.execute(
                 "SELECT unspent.coin_name, "

chia/full_node/eligible_coin_spends.py

@@ -172,7 +172,7 @@ class SingletonFastForward:
     fast_forward_spends: dict[bytes32, UnspentLineageInfo] = dataclasses.field(default_factory=dict)
 
     def process_fast_forward_spends(
-        self, *, mempool_item: InternalMempoolItem, height: uint32, constants: ConsensusConstants
+        self, *, mempool_item: InternalMempoolItem, prev_tx_height: uint32, constants: ConsensusConstants
     ) -> dict[bytes32, BundleCoinSpend]:
         """
         Provides the caller with a `bundle_coin_spends` map that has a proper
@@ -182,7 +182,7 @@ class SingletonFastForward:
         Args:
             mempool_item: The internal mempool item to process
             constants: needed in order to refresh the mempool item if needed
-            height: needed in order to refresh the mempool item if needed
+            prev_tx_height: needed in order to refresh the mempool item if needed
 
         Returns:
             The resulting `bundle_coin_spends` map of coin IDs to coin spends
@@ -273,7 +273,7 @@ class SingletonFastForward:
         try:
             # Run the new spend bundle to make sure it remains valid. What we
             # care about here is whether this call throws or not.
-            get_conditions_from_spendbundle(new_sb, mempool_item.conds.cost, constants, height)
+            get_conditions_from_spendbundle(new_sb, mempool_item.conds.cost, constants, prev_tx_height)
         # get_conditions_from_spendbundle raises a ValueError with an error code
         except ValueError as e:
             # Convert that to a ValidationError

chia/full_node/fee_estimate_store.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import dataclasses
-from typing import Optional
 
 import typing_extensions
 
@@ -15,9 +14,9 @@ class FeeStore:
     This object stores Fee Stats
     """
 
-    _backup: Optional[FeeTrackerBackup] = None
+    _backup: FeeTrackerBackup | None = None
 
-    def get_stored_fee_data(self) -> Optional[FeeTrackerBackup]:
+    def get_stored_fee_data(self) -> FeeTrackerBackup | None:
         return self._backup
 
     def store_fee_data(self, fee_backup: FeeTrackerBackup) -> None:

chia/full_node/fee_tracker.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 import logging
 from bisect import bisect_left
 from dataclasses import dataclass
-from typing import Optional
 
 from chia_rs.sized_ints import uint8, uint32, uint64
 
@@ -454,7 +453,7 @@ class FeeTracker:
             self.fee_store,
             "long",
         )
-        fee_backup: Optional[FeeTrackerBackup] = self.fee_store.get_stored_fee_data()
+        fee_backup: FeeTrackerBackup | None = self.fee_store.get_stored_fee_data()
 
         if fee_backup is not None:
             self.first_recorded_height = fee_backup.first_recorded_height

chia/full_node/full_block_utils.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
+from collections.abc import Callable
 from dataclasses import dataclass
-from typing import Callable, Optional
 
 from chia_rs import G1Element, G2Element, TransactionsInfo, serialized_length
 from chia_rs.sized_bytes import bytes32
@@ -203,7 +203,7 @@ def skip_transactions_info(buf: memoryview) -> memoryview:
     return skip_list(buf, skip_coin)
 
 
-def generator_from_block(buf: memoryview) -> Optional[bytes]:
+def generator_from_block(buf: memoryview) -> bytes | None:
     buf = skip_list(buf, skip_end_of_sub_slot_bundle)  # finished_sub_slots
     buf = skip_reward_chain_block(buf)  # reward_chain_block
     buf = skip_optional(buf, skip_vdf_proof)  # challenge_chain_sp_proof
@@ -228,7 +228,7 @@ def generator_from_block(buf: memoryview) -> Optional[bytes]:
 @dataclass(frozen=True)
 class GeneratorBlockInfo:
     prev_header_hash: bytes32
-    transactions_generator: Optional[SerializedProgram]
+    transactions_generator: SerializedProgram | None
     transactions_generator_ref_list: list[uint32]
 
 
@@ -284,7 +284,7 @@ def header_block_from_block(
 
     buf2 = skip_optional(buf2, skip_foliage_transaction_block)  # foliage_transaction_block
 
-    transactions_info: Optional[TransactionsInfo] = None
+    transactions_info: TransactionsInfo | None = None
     # we make it optional even if it's not by default
     # if request_filter is True it will read extra bytes and populate it properly
     transactions_info_optional: bytes = bytes([0])