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

chia/cmds/sim_funcs.py

@@ -5,10 +5,10 @@ import os
 import sys
 from pathlib import Path, PureWindowsPath
 from random import randint
-from typing import Any, Optional
+from typing import Any
 
 from aiohttp import ClientConnectorError
-from chia_rs import PrivateKey
+from chia_rs import CoinRecord, PrivateKey
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint32
 
@@ -17,7 +17,6 @@ from chia.cmds.start_funcs import async_start
 from chia.protocols.outbound_message import NodeType
 from chia.server.resolve_peer_info import set_peer_info
 from chia.simulator.simulator_full_node_rpc_client import SimulatorFullNodeRpcClient
-from chia.types.coin_record import CoinRecord
 from chia.util.bech32m import decode_puzzle_hash, encode_puzzle_hash
 from chia.util.config import load_config, save_config
 from chia.util.errors import KeychainFingerprintExists
@@ -44,9 +43,9 @@ def get_ph_from_fingerprint(fingerprint: int, key_id: int = 1) -> bytes32:
 def create_chia_directory(
     chia_root: Path,
     fingerprint: int,
-    farming_address: Optional[str],
-    plot_directory: Optional[str],
-    auto_farm: Optional[bool],
+    farming_address: str | None,
+    plot_directory: str | None,
+    auto_farm: bool | None,
     docker_mode: bool,
 ) -> dict[str, Any]:
     """
@@ -164,7 +163,7 @@ def display_key_info(fingerprint: int, prefix: str) -> None:
     print(f"{mnemonic} \n")
 
 
-def generate_and_return_fingerprint(mnemonic: Optional[str] = None) -> int:
+def generate_and_return_fingerprint(mnemonic: str | None = None) -> int:
     """
     Generate and add new PrivateKey and return its fingerprint.
     """
@@ -185,8 +184,8 @@ def generate_and_return_fingerprint(mnemonic: Optional[str] = None) -> int:
 
 
 def select_fingerprint(
-    fingerprint: Optional[int] = None, mnemonic_string: Optional[str] = None, auto_generate_key: bool = False
-) -> Optional[int]:
+    fingerprint: int | None = None, mnemonic_string: str | None = None, auto_generate_key: bool = False
+) -> int | None:
     """
     Either select an existing fingerprint or create one and return it.
     """
@@ -254,18 +253,18 @@ async def generate_plots(config: dict[str, Any], root_path: Path, fingerprint: i
     os.environ["CHIA_ROOT"] = str(root_path)  # change env variable, to make it match what the daemon would set it to
 
     # create block tools and use local keychain
-    bt = BlockTools(
+    with BlockTools(
         test_constants,
         root_path,
         automated_testing=False,
         plot_dir=config["simulator"].get("plot_directory", "plots"),
         keychain=Keychain(),
-    )
-    await bt.setup_keys(fingerprint=fingerprint, reward_ph=farming_puzzle_hash)
-    existing_plots = await bt.setup_plots(
-        num_og_plots=PLOTS, num_pool_plots=0, num_non_keychain_plots=0, plot_size=PLOT_SIZE, bitfield=bitfield
-    )
-    print(f"{'New plots generated.' if existing_plots else 'Using Existing Plots'}\n")
+    ) as bt:
+        await bt.setup_keys(fingerprint=fingerprint, reward_ph=farming_puzzle_hash)
+        existing_plots = await bt.setup_plots(
+            num_og_plots=PLOTS, num_pool_plots=0, num_non_keychain_plots=0, plot_size=PLOT_SIZE, bitfield=bitfield
+        )
+        print(f"{'New plots generated.' if existing_plots else 'Using Existing Plots'}\n")
 
 
 async def get_current_height(root_path: Path) -> int:
@@ -279,11 +278,11 @@ async def get_current_height(root_path: Path) -> int:
 
 async def async_config_wizard(
     root_path: Path,
-    fingerprint: Optional[int],
-    farming_address: Optional[str],
-    plot_directory: Optional[str],
-    mnemonic_string: Optional[str],
-    auto_farm: Optional[bool],
+    fingerprint: int | None,
+    farming_address: str | None,
+    plot_directory: str | None,
+    mnemonic_string: str | None,
+    auto_farm: bool | None,
     docker_mode: bool,
     bitfield: bool,
 ) -> None:
@@ -391,9 +390,9 @@ async def print_wallets(config: dict[str, Any], node_client: SimulatorFullNodeRp
 
 
 async def print_status(
-    rpc_port: Optional[int],
+    rpc_port: int | None,
     root_path: Path,
-    fingerprint: Optional[int],
+    fingerprint: int | None,
     show_key: bool,
     show_coins: bool,
     include_reward_coins: bool,
@@ -440,7 +439,7 @@ async def print_status(
 
 
 async def revert_block_height(
-    rpc_port: Optional[int],
+    rpc_port: int | None,
     root_path: Path,
     num_blocks: int,
     num_new_blocks: int,
@@ -469,7 +468,7 @@ async def revert_block_height(
 
 
 async def farm_blocks(
-    rpc_port: Optional[int],
+    rpc_port: int | None,
     root_path: Path,
     num_blocks: int,
     transaction_blocks: bool,
@@ -495,7 +494,7 @@ async def farm_blocks(
         print(f"Block Height is now: {block_height}")
 
 
-async def set_auto_farm(rpc_port: Optional[int], root_path: Path, set_autofarm: bool) -> None:
+async def set_auto_farm(rpc_port: int | None, root_path: Path, set_autofarm: bool) -> None:
     """
     This function can be used to enable or disable Auto Farming.
     """

chia/cmds/solver.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Optional
-
 import click
 
 from chia.cmds.cmd_classes import ChiaCliContext
@@ -24,7 +22,7 @@ def solver_cmd() -> None:
 @click.pass_context
 def get_state_cmd(
     ctx: click.Context,
-    solver_rpc_port: Optional[int],
+    solver_rpc_port: int | None,
 ) -> None:
     import asyncio
 

chia/cmds/solver_funcs.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import json
-from typing import Optional
 
 from chia.cmds.cmd_classes import ChiaCliContext
 from chia.cmds.cmds_util import get_any_service_client
@@ -10,7 +9,7 @@ from chia.solver.solver_rpc_client import SolverRpcClient
 
 async def get_state(
     ctx: ChiaCliContext,
-    solver_rpc_port: Optional[int] = None,
+    solver_rpc_port: int | None = None,
 ) -> None:
     """Get solver state via RPC."""
     try:

chia/cmds/start_funcs.py

@@ -7,7 +7,7 @@ import subprocess
 import sys
 from concurrent.futures import ThreadPoolExecutor
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 from chia.cmds.passphrase_funcs import get_current_passphrase
 from chia.daemon.client import DaemonProxy, connect_to_daemon_and_validate
@@ -45,7 +45,7 @@ def launch_start_daemon(root_path: Path) -> subprocess.Popen:
 
 async def create_start_daemon_connection(
     root_path: Path, config: dict[str, Any], *, skip_keyring: bool
-) -> Optional[DaemonProxy]:
+) -> DaemonProxy | None:
     connection = await connect_to_daemon_and_validate(root_path, config)
     if connection is None:
         print("Starting daemon", flush=True)

chia/cmds/wallet.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 import asyncio
 import pathlib
 from collections.abc import Sequence
-from typing import Optional
 
 import click
 from chia_rs.sized_bytes import bytes32
@@ -55,7 +54,7 @@ wallet_cmd.add_command(get_chia_command_metadata(PushTransactionsCMD).command)
 @click.option("--verbose", "-v", count=True, type=int)
 @click.pass_context
 def get_transaction_cmd(
-    ctx: click.Context, wallet_rpc_port: Optional[int], fingerprint: int, id: int, tx_id: str, verbose: int
+    ctx: click.Context, wallet_rpc_port: int | None, fingerprint: int, id: int, tx_id: str, verbose: int
 ) -> None:
     from chia.cmds.wallet_funcs import get_transaction
 
@@ -94,7 +93,7 @@ def get_transaction_cmd(
     "--limit",
     help="Max number of transactions to return",
     type=int,
-    default=(2**16 - 1),
+    default=(2**32 - 1),
     show_default=True,
     required=False,
 )
@@ -105,19 +104,19 @@ def get_transaction_cmd(
     help="Prompt for each page of data.  Defaults to true for interactive consoles, otherwise false.",
 )
 @click.option(
-    "--sort-by-height",
+    "--sort-by-relevance",
     "sort_key",
-    flag_value=SortKey.CONFIRMED_AT_HEIGHT,
+    flag_value=SortKey.RELEVANCE,
     type=SortKey,
-    help="Sort transactions by height",
+    default=SortKey.RELEVANCE,
+    help="Sort transactions by {confirmed, height, time}",
 )
 @click.option(
-    "--sort-by-relevance",
+    "--sort-by-height",
     "sort_key",
-    flag_value=SortKey.RELEVANCE,
+    flag_value=SortKey.CONFIRMED_AT_HEIGHT,
     type=SortKey,
-    default=True,
-    help="Sort transactions by {confirmed, height, time}",
+    help="Sort transactions by height",
 )
 @click.option(
     "--reverse",
@@ -134,13 +133,13 @@ def get_transaction_cmd(
 @click.pass_context
 def get_transactions_cmd(
     ctx: click.Context,
-    wallet_rpc_port: Optional[int],
+    wallet_rpc_port: int | None,
     fingerprint: int,
     id: int,
     offset: int,
     limit: int,
     verbose: bool,
-    paginate: Optional[bool],
+    paginate: bool | None,
     sort_key: SortKey,
     reverse: bool,
     clawback: bool,
@@ -224,11 +223,11 @@ def get_transactions_cmd(
 @click.pass_context
 def send_cmd(
     ctx: click.Context,
-    wallet_rpc_port: Optional[int],
+    wallet_rpc_port: int | None,
     fingerprint: int,
     id: int,
     amount: CliAmount,
-    memo: Optional[str],
+    memo: str | None,
     fee: uint64,
     address: CliAddress,
     override: bool,
@@ -281,7 +280,7 @@ def send_cmd(
     default=None,
 )
 @click.pass_context
-def show_cmd(ctx: click.Context, wallet_rpc_port: Optional[int], fingerprint: int, wallet_type: Optional[str]) -> None:
+def show_cmd(ctx: click.Context, wallet_rpc_port: int | None, fingerprint: int, wallet_type: str | None) -> None:
     from chia.cmds.wallet_funcs import print_balances
 
     asyncio.run(
@@ -316,7 +315,7 @@ def show_cmd(ctx: click.Context, wallet_rpc_port: Optional[int], fingerprint: in
 )
 @click.pass_context
 def get_address_cmd(
-    ctx: click.Context, wallet_rpc_port: Optional[int], id: int, fingerprint: int, new_address: bool
+    ctx: click.Context, wallet_rpc_port: int | None, id: int, fingerprint: int, new_address: bool
 ) -> None:
     from chia.cmds.wallet_funcs import get_address
 
@@ -357,7 +356,7 @@ def get_address_cmd(
 @click.pass_context
 def clawback(
     ctx: click.Context,
-    wallet_rpc_port: Optional[int],
+    wallet_rpc_port: int | None,
     id: int,
     fingerprint: int,
     tx_ids: str,
@@ -394,7 +393,7 @@ def clawback(
 @options.create_fingerprint()
 @click.pass_context
 def delete_unconfirmed_transactions_cmd(
-    ctx: click.Context, wallet_rpc_port: Optional[int], id: int, fingerprint: int
+    ctx: click.Context, wallet_rpc_port: int | None, id: int, fingerprint: int
 ) -> None:
     from chia.cmds.wallet_funcs import delete_unconfirmed_transactions
 
@@ -413,7 +412,7 @@ def delete_unconfirmed_transactions_cmd(
 )
 @options.create_fingerprint()
 @click.pass_context
-def get_derivation_index_cmd(ctx: click.Context, wallet_rpc_port: Optional[int], fingerprint: int) -> None:
+def get_derivation_index_cmd(ctx: click.Context, wallet_rpc_port: int | None, fingerprint: int) -> None:
     from chia.cmds.wallet_funcs import get_derivation_index
 
     asyncio.run(get_derivation_index(ChiaCliContext.set_default(ctx).root_path, wallet_rpc_port, fingerprint))
@@ -433,7 +432,7 @@ def get_derivation_index_cmd(ctx: click.Context, wallet_rpc_port: Optional[int],
 @click.option("-m", "--hex_message", help="The hex message you want sign", type=str, required=True)
 @click.pass_context
 def address_sign_message(
-    ctx: click.Context, wallet_rpc_port: Optional[int], fingerprint: int, address: CliAddress, hex_message: str
+    ctx: click.Context, wallet_rpc_port: int | None, fingerprint: int, address: CliAddress, hex_message: str
 ) -> None:
     from chia.cmds.wallet_funcs import sign_message
 
@@ -464,9 +463,7 @@ def address_sign_message(
     "-i", "--index", help="Index to set. Must be greater than the current derivation index", type=int, required=True
 )
 @click.pass_context
-def update_derivation_index_cmd(
-    ctx: click.Context, wallet_rpc_port: Optional[int], fingerprint: int, index: int
-) -> None:
+def update_derivation_index_cmd(ctx: click.Context, wallet_rpc_port: int | None, fingerprint: int, index: int) -> None:
     from chia.cmds.wallet_funcs import update_derivation_index
 
     asyncio.run(update_derivation_index(ChiaCliContext.set_default(ctx).root_path, wallet_rpc_port, fingerprint, index))
@@ -495,7 +492,7 @@ def update_derivation_index_cmd(
 @options.create_fingerprint()
 @click.pass_context
 def add_token_cmd(
-    ctx: click.Context, wallet_rpc_port: Optional[int], asset_id: bytes32, token_name: str, fingerprint: int
+    ctx: click.Context, wallet_rpc_port: int | None, asset_id: bytes32, token_name: str, fingerprint: int
 ) -> None:
     from chia.cmds.wallet_funcs import add_token
 
@@ -547,7 +544,7 @@ def add_token_cmd(
 # we already have a canonical offer file format which the idea of exporting a different transaction conflicts with
 def make_offer_cmd(
     ctx: click.Context,
-    wallet_rpc_port: Optional[int],
+    wallet_rpc_port: int | None,
     fingerprint: int,
     offer: Sequence[str],
     request: Sequence[str],
@@ -602,10 +599,10 @@ def make_offer_cmd(
 @click.pass_context
 def get_offers_cmd(
     ctx: click.Context,
-    wallet_rpc_port: Optional[int],
+    wallet_rpc_port: int | None,
     fingerprint: int,
-    id: Optional[bytes32],
-    filepath: Optional[str],
+    id: bytes32 | None,
+    filepath: str | None,
     exclude_my_offers: bool,
     exclude_taken_offers: bool,
     include_completed: bool,
@@ -656,7 +653,7 @@ def get_offers_cmd(
 def take_offer_cmd(
     ctx: click.Context,
     path_or_hex: str,
-    wallet_rpc_port: Optional[int],
+    wallet_rpc_port: int | None,
     fingerprint: int,
     examine_only: bool,
     fee: uint64,
@@ -696,7 +693,7 @@ def take_offer_cmd(
 @click.pass_context
 def cancel_offer_cmd(
     ctx: click.Context,
-    wallet_rpc_port: Optional[int],
+    wallet_rpc_port: int | None,
     fingerprint: int,
     id: bytes32,
     insecure: bool,
@@ -762,9 +759,9 @@ def did_cmd() -> None:
 @click.pass_context
 def did_create_wallet_cmd(
     ctx: click.Context,
-    wallet_rpc_port: Optional[int],
+    wallet_rpc_port: int | None,
     fingerprint: int,
-    name: Optional[str],
+    name: str | None,
     amount: int,
     fee: uint64,
     push: bool,
@@ -799,7 +796,7 @@ def did_create_wallet_cmd(
 @click.option("-m", "--hex_message", help="The hex message you want to sign", type=str, required=True)
 @click.pass_context
 def did_sign_message(
-    ctx: click.Context, wallet_rpc_port: Optional[int], fingerprint: int, did_id: CliAddress, hex_message: str
+    ctx: click.Context, wallet_rpc_port: int | None, fingerprint: int, did_id: CliAddress, hex_message: str
 ) -> None:
     from chia.cmds.wallet_funcs import sign_message
 
@@ -827,9 +824,7 @@ def did_sign_message(
 @click.option("-i", "--id", help="Id of the wallet to use", type=int, required=True)
 @click.option("-n", "--name", help="Set the DID wallet name", type=str, required=True)
 @click.pass_context
-def did_wallet_name_cmd(
-    ctx: click.Context, wallet_rpc_port: Optional[int], fingerprint: int, id: int, name: str
-) -> None:
+def did_wallet_name_cmd(ctx: click.Context, wallet_rpc_port: int | None, fingerprint: int, id: int, name: str) -> None:
     from chia.cmds.wallet_funcs import did_set_wallet_name
 
     asyncio.run(did_set_wallet_name(ChiaCliContext.set_default(ctx).root_path, wallet_rpc_port, fingerprint, id, name))
@@ -846,7 +841,7 @@ def did_wallet_name_cmd(
 @options.create_fingerprint()
 @click.option("-i", "--id", help="Id of the wallet to use", type=int, required=True)
 @click.pass_context
-def did_get_did_cmd(ctx: click.Context, wallet_rpc_port: Optional[int], fingerprint: int, id: int) -> None:
+def did_get_did_cmd(ctx: click.Context, wallet_rpc_port: int | None, fingerprint: int, id: int) -> None:
     from chia.cmds.wallet_funcs import get_did
 
     asyncio.run(get_did(ChiaCliContext.set_default(ctx).root_path, wallet_rpc_port, fingerprint, id))
@@ -865,7 +860,7 @@ def did_get_did_cmd(ctx: click.Context, wallet_rpc_port: Optional[int], fingerpr
 @click.option("-l", "--latest", help="Return latest DID information", is_flag=True, default=True)
 @click.pass_context
 def did_get_details_cmd(
-    ctx: click.Context, wallet_rpc_port: Optional[int], fingerprint: int, coin_id: str, latest: bool
+    ctx: click.Context, wallet_rpc_port: int | None, fingerprint: int, coin_id: str, latest: bool
 ) -> None:
     from chia.cmds.wallet_funcs import get_did_info
 
@@ -893,7 +888,7 @@ def did_get_details_cmd(
 @click.pass_context
 def did_update_metadata_cmd(
     ctx: click.Context,
-    wallet_rpc_port: Optional[int],
+    wallet_rpc_port: int | None,
     fingerprint: int,
     id: int,
     metadata: str,
@@ -946,12 +941,12 @@ def did_update_metadata_cmd(
 @click.pass_context
 def did_find_lost_cmd(
     ctx: click.Context,
-    wallet_rpc_port: Optional[int],
+    wallet_rpc_port: int | None,
     fingerprint: int,
     coin_id: str,
-    metadata: Optional[str],
-    recovery_list_hash: Optional[str],
-    num_verification: Optional[int],
+    metadata: str | None,
+    recovery_list_hash: str | None,
+    num_verification: int | None,
 ) -> None:
     from chia.cmds.wallet_funcs import find_lost_did
 
@@ -996,11 +991,11 @@ def did_find_lost_cmd(
 @click.pass_context
 def did_message_spend_cmd(
     ctx: click.Context,
-    wallet_rpc_port: Optional[int],
+    wallet_rpc_port: int | None,
     fingerprint: int,
     id: int,
-    puzzle_announcements: Optional[str],
-    coin_announcements: Optional[str],
+    puzzle_announcements: str | None,
+    coin_announcements: str | None,
     push: bool,
     condition_valid_times: ConditionValidTimes,
 ) -> list[TransactionRecord]:
@@ -1067,7 +1062,7 @@ def did_message_spend_cmd(
 @click.pass_context
 def did_transfer_did(
     ctx: click.Context,
-    wallet_rpc_port: Optional[int],
+    wallet_rpc_port: int | None,
     fingerprint: int,
     id: int,
     target_address: CliAddress,
@@ -1115,10 +1110,10 @@ def nft_cmd() -> None:
 @click.pass_context
 def nft_wallet_create_cmd(
     ctx: click.Context,
-    wallet_rpc_port: Optional[int],
+    wallet_rpc_port: int | None,
     fingerprint: int,
-    did_id: Optional[CliAddress],
-    name: Optional[str],
+    did_id: CliAddress | None,
+    name: str | None,
 ) -> None:
     from chia.cmds.wallet_funcs import create_nft_wallet
 
@@ -1140,7 +1135,7 @@ def nft_wallet_create_cmd(
 @click.option("-m", "--hex_message", help="The hex message you want to sign", type=str, required=True)
 @click.pass_context
 def nft_sign_message(
-    ctx: click.Context, wallet_rpc_port: Optional[int], fingerprint: int, nft_id: CliAddress, hex_message: str
+    ctx: click.Context, wallet_rpc_port: int | None, fingerprint: int, nft_id: CliAddress, hex_message: str
 ) -> None:
     from chia.cmds.wallet_funcs import sign_message
 
@@ -1196,20 +1191,20 @@ def nft_sign_message(
 @click.pass_context
 def nft_mint_cmd(
     ctx: click.Context,
-    wallet_rpc_port: Optional[int],
+    wallet_rpc_port: int | None,
     fingerprint: int,
     id: int,
-    royalty_address: Optional[CliAddress],
-    target_address: Optional[CliAddress],
+    royalty_address: CliAddress | None,
+    target_address: CliAddress | None,
     no_did_ownership: bool,
     hash: str,
     uris: str,
-    metadata_hash: Optional[str],
-    metadata_uris: Optional[str],
-    license_hash: Optional[str],
-    license_uris: Optional[str],
-    edition_total: Optional[int],
-    edition_number: Optional[int],
+    metadata_hash: str | None,
+    metadata_uris: str | None,
+    license_hash: str | None,
+    license_uris: str | None,
+    edition_total: int | None,
+    edition_number: int | None,
     fee: uint64,
     royalty_percentage_fraction: int,
     reuse: bool,
@@ -1280,7 +1275,7 @@ def nft_mint_cmd(
 @click.pass_context
 def nft_add_uri_cmd(
     ctx: click.Context,
-    wallet_rpc_port: Optional[int],
+    wallet_rpc_port: int | None,
     fingerprint: int,
     id: int,
     nft_coin_id: str,
@@ -1336,7 +1331,7 @@ def nft_add_uri_cmd(
 @click.pass_context
 def nft_transfer_cmd(
     ctx: click.Context,
-    wallet_rpc_port: Optional[int],
+    wallet_rpc_port: int | None,
     fingerprint: int,
     id: int,
     nft_coin_id: str,
@@ -1378,7 +1373,7 @@ def nft_transfer_cmd(
 @click.option("--start-index", help="Which starting index to start listing NFTs from", type=int, default=0)
 @click.pass_context
 def nft_list_cmd(
-    ctx: click.Context, wallet_rpc_port: Optional[int], fingerprint: int, id: int, num: int, start_index: int
+    ctx: click.Context, wallet_rpc_port: int | None, fingerprint: int, id: int, num: int, start_index: int
 ) -> None:
     from chia.cmds.wallet_funcs import list_nfts
 
@@ -1411,7 +1406,7 @@ def nft_list_cmd(
 @click.pass_context
 def nft_set_did_cmd(
     ctx: click.Context,
-    wallet_rpc_port: Optional[int],
+    wallet_rpc_port: int | None,
     fingerprint: int,
     id: int,
     did_id: str,
@@ -1453,7 +1448,7 @@ def nft_set_did_cmd(
 @click.pass_context
 def nft_get_info_cmd(
     ctx: click.Context,
-    wallet_rpc_port: Optional[int],
+    wallet_rpc_port: int | None,
     fingerprint: int,
     nft_coin_id: str,
 ) -> None:
@@ -1498,7 +1493,7 @@ def notification_cmd() -> None:
 @click.pass_context
 def send_notification_cmd(
     ctx: click.Context,
-    wallet_rpc_port: Optional[int],
+    wallet_rpc_port: int | None,
     fingerprint: int,
     to_address: CliAddress,
     amount: CliAmount,
@@ -1540,11 +1535,11 @@ def send_notification_cmd(
 @click.pass_context
 def get_notifications_cmd(
     ctx: click.Context,
-    wallet_rpc_port: Optional[int],
+    wallet_rpc_port: int | None,
     fingerprint: int,
     id: Sequence[bytes32],
-    start: Optional[int],
-    end: Optional[int],
+    start: int | None,
+    end: int | None,
 ) -> None:
     from chia.cmds.wallet_funcs import get_notifications
 
@@ -1567,7 +1562,7 @@ def get_notifications_cmd(
 @click.pass_context
 def delete_notifications_cmd(
     ctx: click.Context,
-    wallet_rpc_port: Optional[int],
+    wallet_rpc_port: int | None,
     fingerprint: int,
     id: Sequence[bytes32],
     all: bool,
@@ -1604,10 +1599,10 @@ def vcs_cmd() -> None:  # pragma: no cover
 @click.pass_context
 def mint_vc_cmd(
     ctx: click.Context,
-    wallet_rpc_port: Optional[int],
+    wallet_rpc_port: int | None,
     fingerprint: int,
     did: CliAddress,
-    target_address: Optional[CliAddress],
+    target_address: CliAddress | None,
     fee: uint64,
     push: bool,
     condition_valid_times: ConditionValidTimes,
@@ -1646,7 +1641,7 @@ def mint_vc_cmd(
 @click.pass_context
 def get_vcs_cmd(
     ctx: click.Context,
-    wallet_rpc_port: Optional[int],
+    wallet_rpc_port: int | None,
     fingerprint: int,
     start: int,
     count: int,
@@ -1691,10 +1686,10 @@ def get_vcs_cmd(
 @click.pass_context
 def spend_vc_cmd(
     ctx: click.Context,
-    wallet_rpc_port: Optional[int],
+    wallet_rpc_port: int | None,
     fingerprint: int,
     vc_id: bytes32,
-    new_puzhash: Optional[bytes32],
+    new_puzhash: bytes32 | None,
     new_proof_hash: str,
     fee: uint64,
     reuse_puzhash: bool,
@@ -1733,7 +1728,7 @@ def spend_vc_cmd(
 @click.pass_context
 def add_proof_reveal_cmd(
     ctx: click.Context,
-    wallet_rpc_port: Optional[int],
+    wallet_rpc_port: int | None,
     fingerprint: int,
     proof: Sequence[str],
     root_only: bool,
@@ -1758,7 +1753,7 @@ def add_proof_reveal_cmd(
 @click.pass_context
 def get_proofs_for_root_cmd(
     ctx: click.Context,
-    wallet_rpc_port: Optional[int],
+    wallet_rpc_port: int | None,
     fingerprint: int,
     proof_hash: str,
 ) -> None:  # pragma: no cover
@@ -1803,10 +1798,10 @@ def get_proofs_for_root_cmd(
 @click.pass_context
 def revoke_vc_cmd(
     ctx: click.Context,
-    wallet_rpc_port: Optional[int],
+    wallet_rpc_port: int | None,
     fingerprint: int,
-    parent_coin_id: Optional[bytes32],
-    vc_id: Optional[bytes32],
+    parent_coin_id: bytes32 | None,
+    vc_id: bytes32 | None,
     fee: uint64,
     reuse_puzhash: bool,
     push: bool,
@@ -1871,7 +1866,7 @@ def revoke_vc_cmd(
 @click.pass_context
 def approve_r_cats_cmd(
     ctx: click.Context,
-    wallet_rpc_port: Optional[int],
+    wallet_rpc_port: int | None,
     fingerprint: int,
     id: int,
     min_amount_to_claim: CliAmount,