chia-blockchain 2.5.2rc2__py3-none-any.whl → 2.5.3rc1__py3-none-any.whl

chia/_tests/wallet/vc_wallet/test_vc_lifecycle.py

@@ -5,18 +5,18 @@ from typing import Optional
 
 import pytest
 from chia_rs import G2Element
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32, uint64
 
 from chia._tests.util.spend_sim import CostLogger, sim_and_client
 from chia.types.blockchain_format.coin import Coin
 from chia.types.blockchain_format.program import Program
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.coin_spend import CoinSpend, make_spend
 from chia.types.mempool_inclusion_status import MempoolInclusionStatus
 from chia.util.errors import Err
 from chia.util.hash import std_hash
-from chia.util.ints import uint32, uint64
+from chia.wallet.conditions import CreateCoin
 from chia.wallet.lineage_proof import LineageProof
-from chia.wallet.payment import Payment
 from chia.wallet.puzzles.singleton_top_layer_v1_1 import (
     launch_conditions_and_coinsol,
     puzzle_for_singleton,
@@ -30,14 +30,14 @@ from chia.wallet.vc_wallet.vc_drivers import (
     construct_exigent_metadata_layer,
     create_covenant_layer,
     create_did_tp,
+    create_revocation_layer,
     create_std_parent_morpher,
-    create_viral_backdoor,
     match_covenant_layer,
     match_did_tp,
-    match_viral_backdoor,
+    match_revocation_layer,
     solve_covenant_layer,
     solve_did_tp,
-    solve_viral_backdoor,
+    solve_revocation_layer,
 )
 from chia.wallet.wallet_spend_bundle import WalletSpendBundle
 
@@ -311,13 +311,13 @@ async def test_did_tp(cost_logger: CostLogger) -> None:
 
 
 @pytest.mark.anyio
-async def test_viral_backdoor(cost_logger: CostLogger) -> None:
+async def test_revocation_layer(cost_logger: CostLogger) -> None:
     async with sim_and_client() as (sim, client):
         # Setup and farm the puzzle
         hidden_puzzle: Program = Program.to((1, [[61, 1]]))  # assert a coin announcement that the solution tells us
         hidden_puzzle_hash: bytes32 = hidden_puzzle.get_tree_hash()
-        p2_either_puzzle: Program = create_viral_backdoor(hidden_puzzle_hash, ACS_PH)
-        assert match_viral_backdoor(uncurry_puzzle(p2_either_puzzle)) == (hidden_puzzle_hash, ACS_PH)
+        p2_either_puzzle: Program = create_revocation_layer(hidden_puzzle_hash, ACS_PH)
+        assert match_revocation_layer(uncurry_puzzle(p2_either_puzzle)) == (hidden_puzzle_hash, ACS_PH)
 
         await sim.farm_block(p2_either_puzzle.get_tree_hash())
         p2_either_coin: Coin = (
@@ -333,7 +333,7 @@ async def test_viral_backdoor(cost_logger: CostLogger) -> None:
                     make_spend(
                         p2_either_coin,
                         p2_either_puzzle,
-                        solve_viral_backdoor(
+                        solve_revocation_layer(
                             ACS,
                             Program.to(None),
                             hidden=True,
@@ -352,7 +352,7 @@ async def test_viral_backdoor(cost_logger: CostLogger) -> None:
                     make_spend(
                         p2_either_coin,
                         p2_either_puzzle,
-                        solve_viral_backdoor(
+                        solve_revocation_layer(
                             hidden_puzzle,
                             Program.to(bytes32.zeros),
                             hidden=True,
@@ -366,7 +366,7 @@ async def test_viral_backdoor(cost_logger: CostLogger) -> None:
 
         # Spend the inner puzzle
         brick_hash: bytes32 = bytes32.zeros
-        wrapped_brick_hash: bytes32 = create_viral_backdoor(
+        wrapped_brick_hash: bytes32 = create_revocation_layer(
             hidden_puzzle_hash,
             brick_hash,
         ).get_tree_hash()
@@ -378,7 +378,7 @@ async def test_viral_backdoor(cost_logger: CostLogger) -> None:
                         make_spend(
                             p2_either_coin,
                             p2_either_puzzle,
-                            solve_viral_backdoor(
+                            solve_revocation_layer(
                                 ACS,
                                 Program.to([[51, brick_hash, 0]]),
                             ),
@@ -615,7 +615,7 @@ async def test_vc_lifecycle(test_syncing: bool, cost_logger: CostLogger) -> None
             AUTHORIZED_PROVIDERS: list[bytes32] = [launcher_id]
             dpuz_1, launch_crcat_spend_1, cr_1 = CRCAT.launch(
                 cr_coin_1,
-                Payment(ACS_PH, uint64(cr_coin_1.amount), []),
+                CreateCoin(ACS_PH, uint64(cr_coin_1.amount)),
                 Program.to(None),
                 Program.to(None),
                 AUTHORIZED_PROVIDERS,
@@ -623,7 +623,7 @@ async def test_vc_lifecycle(test_syncing: bool, cost_logger: CostLogger) -> None
             )
             dpuz_2, launch_crcat_spend_2, cr_2 = CRCAT.launch(
                 cr_coin_2,
-                Payment(ACS_PH, uint64(cr_coin_2.amount), []),
+                CreateCoin(ACS_PH, uint64(cr_coin_2.amount)),
                 Program.to(None),
                 Program.to(None),
                 AUTHORIZED_PROVIDERS,

chia/_tests/wallet/vc_wallet/test_vc_wallet.py

@@ -6,6 +6,8 @@ from typing import Any, Callable, Optional
 
 import pytest
 from chia_rs import G2Element
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
 from typing_extensions import Literal
 
 from chia._tests.environments.wallet import WalletEnvironment, WalletStateTransition, WalletTestFramework
@@ -15,11 +17,9 @@ from chia.rpc.wallet_rpc_client import WalletRpcClient
 from chia.simulator.full_node_simulator import FullNodeSimulator
 from chia.types.blockchain_format.coin import coin_as_list
 from chia.types.blockchain_format.program import Program
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.coin_spend import make_spend
 from chia.types.peer_info import PeerInfo
 from chia.util.bech32m import encode_puzzle_hash
-from chia.util.ints import uint64
 from chia.wallet.cat_wallet.cat_utils import CAT_MOD, construct_cat_puzzle
 from chia.wallet.cat_wallet.cat_wallet import CATWallet
 from chia.wallet.did_wallet.did_wallet import DIDWallet
@@ -719,8 +719,10 @@ async def test_self_revoke(wallet_environments: WalletTestFramework) -> None:
             wallet_environments.tx_config, push=False
         ) as action_scope:
             await (await wallet_node_0.wallet_state_manager.get_or_create_vc_wallet()).generate_signed_transaction(
-                new_vc_record.vc.launcher_id,
+                [uint64(1)],
+                [await wallet_0.get_puzzle_hash(new=not action_scope.config.tx_config.reuse_puzhash)],
                 action_scope,
+                vc_id=new_vc_record.vc.launcher_id,
                 new_proof_hash=bytes32.zeros,
                 self_revoke=True,
             )

chia/_tests/wallet/wallet_block_tools.py

@@ -3,23 +3,32 @@ from __future__ import annotations
 import time
 from typing import Any, Optional
 
-from chia_rs import G1Element, G2Element, compute_merkle_set_root
+from chia_rs import (
+    ConsensusConstants,
+    Foliage,
+    FoliageBlockData,
+    FoliageTransactionBlock,
+    G1Element,
+    G2Element,
+    PoolTarget,
+    RewardChainBlock,
+    RewardChainBlockUnfinished,
+    TransactionsInfo,
+    compute_merkle_set_root,
+)
+from chia_rs.sized_bytes import bytes32, bytes100
+from chia_rs.sized_ints import uint8, uint32, uint64, uint128
 from chiabip158 import PyBIP158
 
 from chia.consensus.block_record import BlockRecord
 from chia.consensus.block_rewards import calculate_base_farmer_reward, calculate_pool_reward
 from chia.consensus.coinbase import create_farmer_coin, create_pool_coin
-from chia.consensus.constants import ConsensusConstants
 from chia.consensus.full_block_to_block_record import block_to_block_record
 from chia.full_node.bundle_tools import simple_solution_generator
 from chia.simulator.block_tools import BlockTools, compute_additions_unchecked
 from chia.types.blockchain_format.classgroup import ClassgroupElement
 from chia.types.blockchain_format.coin import Coin, hash_coin_ids
-from chia.types.blockchain_format.foliage import Foliage, FoliageBlockData, FoliageTransactionBlock, TransactionsInfo
-from chia.types.blockchain_format.pool_target import PoolTarget
 from chia.types.blockchain_format.proof_of_space import ProofOfSpace
-from chia.types.blockchain_format.reward_chain_block import RewardChainBlock, RewardChainBlockUnfinished
-from chia.types.blockchain_format.sized_bytes import bytes32, bytes100
 from chia.types.blockchain_format.vdf import VDFInfo, VDFProof
 from chia.types.full_block import FullBlock
 from chia.types.generator_types import BlockGenerator
@@ -27,7 +36,6 @@ from chia.types.spend_bundle import SpendBundle
 from chia.types.unfinished_block import UnfinishedBlock
 from chia.util.block_cache import BlockCache
 from chia.util.hash import std_hash
-from chia.util.ints import uint8, uint32, uint64, uint128
 
 DEFAULT_PROOF_OF_SPACE = ProofOfSpace(
     bytes32.zeros,

chia/_tests/weight_proof/test_weight_proof.py

@@ -3,22 +3,22 @@ from __future__ import annotations
 from typing import Optional
 
 import pytest
+from chia_rs import ConsensusConstants
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint32, uint64
 
 from chia._tests.util.blockchain_mock import BlockchainMock
 from chia.consensus.block_record import BlockRecord
-from chia.consensus.constants import ConsensusConstants
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
 from chia.consensus.full_block_to_block_record import block_to_block_record
 from chia.consensus.pot_iterations import calculate_iterations_quality
 from chia.full_node.weight_proof import WeightProofHandler, _map_sub_epoch_summaries, _validate_summaries_weight
 from chia.simulator.block_tools import BlockTools
 from chia.types.blockchain_format.proof_of_space import calculate_prefix_bits, verify_and_get_quality_string
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.blockchain_format.sub_epoch_summary import SubEpochSummary
 from chia.types.full_block import FullBlock
 from chia.types.header_block import HeaderBlock
 from chia.util.generator_tools import get_block_header
-from chia.util.ints import uint8, uint32, uint64
 
 
 async def load_blocks_dont_validate(

chia/cmds/chia.py

@@ -10,7 +10,6 @@ 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
 from chia.cmds.data import data_cmd
 from chia.cmds.db import db_cmd
 from chia.cmds.dev import dev_cmd
@@ -139,7 +138,6 @@ cli.add_command(data_cmd)
 cli.add_command(passphrase_cmd)
 cli.add_command(beta_cmd)
 cli.add_command(completion)
-cli.add_command(dao_cmd)
 cli.add_command(dev_cmd)
 
 

chia/cmds/cmd_classes.py

@@ -21,9 +21,9 @@ from typing import (
 )
 
 import click
+from chia_rs.sized_bytes import bytes32
 from typing_extensions import dataclass_transform
 
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.byte_types import hexstr_to_bytes
 from chia.util.default_root import DEFAULT_ROOT_PATH
 from chia.util.streamable import is_type_SpecificOptional
@@ -271,11 +271,11 @@ def chia_command(
         # passed through the dataclass wrapper.  Not sure what to do about this right now.
         if sys.version_info < (3, 10):  # pragma: no cover
             # stuff below 3.10 doesn't know about kw_only
-            wrapped_cls: type[ChiaCommand] = dataclass(  # type: ignore[assignment]
+            wrapped_cls: type[ChiaCommand] = dataclass(
                 frozen=True,
             )(cls)
         else:
-            wrapped_cls: type[ChiaCommand] = dataclass(  # type: ignore[assignment]
+            wrapped_cls: type[ChiaCommand] = dataclass(
                 frozen=True,
                 kw_only=True,
             )(cls)

chia/cmds/cmd_helpers.py

@@ -7,12 +7,13 @@ from functools import cached_property
 from pathlib import Path
 from typing import Any, Callable, Optional, TypeVar
 
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
+
 from chia.cmds.cmd_classes import ChiaCliContext, command_helper, option
 from chia.cmds.cmds_util import CMDCoinSelectionConfigLoader, CMDTXConfigLoader, TransactionBundle, get_wallet_client
 from chia.cmds.param_types import AmountParamType, Bytes32ParamType, CliAmount, TransactionFeeParamType, cli_amount_none
 from chia.rpc.wallet_rpc_client import WalletRpcClient
-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
 from chia.wallet.util.tx_config import CoinSelectionConfig, TXConfig
@@ -33,8 +34,7 @@ class NeedsWalletRPC:
         "-wp",
         "--wallet-rpc_port",
         help=(
-            "Set the port where the Wallet is hosting the RPC interface."
-            "See the rpc_port under wallet in config.yaml."
+            "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/cmds/cmds_util.py

@@ -11,6 +11,8 @@ from typing import Any, Callable, Optional, TypeVar
 
 import click
 from aiohttp import ClientConnectorCertificateError, ClientConnectorError
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint16, uint32, uint64
 
 from chia.cmds.param_types import AmountParamType, Bytes32ParamType, CliAmount, cli_amount_none
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
@@ -23,11 +25,9 @@ from chia.rpc.rpc_client import ResponseFailureError, RpcClient
 from chia.rpc.wallet_request_types import LogIn
 from chia.rpc.wallet_rpc_client import WalletRpcClient
 from chia.simulator.simulator_full_node_rpc_client import SimulatorFullNodeRpcClient
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.mempool_submission_status import MempoolSubmissionStatus
 from chia.util.config import load_config
 from chia.util.errors import CliRpcConnectionError, InvalidPathError
-from chia.util.ints import uint16, uint32, uint64
 from chia.util.keychain import KeyData
 from chia.util.streamable import Streamable, streamable
 from chia.wallet.conditions import ConditionValidTimes

chia/cmds/coin_funcs.py

@@ -5,16 +5,17 @@ import sys
 from collections.abc import Sequence
 from typing import Optional
 
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint16, uint32, uint64
+
 from chia.cmds.cmd_helpers import WalletClientInfo
 from chia.cmds.cmds_util import CMDCoinSelectionConfigLoader, CMDTXConfigLoader, cli_confirm
 from chia.cmds.param_types import CliAmount
 from chia.cmds.wallet_funcs import get_mojo_per_unit, get_wallet_type, print_balance
 from chia.rpc.wallet_request_types import CombineCoins, SplitCoins
 from chia.types.blockchain_format.coin import Coin
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.bech32m import encode_puzzle_hash
 from chia.util.config import selected_network_address_prefix
-from chia.util.ints import uint16, uint32, uint64
 from chia.wallet.conditions import ConditionValidTimes
 from chia.wallet.transaction_record import TransactionRecord
 from chia.wallet.util.wallet_types import WalletType

chia/cmds/coins.py

@@ -4,6 +4,7 @@ from collections.abc import Sequence
 from typing import Optional
 
 import click
+from chia_rs.sized_bytes import bytes32
 
 from chia.cmds.cmd_classes import (
     chia_command,
@@ -16,7 +17,6 @@ from chia.cmds.cmd_helpers import (
     transaction_endpoint_runner,
 )
 from chia.cmds.param_types import AmountParamType, Bytes32ParamType, CliAmount
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.wallet.transaction_record import TransactionRecord
 
 

chia/cmds/data.py

@@ -7,11 +7,11 @@ from pathlib import Path
 from typing import Any, Callable, Optional, TypeVar, Union
 
 import click
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
 
 from chia.cmds import options
 from chia.cmds.param_types import Bytes32ParamType
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint64
 
 _T = TypeVar("_T")
 

chia/cmds/data_funcs.py

@@ -6,12 +6,13 @@ from collections.abc import AsyncIterator
 from pathlib import Path
 from typing import Any, Optional
 
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
+
 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

chia/cmds/db_upgrade_func.py

@@ -220,7 +220,7 @@ def convert_v1_to_v2(in_path: Path, out_path: Path) -> None:
                         br.block
                     FROM block_records br
                     JOIN full_blocks fb ON br.header_hash = fb.header_hash
-                    WHERE br.rowid IN ({','.join('?' * len(rowids))})
+                    WHERE br.rowid IN ({",".join("?" * len(rowids))})
                 """,
                 rowids,
             )
@@ -330,7 +330,7 @@ def convert_v1_to_v2(in_path: Path, out_path: Path) -> None:
                         coin_id,
                         hint
                     FROM hints
-                    WHERE id IN ({','.join('?' * len(rows))})
+                    WHERE id IN ({",".join("?" * len(rows))})
                 """,
                 [id_tuple[0] for id_tuple in rows],
             )

chia/cmds/db_validate_func.py

@@ -3,9 +3,11 @@ from __future__ import annotations
 from pathlib import Path
 from typing import Any, Optional
 
+from chia_rs.sized_bytes import bytes32
+
 from chia.consensus.block_record import BlockRecord
+from chia.consensus.constants import replace_str_to_bytes
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.full_block import FullBlock
 from chia.util.config import load_config
 from chia.util.path import path_from_root
@@ -17,19 +19,20 @@ def db_validate_func(
     *,
     validate_blocks: bool,
 ) -> None:
+    config: dict[str, Any] = load_config(root_path, "config.yaml")
     if in_db_path is None:
-        config: dict[str, Any] = load_config(root_path, "config.yaml")["full_node"]
-        selected_network: str = config["selected_network"]
-        db_pattern: str = config["database_path"]
+        full_node_config = config["full_node"]
+        selected_network: str = full_node_config["selected_network"]
+        db_pattern: str = full_node_config["database_path"]
         db_path_replaced: str = db_pattern.replace("CHALLENGE", selected_network)
         in_db_path = path_from_root(root_path, db_path_replaced)
 
-    validate_v2(in_db_path, validate_blocks=validate_blocks)
+    validate_v2(in_db_path, config=config, validate_blocks=validate_blocks)
 
     print(f"\n\nDATABASE IS VALID: {in_db_path}\n")
 
 
-def validate_v2(in_path: Path, *, validate_blocks: bool) -> None:
+def validate_v2(in_path: Path, *, config: dict[str, Any], validate_blocks: bool) -> None:
     import sqlite3
     from contextlib import closing
 
@@ -174,10 +177,14 @@ def validate_v2(in_path: Path, *, validate_blocks: bool) -> None:
 
         # make sure the prev_hash pointer of block height 0 is the genesis
         # challenge
-        if next_hash != DEFAULT_CONSTANTS.AGG_SIG_ME_ADDITIONAL_DATA:
+        service_config = config["full_node"]
+        network_id = service_config["selected_network"]
+        overrides = service_config["network_overrides"]["constants"][network_id]
+        updated_constants = replace_str_to_bytes(DEFAULT_CONSTANTS, **overrides)
+        if next_hash != updated_constants.AGG_SIG_ME_ADDITIONAL_DATA:
             raise RuntimeError(
                 f"Blockchain has invalid genesis challenge {next_hash}, expected "
-                f"{DEFAULT_CONSTANTS.AGG_SIG_ME_ADDITIONAL_DATA.hex()}"
+                f"{updated_constants.AGG_SIG_ME_ADDITIONAL_DATA.hex()}"
             )
 
         if num_orphans > 0:

chia/cmds/farm.py

@@ -17,8 +17,7 @@ def farm_cmd() -> None:
     "-p",
     "--rpc-port",
     help=(
-        "Set the port where the Full Node is hosting the RPC interface. "
-        "See the rpc_port under full_node in config.yaml"
+        "Set the port where the Full Node is hosting the RPC interface. See the rpc_port under full_node in config.yaml"
     ),
     type=int,
     default=None,
@@ -36,8 +35,7 @@ def farm_cmd() -> None:
     "-hp",
     "--harvester-rpc-port",
     help=(
-        "Set the port where the Harvester is hosting the RPC interface"
-        "See the rpc_port under harvester in config.yaml"
+        "Set the port where the Harvester is hosting the RPC interface. See the rpc_port under harvester in config.yaml"
     ),
     type=int,
     default=None,

chia/cmds/keys.py

@@ -380,8 +380,6 @@ def _resolve_fingerprint_and_sk(
     if non_observer_derivation and resolved_sk is None:
         print("Could not resolve private key for non-observer derivation")
         raise ResolutionError()
-    else:
-        pass
 
     if reolved_fp is None:
         print("A fingerprint of a root key to derive from is required")

chia/cmds/keys_funcs.py

@@ -8,6 +8,7 @@ from pathlib import Path
 from typing import Any, Optional, Union
 
 from chia_rs import AugSchemeMPL, G1Element, G2Element, PrivateKey
+from chia_rs.sized_ints import uint32
 
 from chia.consensus.coinbase import create_puzzlehash_for_pk
 from chia.types.signing_mode import SigningMode
@@ -15,7 +16,6 @@ from chia.util.bech32m import bech32_encode, convertbits, encode_puzzle_hash
 from chia.util.config import load_config
 from chia.util.errors import KeychainException
 from chia.util.file_keyring import MAX_LABEL_LENGTH
-from chia.util.ints import uint32
 from chia.util.keychain import (
     Keychain,
     KeyData,

chia/cmds/netspace_funcs.py

@@ -3,9 +3,10 @@ from __future__ import annotations
 from pathlib import Path
 from typing import Optional
 
+from chia_rs.sized_bytes import bytes32
+
 from chia.cmds.cmds_util import format_bytes, get_any_service_client
 from chia.rpc.full_node_rpc_client import FullNodeRpcClient
-from chia.types.blockchain_format.sized_bytes import bytes32
 
 
 async def netstorge_async(root_path: Path, rpc_port: Optional[int], delta_block_height: str, start: str) -> None:

chia/cmds/param_types.py

@@ -5,14 +5,14 @@ from decimal import Decimal, InvalidOperation
 from typing import Any, Callable, Optional, Union
 
 import click
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
 
 from chia.cmds.cmd_classes import ChiaCliContext
 from chia.cmds.units import units
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.bech32m import bech32_decode, decode_puzzle_hash
 from chia.util.config import load_config, selected_network_address_prefix
 from chia.util.default_root import DEFAULT_ROOT_PATH
-from chia.util.ints import uint64
 from chia.wallet.util.address_type import AddressType
 
 one_decimal_mojo = Decimal("1e-12")

chia/cmds/plotnft.py

@@ -4,6 +4,8 @@ from dataclasses import field
 from typing import Optional
 
 import click
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
 
 from chia.cmds.cmd_classes import ChiaCliContext, chia_command, option
 from chia.cmds.cmd_helpers import NeedsWalletRPC
@@ -13,9 +15,7 @@ from chia.cmds.param_types import (
     CliAddress,
     TransactionFeeParamType,
 )
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.errors import CliRpcConnectionError
-from chia.util.ints import uint64
 
 
 @click.group("plotnft", help="Manage your plot NFTs")

chia/cmds/plotnft_funcs.py

@@ -11,6 +11,8 @@ from pprint import pprint
 from typing import Any, Callable, Optional
 
 import aiohttp
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32, uint64
 
 from chia.cmds.cmd_helpers import WalletClientInfo
 from chia.cmds.cmds_util import (
@@ -28,11 +30,9 @@ from chia.rpc.farmer_rpc_client import FarmerRpcClient
 from chia.rpc.wallet_rpc_client import WalletRpcClient
 from chia.server.server import ssl_context_for_root
 from chia.ssl.create_ssl import get_mozilla_ca_crt
-from chia.types.blockchain_format.sized_bytes import bytes32
 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.util.ints import uint32, uint64
 from chia.wallet.transaction_record import TransactionRecord
 from chia.wallet.util.address_type import AddressType
 from chia.wallet.util.wallet_types import WalletType

chia/cmds/rpc.py

@@ -8,10 +8,10 @@ from typing import Any, Optional, TextIO
 
 import click
 from aiohttp import ClientResponseError
+from chia_rs.sized_ints import uint16
 
 from chia.cmds.cmd_classes import ChiaCliContext
 from chia.util.config import load_config
-from chia.util.ints import uint16
 
 services: list[str] = ["crawler", "daemon", "farmer", "full_node", "harvester", "timelord", "wallet", "data_layer"]
 

chia/cmds/show.py

@@ -13,8 +13,7 @@ from chia.cmds.show_funcs import show_async
     "-p",
     "--rpc-port",
     help=(
-        "Set the port where the Full Node is hosting the RPC interface. "
-        "See the rpc_port under full_node in config.yaml"
+        "Set the port where the Full Node is hosting the RPC interface. See the rpc_port under full_node in config.yaml"
     ),
     type=int,
     default=None,

chia/cmds/show_funcs.py

@@ -4,16 +4,18 @@ import json
 from pathlib import Path
 from typing import Any, Optional, Union
 
+from chia_rs.sized_bytes import bytes32
+
 from chia.rpc.full_node_rpc_client import FullNodeRpcClient
-from chia.types.blockchain_format.sized_bytes import bytes32
 
 
 async def print_blockchain_state(node_client: FullNodeRpcClient, config: dict[str, Any]) -> bool:
     import time
 
+    from chia_rs.sized_ints import uint64
+
     from chia.cmds.cmds_util import format_bytes
     from chia.consensus.block_record import BlockRecord
-    from chia.util.ints import uint64
 
     blockchain_state = await node_client.get_blockchain_state()
     if blockchain_state is None:
@@ -97,8 +99,9 @@ async def print_block_from_hash(
 ) -> None:
     import time
 
+    from chia_rs.sized_bytes import bytes32
+
     from chia.consensus.block_record import BlockRecord
-    from chia.types.blockchain_format.sized_bytes import bytes32
     from chia.types.full_block import FullBlock
     from chia.util.bech32m import encode_puzzle_hash
 

chia/cmds/signer.py

@@ -161,8 +161,7 @@ class SPOut(QrCodeDisplay, _SPTranslation):
                 return
             elif len(self.output_file) != len(outputs):
                 print(
-                    "Incorrect number of file outputs specified, "
-                    f"expected: {len(outputs)} got {len(self.output_file)}"
+                    f"Incorrect number of file outputs specified, expected: {len(outputs)} got {len(self.output_file)}"
                 )
                 return
             else:

chia/cmds/sim.py

@@ -17,8 +17,7 @@ from chia.util.default_root import SIMULATOR_ROOT_PATH
     "-p",
     "--rpc-port",
     help=(
-        "Set the port where the Simulator is hosting the RPC interface. "
-        "See the rpc_port under full_node in config.yaml"
+        "Set the port where the Simulator is hosting the RPC interface. See the rpc_port under full_node in config.yaml"
     ),
     type=int,
     default=None,