chia-blockchain 2.5.0rc1__py3-none-any.whl → 2.5.1__py3-none-any.whl

chia/wallet/notification_store.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import dataclasses
 import logging
 import sqlite3
-from typing import List, Optional, Tuple
+from typing import Optional
 
 from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.db_wrapper import DBWrapper2
@@ -84,7 +84,7 @@ class NotificationStore:
             )
             await cursor.close()
 
-    async def get_notifications(self, coin_ids: List[bytes32]) -> List[Notification]:
+    async def get_notifications(self, coin_ids: list[bytes32]) -> list[Notification]:
         """
         Checks DB for Notification with id: id and returns it.
         """
@@ -111,15 +111,15 @@ class NotificationStore:
         ]
 
     async def get_all_notifications(
-        self, pagination: Optional[Tuple[Optional[int], Optional[int]]] = None
-    ) -> List[Notification]:
+        self, pagination: Optional[tuple[Optional[int], Optional[int]]] = None
+    ) -> list[Notification]:
         """
         Checks DB for Notification with id: id and returns it.
         """
         if pagination is not None:
             if pagination[1] is not None and pagination[0] is not None:
                 pagination_str = " LIMIT ?, ?"
-                pagination_params: Tuple[int, ...] = (pagination[0], pagination[1] - pagination[0])
+                pagination_params: tuple[int, ...] = (pagination[0], pagination[1] - pagination[0])
             elif pagination[1] is None and pagination[0] is not None:
                 pagination_str = " LIMIT ?, (SELECT COUNT(*) from notifications)"
                 pagination_params = (pagination[0],)
@@ -148,7 +148,7 @@ class NotificationStore:
             for row in rows
         ]
 
-    async def delete_notifications(self, coin_ids: List[bytes32]) -> None:
+    async def delete_notifications(self, coin_ids: list[bytes32]) -> None:
         coin_ids_str_list = "("
         for _ in coin_ids:
             coin_ids_str_list += "?"

chia/wallet/outer_puzzles.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from enum import Enum
-from typing import Dict, Optional
+from typing import Optional
 
 from chia.types.blockchain_format.program import Program
 from chia.types.blockchain_format.sized_bytes import bytes32
@@ -74,7 +74,7 @@ def create_asset_id(constructor: PuzzleInfo) -> Optional[bytes32]:
 
 function_args = (match_puzzle, construct_puzzle, solve_puzzle, get_inner_puzzle, get_inner_solution)
 
-driver_lookup: Dict[AssetType, DriverProtocol] = {
+driver_lookup: dict[AssetType, DriverProtocol] = {
     AssetType.CAT: CATOuterPuzzle(*function_args),
     AssetType.SINGLETON: SingletonOuterPuzzle(*function_args),
     AssetType.METADATA: MetadataOuterPuzzle(*function_args),

chia/wallet/payment.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from typing import List
 
 from chia.types.blockchain_format.program import Program
 from chia.types.blockchain_format.sized_bytes import bytes32
@@ -13,9 +12,9 @@ from chia.util.ints import uint64
 class Payment:
     puzzle_hash: bytes32
     amount: uint64
-    memos: List[bytes] = field(default_factory=list)
+    memos: list[bytes] = field(default_factory=list)
 
-    def as_condition_args(self) -> List:
+    def as_condition_args(self) -> list:
         return [self.puzzle_hash, self.amount, self.memos]
 
     def as_condition(self) -> Program:
@@ -26,9 +25,9 @@ class Payment:
 
     @classmethod
     def from_condition(cls, condition: Program) -> Payment:
-        python_condition: List = condition.as_python()
+        python_condition: list = condition.as_python()
         puzzle_hash, amount = python_condition[1:3]
-        memos: List[bytes] = []
+        memos: list[bytes] = []
         if len(python_condition) > 3:
             memos = python_condition[3]
         return cls(bytes32(puzzle_hash), uint64(int.from_bytes(amount, "big")), memos)

chia/wallet/puzzle_drivers.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Any, Dict, List, Optional
+from typing import Any, Optional
 
 from clvm.casts import int_from_bytes
 from clvm.SExp import SExp
@@ -25,7 +25,7 @@ class PuzzleInfo:
       - 'also' gets its own method as it's the supported way to do recursion of PuzzleInfos
     """
 
-    info: Dict[str, Any]
+    info: dict[str, Any]
 
     def __post_init__(self) -> None:
         if "type" not in self.info:
@@ -59,7 +59,7 @@ class PuzzleInfo:
         else:
             return None
 
-    def check_type(self, types: List[str]) -> bool:
+    def check_type(self, types: list[str]) -> bool:
         if types == []:
             if self.also() is None:
                 return True
@@ -78,7 +78,7 @@ class PuzzleInfo:
 
 @dataclass(frozen=True)
 class Solver:
-    info: Dict[str, Any]
+    info: dict[str, Any]
 
     def __getitem__(self, item: str) -> Any:
         value = self.info[item]

chia/wallet/puzzles/clawback/drivers.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import logging
-from typing import Any, List, Optional, Set, Union
+from typing import Any, Optional, Union
 
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
 from chia.types.blockchain_format.coin import Coin
@@ -29,11 +29,11 @@ AUGMENTED_CONDITION_HASH = AUGMENTED_CONDITION.get_tree_hash()
 log = logging.getLogger(__name__)
 
 
-def create_augmented_cond_puzzle(condition: List[Union[int, uint64]], puzzle: Program) -> Program:
+def create_augmented_cond_puzzle(condition: list[Union[int, uint64]], puzzle: Program) -> Program:
     return AUGMENTED_CONDITION.curry(condition, puzzle)
 
 
-def create_augmented_cond_puzzle_hash(condition: List[Any], puzzle_hash: bytes32) -> bytes32:
+def create_augmented_cond_puzzle_hash(condition: list[Any], puzzle_hash: bytes32) -> bytes32:
     hash_of_quoted_mod_hash = calculate_hash_of_quoted_mod_hash(AUGMENTED_CONDITION_HASH)
     hashed_args = [Program.to(condition).get_tree_hash(), puzzle_hash]
     return curry_and_treehash(hash_of_quoted_mod_hash, *hashed_args)
@@ -76,7 +76,7 @@ def create_merkle_proof(merkle_tree: MerkleTree, puzzle_hash: bytes32) -> Progra
     To spend a p2_1_of_n clawback we recreate the full merkle tree
     The required proof is then selected from the merkle tree based on the puzzle_hash of the puzzle we
     want to execute
-    Returns a proof: (int, List[bytes32]) which can be provided to the p2_1_of_n solution
+    Returns a proof: (int, list[bytes32]) which can be provided to the p2_1_of_n solution
     """
     proof = merkle_tree.generate_proof(puzzle_hash)
     program: Program = Program.to((proof[0], proof[1][0]))
@@ -140,7 +140,7 @@ def match_clawback_puzzle(
         DEFAULT_CONSTANTS.MAX_BLOCK_COST_CLVM // 8,
     )
     metadata: Optional[ClawbackMetadata] = None
-    new_puzhash: Set[bytes32] = set()
+    new_puzhash: set[bytes32] = set()
     if conditions is not None:
         for condition in conditions:
             if (

chia/wallet/puzzles/clawback/puzzle_decorator.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any, Dict, List, Tuple
+from typing import Any
 
 from chia.types.blockchain_format.program import Program
 from chia.types.blockchain_format.sized_bytes import bytes32
@@ -21,7 +21,7 @@ class ClawbackPuzzleDecorator:
     time_lock: uint64
 
     @staticmethod
-    def create(config: Dict[str, Any]) -> ClawbackPuzzleDecorator:
+    def create(config: dict[str, Any]) -> ClawbackPuzzleDecorator:
         self = ClawbackPuzzleDecorator()
         self.time_lock = uint64(config.get("clawback_timelock", 0))
         return self
@@ -34,15 +34,15 @@ class ClawbackPuzzleDecorator:
         self,
         inner_puzzle: Program,
         target_puzzle_hash: bytes32,
-    ) -> Tuple[Program, bytes32]:
+    ) -> tuple[Program, bytes32]:
         return (
             self.decorate(inner_puzzle),
             create_merkle_puzzle(self.time_lock, inner_puzzle.get_tree_hash(), target_puzzle_hash).get_tree_hash(),
         )
 
     def solve(
-        self, inner_puzzle: Program, primaries: List[Payment], inner_solution: Program
-    ) -> Tuple[Program, Program]:
+        self, inner_puzzle: Program, primaries: list[Payment], inner_solution: Program
+    ) -> tuple[Program, Program]:
         # Append REMARK condition [1, "CLAWBACK", TIME_LOCK, SENDER_PUZHSAH, RECIPIENT_PUZHSAH]
         if len(primaries) == 1:
             recipient_puzhash = primaries[0].puzzle_hash
@@ -61,7 +61,7 @@ class ClawbackPuzzleDecorator:
         return self.decorate(inner_puzzle), inner_solution
 
     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]]:
         memos.insert(0, target_puzzle_hash)
         return self.decorate(inner_puzzle), memos

chia/wallet/puzzles/load_clvm.py

@@ -6,7 +6,6 @@ import os
 import pathlib
 import sys
 import tempfile
-from typing import List
 
 import importlib_resources
 from clvm_tools_rs import compile_clvm as compile_clvm_rust
@@ -40,7 +39,7 @@ if "CLVM_TOOLS" in os.environ:
     compile_clvm_py = compile_clvm_py_candidate
 
 
-def compile_clvm_in_lock(full_path: pathlib.Path, output: pathlib.Path, search_paths: List[pathlib.Path]):
+def compile_clvm_in_lock(full_path: pathlib.Path, output: pathlib.Path, search_paths: list[pathlib.Path]):
     # Compile using rust (default)
 
     # Ensure path translation is done in the idiomatic way currently
@@ -75,7 +74,7 @@ def compile_clvm_in_lock(full_path: pathlib.Path, output: pathlib.Path, search_p
     return res
 
 
-def compile_clvm(full_path: pathlib.Path, output: pathlib.Path, search_paths: List[pathlib.Path] = []):
+def compile_clvm(full_path: pathlib.Path, output: pathlib.Path, search_paths: list[pathlib.Path] = []):
     with Lockfile.create(pathlib.Path(tempfile.gettempdir()) / "clvm_compile" / full_path.name):
         compile_clvm_in_lock(full_path, output, search_paths)
 

chia/wallet/puzzles/p2_conditions.py

@@ -13,8 +13,7 @@ the doctor ordered.
 from __future__ import annotations
 
 from chia.types.blockchain_format.program import Program
-
-from .load_clvm import load_clvm_maybe_recompile
+from chia.wallet.puzzles.load_clvm import load_clvm_maybe_recompile
 
 MOD = load_clvm_maybe_recompile("p2_conditions.clsp")
 

chia/wallet/puzzles/p2_delegated_conditions.py

@@ -8,8 +8,7 @@ is returned literally.
 from __future__ import annotations
 
 from chia.types.blockchain_format.program import Program
-
-from .load_clvm import load_clvm_maybe_recompile
+from chia.wallet.puzzles.load_clvm import load_clvm_maybe_recompile
 
 MOD = load_clvm_maybe_recompile("p2_delegated_conditions.clsp")
 

chia/wallet/puzzles/p2_delegated_puzzle.py

@@ -15,9 +15,8 @@ This roughly corresponds to bitcoin's graftroot.
 from __future__ import annotations
 
 from chia.types.blockchain_format.program import Program
-
-from . import p2_conditions
-from .load_clvm import load_clvm_maybe_recompile
+from chia.wallet.puzzles import p2_conditions
+from chia.wallet.puzzles.load_clvm import load_clvm_maybe_recompile
 
 MOD = load_clvm_maybe_recompile("p2_delegated_puzzle.clsp")
 

chia/wallet/puzzles/p2_delegated_puzzle_or_hidden_puzzle.py

@@ -67,14 +67,13 @@ from clvm.casts import int_from_bytes
 
 from chia.types.blockchain_format.program import Program
 from chia.types.blockchain_format.sized_bytes import bytes32
+from chia.wallet.puzzles.load_clvm import load_clvm_maybe_recompile
+from chia.wallet.puzzles.p2_conditions import puzzle_for_conditions
 from chia.wallet.util.curry_and_treehash import calculate_hash_of_quoted_mod_hash, curry_and_treehash, shatree_atom
 
-from .load_clvm import load_clvm_maybe_recompile
-from .p2_conditions import puzzle_for_conditions
-
 DEFAULT_HIDDEN_PUZZLE = Program.from_bytes(bytes.fromhex("ff0980"))
 
-DEFAULT_HIDDEN_PUZZLE_HASH = DEFAULT_HIDDEN_PUZZLE.get_tree_hash()  # this puzzle `(x)` always fails
+DEFAULT_HIDDEN_PUZZLE_HASH = DEFAULT_HIDDEN_PUZZLE.get_tree_hash()  # this puzzle `(=)` always fails
 
 MOD = load_clvm_maybe_recompile("p2_delegated_puzzle_or_hidden_puzzle.clsp")
 

chia/wallet/puzzles/p2_m_of_n_delegate_direct.py

@@ -8,8 +8,7 @@ it includes N public keys, any M of which needs to sign the delegated puzzle.
 from __future__ import annotations
 
 from chia.types.blockchain_format.program import Program
-
-from .load_clvm import load_clvm_maybe_recompile
+from chia.wallet.puzzles.load_clvm import load_clvm_maybe_recompile
 
 MOD = load_clvm_maybe_recompile("p2_m_of_n_delegate_direct.clsp")
 

chia/wallet/puzzles/p2_puzzle_hash.py

@@ -9,8 +9,7 @@ from __future__ import annotations
 
 from chia.types.blockchain_format.program import Program
 from chia.types.blockchain_format.sized_bytes import bytes32
-
-from .load_clvm import load_clvm_maybe_recompile
+from chia.wallet.puzzles.load_clvm import load_clvm_maybe_recompile
 
 MOD = load_clvm_maybe_recompile("p2_puzzle_hash.clsp")
 

chia/wallet/puzzles/puzzle_utils.py

@@ -1,34 +1,34 @@
 from __future__ import annotations
 
-from typing import Any, List
+from typing import Any
 
 from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.condition_opcodes import ConditionOpcode
 from chia.util.ints import uint64
 
 
-def make_create_coin_condition(puzzle_hash: bytes32, amount: uint64, memos: List[bytes]) -> List[Any]:
+def make_create_coin_condition(puzzle_hash: bytes32, amount: uint64, memos: list[bytes]) -> list[Any]:
     condition = [ConditionOpcode.CREATE_COIN, puzzle_hash, amount]
     if len(memos) > 0:
         condition.append(memos)
     return condition
 
 
-def make_reserve_fee_condition(fee: uint64) -> List[Any]:
+def make_reserve_fee_condition(fee: uint64) -> list[Any]:
     return [ConditionOpcode.RESERVE_FEE, fee]
 
 
-def make_assert_coin_announcement(announcement_hash: bytes32) -> List[bytes]:
+def make_assert_coin_announcement(announcement_hash: bytes32) -> list[bytes]:
     return [ConditionOpcode.ASSERT_COIN_ANNOUNCEMENT, announcement_hash]
 
 
-def make_assert_puzzle_announcement(announcement_hash: bytes32) -> List[bytes]:
+def make_assert_puzzle_announcement(announcement_hash: bytes32) -> list[bytes]:
     return [ConditionOpcode.ASSERT_PUZZLE_ANNOUNCEMENT, announcement_hash]
 
 
-def make_create_coin_announcement(message: bytes) -> List[bytes]:
+def make_create_coin_announcement(message: bytes) -> list[bytes]:
     return [ConditionOpcode.CREATE_COIN_ANNOUNCEMENT, message]
 
 
-def make_create_puzzle_announcement(message: bytes) -> List[bytes]:
+def make_create_puzzle_announcement(message: bytes) -> list[bytes]:
     return [ConditionOpcode.CREATE_PUZZLE_ANNOUNCEMENT, message]

chia/wallet/puzzles/singleton_top_layer.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
-from typing import Iterator, List, Optional, Tuple
+from collections.abc import Iterator
+from typing import Optional
 
 from chia.types.blockchain_format.coin import Coin
 from chia.types.blockchain_format.program import Program
@@ -159,7 +160,7 @@ MELT_CONDITION = [ConditionOpcode.CREATE_COIN, 0, ESCAPE_VALUE]
 #
 
 
-def match_singleton_puzzle(puzzle: Program) -> Tuple[bool, Iterator[Program]]:
+def match_singleton_puzzle(puzzle: Program) -> tuple[bool, Iterator[Program]]:
     mod, curried_args = puzzle.uncurry()
     if mod == SINGLETON_MOD:
         return True, curried_args.as_iter()
@@ -185,8 +186,8 @@ def adapt_inner_puzzle_hash_to_singleton(inner_puzzle_hash: bytes32) -> bytes32:
 
 # Take standard coin and amount -> launch conditions & launcher coin solution
 def launch_conditions_and_coinsol(
-    coin: Coin, inner_puzzle: Program, comment: List[Tuple[str, str]], amount: uint64
-) -> Tuple[List[Program], CoinSpend]:
+    coin: Coin, inner_puzzle: Program, comment: list[tuple[str, str]], amount: uint64
+) -> tuple[list[Program], CoinSpend]:
     if (amount % 2) == 0:
         raise ValueError("Coin amount cannot be even. Subtract one mojo.")
 
@@ -271,7 +272,7 @@ def claim_p2_singleton(
     launcher_id: bytes32,
     delay_time: Optional[uint64] = None,
     delay_ph: Optional[bytes32] = None,
-) -> Tuple[Program, Program, CoinSpend]:
+) -> tuple[Program, Program, CoinSpend]:
     assertion = Program.to([ConditionOpcode.ASSERT_COIN_ANNOUNCEMENT, std_hash(p2_singleton_coin.name() + b"$")])
     announcement = Program.to([ConditionOpcode.CREATE_PUZZLE_ANNOUNCEMENT, p2_singleton_coin.name()])
     if delay_time is None or delay_ph is None:

chia/wallet/puzzles/singleton_top_layer_v1_1.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
-from typing import Iterator, List, Optional, Tuple
+from collections.abc import Iterator
+from typing import Optional
 
 from chia.types.blockchain_format.coin import Coin
 from chia.types.blockchain_format.program import Program
@@ -160,7 +161,7 @@ MELT_CONDITION = [ConditionOpcode.CREATE_COIN, 0, ESCAPE_VALUE]
 #
 
 
-def match_singleton_puzzle(puzzle: UncurriedPuzzle) -> Tuple[bool, Iterator[Program]]:
+def match_singleton_puzzle(puzzle: UncurriedPuzzle) -> tuple[bool, Iterator[Program]]:
     if puzzle.mod == SINGLETON_MOD:
         return True, puzzle.args.as_iter()
     else:
@@ -176,9 +177,9 @@ def generate_launcher_coin(coin: Coin, amount: uint64) -> Coin:
 def launch_conditions_and_coinsol(
     coin: Coin,
     inner_puzzle: Program,
-    comment: List[Tuple[str, str]],
+    comment: list[tuple[str, str]],
     amount: uint64,
-) -> Tuple[List[Program], CoinSpend]:
+) -> tuple[list[Program], CoinSpend]:
     if (amount % 2) == 0:
         raise ValueError("Coin amount cannot be even. Subtract one mojo.")
 
@@ -309,7 +310,7 @@ def claim_p2_singleton(
     launcher_id: bytes32,
     delay_time: Optional[uint64] = None,
     delay_ph: Optional[bytes32] = None,
-) -> Tuple[Program, Program, CoinSpend]:
+) -> tuple[Program, Program, CoinSpend]:
     assertion = Program.to([ConditionOpcode.ASSERT_COIN_ANNOUNCEMENT, std_hash(p2_singleton_coin.name() + b"$")])
     announcement = Program.to([ConditionOpcode.CREATE_PUZZLE_ANNOUNCEMENT, p2_singleton_coin.name()])
     if delay_time is None or delay_ph is None: