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

chia/wallet/wallet_transaction_store.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 import dataclasses
 import logging
 import time
-from typing import Optional
 
 import aiosqlite
 from chia_rs.sized_bytes import bytes32
@@ -29,7 +28,7 @@ from chia.wallet.util.transaction_type import TransactionType
 log = logging.getLogger(__name__)
 
 
-def filter_ok_mempool_status(sent_to: list[tuple[str, uint8, Optional[str]]]) -> list[tuple[str, uint8, Optional[str]]]:
+def filter_ok_mempool_status(sent_to: list[tuple[str, uint8, str | None]]) -> list[tuple[str, uint8, str | None]]:
     """Remove SUCCESS and PENDING status records from a TransactionRecord sent_to field"""
     new_sent_to = []
     for peer, status, err in sent_to:
@@ -162,7 +161,7 @@ class WalletTransactionStore:
         """
         Updates transaction to be confirmed.
         """
-        current: Optional[TransactionRecord] = await self.get_transaction_record(tx_id)
+        current: TransactionRecord | None = await self.get_transaction_record(tx_id)
         if current is None:
             return None
         if current.confirmed_at_height == height:
@@ -176,13 +175,13 @@ class WalletTransactionStore:
         tx_id: bytes32,
         name: str,
         send_status: MempoolInclusionStatus,
-        err: Optional[Err],
+        err: Err | None,
     ) -> bool:
         """
         Updates transaction sent count (Full Node has received spend_bundle and sent ack).
         """
 
-        current: Optional[TransactionRecord] = await self.get_transaction_record(tx_id)
+        current: TransactionRecord | None = await self.get_transaction_record(tx_id)
         if current is None:
             return False
 
@@ -219,7 +218,7 @@ class WalletTransactionStore:
         )
         await self.add_transaction_record(tx)
 
-    async def get_transaction_record(self, tx_id: bytes32) -> Optional[TransactionRecord]:
+    async def get_transaction_record(self, tx_id: bytes32) -> TransactionRecord | None:
         """
         Checks DB and cache for TransactionRecord with id: id and returns it.
         """
@@ -316,9 +315,9 @@ class WalletTransactionStore:
         end,
         sort_key=None,
         reverse=False,
-        confirmed: Optional[bool] = None,
-        to_puzzle_hash: Optional[bytes32] = None,
-        type_filter: Optional[TransactionTypeFilter] = None,
+        confirmed: bool | None = None,
+        to_puzzle_hash: bytes32 | None = None,
+        type_filter: TransactionTypeFilter | None = None,
     ) -> list[TransactionRecord]:
         """Return a list of transaction between start and end index. List is in reverse chronological order.
         start = 0 is most recent transaction
@@ -365,8 +364,8 @@ class WalletTransactionStore:
     async def get_transaction_count_for_wallet(
         self,
         wallet_id: int,
-        confirmed: Optional[bool] = None,
-        type_filter: Optional[TransactionTypeFilter] = None,
+        confirmed: bool | None = None,
+        type_filter: TransactionTypeFilter | None = None,
     ) -> int:
         confirmed_str = ""
         if confirmed is not None:
@@ -388,9 +387,7 @@ class WalletTransactionStore:
             )
         return 0 if len(rows) == 0 else rows[0][0]
 
-    async def get_all_transactions_for_wallet(
-        self, wallet_id: int, type: Optional[int] = None
-    ) -> list[TransactionRecord]:
+    async def get_all_transactions_for_wallet(self, wallet_id: int, type: int | None = None) -> list[TransactionRecord]:
         """
         Returns all stored transactions.
         """

chia/wallet/wallet_user_store.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Optional
-
 from chia_rs.sized_ints import uint32
 
 from chia.util.db_wrapper import DBWrapper2, execute_fetchone
@@ -50,7 +48,7 @@ class WalletUserStore:
         name: str,
         wallet_type: int,
         data: str,
-        id: Optional[int] = None,
+        id: int | None = None,
     ) -> WalletInfo:
         async with self.db_wrapper.writer_maybe_transaction() as conn:
             cursor = await conn.execute(
@@ -81,13 +79,13 @@ class WalletUserStore:
             )
             await cursor.close()
 
-    async def get_last_wallet(self) -> Optional[WalletInfo]:
+    async def get_last_wallet(self) -> WalletInfo | None:
         async with self.db_wrapper.reader_no_transaction() as conn:
             row = await execute_fetchone(conn, "SELECT MAX(id) FROM users_wallets")
 
         return None if row is None else await self.get_wallet_by_id(row[0])
 
-    async def get_all_wallet_info_entries(self, wallet_type: Optional[WalletType] = None) -> list[WalletInfo]:
+    async def get_all_wallet_info_entries(self, wallet_type: WalletType | None = None) -> list[WalletInfo]:
         """
         Return a set containing all wallets, optionally with a specific WalletType
         """
@@ -100,7 +98,7 @@ class WalletUserStore:
                 )
             return [WalletInfo(row[0], row[1], row[2], row[3]) for row in rows]
 
-    async def get_wallet_by_id(self, id: int) -> Optional[WalletInfo]:
+    async def get_wallet_by_id(self, id: int) -> WalletInfo | None:
         """
         Return a wallet by id
         """

chia/wallet/wallet_weight_proof_handler.py

@@ -6,7 +6,7 @@ import tempfile
 import time
 from concurrent.futures.process import ProcessPoolExecutor
 from multiprocessing.context import BaseContext
-from typing import IO, Optional
+from typing import IO
 
 from chia_rs import BlockRecord, ConsensusConstants
 from chia_rs.sized_ints import uint32
@@ -43,7 +43,7 @@ class WalletWeightProofHandler:
         self._executor.shutdown(wait=True)
 
     async def validate_weight_proof(
-        self, weight_proof: WeightProof, skip_segment_validation: bool = False, old_proof: Optional[WeightProof] = None
+        self, weight_proof: WeightProof, skip_segment_validation: bool = False, old_proof: WeightProof | None = None
     ) -> list[BlockRecord]:
         start_time = time.time()
         summaries, sub_epoch_weight_list = _validate_sub_epoch_summaries(self._constants, weight_proof)
@@ -68,7 +68,7 @@ class WalletWeightProofHandler:
         return block_records
 
 
-def get_wp_fork_point(constants: ConsensusConstants, old_wp: Optional[WeightProof], new_wp: WeightProof) -> uint32:
+def get_wp_fork_point(constants: ConsensusConstants, old_wp: WeightProof | None, new_wp: WeightProof) -> uint32:
     """
     iterate through sub epoch summaries to find fork point. This method is conservative, it does not return the
     actual fork point, it can return a height that is before the actual fork point.
@@ -106,7 +106,7 @@ def get_wp_fork_point(constants: ConsensusConstants, old_wp: Optional[WeightProo
     return uint32((constants.SUB_EPOCH_BLOCKS * count) + overflow)
 
 
-def get_fork_ses_idx(old_wp: Optional[WeightProof], new_wp: WeightProof) -> int:
+def get_fork_ses_idx(old_wp: WeightProof | None, new_wp: WeightProof) -> int:
     """
     iterate through sub epoch summaries to find fork point. This method is conservative, it does not return the
     actual fork point, it can return a height that is before the actual fork point.

{chia_blockchain-2.5.7rc4.dist-info → chia_blockchain-2.5.8rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chia-blockchain
-Version: 2.5.7rc4
+Version: 2.5.8rc1
 Summary: Chia blockchain full node, farmer, timelord, and wallet.
 License-Expression: Apache-2.0
 License-File: LICENSE
@@ -26,14 +26,14 @@ Requires-Dist: bitstring (>=4.1.4)
 Requires-Dist: boto3 (>=1.35.43)
 Requires-Dist: build ; extra == "dev"
 Requires-Dist: chia-puzzles-py (>=0.20.1)
-Requires-Dist: chia_rs (>=0.30,<0.31)
+Requires-Dist: chia_rs (>=0.35,<0.36)
 Requires-Dist: chiabip158 (>=1.5.2)
+Requires-Dist: chialisp (>=0.4.1)
 Requires-Dist: chiapos (>=2.0.10)
 Requires-Dist: chiavdf (>=1.1.10)
 Requires-Dist: click (>=8.1.7)
 Requires-Dist: clvm (>=0.9.14)
 Requires-Dist: clvm_tools (>=0.4.9)
-Requires-Dist: clvm_tools_rs (>=0.1.45)
 Requires-Dist: colorama (>=0.4.6)
 Requires-Dist: colorlog (>=6.9.0)
 Requires-Dist: concurrent_log_handler (>=0.9.25)
@@ -43,7 +43,7 @@ Requires-Dist: diff-cover ; extra == "dev"
 Requires-Dist: dnslib (>=0.9.25)
 Requires-Dist: dnspython (>=2.6.1)
 Requires-Dist: filelock (>=3.16.1)
-Requires-Dist: hsms (>=0.3.1)
+Requires-Dist: hsms (>=0.3.2)
 Requires-Dist: importlib-resources (>=6.4.5)
 Requires-Dist: keyring (>=25.5.0)
 Requires-Dist: keyrings.cryptfile ; extra == "legacy-keyring"
@@ -60,6 +60,7 @@ Requires-Dist: pytest ; extra == "dev"
 Requires-Dist: pytest-cov ; extra == "dev"
 Requires-Dist: pytest-mock ; extra == "dev"
 Requires-Dist: pytest-monitor ; extra == "dev"
+Requires-Dist: pytest-rerunfailures ; extra == "dev"
 Requires-Dist: pytest-xdist ; extra == "dev"
 Requires-Dist: pyyaml (>=6.0.2)
 Requires-Dist: ruff ; extra == "dev"
@@ -74,7 +75,7 @@ Requires-Dist: types-setuptools ; extra == "dev"
 Requires-Dist: typing-extensions (>=4.12.2)
 Requires-Dist: watchdog (>=4.0.1)
 Requires-Dist: zstd (>=1.5.5.1) ; python_version < "3.12"
-Requires-Dist: zstd (>=1.5.5.1) ; python_version == "3.12"
+Requires-Dist: zstd (>=1.5.5.1) ; python_version >= "3.12"
 Project-URL: changelog, https://github.com/Chia-Network/chia-blockchain/blob/main/CHANGELOG.md
 Project-URL: source, https://github.com/Chia-Network/chia-blockchain/
 Description-Content-Type: text/markdown