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

chia/cmds/coins.py

@@ -1,16 +1,22 @@
 from __future__ import annotations
 
-import asyncio
-from typing import List, Optional, Sequence
+from collections.abc import Sequence
+from typing import Optional
 
 import click
 
-from chia.cmds import options
-from chia.cmds.cmds_util import coin_selection_args, tx_config_args, tx_out_cmd
+from chia.cmds.cmd_classes import (
+    chia_command,
+    option,
+)
+from chia.cmds.cmd_helpers import (
+    NeedsCoinSelectionConfig,
+    NeedsWalletRPC,
+    TransactionEndpoint,
+    transaction_endpoint_runner,
+)
 from chia.cmds.param_types import AmountParamType, Bytes32ParamType, CliAmount
 from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint64
-from chia.wallet.conditions import ConditionValidTimes
 from chia.wallet.transaction_record import TransactionRecord
 
 
@@ -20,201 +26,157 @@ def coins_cmd(ctx: click.Context) -> None:
     pass
 
 
-@coins_cmd.command("list", help="List all coins")
-@click.option(
-    "-p",
-    "--wallet-rpc-port",
-    help="Set the port where the Wallet is hosting the RPC interface. See the rpc_port under wallet in config.yaml",
-    type=int,
-    default=None,
+@chia_command(
+    group=coins_cmd,
+    name="list",
+    short_help="List all coins",
+    help="List all coins",
 )
-@options.create_fingerprint()
-@click.option("-i", "--id", help="Id of the wallet to use", type=int, default=1, show_default=True, required=True)
-@click.option("-u", "--show-unconfirmed", help="Separately display unconfirmed coins.", is_flag=True)
-@coin_selection_args
-@click.option(
-    "--paginate/--no-paginate",
-    default=None,
-    help="Prompt for each page of data.  Defaults to true for interactive consoles, otherwise false.",
-)
-@click.pass_context
-def list_cmd(
-    ctx: click.Context,
-    wallet_rpc_port: Optional[int],
-    fingerprint: int,
-    id: int,
-    show_unconfirmed: bool,
-    min_coin_amount: CliAmount,
-    max_coin_amount: CliAmount,
-    coins_to_exclude: Sequence[bytes32],
-    amounts_to_exclude: Sequence[CliAmount],
-    paginate: Optional[bool],
-) -> None:
-    from .coin_funcs import async_list
-
-    asyncio.run(
-        async_list(
-            wallet_rpc_port=wallet_rpc_port,
-            fingerprint=fingerprint,
-            wallet_id=id,
-            max_coin_amount=max_coin_amount,
-            min_coin_amount=min_coin_amount,
-            excluded_amounts=amounts_to_exclude,
-            excluded_coin_ids=coins_to_exclude,
-            show_unconfirmed=show_unconfirmed,
-            paginate=paginate,
-        )
+class ListCMD:
+    rpc_info: NeedsWalletRPC
+    coin_selection_config: NeedsCoinSelectionConfig
+    id: int = option(
+        "-i", "--id", help="Id of the wallet to use", type=int, default=1, show_default=True, required=True
+    )
+    show_unconfirmed: bool = option(
+        "-u", "--show-unconfirmed", help="Separately display unconfirmed coins.", is_flag=True
+    )
+    paginate: Optional[bool] = option(
+        "--paginate/--no-paginate",
+        default=None,
+        help="Prompt for each page of data.  Defaults to true for interactive consoles, otherwise false.",
     )
 
+    async def run(self) -> None:
+        async with self.rpc_info.wallet_rpc() as wallet_rpc:
+            from chia.cmds.coin_funcs import async_list
 
-@coins_cmd.command("combine", help="Combine dust coins")
-@click.option(
-    "-p",
-    "--wallet-rpc-port",
-    help="Set the port where the Wallet is hosting the RPC interface. See the rpc_port under wallet in config.yaml",
-    type=int,
-    default=None,
-)
-@options.create_fingerprint()
-@click.option("-i", "--id", help="Id of the wallet to use", type=int, default=1, show_default=True, required=True)
-@click.option(
-    "-a",
-    "--target-amount",
-    help="Select coins until this amount (in XCH or CAT) is reached. \
-    Combine all selected coins into one coin, which will have a value of at least target-amount",
-    type=AmountParamType(),
-    default=None,
-)
-@click.option(
-    "-n",
-    "--number-of-coins",
-    type=int,
-    default=500,
-    show_default=True,
-    help="The number of coins we are combining.",
-)
-@tx_config_args
-@options.create_fee()
-@click.option(
-    "--input-coin",
-    "input_coins",
-    multiple=True,
-    help="Only combine coins with these ids.",
-    type=Bytes32ParamType(),
-)
-@click.option(
-    "--largest-first/--smallest-first",
-    "largest_first",
-    default=False,
-    help="Sort coins from largest to smallest or smallest to largest.",
+            await async_list(
+                client_info=wallet_rpc,
+                wallet_id=self.id,
+                max_coin_amount=self.coin_selection_config.max_coin_amount,
+                min_coin_amount=self.coin_selection_config.min_coin_amount,
+                excluded_amounts=self.coin_selection_config.amounts_to_exclude,
+                excluded_coin_ids=self.coin_selection_config.coins_to_exclude,
+                show_unconfirmed=self.show_unconfirmed,
+                paginate=self.paginate,
+            )
+
+
+@chia_command(
+    group=coins_cmd,
+    name="combine",
+    short_help="Combine dust coins",
+    help="Combine dust coins",
 )
-@click.option("--override", help="Submits transaction without checking for unusual values", is_flag=True, default=False)
-@tx_out_cmd()
-def combine_cmd(
-    wallet_rpc_port: Optional[int],
-    fingerprint: int,
-    id: int,
-    target_amount: Optional[CliAmount],
-    min_coin_amount: CliAmount,
-    amounts_to_exclude: Sequence[CliAmount],
-    coins_to_exclude: Sequence[bytes32],
-    number_of_coins: int,
-    max_coin_amount: CliAmount,
-    fee: uint64,
-    input_coins: Sequence[bytes32],
-    largest_first: bool,
-    reuse: bool,
-    push: bool,
-    condition_valid_times: ConditionValidTimes,
-    override: bool,
-) -> List[TransactionRecord]:
-    from .coin_funcs import async_combine
-
-    return asyncio.run(
-        async_combine(
-            wallet_rpc_port=wallet_rpc_port,
-            fingerprint=fingerprint,
-            wallet_id=id,
-            fee=fee,
-            max_coin_amount=max_coin_amount,
-            min_coin_amount=min_coin_amount,
-            excluded_amounts=amounts_to_exclude,
-            coins_to_exclude=coins_to_exclude,
-            reuse_puzhash=reuse,
-            number_of_coins=number_of_coins,
-            target_coin_amount=target_amount,
-            target_coin_ids=input_coins,
-            largest_first=largest_first,
-            push=push,
-            condition_valid_times=condition_valid_times,
-            override=override,
-        )
+class CombineCMD(TransactionEndpoint):
+    id: int = option(
+        "-i", "--id", help="Id of the wallet to use", type=int, default=1, show_default=True, required=True
+    )
+    target_amount: Optional[CliAmount] = option(
+        "-a",
+        "--target-amount",
+        help="Select coins until this amount (in XCH or CAT) is reached. \
+        Combine all selected coins into one coin, which will have a value of at least target-amount",
+        type=AmountParamType(),
+        default=None,
+    )
+    number_of_coins: int = option(
+        "-n",
+        "--number-of-coins",
+        type=int,
+        default=500,
+        show_default=True,
+        help="The number of coins we are combining.",
+    )
+    input_coins: Sequence[bytes32] = option(
+        "--input-coin",
+        multiple=True,
+        help="Only combine coins with these ids.",
+        type=Bytes32ParamType(),
+    )
+    largest_first: bool = option(
+        "--largest-first/--smallest-first",
+        default=False,
+        help="Sort coins from largest to smallest or smallest to largest.",
+    )
+    override: bool = option(
+        "--override", help="Submits transaction without checking for unusual values", is_flag=True, default=False
     )
 
+    @transaction_endpoint_runner
+    async def run(self) -> list[TransactionRecord]:
+        async with self.rpc_info.wallet_rpc() as wallet_rpc:
+            from chia.cmds.coin_funcs import async_combine
 
-@coins_cmd.command("split", help="Split up larger coins")
-@click.option(
-    "-p",
-    "--wallet-rpc-port",
-    help="Set the port where the Wallet is hosting the RPC interface. See the rpc_port under wallet in config.yaml",
-    type=int,
-    default=None,
-)
-@options.create_fingerprint()
-@click.option("-i", "--id", help="Id of the wallet to use", type=int, default=1, show_default=True, required=True)
-@click.option(
-    "-n",
-    "--number-of-coins",
-    type=int,
-    help="The number of coins we are creating.",
-    required=True,
-)
-@options.create_fee()
-@click.option(
-    "-a",
-    "--amount-per-coin",
-    help="The amount of each newly created coin, in XCH or CAT units",
-    type=AmountParamType(),
-    required=True,
-)
-@click.option(
-    "-t", "--target-coin-id", type=Bytes32ParamType(), required=True, help="The coin id of the coin we are splitting."
+            return await async_combine(
+                client_info=wallet_rpc,
+                wallet_id=self.id,
+                fee=self.fee,
+                max_coin_amount=self.tx_config_loader.max_coin_amount,
+                min_coin_amount=self.tx_config_loader.min_coin_amount,
+                excluded_amounts=self.tx_config_loader.amounts_to_exclude,
+                coins_to_exclude=self.tx_config_loader.coins_to_exclude,
+                reuse_puzhash=self.tx_config_loader.reuse,
+                number_of_coins=self.number_of_coins,
+                target_coin_amount=self.target_amount,
+                target_coin_ids=self.input_coins,
+                largest_first=self.largest_first,
+                push=self.push,
+                condition_valid_times=self.load_condition_valid_times(),
+                override=self.override,
+            )
+
+
+@chia_command(
+    group=coins_cmd,
+    name="split",
+    short_help="Split up larger coins",
+    help="Split up larger coins",
 )
-@tx_config_args
-@tx_out_cmd()
-def split_cmd(
-    wallet_rpc_port: Optional[int],
-    fingerprint: int,
-    id: int,
-    number_of_coins: int,
-    fee: uint64,
-    amount_per_coin: CliAmount,
-    target_coin_id: bytes32,
-    min_coin_amount: CliAmount,
-    max_coin_amount: CliAmount,
-    amounts_to_exclude: Sequence[CliAmount],
-    coins_to_exclude: Sequence[bytes32],
-    reuse: bool,
-    push: bool,
-    condition_valid_times: ConditionValidTimes,
-) -> List[TransactionRecord]:
-    from .coin_funcs import async_split
-
-    return asyncio.run(
-        async_split(
-            wallet_rpc_port=wallet_rpc_port,
-            fingerprint=fingerprint,
-            wallet_id=id,
-            fee=fee,
-            max_coin_amount=max_coin_amount,
-            min_coin_amount=min_coin_amount,
-            excluded_amounts=amounts_to_exclude,
-            coins_to_exclude=coins_to_exclude,
-            reuse_puzhash=reuse,
-            number_of_coins=number_of_coins,
-            amount_per_coin=amount_per_coin,
-            target_coin_id=target_coin_id,
-            push=push,
-            condition_valid_times=condition_valid_times,
-        )
+class SplitCMD(TransactionEndpoint):
+    id: int = option(
+        "-i", "--id", help="Id of the wallet to use", type=int, default=1, show_default=True, required=True
+    )
+    number_of_coins: int = option(
+        "-n",
+        "--number-of-coins",
+        type=int,
+        help="The number of coins we are creating.",
+        required=True,
+    )
+    amount_per_coin: CliAmount = option(
+        "-a",
+        "--amount-per-coin",
+        help="The amount of each newly created coin, in XCH or CAT units",
+        type=AmountParamType(),
+        required=True,
     )
+    target_coin_id: bytes32 = option(
+        "-t",
+        "--target-coin-id",
+        type=Bytes32ParamType(),
+        required=True,
+        help="The coin id of the coin we are splitting.",
+    )
+
+    @transaction_endpoint_runner
+    async def run(self) -> list[TransactionRecord]:
+        async with self.rpc_info.wallet_rpc() as wallet_rpc:
+            from chia.cmds.coin_funcs import async_split
+
+            return await async_split(
+                client_info=wallet_rpc,
+                wallet_id=self.id,
+                fee=self.fee,
+                max_coin_amount=self.tx_config_loader.max_coin_amount,
+                min_coin_amount=self.tx_config_loader.min_coin_amount,
+                excluded_amounts=self.tx_config_loader.amounts_to_exclude,
+                coins_to_exclude=self.tx_config_loader.coins_to_exclude,
+                reuse_puzhash=self.tx_config_loader.reuse,
+                number_of_coins=self.number_of_coins,
+                amount_per_coin=self.amount_per_coin,
+                target_coin_id=self.target_coin_id,
+                push=self.push,
+                condition_valid_times=self.load_condition_valid_times(),
+            )

chia/cmds/configure.py

@@ -6,6 +6,7 @@ from typing import Optional
 import click
 import yaml
 
+from chia.cmds.cmd_classes import ChiaCliContext
 from chia.server.outbound_message import NodeType
 from chia.util.config import (
     initial_config_file,
@@ -103,7 +104,7 @@ def configure(
             print("Target peer count updated")
             change_made = True
         if testnet:
-            if testnet == "true" or testnet == "t":
+            if testnet in {"true", "t"}:
                 print("Setting Testnet")
                 # check if network_overrides.constants.testnet11 exists
                 if (
@@ -167,7 +168,7 @@ def configure(
                 print("Default full node port, introducer and network setting updated")
                 change_made = True
 
-            elif testnet == "false" or testnet == "f":
+            elif testnet in {"false", "f"}:
                 print("Setting Mainnet")
                 mainnet_port = "8444"
                 mainnet_introducer = "introducer.chia.net"
@@ -313,7 +314,7 @@ def configure_cmd(
     seeder_nameserver: str,
 ) -> None:
     configure(
-        ctx.obj["root_path"],
+        ChiaCliContext.set_default(ctx).root_path,
         set_farmer_peer,
         set_node_introducer,
         set_fullnode_port,