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

chia/cmds/param_types.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
+from collections.abc import Callable
 from dataclasses import dataclass
 from decimal import Decimal, InvalidOperation
-from typing import Any, Callable, Optional, Union
+from typing import Any
 
 import click
 from chia_rs.sized_bytes import bytes32
@@ -20,9 +21,9 @@ one_decimal_mojo = Decimal("1e-12")
 
 def validate_uint64(
     value: str,
-    fail_func: Callable[[str, Optional[click.Parameter], Optional[click.Context]], None],
-    param: Optional[click.Parameter],
-    ctx: Optional[click.Context],
+    fail_func: Callable[[str, click.Parameter | None, click.Context | None], None],
+    param: click.Parameter | None,
+    ctx: click.Context | None,
 ) -> uint64:
     try:
         d_value = Decimal(value)
@@ -41,9 +42,9 @@ def validate_uint64(
 
 def validate_decimal_xch(
     value: str,
-    fail_func: Callable[[str, Optional[click.Parameter], Optional[click.Context]], None],
-    param: Optional[click.Parameter],
-    ctx: Optional[click.Context],
+    fail_func: Callable[[str, click.Parameter | None, click.Context | None], None],
+    param: click.Parameter | None,
+    ctx: click.Context | None,
 ) -> Decimal:
     try:
         d_value = Decimal(value)
@@ -64,7 +65,7 @@ class TransactionFeeParamType(click.ParamType):
     name: str = "XCH"  # type name for cli, TODO: Change once the mojo flag is implemented
     value_limit: Decimal = Decimal("0.5")
 
-    def convert(self, value: Any, param: Optional[click.Parameter], ctx: Optional[click.Context]) -> uint64:
+    def convert(self, value: Any, param: click.Parameter | None, ctx: click.Context | None) -> uint64:
         # suggested by click, but we are not using it to avoid possible misinterpretation of units.
         # if isinstance(value, uint64):
         #     return value
@@ -89,11 +90,11 @@ class CliAmount:
     """
 
     mojos: bool
-    amount: Union[uint64, Decimal, None]  # uint64 if mojos, Decimal if not, None if default value is none
+    amount: uint64 | Decimal | None  # uint64 if mojos, Decimal if not, None if default value is none
 
     def convert_amount_with_default(
-        self, mojo_per_unit: int, default_value: Optional[uint64] = uint64(0)
-    ) -> Optional[uint64]:
+        self, mojo_per_unit: int, default_value: uint64 | None = uint64(0)
+    ) -> uint64 | None:
         if self.amount is None:  # if the value is set to none, return the default value
             return default_value
         return self.convert_amount(mojo_per_unit)
@@ -122,7 +123,7 @@ class AmountParamType(click.ParamType):
 
     name: str = "XCH"  # type name for cli, TODO: Change once the mojo flag is implemented
 
-    def convert(self, value: Any, param: Optional[click.Parameter], ctx: Optional[click.Context]) -> CliAmount:
+    def convert(self, value: Any, param: click.Parameter | None, ctx: click.Context | None) -> CliAmount:
         # suggested by click, but being left in as mojos flag makes default misrepresentation less likely.
         if isinstance(value, CliAmount):
             return value
@@ -164,7 +165,7 @@ class AddressParamType(click.ParamType):
 
     name: str = "Address"  # type name for cli
 
-    def convert(self, value: Any, param: Optional[click.Parameter], ctx: Optional[click.Context]) -> CliAddress:
+    def convert(self, value: Any, param: click.Parameter | None, ctx: click.Context | None) -> CliAddress:
         # suggested by click, but not really used so removed to make unexpected types more obvious.
         # if isinstance(value, CliAddress):
         #    return value
@@ -176,7 +177,7 @@ class AddressParamType(click.ParamType):
                 addr_type: AddressType = AddressType.XCH
 
                 # attempt to get cached prefix
-                expected_prefix: Optional[str] = None
+                expected_prefix: str | None = None
                 root_path = DEFAULT_ROOT_PATH
 
                 if ctx is not None:
@@ -208,7 +209,7 @@ class Bytes32ParamType(click.ParamType):
 
     name: str = "HexString"  # type name for cli
 
-    def convert(self, value: Any, param: Optional[click.Parameter], ctx: Optional[click.Context]) -> bytes32:
+    def convert(self, value: Any, param: click.Parameter | None, ctx: click.Context | None) -> bytes32:
         # suggested by click but deemed not necessary due to unnecessary complexity.
         # if isinstance(value, bytes32):
         #     return value
@@ -227,7 +228,7 @@ class Uint64ParamType(click.ParamType):
 
     name: str = uint64.__name__  # type name for cli
 
-    def convert(self, value: Any, param: Optional[click.Parameter], ctx: Optional[click.Context]) -> uint64:
+    def convert(self, value: Any, param: click.Parameter | None, ctx: click.Context | None) -> uint64:
         if isinstance(value, uint64):  # required by click
             return value
         if not isinstance(value, str):

chia/cmds/passphrase.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 import asyncio
 import sys
 from io import TextIOWrapper
-from typing import Optional
 
 import click
 
@@ -31,9 +30,9 @@ def passphrase_cmd() -> None:
 @click.pass_context
 def set_cmd(
     ctx: click.Context,
-    passphrase_file: Optional[TextIOWrapper],
-    current_passphrase_file: Optional[TextIOWrapper],
-    hint: Optional[str],
+    passphrase_file: TextIOWrapper | None,
+    current_passphrase_file: TextIOWrapper | None,
+    hint: str | None,
 ) -> None:
     from chia.cmds.passphrase_funcs import (
         async_update_daemon_passphrase_cache_if_running,
@@ -43,7 +42,7 @@ def set_cmd(
     )
 
     success: bool = False
-    current_passphrase: Optional[str] = None
+    current_passphrase: str | None = None
     if current_passphrase_file is not None:
         current_passphrase = read_passphrase_from_file(current_passphrase_file)
 
@@ -86,14 +85,14 @@ def set_cmd(
     "--current-passphrase-file", type=click.File("r"), help="File or descriptor to read the current passphrase from"
 )
 @click.pass_context
-def remove_cmd(ctx: click.Context, current_passphrase_file: Optional[TextIOWrapper]) -> None:
+def remove_cmd(ctx: click.Context, current_passphrase_file: TextIOWrapper | None) -> None:
     from chia.cmds.passphrase_funcs import (
         async_update_daemon_passphrase_cache_if_running,
         read_passphrase_from_file,
         remove_passphrase,
     )
 
-    current_passphrase: Optional[str] = None
+    current_passphrase: str | None = None
     if current_passphrase_file is not None:
         current_passphrase = read_passphrase_from_file(current_passphrase_file)
 

chia/cmds/passphrase_funcs.py

@@ -5,7 +5,7 @@ import sys
 from getpass import getpass
 from io import TextIOWrapper
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import click
 import colorama
@@ -24,9 +24,7 @@ SAVE_MASTER_PASSPHRASE_WARNING = (
 )
 
 
-def verify_passphrase_meets_requirements(
-    new_passphrase: str, confirmation_passphrase: str
-) -> tuple[bool, Optional[str]]:
+def verify_passphrase_meets_requirements(new_passphrase: str, confirmation_passphrase: str) -> tuple[bool, str | None]:
     match = new_passphrase == confirmation_passphrase
     min_length = Keychain.minimum_passphrase_length()
     meets_len_requirement = len(new_passphrase) >= min_length
@@ -46,8 +44,8 @@ def prompt_to_save_passphrase() -> bool:
 
     try:
         if supports_os_passphrase_storage():
-            location: Optional[str] = None
-            warning: Optional[str] = None
+            location: str | None = None
+            warning: str | None = None
 
             if sys.platform == "darwin":
                 location = "macOS Keychain"
@@ -113,7 +111,7 @@ def initialize_passphrase() -> None:
     # We'll rely on Keyring initialization to leverage the cached passphrase for
     # bootstrapping the keyring encryption process
     print("Setting keyring passphrase")
-    passphrase: Optional[str] = None
+    passphrase: str | None = None
     # save_passphrase indicates whether the passphrase should be saved in the
     # macOS Keychain or Windows Credential Manager
     save_passphrase: bool = False
@@ -127,7 +125,7 @@ def initialize_passphrase() -> None:
     Keychain.set_master_passphrase(current_passphrase=None, new_passphrase=passphrase, save_passphrase=save_passphrase)
 
 
-def set_or_update_passphrase(passphrase: Optional[str], current_passphrase: Optional[str], hint: Optional[str]) -> bool:
+def set_or_update_passphrase(passphrase: str | None, current_passphrase: str | None, hint: str | None) -> bool:
     # Prompt for the current passphrase, if necessary
     if Keychain.has_master_passphrase():
         # Try the default passphrase first
@@ -142,7 +140,7 @@ def set_or_update_passphrase(passphrase: Optional[str], current_passphrase: Opti
                 sys.exit(1)
 
     success: bool = False
-    new_passphrase: Optional[str] = passphrase
+    new_passphrase: str | None = passphrase
     save_passphrase: bool = False
 
     try:
@@ -167,7 +165,7 @@ def set_or_update_passphrase(passphrase: Optional[str], current_passphrase: Opti
     return success
 
 
-def remove_passphrase(current_passphrase: Optional[str]) -> bool:
+def remove_passphrase(current_passphrase: str | None) -> bool:
     """
     Removes the user's keyring passphrase. The keyring will be re-encrypted to the default passphrase.
     """
@@ -204,7 +202,7 @@ def cache_passphrase(passphrase: str) -> None:
     Keychain.set_cached_master_passphrase(passphrase)
 
 
-def get_current_passphrase() -> Optional[str]:
+def get_current_passphrase() -> str | None:
     if not Keychain.has_master_passphrase():
         return None
 
@@ -240,12 +238,12 @@ def display_passphrase_hint() -> None:
         print("Passphrase hint is not set")
 
 
-def update_passphrase_hint(hint: Optional[str] = None) -> bool:
+def update_passphrase_hint(hint: str | None = None) -> bool:
     updated: bool = False
     if Keychain.has_master_passphrase() is False or using_default_passphrase():
         print("Updating the passphrase hint requires that a passphrase has been set")
     else:
-        current_passphrase: Optional[str] = get_current_passphrase()
+        current_passphrase: str | None = get_current_passphrase()
         if current_passphrase is None:
             print("Keyring is not passphrase-protected")
         else:

chia/cmds/peer.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Optional
-
 import click
 
 from chia.cmds.cmd_classes import ChiaCliContext
@@ -31,7 +29,7 @@ from chia.cmds.peer_funcs import peer_async
 @click.pass_context
 def peer_cmd(
     ctx: click.Context,
-    rpc_port: Optional[int],
+    rpc_port: int | None,
     connections: bool,
     add_connection: str,
     remove_connection: str,

chia/cmds/peer_funcs.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 from chia.cmds.cmds_util import NODE_TYPES, get_any_service_client
 from chia.rpc.rpc_client import RpcClient
@@ -20,7 +20,7 @@ async def add_node_connection(rpc_client: RpcClient, add_connection: str) -> Non
         except Exception:
             print(f"Failed to connect to {host}:{port}")
     except ValueError:
-        print("Enter a valid IP and port in the following format: 10.5.4.3:8000")
+        print("Enter a valid IP and port in the following format: 10.5.4.3:8444 or [2606:f6c0:80:5::a]:8444")
 
 
 async def remove_node_connection(rpc_client: RpcClient, remove_connection: str) -> None:
@@ -107,7 +107,7 @@ async def print_connections(rpc_client: RpcClient, trusted_peers: dict[str, Any]
 
 async def peer_async(
     node_type: str,
-    rpc_port: Optional[int],
+    rpc_port: int | None,
     root_path: Path,
     show_connections: bool,
     add_connection: str,

chia/cmds/plotnft.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from dataclasses import field
-from typing import Optional
 
 import click
 from chia_rs.sized_bytes import bytes32
@@ -33,7 +32,7 @@ def plotnft_cmd(ctx: click.Context) -> None:
 class ShowPlotNFTCMD:
     rpc_info: NeedsWalletRPC  # provides wallet-rpc-port and fingerprint options
     context: ChiaCliContext = field(default_factory=ChiaCliContext)
-    id: Optional[int] = option(
+    id: int | None = option(
         "-i", "--id", help="ID of the wallet to use", default=None, show_default=True, required=False
     )
 
@@ -77,7 +76,7 @@ class GetLoginLinkCMD:
 )
 class CreatePlotNFTCMD:
     rpc_info: NeedsWalletRPC  # provides wallet-rpc-port and fingerprint options
-    pool_url: Optional[str] = option("-u", "--pool-url", help="HTTPS host:port of the pool to join", required=False)
+    pool_url: str | None = option("-u", "--pool-url", help="HTTPS host:port of the pool to join", required=False)
     state: str = option(
         "-s",
         "--state",
@@ -135,7 +134,7 @@ class JoinPlotNFTCMD:
         required=True,
     )
     dont_prompt: bool = option("-y", "--yes", help="No prompts", is_flag=True)
-    id: Optional[int] = option(
+    id: int | None = option(
         "-i", "--id", help="ID of the wallet to use", default=None, show_default=True, required=False
     )
 
@@ -171,7 +170,7 @@ class LeavePlotNFTCMD:
         show_default=True,
         required=True,
     )
-    id: Optional[int] = option(
+    id: int | None = option(
         "-i", "--id", help="ID of the wallet to use", default=None, show_default=True, required=False
     )
 
@@ -195,7 +194,7 @@ class LeavePlotNFTCMD:
 )
 class InspectPlotNFTCMD:
     rpc_info: NeedsWalletRPC  # provides wallet-rpc-port and fingerprint options
-    id: Optional[int] = option(
+    id: int | None = option(
         "-i", "--id", help="ID of the wallet to use", default=None, show_default=True, required=False
     )
 
@@ -215,7 +214,7 @@ class InspectPlotNFTCMD:
 )
 class ClaimPlotNFTCMD:
     rpc_info: NeedsWalletRPC  # provides wallet-rpc-port and fingerprint options
-    id: Optional[int] = option(
+    id: int | None = option(
         "-i", "--id", help="ID of the wallet to use", default=None, show_default=True, required=False
     )
     fee: uint64 = option(

chia/cmds/plotnft_funcs.py

@@ -4,11 +4,11 @@ import asyncio
 import functools
 import json
 import time
-from collections.abc import Awaitable
+from collections.abc import Awaitable, Callable
 from dataclasses import replace
 from pathlib import Path
 from pprint import pprint
-from typing import Any, Callable, Optional
+from typing import Any
 
 import aiohttp
 import click
@@ -30,7 +30,7 @@ from chia.pools.pool_config import (
     load_pool_config,
     update_pool_config,
 )
-from chia.pools.pool_wallet_info import PoolSingletonState, PoolWalletInfo
+from chia.pools.pool_wallet_info import NewPoolWalletInitialTargetState, PoolSingletonState, PoolWalletInfo
 from chia.protocols.pool_protocol import POOL_PROTOCOL_VERSION
 from chia.rpc.rpc_client import ResponseFailureError
 from chia.server.server import ssl_context_for_root
@@ -38,11 +38,12 @@ from chia.ssl.create_ssl import get_mozilla_ca_crt
 from chia.util.bech32m import encode_puzzle_hash
 from chia.util.default_root import DEFAULT_ROOT_PATH
 from chia.util.errors import CliRpcConnectionError
-from chia.wallet.transaction_record import TransactionRecord
 from chia.wallet.util.address_type import AddressType
 from chia.wallet.util.tx_config import DEFAULT_TX_CONFIG
 from chia.wallet.util.wallet_types import WalletType
 from chia.wallet.wallet_request_types import (
+    CreateNewWallet,
+    CreateNewWalletType,
     GetTransaction,
     GetWalletBalance,
     GetWallets,
@@ -51,6 +52,7 @@ from chia.wallet.wallet_request_types import (
     PWSelfPool,
     PWStatus,
     TransactionEndpointResponse,
+    WalletCreationMode,
     WalletInfoResponse,
 )
 from chia.wallet.wallet_rpc_client import WalletRpcClient
@@ -81,17 +83,17 @@ async def create_pool_args(pool_url: str) -> dict[str, Any]:
 
 async def create(
     wallet_info: WalletClientInfo,
-    pool_url: Optional[str],
+    pool_url: str | None,
     state: str,
     fee: uint64,
     *,
     prompt: bool,
 ) -> None:
-    target_puzzle_hash: Optional[bytes32]
+    target_puzzle_hash: bytes32 | None
     # Could use initial_pool_state_from_dict to simplify
     if state == "SELF_POOLING":
         pool_url = None
-        relative_lock_height = uint32(0)
+        relative_lock_height = None
         target_puzzle_hash = None  # wallet will fill this in
     elif state == "FARMING_TO_POOL":
         enforce_https = wallet_info.config["selected_network"] == "mainnet"
@@ -110,22 +112,31 @@ async def create(
         cli_confirm("Confirm (y/n): ", "Aborting.")
 
     try:
-        tx_record: TransactionRecord = await wallet_info.client.create_new_pool_wallet(
-            target_puzzle_hash,
-            pool_url,
-            relative_lock_height,
-            "localhost:5000",
-            "new",
-            state,
-            fee,
+        create_response = await wallet_info.client.create_new_wallet(
+            CreateNewWallet(
+                wallet_type=CreateNewWalletType.POOL_WALLET,
+                initial_target_state=NewPoolWalletInitialTargetState(
+                    target_puzzle_hash=target_puzzle_hash,
+                    state=state,
+                    pool_url=pool_url,
+                    relative_lock_height=relative_lock_height,
+                ),
+                mode=WalletCreationMode.NEW,
+                fee=fee,
+                push=True,
+            ),
+            DEFAULT_TX_CONFIG,
         )
+        assert create_response.transaction is not None  # mypy doesn't know about __post_init__
         start = time.time()
         while time.time() - start < 10:
             await asyncio.sleep(0.1)
-            tx = (await wallet_info.client.get_transaction(GetTransaction(tx_record.name))).transaction
+            tx = (
+                await wallet_info.client.get_transaction(GetTransaction(create_response.transaction.name))
+            ).transaction
             if len(tx.sent_to) > 0:
                 print(transaction_submitted_msg(tx))
-                print(transaction_status_msg(wallet_info.fingerprint, tx_record.name))
+                print(transaction_status_msg(wallet_info.fingerprint, create_response.transaction.name))
                 return None
     except Exception as e:
         raise CliRpcConnectionError(
@@ -138,7 +149,7 @@ async def pprint_pool_wallet_state(
     wallet_id: int,
     pool_wallet_info: PoolWalletInfo,
     address_prefix: str,
-    pool_state_dict: Optional[dict[str, Any]],
+    pool_state_dict: dict[str, Any] | None,
 ) -> None:
     print(f"Wallet ID: {wallet_id}")
     if pool_wallet_info.current.state == PoolSingletonState.LEAVING_POOL.value and pool_wallet_info.target is None:
@@ -222,7 +233,7 @@ async def pprint_all_pool_wallet_state(
 async def show(
     wallet_info: WalletClientInfo,
     root_path: Path,
-    wallet_id_passed_in: Optional[int],
+    wallet_id_passed_in: int | None,
 ) -> None:
     summaries_response = await wallet_info.client.get_wallets(GetWallets())
     config = wallet_info.config
@@ -261,7 +272,7 @@ async def show(
 
 async def get_login_link(launcher_id: bytes32, root_path: Path) -> None:
     async with get_any_service_client(FarmerRpcClient, root_path=root_path) as (farmer_client, _):
-        login_link: Optional[str] = await farmer_client.get_pool_login_link(launcher_id)
+        login_link: str | None = await farmer_client.get_pool_login_link(launcher_id)
         if login_link is None:
             raise CliRpcConnectionError("Was not able to get login link.")
         else:
@@ -298,7 +309,7 @@ async def submit_tx_with_confirmation(
         print(f"Error performing operation on Plot NFT -f {fingerprint} wallet id: {wallet_id}: {e}")
 
 
-async def wallet_id_lookup_and_check(wallet_client: WalletRpcClient, wallet_id: Optional[int]) -> int:
+async def wallet_id_lookup_and_check(wallet_client: WalletRpcClient, wallet_id: int | None) -> int:
     selected_wallet_id: int
 
     # absent network errors, this should not fail with an error
@@ -326,7 +337,7 @@ async def join_pool(
     wallet_info: WalletClientInfo,
     pool_url: str,
     fee: uint64,
-    wallet_id: Optional[int],
+    wallet_id: int | None,
     prompt: bool,
 ) -> None:
     selected_wallet_id = await wallet_id_lookup_and_check(wallet_info.client, wallet_id)
@@ -389,7 +400,7 @@ async def join_pool(
     )
 
 
-async def self_pool(*, wallet_info: WalletClientInfo, fee: uint64, wallet_id: Optional[int], prompt: bool) -> None:
+async def self_pool(*, wallet_info: WalletClientInfo, fee: uint64, wallet_id: int | None, prompt: bool) -> None:
     selected_wallet_id = await wallet_id_lookup_and_check(wallet_info.client, wallet_id)
     msg = (
         "Will start self-farming with Plot NFT on wallet id "
@@ -405,7 +416,7 @@ async def self_pool(*, wallet_info: WalletClientInfo, fee: uint64, wallet_id: Op
     )
 
 
-async def inspect_cmd(wallet_info: WalletClientInfo, wallet_id: Optional[int]) -> None:
+async def inspect_cmd(wallet_info: WalletClientInfo, wallet_id: int | None) -> None:
     selected_wallet_id = await wallet_id_lookup_and_check(wallet_info.client, wallet_id)
     res = await wallet_info.client.pw_status(PWStatus(uint32(selected_wallet_id)))
     print(
@@ -420,7 +431,7 @@ async def inspect_cmd(wallet_info: WalletClientInfo, wallet_id: Optional[int]) -
     )
 
 
-async def claim_cmd(*, wallet_info: WalletClientInfo, fee: uint64, wallet_id: Optional[int]) -> None:
+async def claim_cmd(*, wallet_info: WalletClientInfo, fee: uint64, wallet_id: int | None) -> None:
     selected_wallet_id = await wallet_id_lookup_and_check(wallet_info.client, wallet_id)
     msg = f"\nWill claim rewards for wallet ID: {selected_wallet_id}."
     func = functools.partial(
@@ -435,7 +446,7 @@ async def claim_cmd(*, wallet_info: WalletClientInfo, fee: uint64, wallet_id: Op
     await submit_tx_with_confirmation(msg, False, func, wallet_info.client, wallet_info.fingerprint, selected_wallet_id)
 
 
-async def change_payout_instructions(launcher_id: bytes32, address: CliAddress, root_path: Optional[Path]) -> None:
+async def change_payout_instructions(launcher_id: bytes32, address: CliAddress, root_path: Path | None) -> None:
     new_pool_configs: list[PoolWalletConfig] = []
     id_found = False
     puzzle_hash = address.validate_address_type_get_ph(AddressType.XCH)

chia/cmds/rpc.py

@@ -4,7 +4,7 @@ import asyncio
 import json
 import sys
 from pathlib import Path
-from typing import Any, Optional, TextIO
+from typing import Any, TextIO
 
 import click
 from aiohttp import ClientResponseError
@@ -184,8 +184,8 @@ def create_commands() -> None:
         def rpc_client_cmd(
             ctx: click.Context,
             endpoint: str,
-            request: Optional[str],
-            json_file: Optional[TextIO],
+            request: str | None,
+            json_file: TextIO | None,
             service: str = service,
         ) -> None:
             root_path: Path = ChiaCliContext.set_default(ctx).root_path

chia/cmds/show.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Optional
-
 import click
 
 from chia.cmds.cmd_classes import ChiaCliContext
@@ -39,14 +37,14 @@ from chia.cmds.show_funcs import show_async
 @click.pass_context
 def show_cmd(
     ctx: click.Context,
-    rpc_port: Optional[int],
-    wallet_rpc_port: Optional[int],
+    rpc_port: int | None,
+    wallet_rpc_port: int | None,
     fee: bool,
     state: bool,
     connections: bool,
     add_connection: str,
     remove_connection: str,
-    block_header_hash_by_height: Optional[int],
+    block_header_hash_by_height: int | None,
     block_by_header_hash: str,
 ) -> None:
     import asyncio

chia/cmds/show_funcs.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import json
 from pathlib import Path
-from typing import Any, Optional, Union
+from typing import Any
 
 from chia_rs.sized_bytes import bytes32
 
@@ -21,7 +21,7 @@ async def print_blockchain_state(node_client: FullNodeRpcClient, config: dict[st
     if blockchain_state is None:
         print("There is no blockchain found yet. Try again shortly")
         return True
-    peak: Optional[BlockRecord] = blockchain_state["peak"]
+    peak: BlockRecord | None = blockchain_state["peak"]
     node_id = blockchain_state["node_id"]
     difficulty = blockchain_state["difficulty"]
     sub_slot_iters = blockchain_state["sub_slot_iters"]
@@ -104,8 +104,8 @@ async def print_block_from_hash(
 
     from chia.util.bech32m import encode_puzzle_hash
 
-    block: Optional[BlockRecord] = await node_client.get_block_record(bytes32.from_hexstr(block_by_header_hash))
-    full_block: Optional[FullBlock] = await node_client.get_block(bytes32.from_hexstr(block_by_header_hash))
+    block: BlockRecord | None = await node_client.get_block_record(bytes32.from_hexstr(block_by_header_hash))
+    full_block: FullBlock | None = await node_client.get_block(bytes32.from_hexstr(block_by_header_hash))
     # Would like to have a verbose flag for this
     if block is not None:
         assert full_block is not None
@@ -123,7 +123,7 @@ async def print_block_from_hash(
             )
             block_time_string = time.strftime("%a %b %d %Y %T %Z", block_time)
             cost = str(full_block.transactions_info.cost)
-            tx_filter_hash: Union[str, bytes32] = "Not a transaction block"
+            tx_filter_hash: str | bytes32 = "Not a transaction block"
             if full_block.foliage_transaction_block:
                 tx_filter_hash = full_block.foliage_transaction_block.filter_hash
             fees: Any = block.fees
@@ -152,8 +152,8 @@ async def print_block_from_hash(
             f"Total VDF Iterations   {block.total_iters}\n"
             f"Is a Transaction Block?{block.is_transaction_block}\n"
             f"Deficit                {block.deficit}\n"
-            f"PoSpace 'k' Size (v1)  {full_block.reward_chain_block.proof_of_space.size().size_v1}\n"
-            f"PoSpace 'k' Size (v2)  {full_block.reward_chain_block.proof_of_space.size().size_v2}\n"
+            f"PoSpace 'k' Size (v1)  {full_block.reward_chain_block.proof_of_space.param().size_v1}\n"
+            f"PoSpace strength (v2)  {full_block.reward_chain_block.proof_of_space.param().strength_v2}\n"
             f"Plot Public Key        0x{full_block.reward_chain_block.proof_of_space.plot_public_key}\n"
             f"Pool Public Key        {pool_pk}\n"
             f"Tx Filter Hash         {tx_filter_hash}\n"
@@ -191,11 +191,11 @@ async def print_fee_info(node_client: FullNodeRpcClient) -> None:
 
 
 async def show_async(
-    rpc_port: Optional[int],
+    rpc_port: int | None,
     root_path: Path,
     print_fee_info_flag: bool,
     print_state: bool,
-    block_header_hash_by_height: Optional[int],
+    block_header_hash_by_height: int | None,
     block_by_header_hash: str,
 ) -> None:
     from chia.cmds.cmds_util import get_any_service_client