chia-blockchain 2.5.0rc2__py3-none-any.whl → 2.5.1rc2__py3-none-any.whl

chia/cmds/beta.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import zipfile
 from datetime import datetime
 from pathlib import Path
-from typing import List, Optional
+from typing import Optional
 
 import click
 
@@ -19,6 +19,7 @@ from chia.cmds.beta_funcs import (
     validate_beta_path,
     validate_metrics_log_interval,
 )
+from chia.cmds.cmd_classes import ChiaCliContext
 from chia.util.beta_metrics import metrics_log_interval_default
 from chia.util.config import lock_and_load_config, save_config
 
@@ -37,7 +38,7 @@ def beta_cmd() -> None:
 @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:
-    root_path = ctx.obj["root_path"]
+    root_path = ChiaCliContext.set_default(ctx).root_path
     with lock_and_load_config(root_path, "config.yaml") as config:
         if "beta" not in config:
             raise click.ClickException("beta test mode is not enabled, enable it first with `chia beta enable`")
@@ -79,7 +80,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:
-    root_path = ctx.obj["root_path"]
+    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):
             raise click.ClickException("beta test mode is already enabled")
@@ -107,7 +108,7 @@ def enable_cmd(ctx: click.Context, force: bool, path: Optional[str]) -> None:
 @beta_cmd.command("disable", help="Disable beta test mode")
 @click.pass_context
 def disable_cmd(ctx: click.Context) -> None:
-    root_path = ctx.obj["root_path"]
+    root_path = ChiaCliContext.set_default(ctx).root_path
     with lock_and_load_config(root_path, "config.yaml") as config:
         if not config.get("beta", {}).get("enabled", False):
             raise click.ClickException("beta test mode is not enabled")
@@ -121,7 +122,7 @@ def disable_cmd(ctx: click.Context) -> None:
 @beta_cmd.command("prepare_submission", help="Prepare the collected log data for submission")
 @click.pass_context
 def prepare_submission_cmd(ctx: click.Context) -> None:
-    with lock_and_load_config(ctx.obj["root_path"], "config.yaml") as config:
+    with lock_and_load_config(ChiaCliContext.set_default(ctx).root_path, "config.yaml") as config:
         beta_root_path = config.get("beta", {}).get("path", None)
         if beta_root_path is None:
             raise click.ClickException("beta test mode not enabled. Run `chia beta enable` first.")
@@ -150,7 +151,7 @@ def prepare_submission_cmd(ctx: click.Context) -> None:
         prepare_result / f"submission_{prepare_result.name}__{datetime.now().strftime('%m_%d_%Y__%H_%M_%S')}.zip"
     )
 
-    def add_files(paths: List[Path]) -> int:
+    def add_files(paths: list[Path]) -> int:
         added = 0
         for path in paths:
             if path.name.startswith("."):
@@ -173,7 +174,7 @@ def prepare_submission_cmd(ctx: click.Context) -> None:
 @beta_cmd.command("status", help="Show the current beta configuration")
 @click.pass_context
 def status(ctx: click.Context) -> None:
-    with lock_and_load_config(ctx.obj["root_path"], "config.yaml") as config:
+    with lock_and_load_config(ChiaCliContext.set_default(ctx).root_path, "config.yaml") as config:
         beta_config = config.get("beta")
         if beta_config is None:
             raise click.ClickException("beta test mode is not enabled, enable it first with `chia beta enable`")

chia/cmds/beta_funcs.py

@@ -3,9 +3,11 @@ from __future__ import annotations
 import os
 import sys
 from pathlib import Path
-from typing import Any, Callable, Dict, List, Optional
+from typing import Any, Callable, Optional
 
-from chia.cmds.cmds_util import format_bytes, prompt_yes_no, validate_directory_writable
+import click
+
+from chia.cmds.cmds_util import format_bytes, validate_directory_writable
 from chia.util.beta_metrics import metrics_log_interval_max, metrics_log_interval_min
 from chia.util.chia_logging import get_beta_logging_config
 from chia.util.errors import InvalidPathError
@@ -15,7 +17,7 @@ def default_beta_root_path() -> Path:
     return Path(os.path.expanduser(os.getenv("CHIA_BETA_ROOT", "~/chia-beta-test"))).resolve()
 
 
-def warn_if_beta_enabled(config: Dict[str, Any]) -> None:
+def warn_if_beta_enabled(config: dict[str, Any]) -> None:
     if config.get("beta", {}).get("enabled", False):
         print("\nWARNING: beta test mode is enabled. Run `chia beta disable` if this is unintentional.\n")
 
@@ -25,11 +27,12 @@ def prompt_beta_warning() -> bool:
     # The `/ 5` is just a rough estimation for `gzip` being used by the log rotation in beta mode. It was like
     # 7-10x compressed in example tests with 2MB files.
     min_space = format_bytes(int(logging_config["log_maxfilesrotation"] * logging_config["log_maxbytesrotation"] / 5))
-    return prompt_yes_no(
+    message = (
         f"\nWARNING: Enabling the beta test mode increases disk writes and may lead to {min_space} of "
         "extra logfiles getting stored on your disk. This should only be done if you are part of the beta test "
         "program.\n\nDo you really want to enable the beta test mode?"
     )
+    return click.confirm(message, default=None)
 
 
 def prompt_for_beta_path(default_path: Path) -> Path:
@@ -37,11 +40,12 @@ def prompt_for_beta_path(default_path: Path) -> Path:
     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 "
-            f"[{str(default_path)}]:"
+            f"[{default_path!s}]:"
         )
         test_path = Path(user_input) if user_input else default_path
-        if not test_path.is_dir() and prompt_yes_no(
-            f"\nDirectory {str(test_path)!r} doesn't exist.\n\nDo you want to create it?"
+        if not test_path.is_dir() and click.confirm(
+            f"\nDirectory {str(test_path)!r} doesn't exist.\n\nDo you want to create it?",
+            default=None,
         ):
             test_path.mkdir(parents=True)
 
@@ -65,7 +69,7 @@ def prompt_for_metrics_log_interval(default_interval: int) -> int:
     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 "
-            f"[{str(default_interval)}]:"
+            f"[{default_interval!s}]:"
         )
         test_interval = int(user_input) if user_input else default_interval
 
@@ -84,7 +88,7 @@ def prompt_for_metrics_log_interval(default_interval: int) -> int:
         return interval
 
 
-def update_beta_config(enabled: bool, path: Path, metrics_log_interval: int, config: Dict[str, Any]) -> None:
+def update_beta_config(enabled: bool, path: Path, metrics_log_interval: int, config: dict[str, Any]) -> None:
     if "beta" not in config:
         config["beta"] = {}
 
@@ -121,9 +125,9 @@ def prepare_chia_blockchain_log(path: Path) -> None:
     print(f"  - {path.name}")
 
 
-def prepare_logs(prepare_path: Path, prepare_callback: Callable[[Path], None]) -> List[Path]:
+def prepare_logs(prepare_path: Path, prepare_callback: Callable[[Path], None]) -> list[Path]:
     result = [path for path in prepare_path.iterdir()] if prepare_path.exists() else []
-    if len(result):
+    if len(result) > 0:
         print(f"\nPreparing {prepare_path.name!r} logs:")
         for log in result:
             if log.name.startswith("."):

chia/cmds/check_wallet_db.py

@@ -3,14 +3,15 @@ from __future__ import annotations
 import asyncio
 import sys
 from collections import defaultdict
+from collections.abc import Iterable
 from pathlib import Path
 from sqlite3 import Row
-from typing import Any, Dict, Iterable, List, Optional, Set
+from typing import Any, Optional
 
 from chia.util.collection import find_duplicates
 from chia.util.db_synchronous import db_synchronous_on
 from chia.util.db_wrapper import DBWrapper2, execute_fetchone
-from chia.util.pprint import print_compact_ranges
+from chia.wallet.util.pprint import print_compact_ranges
 from chia.wallet.util.wallet_types import WalletType
 
 # TODO: Check for missing paired wallets (eg. No DID wallet for an NFT)
@@ -48,18 +49,18 @@ def _validate_args_addresses_used(wallet_id: int, last_index: int, last_hardened
             raise ValueError(f"Invalid argument: noncontiguous derivation_index at {last_index} wallet_id={wallet_id}")
 
 
-def check_addresses_used_contiguous(derivation_paths: List[DerivationPath]) -> List[str]:
+def check_addresses_used_contiguous(derivation_paths: list[DerivationPath]) -> list[str]:
     """
     The used column for addresses in the derivation_paths table should be a
     zero or greater run of 1's, followed by a zero or greater run of 0's.
     There should be no used derivations after seeing a used derivation.
     """
-    errors: List[str] = []
+    errors: list[str] = []
 
     for wallet_id, dps in dp_by_wallet_id(derivation_paths).items():
         saw_unused = False
-        bad_used_values: Set[int] = set()
-        ordering_errors: List[str] = []
+        bad_used_values: set[int] = set()
+        ordering_errors: list[str] = []
         # last_index = None
         # last_hardened = None
         for dp in dps:
@@ -89,7 +90,7 @@ def check_addresses_used_contiguous(derivation_paths: List[DerivationPath]) -> L
     return errors
 
 
-def check_for_gaps(array: List[int], start: int, end: int, *, data_type_plural: str = "Elements") -> List[str]:
+def check_for_gaps(array: list[int], start: int, end: int, *, data_type_plural: str = "Elements") -> list[str]:
     """
     Check for compact sequence:
     Check that every value from start to end is present in array, and no more.
@@ -100,7 +101,7 @@ def check_for_gaps(array: List[int], start: int, end: int, *, data_type_plural:
 
     if start > end:
         raise ValueError(f"{__name__} called with incorrect arguments: start={start} end={end} (start > end)")
-    errors: List[str] = []
+    errors: list[str] = []
 
     if start == end and len(array) == 1:
         return errors
@@ -123,7 +124,7 @@ def check_for_gaps(array: List[int], start: int, end: int, *, data_type_plural:
 
 
 class FromDB:
-    def __init__(self, row: Iterable[Any], fields: List[str]) -> None:
+    def __init__(self, row: Iterable[Any], fields: list[str]) -> None:
         self.fields = fields
         for field, value in zip(fields, row):
             setattr(self, field, value)
@@ -144,7 +145,7 @@ def wallet_type_name(
         return f"INVALID_WALLET_TYPE ({wallet_type})"
 
 
-def _cwr(row: Row) -> List[Any]:
+def _cwr(row: Row) -> list[Any]:
     r = []
     for i, v in enumerate(row):
         if i == 2:
@@ -175,7 +176,7 @@ class Wallet(FromDB):
     data: str
 
 
-def dp_by_wallet_id(derivation_paths: List[DerivationPath]) -> Dict[int, List[DerivationPath]]:
+def dp_by_wallet_id(derivation_paths: list[DerivationPath]) -> dict[int, list[DerivationPath]]:
     d = defaultdict(list)
     for derivation_path in derivation_paths:
         d[derivation_path.wallet_id].append(derivation_path)
@@ -184,7 +185,7 @@ def dp_by_wallet_id(derivation_paths: List[DerivationPath]) -> Dict[int, List[De
     return d
 
 
-def derivation_indices_by_wallet_id(derivation_paths: List[DerivationPath]) -> Dict[int, List[int]]:
+def derivation_indices_by_wallet_id(derivation_paths: list[DerivationPath]) -> dict[int, list[int]]:
     d = dp_by_wallet_id(derivation_paths)
     di = {}
     for k, v in d.items():
@@ -192,7 +193,7 @@ def derivation_indices_by_wallet_id(derivation_paths: List[DerivationPath]) -> D
     return di
 
 
-def print_min_max_derivation_for_wallets(derivation_paths: List[DerivationPath]) -> None:
+def print_min_max_derivation_for_wallets(derivation_paths: list[DerivationPath]) -> None:
     d = derivation_indices_by_wallet_id(derivation_paths)
     print("Min, Max, Count of derivations for each wallet:")
     for wallet_id, derivation_index_list in d.items():
@@ -205,11 +206,12 @@ def print_min_max_derivation_for_wallets(derivation_paths: List[DerivationPath])
 
 class WalletDBReader:
     db_wrapper: DBWrapper2  # TODO: Remove db_wrapper member
-    config = {"db_readers": 1}
+    # 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
     verbose = False
 
-    async def get_all_wallets(self) -> List[Wallet]:
+    async def get_all_wallets(self) -> list[Wallet]:
         wallet_fields = ["id", "name", "wallet_type", "data"]
         async with self.db_wrapper.reader_no_transaction() as reader:
             # TODO: if table doesn't exist
@@ -217,7 +219,7 @@ class WalletDBReader:
             rows = await cursor.fetchall()
             return [Wallet(r, wallet_fields) for r in rows]
 
-    async def get_derivation_paths(self) -> List[DerivationPath]:
+    async def get_derivation_paths(self) -> list[DerivationPath]:
         fields = ["derivation_index", "pubkey", "puzzle_hash", "wallet_type", "wallet_id", "used", "hardened"]
         async with self.db_wrapper.reader_no_transaction() as reader:
             # TODO: if table doesn't exist
@@ -225,7 +227,7 @@ class WalletDBReader:
             rows = await cursor.fetchall()
             return [DerivationPath(row, fields) for row in rows]
 
-    async def show_tables(self) -> List[str]:
+    async def show_tables(self) -> list[str]:
         async with self.db_wrapper.reader_no_transaction() as reader:
             cursor = await reader.execute("""SELECT name FROM sqlite_master WHERE type='table';""")
             print("\nWallet DB Tables:")
@@ -237,7 +239,7 @@ class WalletDBReader:
             print()
             return []
 
-    async def check_wallets(self) -> List[str]:
+    async def check_wallets(self) -> list[str]:
         # id, name, wallet_type, data
         # TODO: Move this SQL up a level
         async with self.db_wrapper.reader_no_transaction() as reader:
@@ -282,8 +284,8 @@ class WalletDBReader:
             return errors
 
     def check_wallets_missing_derivations(
-        self, wallets: List[Wallet], derivation_paths: List[DerivationPath]
-    ) -> List[str]:
+        self, wallets: list[Wallet], derivation_paths: list[DerivationPath]
+    ) -> list[str]:
         p = []
         d = derivation_indices_by_wallet_id(derivation_paths)  # TODO: calc this once, pass in
         for w in wallets:
@@ -293,7 +295,7 @@ class WalletDBReader:
             return [f"Wallet IDs with no derivations that require them: {p}"]
         return []
 
-    def check_derivations_are_compact(self, wallets: List[Wallet], derivation_paths: List[DerivationPath]) -> List[str]:
+    def check_derivations_are_compact(self, wallets: list[Wallet], derivation_paths: list[DerivationPath]) -> list[str]:
         errors = []
         """
         Gaps in derivation index
@@ -318,8 +320,8 @@ class WalletDBReader:
         return errors
 
     def check_unexpected_derivation_entries(
-        self, wallets: List[Wallet], derivation_paths: List[DerivationPath]
-    ) -> List[str]:
+        self, wallets: list[Wallet], derivation_paths: list[DerivationPath]
+    ) -> list[str]:
         """
         Check for unexpected derivation path entries
 
@@ -340,7 +342,7 @@ class WalletDBReader:
             if d.wallet_id not in wallet_id_to_type:
                 missing_wallet_ids.append(d.wallet_id)
             elif d.wallet_type != wallet_id_to_type[d.wallet_id]:
-                wrong_type[(d.hardened, d.wallet_id, d.wallet_type, wallet_id_to_type[d.wallet_id])].append(
+                wrong_type[d.hardened, d.wallet_id, d.wallet_type, wallet_id_to_type[d.wallet_id]].append(
                     d.derivation_index
                 )
 
@@ -395,9 +397,9 @@ class WalletDBReader:
         return len(errors)
 
 
-async def scan(root_path: str, db_path: Optional[str] = None, *, verbose: bool = False) -> None:
+async def scan(root_path: Path, db_path: Optional[str] = None, *, verbose: bool = False) -> None:
     if db_path is None:
-        wallet_db_path = Path(root_path) / "wallet" / "db"
+        wallet_db_path = root_path / "wallet" / "db"
         wallet_db_paths = list(wallet_db_path.glob("blockchain_wallet_*.sqlite"))
     else:
         wallet_db_paths = [Path(db_path)]
@@ -415,4 +417,4 @@ async def scan(root_path: str, db_path: Optional[str] = None, *, verbose: bool =
 
 if __name__ == "__main__":
     loop = asyncio.get_event_loop()
-    loop.run_until_complete(scan("", sys.argv[1]))
+    loop.run_until_complete(scan(Path(), sys.argv[1]))

chia/cmds/chia.py

@@ -7,6 +7,7 @@ import click
 
 from chia import __version__
 from chia.cmds.beta import beta_cmd
+from chia.cmds.cmd_classes import ChiaCliContext
 from chia.cmds.completion import completion
 from chia.cmds.configure import configure_cmd
 from chia.cmds.dao import dao_cmd
@@ -27,12 +28,15 @@ from chia.cmds.show import show_cmd
 from chia.cmds.start import start_cmd
 from chia.cmds.stop import stop_cmd
 from chia.cmds.wallet import wallet_cmd
-from chia.util.default_root import DEFAULT_KEYS_ROOT_PATH, DEFAULT_ROOT_PATH
+from chia.util.default_root import DEFAULT_KEYS_ROOT_PATH, resolve_root_path
 from chia.util.errors import KeychainCurrentPassphraseIsInvalid
 from chia.util.keychain import Keychain, set_keys_root_path
 from chia.util.ssl_check import check_ssl
 
-CONTEXT_SETTINGS = dict(help_option_names=["-h", "--help"])
+CONTEXT_SETTINGS = {
+    "help_option_names": ["-h", "--help"],
+    "show_default": True,
+}
 
 
 @click.group(
@@ -40,7 +44,13 @@ CONTEXT_SETTINGS = dict(help_option_names=["-h", "--help"])
     epilog="Try 'chia start node', 'chia netspace -d 192', or 'chia show -s'",
     context_settings=CONTEXT_SETTINGS,
 )
-@click.option("--root-path", default=DEFAULT_ROOT_PATH, help="Config file root", type=click.Path(), show_default=True)
+@click.option(
+    "--root-path",
+    default=resolve_root_path(override=None),
+    help="Config file root",
+    type=click.Path(),
+    show_default=True,
+)
 @click.option(
     "--keys-root-path", default=DEFAULT_KEYS_ROOT_PATH, help="Keyring file root", type=click.Path(), show_default=True
 )
@@ -54,8 +64,8 @@ def cli(
 ) -> None:
     from pathlib import Path
 
-    ctx.ensure_object(dict)
-    ctx.obj["root_path"] = Path(root_path)
+    context = ChiaCliContext.set_default(ctx=ctx)
+    context.root_path = Path(root_path)
 
     # keys_root_path and passphrase_file will be None if the passphrase options have been
     # scrubbed from the CLI options
@@ -107,7 +117,7 @@ def run_daemon_cmd(ctx: click.Context, wait_for_unlock: bool) -> None:
 
     wait_for_unlock = wait_for_unlock and Keychain.is_keyring_locked()
 
-    asyncio.run(async_run_daemon(ctx.obj["root_path"], wait_for_unlock=wait_for_unlock))
+    asyncio.run(async_run_daemon(ChiaCliContext.set_default(ctx).root_path, wait_for_unlock=wait_for_unlock))
 
 
 cli.add_command(keys_cmd)
@@ -134,9 +144,7 @@ cli.add_command(dev_cmd)
 
 
 def main() -> None:
-    import chia.cmds.signer  # noqa
-
-    cli()  # pylint: disable=no-value-for-parameter
+    cli()
 
 
 if __name__ == "__main__":