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

chia/wallet/util/peer_request_cache.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import asyncio
-from typing import Any, Dict, List, Optional, Set, Tuple
+from typing import Any, Optional
 
 from chia.protocols.wallet_protocol import CoinState
 from chia.types.blockchain_format.sized_bytes import bytes32
@@ -13,15 +13,15 @@ from chia.util.lru_cache import LRUCache
 
 class PeerRequestCache:
     _blocks: LRUCache[uint32, HeaderBlock]  # height -> HeaderBlock
-    _block_requests: LRUCache[Tuple[uint32, uint32], asyncio.Task[Any]]  # (start, end) -> Task
+    _block_requests: LRUCache[tuple[uint32, uint32], asyncio.Task[Any]]  # (start, end) -> Task
     _states_validated: LRUCache[bytes32, Optional[uint32]]  # coin state hash -> last change height, or None for reorg
     _timestamps: LRUCache[uint32, uint64]  # block height -> timestamp
     _blocks_validated: LRUCache[bytes32, uint32]  # header_hash -> height
     _block_signatures_validated: LRUCache[bytes32, uint32]  # sig_hash -> height
-    _additions_in_block: LRUCache[Tuple[bytes32, bytes32], uint32]  # header_hash, puzzle_hash -> height
+    _additions_in_block: LRUCache[tuple[bytes32, bytes32], uint32]  # header_hash, puzzle_hash -> height
     # The wallet gets the state update before receiving the block. In untrusted mode the block is required for the
     # coin state validation, so we cache them before we apply them once we received the block.
-    _race_cache: Dict[uint32, Set[CoinState]]
+    _race_cache: dict[uint32, set[CoinState]]
 
     def __init__(self) -> None:
         self._blocks = LRUCache(100)
@@ -91,7 +91,7 @@ class PeerRequestCache:
     def in_additions_in_block(self, header_hash: bytes32, addition_ph: bytes32) -> bool:
         return self._additions_in_block.get((header_hash, addition_ph)) is not None
 
-    def add_states_to_race_cache(self, coin_states: List[CoinState]) -> None:
+    def add_states_to_race_cache(self, coin_states: list[CoinState]) -> None:
         for coin_state in coin_states:
             created_height = 0 if coin_state.created_height is None else coin_state.created_height
             spent_height = 0 if coin_state.spent_height is None else coin_state.spent_height
@@ -99,7 +99,7 @@ class PeerRequestCache:
             race_cache = self._race_cache.setdefault(max_height, set())
             race_cache.add(coin_state)
 
-    def get_race_cache(self, height: int) -> Set[CoinState]:
+    def get_race_cache(self, height: int) -> set[CoinState]:
         return self._race_cache[uint32(height)]
 
     def rollback_race_cache(self, *, fork_height: int) -> None:
@@ -120,7 +120,7 @@ class PeerRequestCache:
                 new_blocks.put(k, v)
         self._blocks = new_blocks
 
-        new_block_requests: LRUCache[Tuple[uint32, uint32], asyncio.Task[Any]] = LRUCache(self._block_requests.capacity)
+        new_block_requests: LRUCache[tuple[uint32, uint32], asyncio.Task[Any]] = LRUCache(self._block_requests.capacity)
         for (start_h, end_h), fetch_task in self._block_requests.cache.items():
             if start_h <= height and end_h <= height:
                 new_block_requests.put((start_h, end_h), fetch_task)
@@ -150,7 +150,7 @@ class PeerRequestCache:
                 new_block_signatures_validated.put(sig_hash, h)
         self._block_signatures_validated = new_block_signatures_validated
 
-        new_additions_in_block: LRUCache[Tuple[bytes32, bytes32], uint32] = LRUCache(self._additions_in_block.capacity)
+        new_additions_in_block: LRUCache[tuple[bytes32, bytes32], uint32] = LRUCache(self._additions_in_block.capacity)
         for (hh, ph), h in self._additions_in_block.cache.items():
             if h <= height:
                 new_additions_in_block.put((hh, ph), h)

chia/{util → wallet/util}/pprint.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import List
 
 
 @dataclass
@@ -16,7 +15,7 @@ class Range:
             return f"{self.first} to {self.last}"
 
 
-def int_list_to_ranges(array: List[int]) -> List[Range]:
+def int_list_to_ranges(array: list[int]) -> list[Range]:
     if len(array) == 0:
         return []
     sorted_array = sorted(array)
@@ -36,5 +35,5 @@ def int_list_to_ranges(array: List[int]) -> List[Range]:
     return ranges
 
 
-def print_compact_ranges(array: List[int]) -> str:
+def print_compact_ranges(array: list[int]) -> str:
     return str(int_list_to_ranges(array))

chia/wallet/util/puzzle_compression.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import zlib
-from typing import List
 
 from chia.types.blockchain_format.program import Program
 from chia.wallet.cat_wallet.cat_utils import CAT_MOD
@@ -17,11 +16,11 @@ from chia.wallet.puzzles.load_clvm import load_clvm_maybe_recompile
 
 # Need the legacy CAT mod for zlib backwards compatibility
 LEGACY_CAT_MOD = Program.fromhex(
-    "ff02ffff01ff02ff5effff04ff02ffff04ffff04ff05ffff04ffff0bff2cff0580ffff04ff0bff80808080ffff04ffff02ff17ff2f80ffff04ff5fffff04ffff02ff2effff04ff02ffff04ff17ff80808080ffff04ffff0bff82027fff82057fff820b7f80ffff04ff81bfffff04ff82017fffff04ff8202ffffff04ff8205ffffff04ff820bffff80808080808080808080808080ffff04ffff01ffffffff81ca3dff46ff0233ffff3c04ff01ff0181cbffffff02ff02ffff03ff05ffff01ff02ff32ffff04ff02ffff04ff0dffff04ffff0bff22ffff0bff2cff3480ffff0bff22ffff0bff22ffff0bff2cff5c80ff0980ffff0bff22ff0bffff0bff2cff8080808080ff8080808080ffff010b80ff0180ffff02ffff03ff0bffff01ff02ffff03ffff09ffff02ff2effff04ff02ffff04ff13ff80808080ff820b9f80ffff01ff02ff26ffff04ff02ffff04ffff02ff13ffff04ff5fffff04ff17ffff04ff2fffff04ff81bfffff04ff82017fffff04ff1bff8080808080808080ffff04ff82017fff8080808080ffff01ff088080ff0180ffff01ff02ffff03ff17ffff01ff02ffff03ffff20ff81bf80ffff0182017fffff01ff088080ff0180ffff01ff088080ff018080ff0180ffff04ffff04ff05ff2780ffff04ffff10ff0bff5780ff778080ff02ffff03ff05ffff01ff02ffff03ffff09ffff02ffff03ffff09ff11ff7880ffff0159ff8080ff0180ffff01818f80ffff01ff02ff7affff04ff02ffff04ff0dffff04ff0bffff04ffff04ff81b9ff82017980ff808080808080ffff01ff02ff5affff04ff02ffff04ffff02ffff03ffff09ff11ff7880ffff01ff04ff78ffff04ffff02ff36ffff04ff02ffff04ff13ffff04ff29ffff04ffff0bff2cff5b80ffff04ff2bff80808080808080ff398080ffff01ff02ffff03ffff09ff11ff2480ffff01ff04ff24ffff04ffff0bff20ff2980ff398080ffff010980ff018080ff0180ffff04ffff02ffff03ffff09ff11ff7880ffff0159ff8080ff0180ffff04ffff02ff7affff04ff02ffff04ff0dffff04ff0bffff04ff17ff808080808080ff80808080808080ff0180ffff01ff04ff80ffff04ff80ff17808080ff0180ffffff02ffff03ff05ffff01ff04ff09ffff02ff26ffff04ff02ffff04ff0dffff04ff0bff808080808080ffff010b80ff0180ff0bff22ffff0bff2cff5880ffff0bff22ffff0bff22ffff0bff2cff5c80ff0580ffff0bff22ffff02ff32ffff04ff02ffff04ff07ffff04ffff0bff2cff2c80ff8080808080ffff0bff2cff8080808080ffff02ffff03ffff07ff0580ffff01ff0bffff0102ffff02ff2effff04ff02ffff04ff09ff80808080ffff02ff2effff04ff02ffff04ff0dff8080808080ffff01ff0bff2cff058080ff0180ffff04ffff04ff28ffff04ff5fff808080ffff02ff7effff04ff02ffff04ffff04ffff04ff2fff0580ffff04ff5fff82017f8080ffff04ffff02ff7affff04ff02ffff04ff0bffff04ff05ffff01ff808080808080ffff04ff17ffff04ff81bfffff04ff82017fffff04ffff0bff8204ffffff02ff36ffff04ff02ffff04ff09ffff04ff820affffff04ffff0bff2cff2d80ffff04ff15ff80808080808080ff8216ff80ffff04ff8205ffffff04ff820bffff808080808080808080808080ff02ff2affff04ff02ffff04ff5fffff04ff3bffff04ffff02ffff03ff17ffff01ff09ff2dffff0bff27ffff02ff36ffff04ff02ffff04ff29ffff04ff57ffff04ffff0bff2cff81b980ffff04ff59ff80808080808080ff81b78080ff8080ff0180ffff04ff17ffff04ff05ffff04ff8202ffffff04ffff04ffff04ff24ffff04ffff0bff7cff2fff82017f80ff808080ffff04ffff04ff30ffff04ffff0bff81bfffff0bff7cff15ffff10ff82017fffff11ff8202dfff2b80ff8202ff808080ff808080ff138080ff80808080808080808080ff018080"  # noqa
+    "ff02ffff01ff02ff5effff04ff02ffff04ffff04ff05ffff04ffff0bff2cff0580ffff04ff0bff80808080ffff04ffff02ff17ff2f80ffff04ff5fffff04ffff02ff2effff04ff02ffff04ff17ff80808080ffff04ffff0bff82027fff82057fff820b7f80ffff04ff81bfffff04ff82017fffff04ff8202ffffff04ff8205ffffff04ff820bffff80808080808080808080808080ffff04ffff01ffffffff81ca3dff46ff0233ffff3c04ff01ff0181cbffffff02ff02ffff03ff05ffff01ff02ff32ffff04ff02ffff04ff0dffff04ffff0bff22ffff0bff2cff3480ffff0bff22ffff0bff22ffff0bff2cff5c80ff0980ffff0bff22ff0bffff0bff2cff8080808080ff8080808080ffff010b80ff0180ffff02ffff03ff0bffff01ff02ffff03ffff09ffff02ff2effff04ff02ffff04ff13ff80808080ff820b9f80ffff01ff02ff26ffff04ff02ffff04ffff02ff13ffff04ff5fffff04ff17ffff04ff2fffff04ff81bfffff04ff82017fffff04ff1bff8080808080808080ffff04ff82017fff8080808080ffff01ff088080ff0180ffff01ff02ffff03ff17ffff01ff02ffff03ffff20ff81bf80ffff0182017fffff01ff088080ff0180ffff01ff088080ff018080ff0180ffff04ffff04ff05ff2780ffff04ffff10ff0bff5780ff778080ff02ffff03ff05ffff01ff02ffff03ffff09ffff02ffff03ffff09ff11ff7880ffff0159ff8080ff0180ffff01818f80ffff01ff02ff7affff04ff02ffff04ff0dffff04ff0bffff04ffff04ff81b9ff82017980ff808080808080ffff01ff02ff5affff04ff02ffff04ffff02ffff03ffff09ff11ff7880ffff01ff04ff78ffff04ffff02ff36ffff04ff02ffff04ff13ffff04ff29ffff04ffff0bff2cff5b80ffff04ff2bff80808080808080ff398080ffff01ff02ffff03ffff09ff11ff2480ffff01ff04ff24ffff04ffff0bff20ff2980ff398080ffff010980ff018080ff0180ffff04ffff02ffff03ffff09ff11ff7880ffff0159ff8080ff0180ffff04ffff02ff7affff04ff02ffff04ff0dffff04ff0bffff04ff17ff808080808080ff80808080808080ff0180ffff01ff04ff80ffff04ff80ff17808080ff0180ffffff02ffff03ff05ffff01ff04ff09ffff02ff26ffff04ff02ffff04ff0dffff04ff0bff808080808080ffff010b80ff0180ff0bff22ffff0bff2cff5880ffff0bff22ffff0bff22ffff0bff2cff5c80ff0580ffff0bff22ffff02ff32ffff04ff02ffff04ff07ffff04ffff0bff2cff2c80ff8080808080ffff0bff2cff8080808080ffff02ffff03ffff07ff0580ffff01ff0bffff0102ffff02ff2effff04ff02ffff04ff09ff80808080ffff02ff2effff04ff02ffff04ff0dff8080808080ffff01ff0bff2cff058080ff0180ffff04ffff04ff28ffff04ff5fff808080ffff02ff7effff04ff02ffff04ffff04ffff04ff2fff0580ffff04ff5fff82017f8080ffff04ffff02ff7affff04ff02ffff04ff0bffff04ff05ffff01ff808080808080ffff04ff17ffff04ff81bfffff04ff82017fffff04ffff0bff8204ffffff02ff36ffff04ff02ffff04ff09ffff04ff820affffff04ffff0bff2cff2d80ffff04ff15ff80808080808080ff8216ff80ffff04ff8205ffffff04ff820bffff808080808080808080808080ff02ff2affff04ff02ffff04ff5fffff04ff3bffff04ffff02ffff03ff17ffff01ff09ff2dffff0bff27ffff02ff36ffff04ff02ffff04ff29ffff04ff57ffff04ffff0bff2cff81b980ffff04ff59ff80808080808080ff81b78080ff8080ff0180ffff04ff17ffff04ff05ffff04ff8202ffffff04ffff04ffff04ff24ffff04ffff0bff7cff2fff82017f80ff808080ffff04ffff04ff30ffff04ffff0bff81bfffff0bff7cff15ffff10ff82017fffff11ff8202dfff2b80ff8202ff808080ff808080ff138080ff80808080808080808080ff018080"
 )
 
 OFFER_MOD_OLD = Program.fromhex(
-    "ff02ffff01ff02ff0affff04ff02ffff04ff03ff80808080ffff04ffff01ffff333effff02ffff03ff05ffff01ff04ffff04ff0cffff04ffff02ff1effff04ff02ffff04ff09ff80808080ff808080ffff02ff16ffff04ff02ffff04ff19ffff04ffff02ff0affff04ff02ffff04ff0dff80808080ff808080808080ff8080ff0180ffff02ffff03ff05ffff01ff04ffff04ff08ff0980ffff02ff16ffff04ff02ffff04ff0dffff04ff0bff808080808080ffff010b80ff0180ff02ffff03ffff07ff0580ffff01ff0bffff0102ffff02ff1effff04ff02ffff04ff09ff80808080ffff02ff1effff04ff02ffff04ff0dff8080808080ffff01ff0bffff0101ff058080ff0180ff018080"  # noqa
+    "ff02ffff01ff02ff0affff04ff02ffff04ff03ff80808080ffff04ffff01ffff333effff02ffff03ff05ffff01ff04ffff04ff0cffff04ffff02ff1effff04ff02ffff04ff09ff80808080ff808080ffff02ff16ffff04ff02ffff04ff19ffff04ffff02ff0affff04ff02ffff04ff0dff80808080ff808080808080ff8080ff0180ffff02ffff03ff05ffff01ff04ffff04ff08ff0980ffff02ff16ffff04ff02ffff04ff0dffff04ff0bff808080808080ffff010b80ff0180ff02ffff03ffff07ff0580ffff01ff0bffff0102ffff02ff1effff04ff02ffff04ff09ff80808080ffff02ff1effff04ff02ffff04ff0dff8080808080ffff01ff0bffff0101ff058080ff0180ff018080"
 )
 OFFER_MOD = load_clvm_maybe_recompile("settlement_payments.clsp")
 
@@ -85,7 +84,7 @@ def compress_object_with_puzzles(object_bytes: bytes, version: int) -> bytes:
     return version_blob + compressed_object_blob
 
 
-def lowest_best_version(puzzle_list: List[bytes], max_version: int = len(ZDICT)) -> int:
+def lowest_best_version(puzzle_list: list[bytes], max_version: int = len(ZDICT)) -> int:
     highest_version = 1
     for mod in puzzle_list:
         for version, dict in enumerate(ZDICT):

chia/wallet/util/puzzle_decorator.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import logging
-from typing import Any, Dict, List, Tuple
+from typing import Any
 
 from typing_extensions import Protocol
 
@@ -14,27 +14,27 @@ from chia.wallet.util.puzzle_decorator_type import PuzzleDecoratorType
 
 class PuzzleDecoratorProtocol(Protocol):
     @staticmethod
-    def create(config: Dict[str, Any]) -> PuzzleDecoratorProtocol: ...
+    def create(config: dict[str, Any]) -> PuzzleDecoratorProtocol: ...
 
     def decorate(self, inner_puzzle: Program) -> Program: ...
 
     def decorate_target_puzzle_hash(
         self, inner_puzzle: Program, target_puzzle_hash: bytes32
-    ) -> Tuple[Program, bytes32]: ...
+    ) -> tuple[Program, bytes32]: ...
 
     def decorate_memos(
-        self, inner_puzzle: Program, target_puzzle_hash: bytes32, memos: List[bytes]
-    ) -> Tuple[Program, List[bytes]]: ...
+        self, inner_puzzle: Program, target_puzzle_hash: bytes32, memos: list[bytes]
+    ) -> tuple[Program, list[bytes]]: ...
 
-    def solve(self, puzzle: Program, primaries: List[Payment], inner_solution: Program) -> Tuple[Program, Program]: ...
+    def solve(self, puzzle: Program, primaries: list[Payment], inner_solution: Program) -> tuple[Program, Program]: ...
 
 
 class PuzzleDecoratorManager:
-    decorator_list: List[PuzzleDecoratorProtocol]
+    decorator_list: list[PuzzleDecoratorProtocol]
     log: logging.Logger
 
     @staticmethod
-    def create(config: List[Dict[str, Any]]) -> PuzzleDecoratorManager:
+    def create(config: list[dict[str, Any]]) -> PuzzleDecoratorManager:
         """
         Create a new puzzle decorator manager
         :param config: Config
@@ -75,7 +75,7 @@ class PuzzleDecoratorManager:
             inner_puzzle, target_puzzle_hash = decorator.decorate_target_puzzle_hash(inner_puzzle, target_puzzle_hash)
         return target_puzzle_hash
 
-    def solve(self, inner_puzzle: Program, primaries: List[Payment], inner_solution: Program) -> Program:
+    def solve(self, inner_puzzle: Program, primaries: list[Payment], inner_solution: Program) -> Program:
         """
         Generate the solution of the puzzle
         :param inner_puzzle: Inner puzzle
@@ -87,7 +87,7 @@ class PuzzleDecoratorManager:
             inner_puzzle, inner_solution = decorator.solve(inner_puzzle, primaries, inner_solution)
         return inner_solution
 
-    def decorate_memos(self, inner_puzzle: Program, target_puzzle_hash: bytes32, memos: List[bytes]) -> List[bytes]:
+    def decorate_memos(self, inner_puzzle: Program, target_puzzle_hash: bytes32, memos: list[bytes]) -> list[bytes]:
         """
         Decorate a memo list
         :param inner_puzzle: Inner puzzle

chia/wallet/util/query_filter.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 from enum import IntEnum
-from typing import List
 
 from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.ints import uint8, uint64
@@ -18,43 +17,43 @@ class FilterMode(IntEnum):
 @streamable
 @dataclass(frozen=True)
 class TransactionTypeFilter(Streamable):
-    values: List[uint8]
+    values: list[uint8]
     mode: uint8  # FilterMode
 
     @classmethod
-    def include(cls, values: List[TransactionType]) -> TransactionTypeFilter:
+    def include(cls, values: list[TransactionType]) -> TransactionTypeFilter:
         return cls([uint8(t.value) for t in values], uint8(FilterMode.include))
 
     @classmethod
-    def exclude(cls, values: List[TransactionType]) -> TransactionTypeFilter:
+    def exclude(cls, values: list[TransactionType]) -> TransactionTypeFilter:
         return cls([uint8(t.value) for t in values], uint8(FilterMode.exclude))
 
 
 @streamable
 @dataclass(frozen=True)
 class AmountFilter(Streamable):
-    values: List[uint64]
+    values: list[uint64]
     mode: uint8  # FilterMode
 
     @classmethod
-    def include(cls, values: List[uint64]) -> AmountFilter:
+    def include(cls, values: list[uint64]) -> AmountFilter:
         return cls(values, mode=uint8(FilterMode.include))
 
     @classmethod
-    def exclude(cls, values: List[uint64]) -> AmountFilter:
+    def exclude(cls, values: list[uint64]) -> AmountFilter:
         return cls(values, mode=uint8(FilterMode.exclude))
 
 
 @streamable
 @dataclass(frozen=True)
 class HashFilter(Streamable):
-    values: List[bytes32]
+    values: list[bytes32]
     mode: uint8  # FilterMode
 
     @classmethod
-    def include(cls, values: List[bytes32]) -> HashFilter:
+    def include(cls, values: list[bytes32]) -> HashFilter:
         return cls(values, mode=uint8(FilterMode.include))
 
     @classmethod
-    def exclude(cls, values: List[bytes32]) -> HashFilter:
+    def exclude(cls, values: list[bytes32]) -> HashFilter:
         return cls(values, mode=uint8(FilterMode.exclude))

chia/wallet/util/tx_config.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import dataclasses
-from typing import Any, Dict, List, Optional, Type, TypeVar
+from typing import Any, Optional, TypeVar
 
 from typing_extensions import NotRequired, TypedDict, Unpack
 
@@ -17,10 +17,10 @@ from chia.util.streamable import Streamable, streamable
 class CoinSelectionConfig:
     min_coin_amount: uint64
     max_coin_amount: uint64
-    excluded_coin_amounts: List[uint64]
-    excluded_coin_ids: List[bytes32]
+    excluded_coin_amounts: list[uint64]
+    excluded_coin_ids: list[bytes32]
 
-    def to_json_dict(self) -> Dict[str, Any]:
+    def to_json_dict(self) -> dict[str, Any]:
         return CoinSelectionConfigLoader(
             self.min_coin_amount,
             self.max_coin_amount,
@@ -46,7 +46,7 @@ class TXConfig(CoinSelectionConfig):
             self.excluded_coin_ids,
         )
 
-    def to_json_dict(self) -> Dict[str, Any]:
+    def to_json_dict(self) -> dict[str, Any]:
         return TXConfigLoader(
             self.min_coin_amount,
             self.max_coin_amount,
@@ -62,7 +62,7 @@ class TXConfig(CoinSelectionConfig):
 
 class AutofillArgs(TypedDict):
     constants: ConsensusConstants
-    config: NotRequired[Dict[str, Any]]
+    config: NotRequired[dict[str, Any]]
     logged_in_fingerprint: NotRequired[int]
 
 
@@ -74,8 +74,8 @@ _T_CoinSelectionConfigLoader = TypeVar("_T_CoinSelectionConfigLoader", bound="Co
 class CoinSelectionConfigLoader(Streamable):
     min_coin_amount: Optional[uint64] = None
     max_coin_amount: Optional[uint64] = None
-    excluded_coin_amounts: Optional[List[uint64]] = None
-    excluded_coin_ids: Optional[List[bytes32]] = None
+    excluded_coin_amounts: Optional[list[uint64]] = None
+    excluded_coin_ids: Optional[list[bytes32]] = None
 
     def autofill(
         self,
@@ -91,11 +91,11 @@ class CoinSelectionConfigLoader(Streamable):
 
     @classmethod
     def from_json_dict(
-        cls: Type[_T_CoinSelectionConfigLoader], json_dict: Dict[str, Any]
+        cls: type[_T_CoinSelectionConfigLoader], json_dict: dict[str, Any]
     ) -> _T_CoinSelectionConfigLoader:
         if "excluded_coins" in json_dict:
-            excluded_coins: List[Coin] = [Coin.from_json_dict(c) for c in json_dict["excluded_coins"]]
-            excluded_coin_ids: List[str] = [c.name().hex() for c in excluded_coins]
+            excluded_coins: list[Coin] = [Coin.from_json_dict(c) for c in json_dict["excluded_coins"]]
+            excluded_coin_ids: list[str] = [c.name().hex() for c in excluded_coins]
             if "excluded_coin_ids" in json_dict:
                 json_dict["excluded_coin_ids"] = [*excluded_coin_ids, *json_dict["excluded_coin_ids"]]
             else:
@@ -118,7 +118,7 @@ class TXConfigLoader(CoinSelectionConfigLoader):
     ) -> TXConfig:
         constants: ConsensusConstants = kwargs["constants"]
         if self.reuse_puzhash is None:
-            config: Dict[str, Any] = kwargs.get("config", {})
+            config: dict[str, Any] = kwargs.get("config", {})
             logged_in_fingerprint: int = kwargs.get("logged_in_fingerprint", -1)
             reuse_puzhash_config = config.get("reuse_public_key_for_change", None)
             if reuse_puzhash_config is None:

chia/wallet/util/wallet_sync_utils.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import asyncio
 import logging
 import random
-from typing import Any, List, Optional, Set, Tuple, Union
+from typing import Any, Optional, Union
 
 from chia_rs import compute_merkle_set_root, confirm_included_already_hashed, confirm_not_included_already_hashed
 
@@ -36,6 +36,7 @@ from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.coin_spend import CoinSpend, make_spend
 from chia.types.header_block import HeaderBlock
 from chia.util.ints import uint32
+from chia.util.task_referencer import create_referenced_task
 from chia.wallet.util.peer_request_cache import PeerRequestCache
 
 log = logging.getLogger(__name__)
@@ -46,48 +47,48 @@ class PeerRequestException(Exception):
 
 
 async def subscribe_to_phs(
-    puzzle_hashes: List[bytes32],
+    puzzle_hashes: list[bytes32],
     peer: WSChiaConnection,
     min_height: int,
-) -> List[CoinState]:
+) -> list[CoinState]:
     """
     Tells full nodes that we are interested in puzzle hashes, and returns the response.
     """
     msg = RegisterForPhUpdates(puzzle_hashes, uint32(max(min_height, uint32(0))))
     all_coins_state: Optional[RespondToPhUpdates] = await peer.call_api(
-        FullNodeAPI.register_interest_in_puzzle_hash, msg, timeout=300
+        FullNodeAPI.register_for_ph_updates, msg, timeout=300
     )
     if all_coins_state is None:
-        raise ValueError(f"None response from peer {peer.peer_info.host} for register_interest_in_puzzle_hash")
+        raise ValueError(f"None response from peer {peer.peer_info.host} for register_for_ph_updates")
     return all_coins_state.coin_states
 
 
 async def subscribe_to_coin_updates(
-    coin_names: List[bytes32],
+    coin_names: list[bytes32],
     peer: WSChiaConnection,
     min_height: int,
-) -> List[CoinState]:
+) -> list[CoinState]:
     """
     Tells full nodes that we are interested in coin ids, and returns the response.
     """
     msg = RegisterForCoinUpdates(coin_names, uint32(max(0, min_height)))
     all_coins_state: Optional[RespondToCoinUpdates] = await peer.call_api(
-        FullNodeAPI.register_interest_in_coin, msg, timeout=300
+        FullNodeAPI.register_for_coin_updates, msg, timeout=300
     )
 
     if all_coins_state is None:
-        raise ValueError(f"None response from peer {peer.peer_info.host} for register_interest_in_coin")
+        raise ValueError(f"None response from peer {peer.peer_info.host} for register_for_coin_updates")
     return all_coins_state.coin_states
 
 
 def validate_additions(
-    coins: List[Tuple[bytes32, List[Coin]]],
-    proofs: Optional[List[Tuple[bytes32, bytes, Optional[bytes]]]],
+    coins: list[tuple[bytes32, list[Coin]]],
+    proofs: Optional[list[tuple[bytes32, bytes, Optional[bytes]]]],
     root: bytes32,
 ) -> bool:
     if proofs is None:
         # Verify root
-        additions_merkle_items: List[bytes32] = []
+        additions_merkle_items: list[bytes32] = []
 
         # Addition Merkle set contains puzzlehash and hash of all coins with that puzzlehash
         for puzzle_hash, coins_l in coins:
@@ -100,7 +101,7 @@ def validate_additions(
     else:
         for i in range(len(coins)):
             assert coins[i][0] == proofs[i][0]
-            coin_list_1: List[Coin] = coins[i][1]
+            coin_list_1: list[Coin] = coins[i][1]
             puzzle_hash_proof: Optional[bytes] = proofs[i][1]
             coin_list_proof: Optional[bytes] = proofs[i][2]
             if len(coin_list_1) == 0:
@@ -143,7 +144,7 @@ def validate_additions(
 
 
 def validate_removals(
-    coins: List[Tuple[bytes32, Optional[Coin]]], proofs: Optional[List[Tuple[bytes32, bytes]]], root: bytes32
+    coins: list[tuple[bytes32, Optional[Coin]]], proofs: Optional[list[tuple[bytes32, bytes]]], root: bytes32
 ) -> bool:
     if proofs is None:
         # If there are no proofs, it means all removals were returned in the response.
@@ -235,7 +236,7 @@ def last_change_height_cs(cs: CoinState) -> uint32:
     return uint32(0)
 
 
-def sort_coin_states(coin_states: Set[CoinState]) -> List[CoinState]:
+def sort_coin_states(coin_states: set[CoinState]) -> list[CoinState]:
     return sorted(
         coin_states,
         key=lambda coin_state: (
@@ -248,7 +249,7 @@ def sort_coin_states(coin_states: Set[CoinState]) -> List[CoinState]:
 
 async def request_header_blocks(
     peer: WSChiaConnection, start_height: uint32, end_height: uint32
-) -> Optional[List[HeaderBlock]]:
+) -> Optional[list[HeaderBlock]]:
     if Capability.BLOCK_HEADERS in peer.peer_capabilities:
         response = await peer.call_api(
             FullNodeAPI.request_block_headers, RequestBlockHeaders(start_height, end_height, False)
@@ -262,7 +263,7 @@ async def request_header_blocks(
 
 
 async def _fetch_header_blocks_inner(
-    all_peers: List[Tuple[WSChiaConnection, bool]],
+    all_peers: list[tuple[WSChiaConnection, bool]],
     request_start: uint32,
     request_end: uint32,
 ) -> Optional[Union[RespondHeaderBlocks, RespondBlockHeaders]]:
@@ -298,9 +299,9 @@ async def fetch_header_blocks_in_range(
     start: uint32,
     end: uint32,
     peer_request_cache: PeerRequestCache,
-    all_peers: List[Tuple[WSChiaConnection, bool]],
-) -> Optional[List[HeaderBlock]]:
-    blocks: List[HeaderBlock] = []
+    all_peers: list[tuple[WSChiaConnection, bool]],
+) -> Optional[list[HeaderBlock]]:
+    blocks: list[HeaderBlock] = []
     for i in range(start - (start % 32), end + 1, 32):
         request_start = min(uint32(i), end)
         request_end = min(uint32(i + 31), end)
@@ -316,7 +317,9 @@ async def fetch_header_blocks_in_range(
                 res_h_blocks = await res_h_blocks_task
         else:
             log.debug(f"Fetching: {start}-{end}")
-            res_h_blocks_task = asyncio.create_task(_fetch_header_blocks_inner(all_peers, request_start, request_end))
+            res_h_blocks_task = create_referenced_task(
+                _fetch_header_blocks_inner(all_peers, request_start, request_end)
+            )
             peer_request_cache.add_to_block_requests(request_start, request_end, res_h_blocks_task)
             res_h_blocks = await res_h_blocks_task
         if res_h_blocks is None:

chia/wallet/util/wallet_types.py

@@ -30,6 +30,13 @@ class WalletType(IntEnum):
     DAO_CAT = 15
     CRCAT = 57
 
+    def to_json_dict(self) -> str:
+        # yes, this isn't a `dict`, but it is json and
+        # unfortunately the magic method name is misleading
+        # not sure this code is used
+        # TODO: determine if this code is used and if not, remove it
+        return self.name
+
 
 class CoinType(IntEnum):
     NORMAL = 0
@@ -44,7 +51,7 @@ class RemarkDataType(IntEnum):
     CLAWBACK = 2
 
 
-T = TypeVar("T", contravariant=True)
+T_contra = TypeVar("T_contra", contravariant=True)
 
 
 @dataclass(frozen=True)
@@ -53,7 +60,7 @@ class WalletIdentifier:
     type: WalletType
 
     @classmethod
-    def create(cls, wallet: WalletProtocol[T]) -> WalletIdentifier:
+    def create(cls, wallet: WalletProtocol[T_contra]) -> WalletIdentifier:
         return cls(wallet.id(), wallet.type())