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

chia/apis/introducer_stub.py

@@ -0,0 +1,35 @@
+from __future__ import annotations
+
+import logging
+from typing import ClassVar
+
+from typing_extensions import Protocol
+
+from chia.protocols.introducer_protocol import RequestPeersIntroducer
+from chia.protocols.outbound_message import Message
+from chia.server.api_protocol import ApiMetadata, ApiProtocol
+from chia.server.ws_connection import WSChiaConnection
+
+
+class IntroducerApiStub(ApiProtocol, Protocol):
+    """Non-functional API stub for IntroducerAPI
+
+    This is a protocol definition only - methods are not implemented and should
+    never be called. Use the actual IntroducerAPI implementation at runtime.
+    """
+
+    log: logging.Logger
+    metadata: ClassVar[ApiMetadata] = ApiMetadata()
+
+    def ready(self) -> bool:
+        """Check if the introducer is ready."""
+        ...
+
+    @metadata.request(peer_required=True)
+    async def request_peers_introducer(
+        self,
+        request: RequestPeersIntroducer,
+        peer: WSChiaConnection,
+    ) -> Message | None:
+        """Handle request for peers from a node."""
+        ...

chia/apis/solver_stub.py

@@ -0,0 +1,30 @@
+from __future__ import annotations
+
+import logging
+from typing import ClassVar
+
+from typing_extensions import Protocol
+
+from chia.protocols.outbound_message import Message
+from chia.protocols.solver_protocol import SolverInfo
+from chia.server.api_protocol import ApiMetadata, ApiProtocol
+
+
+class SolverApiStub(ApiProtocol, Protocol):
+    """Non-functional API stub for SolverAPI
+
+    This is a protocol definition only - methods are not implemented and should
+    never be called. Use the actual SolverAPI implementation at runtime.
+    """
+
+    log: logging.Logger
+    metadata: ClassVar[ApiMetadata] = ApiMetadata()
+
+    def ready(self) -> bool:
+        """Check if the solver is ready."""
+        ...
+
+    @metadata.request(peer_required=False)
+    async def solve(self, request: SolverInfo) -> Message | None:
+        """Handle solver request."""
+        ...

chia/apis/stub_protocol_registry.py

@@ -0,0 +1,21 @@
+from __future__ import annotations
+
+from chia.apis.farmer_stub import FarmerApiStub
+from chia.apis.full_node_stub import FullNodeApiStub
+from chia.apis.harvester_stub import HarvesterApiStub
+from chia.apis.introducer_stub import IntroducerApiStub
+from chia.apis.solver_stub import SolverApiStub
+from chia.apis.timelord_stub import TimelordApiStub
+from chia.apis.wallet_stub import WalletNodeApiStub
+from chia.protocols.outbound_message import NodeType
+from chia.server.api_protocol import ApiMetadata
+
+StubMetadataRegistry: dict[NodeType, ApiMetadata] = {
+    NodeType.FULL_NODE: FullNodeApiStub.metadata,
+    NodeType.WALLET: WalletNodeApiStub.metadata,
+    NodeType.INTRODUCER: IntroducerApiStub.metadata,
+    NodeType.TIMELORD: TimelordApiStub.metadata,
+    NodeType.FARMER: FarmerApiStub.metadata,
+    NodeType.HARVESTER: HarvesterApiStub.metadata,
+    NodeType.SOLVER: SolverApiStub.metadata,
+}

chia/apis/timelord_stub.py

@@ -0,0 +1,39 @@
+from __future__ import annotations
+
+import logging
+from typing import ClassVar
+
+from typing_extensions import Protocol
+
+from chia.protocols.timelord_protocol import NewPeakTimelord, NewUnfinishedBlockTimelord, RequestCompactProofOfTime
+from chia.server.api_protocol import ApiMetadata, ApiProtocol
+
+
+class TimelordApiStub(ApiProtocol, Protocol):
+    """Non-functional API stub for TimelordAPI
+
+    This is a protocol definition only - methods are not implemented and should
+    never be called. Use the actual TimelordAPI implementation at runtime.
+    """
+
+    log: logging.Logger
+    metadata: ClassVar[ApiMetadata] = ApiMetadata()
+
+    def ready(self) -> bool:
+        """Check if the timelord is ready."""
+        ...
+
+    @metadata.request()
+    async def new_peak_timelord(self, new_peak: NewPeakTimelord) -> None:
+        """Handle new peak from full node."""
+        ...
+
+    @metadata.request()
+    async def new_unfinished_block_timelord(self, new_unfinished_block: NewUnfinishedBlockTimelord) -> None:
+        """Handle new unfinished block from full node."""
+        ...
+
+    @metadata.request()
+    async def request_compact_proof_of_time(self, vdf_info: RequestCompactProofOfTime) -> None:
+        """Handle request for compact proof of time."""
+        ...

chia/apis/wallet_stub.py

@@ -0,0 +1,161 @@
+from __future__ import annotations
+
+import logging
+from typing import ClassVar
+
+from chia_rs import RespondToPhUpdates
+from typing_extensions import Protocol
+
+from chia.protocols import full_node_protocol, introducer_protocol, wallet_protocol
+from chia.protocols.wallet_protocol import (
+    CoinStateUpdate,
+    RejectAdditionsRequest,
+    RejectBlockHeaders,
+    RejectHeaderBlocks,
+    RejectHeaderRequest,
+    RejectPuzzleSolution,
+    RejectRemovalsRequest,
+    RespondAdditions,
+    RespondBlockHeader,
+    RespondBlockHeaders,
+    RespondChildren,
+    RespondHeaderBlocks,
+    RespondPuzzleSolution,
+    RespondRemovals,
+    RespondSESInfo,
+    RespondToCoinUpdates,
+    TransactionAck,
+)
+from chia.server.api_protocol import ApiMetadata, ApiProtocol
+from chia.server.ws_connection import WSChiaConnection
+
+
+class WalletNodeApiStub(ApiProtocol, Protocol):
+    """Non-functional API stub for WalletNodeAPI
+
+    This is a protocol definition only - methods are not implemented and should
+    never be called. Use the actual WalletNodeAPI implementation at runtime.
+    """
+
+    log: logging.Logger
+    metadata: ClassVar[ApiMetadata] = ApiMetadata()
+
+    def ready(self) -> bool:
+        """Check if the wallet is ready."""
+        ...
+
+    @metadata.request(peer_required=True)
+    async def respond_removals(self, response: RespondRemovals, peer: WSChiaConnection) -> None:
+        """Handle removals response from full node."""
+        ...
+
+    async def reject_removals_request(self, response: RejectRemovalsRequest, peer: WSChiaConnection) -> None:
+        """Handle reject removals request from full node."""
+        ...
+
+    @metadata.request()
+    async def reject_additions_request(self, response: RejectAdditionsRequest) -> None:
+        """Handle reject additions request from full node."""
+        ...
+
+    @metadata.request(peer_required=True, execute_task=True)
+    async def new_peak_wallet(self, peak: wallet_protocol.NewPeakWallet, peer: WSChiaConnection) -> None:
+        """Handle new peak from full node."""
+        ...
+
+    @metadata.request()
+    async def reject_header_request(self, response: RejectHeaderRequest) -> None:
+        """Handle reject header request from full node."""
+        ...
+
+    @metadata.request()
+    async def respond_block_header(self, response: RespondBlockHeader) -> None:
+        """Handle block header response from full node."""
+        ...
+
+    @metadata.request(peer_required=True)
+    async def respond_additions(self, response: RespondAdditions, peer: WSChiaConnection) -> None:
+        """Handle additions response from full node."""
+        ...
+
+    @metadata.request()
+    async def respond_proof_of_weight(self, response: full_node_protocol.RespondProofOfWeight) -> None:
+        """Handle proof of weight response from full node."""
+        ...
+
+    @metadata.request(peer_required=True)
+    async def transaction_ack(self, ack: TransactionAck, peer: WSChiaConnection) -> None:
+        """Handle transaction acknowledgment from full node."""
+        ...
+
+    @metadata.request(peer_required=True)
+    async def respond_peers_introducer(
+        self, request: introducer_protocol.RespondPeersIntroducer, peer: WSChiaConnection
+    ) -> None:
+        """Handle peers response from introducer."""
+        ...
+
+    @metadata.request(peer_required=True)
+    async def respond_peers(self, request: full_node_protocol.RespondPeers, peer: WSChiaConnection) -> None:
+        """Handle peers response from full node."""
+        ...
+
+    @metadata.request()
+    async def respond_puzzle_solution(self, request: RespondPuzzleSolution) -> None:
+        """Handle puzzle solution response from full node."""
+        ...
+
+    @metadata.request()
+    async def reject_puzzle_solution(self, request: RejectPuzzleSolution) -> None:
+        """Handle reject puzzle solution from full node."""
+        ...
+
+    @metadata.request()
+    async def respond_header_blocks(self, request: RespondHeaderBlocks) -> None:
+        """Handle header blocks response from full node."""
+        ...
+
+    @metadata.request()
+    async def respond_block_headers(self, request: RespondBlockHeaders) -> None:
+        """Handle block headers response from full node."""
+        ...
+
+    @metadata.request()
+    async def reject_header_blocks(self, request: RejectHeaderBlocks) -> None:
+        """Handle reject header blocks from full node."""
+        ...
+
+    @metadata.request()
+    async def reject_block_headers(self, request: RejectBlockHeaders) -> None:
+        """Handle reject block headers from full node."""
+        ...
+
+    @metadata.request(peer_required=True, execute_task=True)
+    async def coin_state_update(self, request: CoinStateUpdate, peer: WSChiaConnection) -> None:
+        """Handle coin state update from full node."""
+        ...
+
+    @metadata.request()  # type: ignore[type-var]
+    async def respond_to_ph_updates(self, request: RespondToPhUpdates) -> None:
+        """Handle puzzle hash updates response from full node."""
+        ...
+
+    @metadata.request()
+    async def respond_to_coin_updates(self, request: RespondToCoinUpdates) -> None:
+        """Handle coin updates response from full node."""
+        ...
+
+    @metadata.request()
+    async def respond_children(self, request: RespondChildren) -> None:
+        """Handle children response from full node."""
+        ...
+
+    @metadata.request()
+    async def respond_ses_hashes(self, request: RespondSESInfo) -> None:
+        """Handle SES hashes response from full node."""
+        ...
+
+    @metadata.request()
+    async def respond_blocks(self, request: full_node_protocol.RespondBlocks) -> None:
+        """Handle blocks response from full node."""
+        ...

chia/cmds/beta.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 import zipfile
 from datetime import datetime
 from pathlib import Path
-from typing import Optional
 
 import click
 
@@ -37,7 +36,7 @@ def beta_cmd() -> None:
 @click.option("-p", "--path", help="The beta mode root path", type=str, required=False)
 @click.option("-i", "--interval", help="System metrics will be logged based on this interval", type=int, required=False)
 @click.pass_context
-def configure(ctx: click.Context, path: Optional[str], interval: Optional[int]) -> None:
+def configure(ctx: click.Context, path: str | None, interval: int | None) -> None:
     root_path = ChiaCliContext.set_default(ctx).root_path
     with lock_and_load_config(root_path, "config.yaml") as config:
         if "beta" not in config:
@@ -79,7 +78,7 @@ def configure(ctx: click.Context, path: Optional[str], interval: Optional[int])
 )
 @click.option("-p", "--path", help="The beta mode root path", type=str, required=False)
 @click.pass_context
-def enable_cmd(ctx: click.Context, force: bool, path: Optional[str]) -> None:
+def enable_cmd(ctx: click.Context, force: bool, path: str | None) -> None:
     root_path = ChiaCliContext.set_default(ctx).root_path
     with lock_and_load_config(root_path, "config.yaml") as config:
         if config.get("beta", {}).get("enabled", False):
@@ -92,7 +91,7 @@ def enable_cmd(ctx: click.Context, force: bool, path: Optional[str]) -> None:
         current_path = config.get("beta", {}).get("path")
         current_path = None if current_path is None else Path(current_path)
 
-        path_to_use: Optional[Path] = None if path is None else Path(path)
+        path_to_use: Path | None = None if path is None else Path(path)
         if path_to_use is None:
             path_to_use = current_path
 

chia/cmds/beta_funcs.py

@@ -2,8 +2,9 @@ from __future__ import annotations
 
 import os
 import sys
+from collections.abc import Callable
 from pathlib import Path
-from typing import Any, Callable, Optional
+from typing import Any
 
 import click
 
@@ -36,7 +37,7 @@ def prompt_beta_warning() -> bool:
 
 
 def prompt_for_beta_path(default_path: Path) -> Path:
-    path: Optional[Path] = None
+    path: Path | None = None
     for _ in range(3):
         user_input = input(
             "\nEnter a directory where the beta test logs can be stored or press enter to use the default "
@@ -65,7 +66,7 @@ def prompt_for_beta_path(default_path: Path) -> Path:
 
 
 def prompt_for_metrics_log_interval(default_interval: int) -> int:
-    interval: Optional[int] = None
+    interval: int | None = None
     for _ in range(3):
         user_input = input(
             "\nEnter a number of seconds as interval in which analytics getting logged, press enter to use the default "

chia/cmds/check_wallet_db.py

@@ -6,7 +6,7 @@ from collections import defaultdict
 from collections.abc import Iterable
 from pathlib import Path
 from sqlite3 import Row
-from typing import Any, Optional
+from typing import Any
 
 from chia.util.collection import find_duplicates
 from chia.util.db_synchronous import db_synchronous_on
@@ -208,7 +208,7 @@ class WalletDBReader:
     db_wrapper: DBWrapper2  # TODO: Remove db_wrapper member
     # TODO: make this a dataclass and make this an instance attribute instead of a mutable classvar
     config = {"db_readers": 1}  # noqa: RUF012
-    sql_log_path: Optional[Path] = None
+    sql_log_path: Path | None = None
     verbose = False
 
     async def get_all_wallets(self) -> list[Wallet]:
@@ -258,7 +258,7 @@ class WalletDBReader:
             except Exception as e:
                 errors.append(f"Exception while trying to access wallet {main_wallet_id} from users_wallets: {e}")
 
-            max_id: Optional[int] = None
+            max_id: int | None = None
             max_id_row = await execute_fetchone(reader, "SELECT MAX(id) FROM users_wallets")
             if max_id_row is None:
                 errors.append("Error fetching max wallet ID from table users_wallets. No wallets ?!?")
@@ -397,7 +397,7 @@ class WalletDBReader:
         return len(errors)
 
 
-async def scan(root_path: Path, db_path: Optional[str] = None, *, verbose: bool = False) -> None:
+async def scan(root_path: Path, db_path: str | None = None, *, verbose: bool = False) -> None:
     if db_path is None:
         wallet_db_path = root_path / "wallet" / "db"
         wallet_db_paths = list(wallet_db_path.glob("blockchain_wallet_*.sqlite"))

chia/cmds/chia.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from io import TextIOWrapper
-from typing import Optional
 
 import click
 
@@ -60,7 +59,7 @@ def cli(
     ctx: click.Context,
     root_path: str,
     keys_root_path: str,
-    passphrase_file: Optional[TextIOWrapper] = None,
+    passphrase_file: TextIOWrapper | None = None,
 ) -> None:
     from pathlib import Path
 

chia/cmds/cmd_classes.py

@@ -5,14 +5,12 @@ import collections
 import dataclasses
 import inspect
 import pathlib
+from collections.abc import Callable
 from dataclasses import MISSING, dataclass, field, fields
 from typing import (
     Any,
-    Callable,
     ClassVar,
-    Optional,
     Protocol,
-    Union,
     final,
     get_args,
     get_origin,
@@ -40,7 +38,7 @@ class AsyncChiaCommand(Protocol):
     async def run(self) -> None: ...
 
 
-ChiaCommand = Union[SyncChiaCommand, AsyncChiaCommand]
+ChiaCommand = SyncChiaCommand | AsyncChiaCommand
 
 
 def option(*param_decls: str, **kwargs: Any) -> Any:
@@ -62,11 +60,11 @@ class ChiaCliContext:
 
     root_path: pathlib.Path = DEFAULT_ROOT_PATH
     keys_root_path: pathlib.Path = DEFAULT_KEYS_ROOT_PATH
-    expected_prefix: Optional[str] = None
-    rpc_port: Optional[int] = None
-    keys_fingerprint: Optional[int] = None
-    keys_filename: Optional[str] = None
-    expected_address_prefix: Optional[str] = None
+    expected_prefix: str | None = None
+    rpc_port: int | None = None
+    keys_fingerprint: int | None = None
+    keys_filename: str | None = None
+    expected_address_prefix: str | None = None
 
     @classmethod
     def set_default(cls, ctx: click.Context) -> ChiaCliContext:
@@ -82,7 +80,7 @@ class ChiaCliContext:
 class HexString(click.ParamType):
     name = "hexstring"
 
-    def convert(self, value: str, param: Optional[click.Parameter], ctx: Optional[click.Context]) -> bytes:
+    def convert(self, value: str, param: click.Parameter | None, ctx: click.Context | None) -> bytes:
         if isinstance(value, bytes):  # This if is due to some poor handling on click's part
             return value
         try:
@@ -94,7 +92,7 @@ class HexString(click.ParamType):
 class HexString32(click.ParamType):
     name = "hexstring32"
 
-    def convert(self, value: str, param: Optional[click.Parameter], ctx: Optional[click.Context]) -> bytes32:
+    def convert(self, value: str, param: click.Parameter | None, ctx: click.Context | None) -> bytes32:
         if isinstance(value, bytes32):  # This if is due to some poor handling on click's part
             return value
         try:
@@ -255,7 +253,7 @@ def _convert_class_to_function(cls: type[ChiaCommand]) -> SyncCmd:
 @dataclass_transform(frozen_default=True)
 def chia_command(
     *,
-    group: Optional[click.Group] = None,
+    group: click.Group | None = None,
     name: str,
     short_help: str,
     help: str,
@@ -294,7 +292,7 @@ class Metadata:
 
 
 def get_chia_command_metadata(cls: type[ChiaCommand]) -> Metadata:
-    metadata: Optional[Metadata] = getattr(cls, _chia_command_metadata_attribute, None)
+    metadata: Metadata | None = getattr(cls, _chia_command_metadata_attribute, None)
     if metadata is None:
         raise Exception(f"Class is not a chia command: {cls}")
 

chia/cmds/cmd_helpers.py

@@ -1,11 +1,11 @@
 from __future__ import annotations
 
-from collections.abc import AsyncIterator, Coroutine, Sequence
+from collections.abc import AsyncIterator, Callable, Coroutine, Sequence
 from contextlib import asynccontextmanager
 from dataclasses import dataclass, field
 from functools import cached_property
 from pathlib import Path
-from typing import Any, Callable, Optional, TypeVar
+from typing import Any, TypeVar
 
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint64
@@ -29,8 +29,8 @@ class WalletClientInfo:
 @command_helper
 class NeedsWalletRPC:
     context: ChiaCliContext = field(default_factory=ChiaCliContext)
-    client_info: Optional[WalletClientInfo] = None
-    wallet_rpc_port: Optional[int] = option(
+    client_info: WalletClientInfo | None = None
+    wallet_rpc_port: int | None = option(
         "-wp",
         "--wallet-rpc_port",
         help=(
@@ -39,7 +39,7 @@ class NeedsWalletRPC:
         type=int,
         default=None,
     )
-    fingerprint: Optional[int] = option(
+    fingerprint: int | None = option(
         "-f",
         "--fingerprint",
         help="Fingerprint of the wallet to use",
@@ -78,7 +78,7 @@ class TransactionsIn:
 
 @command_helper
 class TransactionsOut:
-    transaction_file_out: Optional[str] = option(
+    transaction_file_out: str | None = option(
         "--transaction-file-out",
         type=str,
         default=None,
@@ -138,7 +138,7 @@ class NeedsCoinSelectionConfig:
 
 @command_helper
 class NeedsTXConfig(NeedsCoinSelectionConfig):
-    reuse: Optional[bool] = option(
+    reuse: bool | None = option(
         "--reuse/--new-address",
         "--reuse-puzhash/--generate-new-puzhash",
         help="Reuse existing address for the change.",
@@ -189,7 +189,7 @@ class TransactionEndpoint:
     push: bool = option(
         "--push/--no-push", help="Push the transaction to the network", type=bool, is_flag=True, default=True
     )
-    valid_at: Optional[int] = option(
+    valid_at: int | None = option(
         "--valid-at",
         help="UNIX timestamp at which the associated transactions become valid",
         type=int,
@@ -197,7 +197,7 @@ class TransactionEndpoint:
         default=None,
         hidden=True,
     )
-    expires_at: Optional[int] = option(
+    expires_at: int | None = option(
         "--expires-at",
         help="UNIX timestamp at which the associated transactions expire",
         type=int,
@@ -223,14 +223,14 @@ class TransactionEndpoint:
 
 @dataclass(frozen=True)
 class TransactionEndpointWithTimelocks(TransactionEndpoint):
-    valid_at: Optional[int] = option(
+    valid_at: int | None = option(
         "--valid-at",
         help="UNIX timestamp at which the associated transactions become valid",
         type=int,
         required=False,
         default=None,
     )
-    expires_at: Optional[int] = option(
+    expires_at: int | None = option(
         "--expires-at",
         help="UNIX timestamp at which the associated transactions expire",
         type=int,

chia/cmds/cmds_util.py

@@ -4,10 +4,10 @@ import contextlib
 import dataclasses
 import logging
 import traceback
-from collections.abc import AsyncIterator
+from collections.abc import AsyncIterator, Callable
 from contextlib import asynccontextmanager
 from pathlib import Path
-from typing import Any, Callable, Optional, TypeVar
+from typing import Any, TypeVar
 
 import click
 from aiohttp import ClientConnectorCertificateError, ClientConnectorError
@@ -98,7 +98,7 @@ async def validate_client_connection(
 async def get_any_service_client(
     client_type: type[_T_RpcClient],
     root_path: Path,
-    rpc_port: Optional[int] = None,
+    rpc_port: int | None = None,
     consume_errors: bool = True,
     use_ssl: bool = True,
 ) -> AsyncIterator[tuple[_T_RpcClient, dict[str, Any]]]:
@@ -154,9 +154,9 @@ async def get_any_service_client(
             print(f"Exception from '{node_type}' {e}:\n{traceback.format_exc()}")
 
 
-async def get_wallet(root_path: Path, wallet_client: WalletRpcClient, fingerprint: Optional[int]) -> int:
+async def get_wallet(root_path: Path, wallet_client: WalletRpcClient, fingerprint: int | None) -> int:
     selected_fingerprint: int
-    keychain_proxy: Optional[KeychainProxy] = None
+    keychain_proxy: KeychainProxy | None = None
     all_keys: list[KeyData] = []
 
     try:
@@ -176,8 +176,8 @@ async def get_wallet(root_path: Path, wallet_client: WalletRpcClient, fingerprin
                 # if only a single key is available, select it automatically
                 selected_fingerprint = fingerprints[0]
             else:
-                logged_in_fingerprint: Optional[int] = (await wallet_client.get_logged_in_fingerprint()).fingerprint
-                logged_in_key: Optional[KeyData] = None
+                logged_in_fingerprint: int | None = (await wallet_client.get_logged_in_fingerprint()).fingerprint
+                logged_in_key: KeyData | None = None
                 if logged_in_fingerprint is not None:
                     logged_in_key = next((key for key in all_keys if key.fingerprint == logged_in_fingerprint), None)
                 current_sync_status: str = ""
@@ -251,8 +251,8 @@ async def get_wallet(root_path: Path, wallet_client: WalletRpcClient, fingerprin
 @asynccontextmanager
 async def get_wallet_client(
     root_path: Path,
-    wallet_rpc_port: Optional[int] = None,
-    fingerprint: Optional[int] = None,
+    wallet_rpc_port: int | None = None,
+    fingerprint: int | None = None,
     consume_errors: bool = True,
 ) -> AsyncIterator[tuple[WalletRpcClient, int, dict[str, Any]]]:
     async with get_any_service_client(WalletRpcClient, root_path, wallet_rpc_port, consume_errors) as (
@@ -321,7 +321,7 @@ def tx_config_args(func: Callable[..., None]) -> Callable[..., None]:
     )(coin_selection_args(func))
 
 
-def timelock_args(enable: Optional[bool] = None) -> Callable[[Callable[..., None]], Callable[..., None]]:
+def timelock_args(enable: bool | None = None) -> Callable[[Callable[..., None]], Callable[..., None]]:
     def _timelock_args(func: Callable[..., None]) -> Callable[..., None]:
         def _convert_timelock_args_to_cvt(*args: Any, **kwargs: Any) -> None:
             func(
@@ -361,11 +361,11 @@ class TransactionBundle(Streamable):
 
 
 def tx_out_cmd(
-    enable_timelock_args: Optional[bool] = None,
+    enable_timelock_args: bool | None = None,
 ) -> Callable[[Callable[..., list[TransactionRecord]]], Callable[..., None]]:
     def _tx_out_cmd(func: Callable[..., list[TransactionRecord]]) -> Callable[..., None]:
         @timelock_args(enable=enable_timelock_args)
-        def original_cmd(transaction_file_out: Optional[str] = None, **kwargs: Any) -> None:
+        def original_cmd(transaction_file_out: str | None = None, **kwargs: Any) -> None:
             txs: list[TransactionRecord] = func(**kwargs)
             if transaction_file_out is not None:
                 print(f"Writing transactions to file {transaction_file_out}:")
@@ -391,8 +391,8 @@ def tx_out_cmd(
 class CMDCoinSelectionConfigLoader:
     min_coin_amount: CliAmount = cli_amount_none
     max_coin_amount: CliAmount = cli_amount_none
-    excluded_coin_amounts: Optional[list[CliAmount]] = None
-    excluded_coin_ids: Optional[list[bytes32]] = None
+    excluded_coin_amounts: list[CliAmount] | None = None
+    excluded_coin_ids: list[bytes32] | None = None
 
     def to_coin_selection_config(self, mojo_per_unit: int) -> CoinSelectionConfig:
         return CoinSelectionConfigLoader(
@@ -409,7 +409,7 @@ class CMDCoinSelectionConfigLoader:
 
 @dataclasses.dataclass(frozen=True)
 class CMDTXConfigLoader(CMDCoinSelectionConfigLoader):
-    reuse_puzhash: Optional[bool] = None
+    reuse_puzhash: bool | None = None
 
     def to_tx_config(self, mojo_per_unit: int, config: dict[str, Any], fingerprint: int) -> TXConfig:
         cs_config = self.to_coin_selection_config(mojo_per_unit)