chia-blockchain 2.5.7rc4__py3-none-any.whl → 2.6.0rc2__py3-none-any.whl

chia/cmds/dump_keyring.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 import os
 from io import TextIOWrapper
 from pathlib import Path
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import click
 import colorama
@@ -48,8 +48,8 @@ def get_passphrase_prompt(keyring_file: str) -> str:
 )
 @click.option("--passphrase-file", type=click.File("r"), help="File or descriptor to read the passphrase from")
 @click.option("--pretty-print", is_flag=True, default=False)
-def dump(keyring_file: str, full_payload: bool, passphrase_file: Optional[TextIOWrapper], pretty_print: bool) -> None:
-    saved_passphrase: Optional[str] = KeyringWrapper.get_shared_instance().get_master_passphrase_from_credential_store()
+def dump(keyring_file: str, full_payload: bool, passphrase_file: TextIOWrapper | None, pretty_print: bool) -> None:
+    saved_passphrase: str | None = KeyringWrapper.get_shared_instance().get_master_passphrase_from_credential_store()
     passphrase: str = saved_passphrase or DEFAULT_PASSPHRASE_IF_NO_MASTER_PASSPHRASE
     prompt: str = get_passphrase_prompt(keyring_file)
 

chia/cmds/farm.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Optional
-
 import click
 
 from chia.cmds.cmd_classes import ChiaCliContext
@@ -59,10 +57,10 @@ def farm_cmd() -> None:
 @click.pass_context
 def summary_cmd(
     ctx: click.Context,
-    rpc_port: Optional[int],
-    wallet_rpc_port: Optional[int],
-    harvester_rpc_port: Optional[int],
-    farmer_rpc_port: Optional[int],
+    rpc_port: int | None,
+    wallet_rpc_port: int | None,
+    harvester_rpc_port: int | None,
+    farmer_rpc_port: int | None,
     include_pool_rewards: bool,
 ) -> None:
     import asyncio
@@ -99,7 +97,7 @@ def summary_cmd(
     show_default=True,
 )
 @click.pass_context
-def challenges_cmd(ctx: click.Context, farmer_rpc_port: Optional[int], limit: int) -> None:
+def challenges_cmd(ctx: click.Context, farmer_rpc_port: int | None, limit: int) -> None:
     import asyncio
 
     from chia.cmds.farm_funcs import challenges
@@ -120,7 +118,7 @@ def challenges_cmd(ctx: click.Context, farmer_rpc_port: Optional[int], limit: in
 @click.pass_context
 def connect_solver_cmd(
     ctx: click.Context,
-    farmer_rpc_port: Optional[int],
+    farmer_rpc_port: int | None,
     solver_address: str,
 ) -> None:
     import asyncio

chia/cmds/farm_funcs.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import sys
 import traceback
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 from chia_rs import BlockRecord
 
@@ -14,26 +14,27 @@ from chia.full_node.full_node_rpc_client import FullNodeRpcClient
 from chia.util.config import lock_and_load_config, save_config
 from chia.util.errors import CliRpcConnectionError
 from chia.util.network import is_localhost
+from chia.wallet.wallet_request_types import GetFarmedAmount, GetFarmedAmountResponse
 from chia.wallet.wallet_rpc_client import WalletRpcClient
 
 SECONDS_PER_BLOCK = (24 * 3600) / 4608
 
 
-async def get_harvesters_summary(farmer_rpc_port: Optional[int], root_path: Path) -> Optional[dict[str, Any]]:
+async def get_harvesters_summary(farmer_rpc_port: int | None, root_path: Path) -> dict[str, Any] | None:
     async with get_any_service_client(FarmerRpcClient, root_path, farmer_rpc_port) as (farmer_client, _):
         return await farmer_client.get_harvesters_summary()
 
 
-async def get_blockchain_state(rpc_port: Optional[int], root_path: Path) -> Optional[dict[str, Any]]:
+async def get_blockchain_state(rpc_port: int | None, root_path: Path) -> dict[str, Any] | None:
     async with get_any_service_client(FullNodeRpcClient, root_path, rpc_port) as (client, _):
         return await client.get_blockchain_state()
 
 
-async def get_average_block_time(rpc_port: Optional[int], root_path: Path) -> float:
+async def get_average_block_time(rpc_port: int | None, root_path: Path) -> float:
     async with get_any_service_client(FullNodeRpcClient, root_path, rpc_port) as (client, _):
         blocks_to_compare = 500
         blockchain_state = await client.get_blockchain_state()
-        curr: Optional[BlockRecord] = blockchain_state["peak"]
+        curr: BlockRecord | None = blockchain_state["peak"]
         if curr is None or curr.height < (blocks_to_compare + 100):
             return SECONDS_PER_BLOCK
         while curr is not None and curr.height > 0 and not curr.is_transaction_block:
@@ -51,20 +52,20 @@ async def get_average_block_time(rpc_port: Optional[int], root_path: Path) -> fl
 
 
 async def get_wallets_stats(
-    wallet_rpc_port: Optional[int],
+    wallet_rpc_port: int | None,
     root_path: Path,
     include_pool_rewards: bool,
-) -> Optional[dict[str, Any]]:
+) -> GetFarmedAmountResponse | None:
     async with get_any_service_client(WalletRpcClient, root_path, wallet_rpc_port) as (wallet_client, _):
-        return await wallet_client.get_farmed_amount(include_pool_rewards)
+        return await wallet_client.get_farmed_amount(GetFarmedAmount(include_pool_rewards))
 
 
-async def get_challenges(root_path: Path, farmer_rpc_port: Optional[int]) -> Optional[list[dict[str, Any]]]:
+async def get_challenges(root_path: Path, farmer_rpc_port: int | None) -> list[dict[str, Any]] | None:
     async with get_any_service_client(FarmerRpcClient, root_path, farmer_rpc_port) as (farmer_client, _):
         return await farmer_client.get_signage_points()
 
 
-async def challenges(root_path: Path, farmer_rpc_port: Optional[int], limit: int) -> None:
+async def challenges(root_path: Path, farmer_rpc_port: int | None, limit: int) -> None:
     signage_points = await get_challenges(root_path, farmer_rpc_port)
     if signage_points is None:
         return None
@@ -81,10 +82,10 @@ async def challenges(root_path: Path, farmer_rpc_port: Optional[int], limit: int
 
 
 async def summary(
-    rpc_port: Optional[int],
-    wallet_rpc_port: Optional[int],
-    harvester_rpc_port: Optional[int],
-    farmer_rpc_port: Optional[int],
+    rpc_port: int | None,
+    wallet_rpc_port: int | None,
+    harvester_rpc_port: int | None,
+    farmer_rpc_port: int | None,
     include_pool_rewards: bool,
     root_path: Path,
 ) -> None:
@@ -124,23 +125,23 @@ async def summary(
         print("Farming")
 
     if amounts is not None:
-        print(f"Total chia farmed: {amounts['farmed_amount'] / units['chia']}")
-        print(f"User transaction fees: {amounts['fee_amount'] / units['chia']}")
+        print(f"Total chia farmed: {amounts.farmed_amount / units['chia']}")
+        print(f"User transaction fees: {amounts.fee_amount / units['chia']}")
         if include_pool_rewards:
-            print(f"Farmer rewards: {amounts['farmer_reward_amount'] / units['chia']}")
-            print(f"Pool rewards: {amounts['pool_reward_amount'] / units['chia']}")
-            print(f"Total rewards: {(amounts['farmer_reward_amount'] + amounts['pool_reward_amount']) / units['chia']}")
+            print(f"Farmer rewards: {amounts.farmer_reward_amount / units['chia']}")
+            print(f"Pool rewards: {amounts.pool_reward_amount / units['chia']}")
+            print(f"Total rewards: {(amounts.farmer_reward_amount + amounts.pool_reward_amount) / units['chia']}")
             if blockchain_state is not None and blockchain_state["peak"] is not None:
                 peak_height = blockchain_state["peak"].height
-                blocks_since_last_farm = peak_height - amounts["last_height_farmed"]
-                print(f"Current/Last height farmed: {peak_height}/{amounts['last_height_farmed']}")
+                blocks_since_last_farm = peak_height - amounts.last_height_farmed
+                print(f"Current/Last height farmed: {peak_height}/{amounts.last_height_farmed}")
                 print(f"Blocks since last farmed: {blocks_since_last_farm}")
                 print(
                     f"Time since last farmed: {format_minutes(int((blocks_since_last_farm * SECONDS_PER_BLOCK) / 60))}"
                 )
         else:
-            print(f"Block rewards: {(amounts['farmer_reward_amount'] + amounts['pool_reward_amount']) / units['chia']}")
-            print(f"Last height farmed: {amounts['last_height_farmed']}")
+            print(f"Block rewards: {(amounts.farmer_reward_amount + amounts.pool_reward_amount) / units['chia']}")
+            print(f"Last height farmed: {amounts.last_height_farmed}")
 
     class PlotStats:
         total_plot_size = 0
@@ -220,7 +221,7 @@ async def summary(
         print("Note: log into your key using 'chia wallet show' to see rewards for each key")
 
 
-async def solver_connect(root_path: Path, farmer_rpc_port: Optional[int], solver_address: str) -> None:
+async def solver_connect(root_path: Path, farmer_rpc_port: int | None, solver_address: str) -> None:
     from chia.util.network import parse_host_port
 
     try:

chia/cmds/init_funcs.py

@@ -4,7 +4,7 @@ import os
 import shutil
 import sqlite3
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import yaml
 
@@ -61,7 +61,7 @@ def dict_add_new_default(updated: dict[str, Any], default: dict[str, Any], do_no
             updated[k] = v
 
 
-def check_keys(new_root: Path, keychain: Optional[Keychain] = None) -> None:
+def check_keys(new_root: Path, keychain: Keychain | None = None) -> None:
     if keychain is None:
         keychain = Keychain()
     all_sks = keychain.get_all_private_keys()
@@ -216,12 +216,12 @@ def copy_cert_files(cert_path: Path, new_path: Path) -> None:
 
 
 def init(
-    create_certs: Optional[Path],
+    create_certs: Path | None,
     root_path: Path,
     fix_ssl_permissions: bool = False,
     testnet: bool = False,
     v1_db: bool = False,
-) -> Optional[int]:
+) -> int | None:
     if create_certs is not None:
         if root_path.exists():
             if os.path.isdir(create_certs):

chia/cmds/keys.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Optional
-
 import click
 from chia_rs import PrivateKey
 
@@ -28,7 +26,7 @@ def keys_cmd(ctx: click.Context) -> None:
     required=False,
 )
 @click.pass_context
-def generate_cmd(ctx: click.Context, label: Optional[str]) -> None:
+def generate_cmd(ctx: click.Context, label: str | None) -> None:
     from chia.cmds.init_funcs import check_keys
     from chia.cmds.keys_funcs import generate_and_add
 
@@ -71,8 +69,8 @@ def show_cmd(
     show_mnemonic_seed: bool,
     non_observer_derivation: bool,
     json: bool,
-    fingerprint: Optional[int],
-    bech32m_prefix: Optional[str],
+    fingerprint: int | None,
+    bech32m_prefix: str | None,
 ) -> None:
     from chia.cmds.keys_funcs import show_keys
 
@@ -104,7 +102,7 @@ def show_cmd(
     required=False,
 )
 @click.pass_context
-def add_cmd(ctx: click.Context, filename: str, label: Optional[str]) -> None:
+def add_cmd(ctx: click.Context, filename: str, label: str | None) -> None:
     from chia.cmds.init_funcs import check_keys
     from chia.cmds.keys_funcs import query_and_add_key_info
 
@@ -207,7 +205,7 @@ def generate_and_print_cmd() -> None:
     is_flag=True,
 )
 def sign_cmd(
-    message: str, fingerprint: Optional[int], filename: Optional[str], hd_path: str, as_bytes: bool, json: bool
+    message: str, fingerprint: int | None, filename: str | None, hd_path: str, as_bytes: bool, json: bool
 ) -> None:
     from chia.cmds.keys_funcs import resolve_derivation_master_key, sign
 
@@ -280,7 +278,7 @@ def verify_cmd(message: str, public_key: str, signature: str, as_bytes: bool, js
     required=False,
 )
 @click.pass_context
-def derive_cmd(ctx: click.Context, fingerprint: Optional[int], filename: Optional[str]) -> None:
+def derive_cmd(ctx: click.Context, fingerprint: int | None, filename: str | None) -> None:
     context = ChiaCliContext.set_default(ctx)
     context.keys_fingerprint = fingerprint
     context.keys_filename = filename
@@ -332,16 +330,16 @@ def search_cmd(
     non_observer_derivation: bool,
     show_progress: bool,
     search_type: tuple[str, ...],
-    derive_from_hd_path: Optional[str],
-    prefix: Optional[str],
+    derive_from_hd_path: str | None,
+    prefix: str | None,
 ) -> None:
     import sys
 
     from chia.cmds.keys_funcs import resolve_derivation_master_key, search_derive
 
     context = ChiaCliContext.set_default(ctx)
-    fingerprint: Optional[int] = context.keys_fingerprint
-    filename: Optional[str] = context.keys_filename
+    fingerprint: int | None = context.keys_fingerprint
+    filename: str | None = context.keys_filename
 
     # Specifying the master key is optional for the search command. If not specified, we'll search all keys.
     resolved_sk = None
@@ -371,8 +369,8 @@ class ResolutionError(Exception):
 
 
 def _resolve_fingerprint_and_sk(
-    filename: Optional[str], fingerprint: Optional[int], non_observer_derivation: bool
-) -> tuple[Optional[int], Optional[PrivateKey]]:
+    filename: str | None, fingerprint: int | None, non_observer_derivation: bool
+) -> tuple[int | None, PrivateKey | None]:
     from chia.cmds.keys_funcs import resolve_derivation_master_key
 
     reolved_fp, resolved_sk = resolve_derivation_master_key(filename if filename is not None else fingerprint)
@@ -412,7 +410,7 @@ def _resolve_fingerprint_and_sk(
 )
 @click.pass_context
 def wallet_address_cmd(
-    ctx: click.Context, index: int, count: int, prefix: Optional[str], non_observer_derivation: bool, show_hd_path: bool
+    ctx: click.Context, index: int, count: int, prefix: str | None, non_observer_derivation: bool, show_hd_path: bool
 ) -> None:
     from chia.cmds.keys_funcs import derive_wallet_address
 
@@ -488,14 +486,14 @@ def wallet_address_cmd(
 @click.pass_context
 def child_key_cmd(
     ctx: click.Context,
-    key_type: Optional[str],
-    derive_from_hd_path: Optional[str],
+    key_type: str | None,
+    derive_from_hd_path: str | None,
     index: int,
     count: int,
     non_observer_derivation: bool,
     show_private_keys: bool,
     show_hd_path: bool,
-    bech32m_prefix: Optional[str],
+    bech32m_prefix: str | None,
 ) -> None:
     from chia.cmds.keys_funcs import derive_child_key
 

chia/cmds/keys_funcs.py

@@ -5,7 +5,7 @@ import os
 import sys
 from enum import Enum
 from pathlib import Path
-from typing import Any, Optional, Union
+from typing import Any
 
 from chia_rs import AugSchemeMPL, G1Element, G2Element, PrivateKey
 from chia_rs.sized_ints import uint32
@@ -58,7 +58,7 @@ def generate_and_print() -> str:
     return mnemonic
 
 
-def generate_and_add(label: Optional[str]) -> None:
+def generate_and_add(label: str | None) -> None:
     """
     Generates a seed for a private key, prints the mnemonic to the terminal, and adds the key to the keyring.
     """
@@ -67,7 +67,7 @@ def generate_and_add(label: Optional[str]) -> None:
     query_and_add_key_info(mnemonic_or_pk=generate_mnemonic(), label=label)
 
 
-def query_and_add_key_info(mnemonic_or_pk: Optional[str], label: Optional[str] = None) -> None:
+def query_and_add_key_info(mnemonic_or_pk: str | None, label: str | None = None) -> None:
     unlock_keyring()
     if mnemonic_or_pk is None:
         mnemonic_or_pk = input("Enter the mnemonic/observer key you want to use: ")
@@ -78,7 +78,7 @@ def query_and_add_key_info(mnemonic_or_pk: Optional[str], label: Optional[str] =
     add_key_info(mnemonic_or_pk, label)
 
 
-def add_key_info(mnemonic_or_pk: str, label: Optional[str]) -> None:
+def add_key_info(mnemonic_or_pk: str, label: str | None) -> None:
     """
     Add a private key seed or public key to the keyring, with the given mnemonic and an optional label.
     """
@@ -136,7 +136,7 @@ def delete_key_label(fingerprint: int) -> None:
         sys.exit(f"Error: {e}")
 
 
-def format_pk_bech32_maybe(prefix: Optional[str], pubkey: str) -> str:
+def format_pk_bech32_maybe(prefix: str | None, pubkey: str) -> str:
     return pubkey if prefix is None else bech32_encode(prefix, convertbits(list(bytes.fromhex(pubkey)), 8, 5))
 
 
@@ -145,8 +145,8 @@ def show_keys(
     show_mnemonic: bool,
     non_observer_derivation: bool,
     json_output: bool,
-    fingerprint: Optional[int],
-    bech32m_prefix: Optional[str],
+    fingerprint: int | None,
+    bech32m_prefix: str | None,
 ) -> None:
     """
     Prints all keys and mnemonics (if available).
@@ -190,7 +190,7 @@ def show_keys(
 
         if non_observer_derivation:
             if sk is None:
-                first_wallet_pk: Optional[G1Element] = None
+                first_wallet_pk: G1Element | None = None
             else:
                 first_wallet_pk = master_sk_to_wallet_sk(sk, uint32(0)).get_g1()
         else:
@@ -250,8 +250,8 @@ def delete(fingerprint: int) -> None:
 
 
 def derive_pk_and_sk_from_hd_path(
-    master_pk: G1Element, hd_path_root: str, master_sk: Optional[PrivateKey] = None
-) -> tuple[G1Element, Optional[PrivateKey], str]:
+    master_pk: G1Element, hd_path_root: str, master_sk: PrivateKey | None = None
+) -> tuple[G1Element, PrivateKey | None, str]:
     """
     Derive a private key from the provided HD path. Takes a master key and HD path as input,
     and returns the derived key and the HD path that was used to derive it.
@@ -290,7 +290,7 @@ def derive_pk_and_sk_from_hd_path(
 
     # Derive keys along the path
     if master_sk is not None:
-        current_sk: Optional[PrivateKey] = master_sk
+        current_sk: PrivateKey | None = master_sk
         assert current_sk is not None
         for current_index, derivation_type in index_and_derivation_types:
             if derivation_type == DerivationType.NONOBSERVER:
@@ -359,10 +359,10 @@ def _clear_line_part(n: int) -> None:
 
 def _search_derived(
     current_pk: G1Element,
-    current_sk: Optional[PrivateKey],
+    current_sk: PrivateKey | None,
     search_terms: tuple[str, ...],
     path: str,
-    path_indices: Optional[list[int]],
+    path_indices: list[int] | None,
     limit: int,
     non_observer_derivation: bool,
     show_progress: bool,
@@ -417,7 +417,7 @@ def _search_derived(
             else:
                 child_sk = None
 
-        address: Optional[str] = None
+        address: str | None = None
 
         if search_address:
             # Generate a wallet address using the standard p2_delegated_puzzle_or_hidden_puzzle puzzle
@@ -427,7 +427,7 @@ def _search_derived(
 
         for term in remaining_search_terms:
             found_item: Any = None
-            found_item_type: Optional[DerivedSearchResultType] = None
+            found_item_type: DerivedSearchResultType | None = None
 
             if search_private_key and term in str(child_sk):
                 assert child_sk is not None  # semantics above guarantee this
@@ -478,15 +478,15 @@ def _search_derived(
 
 def search_derive(
     root_path: Path,
-    fingerprint: Optional[int],
+    fingerprint: int | None,
     search_terms: tuple[str, ...],
     limit: int,
     non_observer_derivation: bool,
     show_progress: bool,
     search_types: tuple[str, ...],
-    derive_from_hd_path: Optional[str],
-    prefix: Optional[str],
-    private_key: Optional[PrivateKey],
+    derive_from_hd_path: str | None,
+    prefix: str | None,
+    private_key: PrivateKey | None,
 ) -> bool:
     """
     Searches for items derived from the provided private key, or if not specified,
@@ -513,7 +513,7 @@ def search_derive(
 
     if fingerprint is None and private_key is None:
         public_keys: list[G1Element] = Keychain().get_all_public_keys()
-        private_keys: list[Optional[PrivateKey]] = [
+        private_keys: list[PrivateKey | None] = [
             data.private_key if data.secrets is not None else None for data in Keychain().get_keys(include_secrets=True)
         ]
     elif fingerprint is None:
@@ -643,13 +643,13 @@ def search_derive(
 
 def derive_wallet_address(
     root_path: Path,
-    fingerprint: Optional[int],
+    fingerprint: int | None,
     index: int,
     count: int,
-    prefix: Optional[str],
+    prefix: str | None,
     non_observer_derivation: bool,
     show_hd_path: bool,
-    private_key: Optional[PrivateKey],
+    private_key: PrivateKey | None,
 ) -> None:
     """
     Generate wallet addresses using keys derived from the provided private key.
@@ -700,16 +700,16 @@ def private_key_string_repr(private_key: PrivateKey) -> str:
 
 
 def derive_child_key(
-    fingerprint: Optional[int],
-    key_type: Optional[str],
-    derive_from_hd_path: Optional[str],
+    fingerprint: int | None,
+    key_type: str | None,
+    derive_from_hd_path: str | None,
     index: int,
     count: int,
     non_observer_derivation: bool,
     show_private_keys: bool,
     show_hd_path: bool,
-    private_key: Optional[PrivateKey],
-    bech32m_prefix: Optional[str],
+    private_key: PrivateKey | None,
+    bech32m_prefix: str | None,
 ) -> None:
     """
     Derive child keys from the provided master key.
@@ -719,7 +719,7 @@ def derive_child_key(
     if fingerprint is not None:
         key_data: KeyData = Keychain().get_key(fingerprint, include_secrets=True)
         current_pk: G1Element = key_data.public_key
-        current_sk: Optional[PrivateKey] = key_data.private_key if key_data.secrets is not None else None
+        current_sk: PrivateKey | None = key_data.private_key if key_data.secrets is not None else None
     else:
         assert private_key is not None
         current_pk = private_key.get_g1()
@@ -776,7 +776,7 @@ def derive_child_key(
         hd_path: str = (
             " (" + hd_path_root + str(i) + ("n" if non_observer_derivation else "") + ")" if show_hd_path else ""
         )
-        key_type_str: Optional[str]
+        key_type_str: str | None
 
         if key_type is not None:
             key_type_str = key_type.capitalize()
@@ -788,7 +788,7 @@ def derive_child_key(
             print(f"{key_type_str} private key {i}{hd_path}: {private_key_string_repr(sk)}")
 
 
-def private_key_for_fingerprint(fingerprint: int) -> Optional[PrivateKey]:
+def private_key_for_fingerprint(fingerprint: int) -> PrivateKey | None:
     unlock_keyring()
     private_keys = Keychain().get_all_private_keys()
 
@@ -798,7 +798,7 @@ def private_key_for_fingerprint(fingerprint: int) -> Optional[PrivateKey]:
     return None
 
 
-def prompt_for_fingerprint() -> Optional[int]:
+def prompt_for_fingerprint() -> int | None:
     fingerprints: list[int] = [pk.get_fingerprint() for pk in Keychain().get_all_public_keys()]
     while True:
         print("Choose key:")
@@ -822,8 +822,8 @@ def prompt_for_fingerprint() -> Optional[int]:
 
 
 def get_private_key_with_fingerprint_or_prompt(
-    fingerprint: Optional[int],
-) -> tuple[Optional[int], Optional[PrivateKey]]:
+    fingerprint: int | None,
+) -> tuple[int | None, PrivateKey | None]:
     """
     Get a private key with the specified fingerprint. If fingerprint is not
     specified, prompt the user to select a key.
@@ -848,8 +848,8 @@ def private_key_from_mnemonic_seed_file(filename: Path) -> PrivateKey:
 
 
 def resolve_derivation_master_key(
-    fingerprint_or_filename: Optional[Union[int, str, Path]],
-) -> tuple[Optional[int], Optional[PrivateKey]]:
+    fingerprint_or_filename: int | str | Path | None,
+) -> tuple[int | None, PrivateKey | None]:
     """
     Given a key fingerprint of file containing a mnemonic seed, return the private key.
     """

chia/cmds/netspace.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Optional
-
 import click
 
 from chia.cmds.cmd_classes import ChiaCliContext
@@ -39,7 +37,7 @@ from chia.cmds.cmd_classes import ChiaCliContext
     default="",
 )
 @click.pass_context
-def netspace_cmd(ctx: click.Context, rpc_port: Optional[int], delta_block_height: str, start: str) -> None:
+def netspace_cmd(ctx: click.Context, rpc_port: int | None, delta_block_height: str, start: str) -> None:
     """
     Calculates the estimated space on the network given two block header hashes.
     """

chia/cmds/netspace_funcs.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import Optional
 
 from chia_rs.sized_bytes import bytes32
 
@@ -9,7 +8,7 @@ from chia.cmds.cmds_util import format_bytes, get_any_service_client
 from chia.full_node.full_node_rpc_client import FullNodeRpcClient
 
 
-async def netstorge_async(root_path: Path, rpc_port: Optional[int], delta_block_height: str, start: str) -> None:
+async def netstorge_async(root_path: Path, rpc_port: int | None, delta_block_height: str, start: str) -> None:
     """
     Calculates the estimated space on the network given two block header hashes.
     """

chia/cmds/options.py

@@ -1,12 +1,13 @@
 from __future__ import annotations
 
-from typing import Any, Callable, TypeVar, Union
+from collections.abc import Callable
+from typing import Any, TypeVar
 
 import click
 
 from chia.cmds.param_types import TransactionFeeParamType
 
-FC = TypeVar("FC", bound=Union[Callable[..., Any], click.Command])
+FC = TypeVar("FC", bound=Callable[..., Any] | click.Command)
 
 
 def create_fingerprint(required: bool = False) -> Callable[[FC], FC]: