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

chia/cmds/data.py

@@ -2,8 +2,9 @@ from __future__ import annotations
 
 import json
 import logging
+from collections.abc import Coroutine, Sequence
 from pathlib import Path
-from typing import Any, Callable, Coroutine, Dict, List, Optional, Sequence, TypeVar, Union
+from typing import Any, Callable, Optional, TypeVar, Union
 
 import click
 
@@ -20,7 +21,7 @@ logger = logging.getLogger(__name__)
 
 
 # TODO: this is more general and should be part of refactoring the overall CLI code duplication
-def run(coro: Coroutine[Any, Any, Optional[Dict[str, Any]]]) -> None:
+def run(coro: Coroutine[Any, Any, Optional[dict[str, Any]]]) -> None:
     import asyncio
 
     response = asyncio.run(coro)
@@ -344,7 +345,7 @@ def get_root(
 @options.create_fingerprint()
 def subscribe(
     id: bytes32,
-    urls: List[str],
+    urls: list[str],
     data_rpc_port: int,
     fingerprint: Optional[int],
 ) -> None:
@@ -360,7 +361,7 @@ def subscribe(
 @options.create_fingerprint()
 def remove_subscription(
     id: bytes32,
-    urls: List[str],
+    urls: list[str],
     data_rpc_port: int,
     fingerprint: Optional[int],
 ) -> None:
@@ -492,7 +493,7 @@ def add_missing_files(
 def add_mirror(
     id: bytes32,
     amount: int,
-    urls: List[str],
+    urls: list[str],
     fee: Optional[uint64],
     data_rpc_port: int,
     fingerprint: Optional[int],
@@ -674,7 +675,7 @@ def wallet_log_in(
 @options.create_fingerprint()
 def get_proof(
     id: bytes32,
-    key_strings: List[str],
+    key_strings: list[str],
     data_rpc_port: int,
     fingerprint: Optional[int],
 ) -> None:

chia/cmds/data_funcs.py

@@ -2,20 +2,24 @@ from __future__ import annotations
 
 import contextlib
 import json
+from collections.abc import AsyncIterator
 from pathlib import Path
-from typing import Any, AsyncIterator, Dict, List, Optional, Tuple
+from typing import Any, Optional
 
 from chia.cmds.cmds_util import get_any_service_client
 from chia.rpc.data_layer_rpc_client import DataLayerRpcClient
 from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.byte_types import hexstr_to_bytes
+from chia.util.default_root import resolve_root_path
 from chia.util.ints import uint64
 
 
 @contextlib.asynccontextmanager
 async def get_client(
     rpc_port: Optional[int], fingerprint: Optional[int] = None, root_path: Optional[Path] = None
-) -> AsyncIterator[Tuple[DataLayerRpcClient, Dict[str, Any]]]:
+) -> AsyncIterator[tuple[DataLayerRpcClient, dict[str, Any]]]:
+    root_path = resolve_root_path(override=root_path)
+
     async with get_any_service_client(
         client_type=DataLayerRpcClient,
         rpc_port=rpc_port,
@@ -31,7 +35,7 @@ async def wallet_log_in_cmd(
     fingerprint: int,
     root_path: Optional[Path] = None,
 ) -> None:
-    async with get_client(rpc_port=rpc_port, fingerprint=fingerprint, root_path=root_path) as (client, _):
+    async with get_client(rpc_port=rpc_port, fingerprint=fingerprint, root_path=root_path):
         pass
 
 
@@ -63,12 +67,12 @@ async def get_value_cmd(
 async def update_data_store_cmd(
     rpc_port: Optional[int],
     store_id: bytes32,
-    changelist: List[Dict[str, str]],
+    changelist: list[dict[str, str]],
     fee: Optional[uint64],
     fingerprint: Optional[int],
     submit_on_chain: bool,
     root_path: Optional[Path] = None,
-) -> Dict[str, Any]:
+) -> dict[str, Any]:
     res = dict()
     async with get_client(rpc_port=rpc_port, fingerprint=fingerprint, root_path=root_path) as (client, _):
         res = await client.update_data_store(
@@ -84,12 +88,12 @@ async def update_data_store_cmd(
 
 async def update_multiple_stores_cmd(
     rpc_port: Optional[int],
-    store_updates: List[Dict[str, str]],
+    store_updates: list[dict[str, str]],
     fee: Optional[uint64],
     fingerprint: Optional[int],
     submit_on_chain: bool,
     root_path: Optional[Path] = None,
-) -> Dict[str, Any]:
+) -> dict[str, Any]:
     res = dict()
 
     async with get_client(rpc_port=rpc_port, fingerprint=fingerprint, root_path=root_path) as (client, _):
@@ -109,7 +113,7 @@ async def submit_pending_root_cmd(
     fee: Optional[uint64],
     fingerprint: Optional[int],
     root_path: Optional[Path] = None,
-) -> Dict[str, Any]:
+) -> dict[str, Any]:
     res = dict()
     async with get_client(rpc_port=rpc_port, fingerprint=fingerprint, root_path=root_path) as (client, _):
         res = await client.submit_pending_root(
@@ -126,7 +130,7 @@ async def submit_all_pending_roots_cmd(
     fee: Optional[uint64],
     fingerprint: Optional[int],
     root_path: Optional[Path] = None,
-) -> Dict[str, Any]:
+) -> dict[str, Any]:
     res = dict()
     async with get_client(rpc_port=rpc_port, fingerprint=fingerprint, root_path=root_path) as (client, _):
         res = await client.submit_all_pending_roots(fee=fee)
@@ -144,7 +148,7 @@ async def get_keys_cmd(
     page: Optional[int],
     max_page_size: Optional[int],
     root_path: Optional[Path] = None,
-) -> Dict[str, Any]:
+) -> dict[str, Any]:
     res = dict()
     async with get_client(rpc_port=rpc_port, fingerprint=fingerprint, root_path=root_path) as (client, _):
         res = await client.get_keys(store_id=store_id, root_hash=root_hash, page=page, max_page_size=max_page_size)
@@ -162,7 +166,7 @@ async def get_keys_values_cmd(
     page: Optional[int],
     max_page_size: Optional[int],
     root_path: Optional[Path] = None,
-) -> Dict[str, Any]:
+) -> dict[str, Any]:
     res = dict()
     async with get_client(rpc_port=rpc_port, fingerprint=fingerprint, root_path=root_path) as (client, _):
         res = await client.get_keys_values(
@@ -186,7 +190,7 @@ async def get_root_cmd(
 async def subscribe_cmd(
     rpc_port: Optional[int],
     store_id: bytes32,
-    urls: List[str],
+    urls: list[str],
     fingerprint: Optional[int],
 ) -> None:
     async with get_client(rpc_port=rpc_port, fingerprint=fingerprint) as (client, _):
@@ -208,7 +212,7 @@ async def unsubscribe_cmd(
 async def remove_subscriptions_cmd(
     rpc_port: Optional[int],
     store_id: bytes32,
-    urls: List[str],
+    urls: list[str],
     fingerprint: Optional[int],
 ) -> None:
     async with get_client(rpc_port=rpc_port, fingerprint=fingerprint) as (client, _):
@@ -225,7 +229,7 @@ async def get_kv_diff_cmd(
     page: Optional[int],
     max_page_size: Optional[int],
     root_path: Optional[Path] = None,
-) -> Dict[str, Any]:
+) -> dict[str, Any]:
     res = dict()
     async with get_client(rpc_port=rpc_port, fingerprint=fingerprint, root_path=root_path) as (client, _):
         res = await client.get_kv_diff(
@@ -248,7 +252,7 @@ async def get_root_history_cmd(
 
 async def add_missing_files_cmd(
     rpc_port: Optional[int],
-    ids: Optional[List[bytes32]],
+    ids: Optional[list[bytes32]],
     overwrite: bool,
     foldername: Optional[Path],
     fingerprint: Optional[int],
@@ -265,7 +269,7 @@ async def add_missing_files_cmd(
 async def add_mirror_cmd(
     rpc_port: Optional[int],
     store_id: bytes32,
-    urls: List[str],
+    urls: list[str],
     amount: int,
     fee: Optional[uint64],
     fingerprint: Optional[int],
@@ -343,7 +347,8 @@ async def clear_pending_roots(
     rpc_port: Optional[int],
     root_path: Optional[Path] = None,
     fingerprint: Optional[int] = None,
-) -> Dict[str, Any]:
+) -> dict[str, Any]:
+    result = dict()
     async with get_client(rpc_port=rpc_port, fingerprint=fingerprint, root_path=root_path) as (client, _):
         result = await client.clear_pending_roots(store_id=store_id)
         print(json.dumps(result, indent=2, sort_keys=True))
@@ -353,11 +358,11 @@ async def clear_pending_roots(
 
 async def get_proof_cmd(
     store_id: bytes32,
-    key_strings: List[str],
+    key_strings: list[str],
     rpc_port: Optional[int],
     root_path: Optional[Path] = None,
     fingerprint: Optional[int] = None,
-) -> Dict[str, Any]:
+) -> dict[str, Any]:
     result = dict()
     async with get_client(rpc_port=rpc_port, fingerprint=fingerprint, root_path=root_path) as (client, _):
         result = await client.get_proof(store_id=store_id, keys=[hexstr_to_bytes(key) for key in key_strings])
@@ -367,11 +372,11 @@ async def get_proof_cmd(
 
 
 async def verify_proof_cmd(
-    proof: Dict[str, Any],
+    proof: dict[str, Any],
     rpc_port: Optional[int],
     root_path: Optional[Path] = None,
     fingerprint: Optional[int] = None,
-) -> Dict[str, Any]:
+) -> dict[str, Any]:
     result = dict()
     async with get_client(rpc_port=rpc_port, fingerprint=fingerprint, root_path=root_path) as (client, _):
         result = await client.verify_proof(proof=proof)

chia/cmds/db.py

@@ -5,6 +5,7 @@ from typing import Optional
 
 import click
 
+from chia.cmds.cmd_classes import ChiaCliContext
 from chia.cmds.db_backup_func import db_backup_func
 from chia.cmds.db_upgrade_func import db_upgrade_func
 from chia.cmds.db_validate_func import db_validate_func
@@ -41,7 +42,7 @@ def db_upgrade_cmd(
 ) -> None:
     try:
         db_upgrade_func(
-            Path(ctx.obj["root_path"]),
+            ChiaCliContext.set_default(ctx).root_path,
             None if in_db_path is None else Path(in_db_path),
             None if out_db_path is None else Path(out_db_path),
             no_update_config=no_update_config,
@@ -63,7 +64,7 @@ def db_upgrade_cmd(
 def db_validate_cmd(ctx: click.Context, in_db_path: Optional[str], validate_blocks: bool) -> None:
     try:
         db_validate_func(
-            Path(ctx.obj["root_path"]),
+            ChiaCliContext.set_default(ctx).root_path,
             None if in_db_path is None else Path(in_db_path),
             validate_blocks=validate_blocks,
         )
@@ -78,7 +79,7 @@ def db_validate_cmd(ctx: click.Context, in_db_path: Optional[str], validate_bloc
 def db_backup_cmd(ctx: click.Context, db_backup_file: Optional[str], no_indexes: bool) -> None:
     try:
         db_backup_func(
-            Path(ctx.obj["root_path"]),
+            ChiaCliContext.set_default(ctx).root_path,
             None if db_backup_file is None else Path(db_backup_file),
             no_indexes=no_indexes,
         )

chia/cmds/db_backup_func.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import Any, Dict, Optional
+from typing import Any, Optional
 
 from chia.util.config import load_config
 from chia.util.path import path_from_root
@@ -13,7 +13,7 @@ def db_backup_func(
     *,
     no_indexes: bool,
 ) -> None:
-    config: Dict[str, Any] = load_config(root_path, "config.yaml")["full_node"]
+    config: dict[str, Any] = load_config(root_path, "config.yaml")["full_node"]
     selected_network: str = config["selected_network"]
     db_pattern: str = config["database_path"]
     db_path_replaced: str = db_pattern.replace("CHALLENGE", selected_network)

chia/cmds/db_upgrade_func.py

@@ -10,7 +10,7 @@ import textwrap
 from contextlib import closing
 from pathlib import Path
 from time import monotonic
-from typing import Any, Dict, List, Optional
+from typing import Any, Optional
 
 import zstd
 
@@ -33,7 +33,7 @@ def db_upgrade_func(
 ) -> None:
     update_config: bool = in_db_path is None and out_db_path is None and not no_update_config
 
-    config: Dict[str, Any]
+    config: dict[str, Any]
     selected_network: str
     db_pattern: str
     if in_db_path is None or out_db_path is None:
@@ -183,7 +183,7 @@ def convert_v1_to_v2(in_path: Path, out_path: Path) -> None:
         parameter_limit = get_host_parameter_limit()
         start_time = monotonic()
         block_start_time = start_time
-        rowids: List[int] = []
+        rowids: list[int] = []
         small_batch_size = BATCH_SIZE <= parameter_limit
         small_chain = peak_height <= parameter_limit
         current_header_hash = peak_hash

chia/cmds/db_validate_func.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import Any, Dict, Optional
+from typing import Any, Optional
 
 from chia.consensus.block_record import BlockRecord
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
@@ -18,7 +18,7 @@ def db_validate_func(
     validate_blocks: bool,
 ) -> None:
     if in_db_path is None:
-        config: Dict[str, Any] = load_config(root_path, "config.yaml")["full_node"]
+        config: dict[str, Any] = load_config(root_path, "config.yaml")["full_node"]
         selected_network: str = config["selected_network"]
         db_pattern: str = config["database_path"]
         db_path_replaced: str = db_pattern.replace("CHALLENGE", selected_network)

chia/cmds/dev.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import click
 
+from chia.cmds.gh import gh_group
 from chia.cmds.installers import installers_group
 from chia.cmds.sim import sim_cmd
 
@@ -14,3 +15,4 @@ def dev_cmd(ctx: click.Context) -> None:
 
 dev_cmd.add_command(sim_cmd)
 dev_cmd.add_command(installers_group)
+dev_cmd.add_command(gh_group)

chia/cmds/farm.py

@@ -4,6 +4,8 @@ from typing import Optional
 
 import click
 
+from chia.cmds.cmd_classes import ChiaCliContext
+
 
 @click.group("farm", help="Manage your farm")
 def farm_cmd() -> None:
@@ -49,7 +51,9 @@ def farm_cmd() -> None:
     default=None,
     show_default=True,
 )
+@click.pass_context
 def summary_cmd(
+    ctx: click.Context,
     rpc_port: Optional[int],
     wallet_rpc_port: Optional[int],
     harvester_rpc_port: Optional[int],
@@ -57,9 +61,17 @@ def summary_cmd(
 ) -> None:
     import asyncio
 
-    from .farm_funcs import summary
+    from chia.cmds.farm_funcs import summary
 
-    asyncio.run(summary(rpc_port, wallet_rpc_port, harvester_rpc_port, farmer_rpc_port))
+    asyncio.run(
+        summary(
+            rpc_port,
+            wallet_rpc_port,
+            harvester_rpc_port,
+            farmer_rpc_port,
+            root_path=ChiaCliContext.set_default(ctx).root_path,
+        )
+    )
 
 
 @farm_cmd.command("challenges", help="Show the latest challenges")
@@ -79,9 +91,10 @@ def summary_cmd(
     default=20,
     show_default=True,
 )
-def challenges_cmd(farmer_rpc_port: Optional[int], limit: int) -> None:
+@click.pass_context
+def challenges_cmd(ctx: click.Context, farmer_rpc_port: Optional[int], limit: int) -> None:
     import asyncio
 
-    from .farm_funcs import challenges
+    from chia.cmds.farm_funcs import challenges
 
-    asyncio.run(challenges(farmer_rpc_port, limit))
+    asyncio.run(challenges(ChiaCliContext.set_default(ctx).root_path, farmer_rpc_port, limit))

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, Dict, List, Optional
+from typing import Any, Optional
 
 from chia.cmds.cmds_util import format_bytes, format_minutes, get_any_service_client
 from chia.cmds.units import units
@@ -11,29 +11,24 @@ from chia.consensus.block_record import BlockRecord
 from chia.rpc.farmer_rpc_client import FarmerRpcClient
 from chia.rpc.full_node_rpc_client import FullNodeRpcClient
 from chia.rpc.wallet_rpc_client import WalletRpcClient
-from chia.util.default_root import DEFAULT_ROOT_PATH
 from chia.util.errors import CliRpcConnectionError
 from chia.util.network import is_localhost
 
 SECONDS_PER_BLOCK = (24 * 3600) / 4608
 
 
-async def get_harvesters_summary(
-    farmer_rpc_port: Optional[int], root_path: Path = DEFAULT_ROOT_PATH
-) -> Optional[Dict[str, Any]]:
-    async with get_any_service_client(FarmerRpcClient, farmer_rpc_port, root_path) as (farmer_client, _):
+async def get_harvesters_summary(farmer_rpc_port: Optional[int], root_path: Path) -> Optional[dict[str, Any]]:
+    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 = DEFAULT_ROOT_PATH
-) -> Optional[Dict[str, Any]]:
-    async with get_any_service_client(FullNodeRpcClient, rpc_port, root_path) as (client, _):
+async def get_blockchain_state(rpc_port: Optional[int], root_path: Path) -> Optional[dict[str, Any]]:
+    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 = DEFAULT_ROOT_PATH) -> float:
-    async with get_any_service_client(FullNodeRpcClient, rpc_port, root_path) as (client, _):
+async def get_average_block_time(rpc_port: Optional[int], 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"]
@@ -53,20 +48,18 @@ async def get_average_block_time(rpc_port: Optional[int], root_path: Path = DEFA
         return (curr.timestamp - past_curr.timestamp) / (curr.height - past_curr.height)
 
 
-async def get_wallets_stats(
-    wallet_rpc_port: Optional[int], root_path: Path = DEFAULT_ROOT_PATH
-) -> Optional[Dict[str, Any]]:
-    async with get_any_service_client(WalletRpcClient, wallet_rpc_port, root_path) as (wallet_client, _):
+async def get_wallets_stats(wallet_rpc_port: Optional[int], root_path: Path) -> Optional[dict[str, Any]]:
+    async with get_any_service_client(WalletRpcClient, root_path, wallet_rpc_port) as (wallet_client, _):
         return await wallet_client.get_farmed_amount()
 
 
-async def get_challenges(farmer_rpc_port: Optional[int]) -> Optional[List[Dict[str, Any]]]:
-    async with get_any_service_client(FarmerRpcClient, farmer_rpc_port) as (farmer_client, _):
+async def get_challenges(root_path: Path, farmer_rpc_port: Optional[int]) -> Optional[list[dict[str, Any]]]:
+    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(farmer_rpc_port: Optional[int], limit: int) -> None:
-    signage_points = await get_challenges(farmer_rpc_port)
+async def challenges(root_path: Path, farmer_rpc_port: Optional[int], limit: int) -> None:
+    signage_points = await get_challenges(root_path, farmer_rpc_port)
     if signage_points is None:
         return None
 
@@ -86,7 +79,7 @@ async def summary(
     wallet_rpc_port: Optional[int],
     harvester_rpc_port: Optional[int],
     farmer_rpc_port: Optional[int],
-    root_path: Path = DEFAULT_ROOT_PATH,
+    root_path: Path,
 ) -> None:
     harvesters_summary = await get_harvesters_summary(farmer_rpc_port, root_path)
     blockchain_state = None
@@ -135,8 +128,8 @@ async def summary(
         total_plots = 0
 
     if harvesters_summary is not None:
-        harvesters_local: Dict[str, Dict[str, Any]] = {}
-        harvesters_remote: Dict[str, Dict[str, Any]] = {}
+        harvesters_local: dict[str, dict[str, Any]] = {}
+        harvesters_remote: dict[str, dict[str, Any]] = {}
         for harvester in harvesters_summary["harvesters"]:
             ip = harvester["connection"]["host"]
             if is_localhost(ip):
@@ -146,7 +139,7 @@ async def summary(
                     harvesters_remote[ip] = {}
                 harvesters_remote[ip][harvester["connection"]["node_id"]] = harvester
 
-        def process_harvesters(harvester_peers_in: Dict[str, Dict[str, Any]]) -> None:
+        def process_harvesters(harvester_peers_in: dict[str, dict[str, Any]]) -> None:
             for harvester_peer_id, harvester_dict in harvester_peers_in.items():
                 syncing = harvester_dict["syncing"]
                 if syncing is not None and syncing["initial"]: