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

chia/__init__.py

@@ -8,3 +8,10 @@ try:
 except importlib.metadata.PackageNotFoundError:
     # package is not installed
     __version__ = "unknown"
+
+try:
+    assert False
+except AssertionError:
+    pass
+else:
+    raise Exception("asserts are not working and _must_ be enabled, do not run with an optimized build of python")

chia/_tests/blockchain/blockchain_test_utils.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from typing import Optional
 
 from chia_rs import SpendBundleConditions
+from chia_rs.sized_ints import uint32, uint64
 
 from chia.consensus.block_body_validation import ForkInfo
 from chia.consensus.blockchain import AddBlockResult, Blockchain
@@ -12,7 +13,6 @@ from chia.types.full_block import FullBlock
 from chia.types.validation_state import ValidationState
 from chia.util.augmented_chain import AugmentedBlockchain
 from chia.util.errors import Err
-from chia.util.ints import uint32, uint64
 
 
 async def check_block_store_invariant(bc: Blockchain):

chia/_tests/blockchain/test_augmented_chain.py

@@ -4,13 +4,16 @@ from dataclasses import dataclass, field
 from typing import TYPE_CHECKING, ClassVar, Optional, cast
 
 import pytest
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32
 
+from chia._tests.blockchain.blockchain_test_utils import _validate_and_add_block
+from chia._tests.util.blockchain import create_blockchain
 from chia.consensus.block_record import BlockRecord
-from chia.types.blockchain_format.sized_bytes import bytes32
+from chia.simulator.block_tools import BlockTools
 from chia.types.full_block import FullBlock
 from chia.util.augmented_chain import AugmentedBlockchain
 from chia.util.errors import Err
-from chia.util.ints import uint32
 
 
 @dataclass
@@ -46,7 +49,7 @@ class NullBlockchain:
     def height_to_hash(self, height: uint32) -> Optional[bytes32]:
         return self.heights.get(height)
 
-    def contains_block(self, header_hash: bytes32) -> bool:
+    def contains_block(self, header_hash: bytes32, height: uint32) -> bool:
         return False  # pragma: no cover
 
     def contains_height(self, height: uint32) -> bool:
@@ -122,13 +125,13 @@ async def test_augmented_chain(default_10000_blocks: list[FullBlock]) -> None:
         assert abc.try_block_record(blocks[i].header_hash) == block_records[i]
         assert abc.height_to_hash(uint32(i)) == blocks[i].header_hash
         assert await abc.prev_block_hash([blocks[i].header_hash]) == [blocks[i].prev_header_hash]
-        assert abc.contains_block(blocks[i].header_hash) is True
+        assert abc.try_block_record(blocks[i].header_hash) is not None
         assert await abc.get_block_record_from_db(blocks[i].header_hash) == block_records[i]
         assert abc.contains_height(uint32(i))
 
     for i in range(5, 10):
         assert abc.height_to_hash(uint32(i)) is None
-        assert not abc.contains_block(blocks[i].header_hash)
+        assert abc.try_block_record(blocks[i].header_hash) is None
         assert not await abc.get_block_record_from_db(blocks[i].header_hash)
         assert not abc.contains_height(uint32(i))
 
@@ -143,3 +146,49 @@ async def test_augmented_chain(default_10000_blocks: list[FullBlock]) -> None:
         abc.add_block_record(BR(b))
     assert len(abc._extra_blocks) == 0
     assert null.added_blocks == {br.header_hash for br in blocks[:5]}
+
+
+@pytest.mark.anyio
+@pytest.mark.limit_consensus_modes(reason="save time")
+async def test_augmented_chain_contains_block(default_10000_blocks: list[FullBlock], bt: BlockTools) -> None:
+    blocks = default_10000_blocks[:50]
+    async with create_blockchain(bt.constants, 2) as (b1, _):
+        async with create_blockchain(bt.constants, 2) as (b2, _):
+            for block in blocks:
+                await _validate_and_add_block(b1, block)
+                await _validate_and_add_block(b2, block)
+
+            new_blocks = bt.get_consecutive_blocks(10, block_list_input=blocks)[50:]
+            abc = AugmentedBlockchain(b1)
+            for block in new_blocks:
+                await _validate_and_add_block(b2, block)
+                block_rec = b2.block_record(block.header_hash)
+                abc.add_extra_block(block, block_rec)
+
+            for block in blocks:
+                # check underlying contains block but augmented does not
+                assert abc.contains_block(block.header_hash, block.height) is True
+                assert block.height not in abc._height_to_hash
+
+            for block in new_blocks:
+                # check augmented contains block but augmented does not
+                assert abc.contains_block(block.header_hash, block.height) is True
+                assert not abc._underlying.contains_height(block.height)
+
+            for block in new_blocks:
+                await _validate_and_add_block(b1, block)
+
+            for block in new_blocks:
+                # check underlying contains block
+                assert abc._underlying.height_to_hash(block.height) == block.header_hash
+                # check augmented contains block
+                assert abc._height_to_hash[block.height] == block.header_hash
+
+            abc.remove_extra_block(new_blocks[-1].header_hash)
+
+            # check blocks removed from augmented
+            for block in new_blocks:
+                # check underlying contains block
+                assert abc._underlying.height_to_hash(block.height) == block.header_hash
+                # check augmented contains block
+                assert block.height not in abc._height_to_hash

chia/_tests/blockchain/test_blockchain.py

@@ -10,7 +10,9 @@ from dataclasses import replace
 from typing import Optional
 
 import pytest
-from chia_rs import AugSchemeMPL, G2Element, MerkleSet
+from chia_rs import AugSchemeMPL, ConsensusConstants, G2Element, MerkleSet, TransactionsInfo
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint32, uint64
 from clvm.casts import int_to_bytes
 
 from chia._tests.blockchain.blockchain_test_utils import (
@@ -29,7 +31,6 @@ from chia.consensus.block_record import BlockRecord
 from chia.consensus.block_rewards import calculate_base_farmer_reward
 from chia.consensus.blockchain import AddBlockResult, Blockchain
 from chia.consensus.coinbase import create_farmer_coin
-from chia.consensus.constants import ConsensusConstants
 from chia.consensus.find_fork_point import lookup_fork_chain
 from chia.consensus.full_block_to_block_record import block_to_block_record
 from chia.consensus.get_block_generator import get_block_generator
@@ -40,9 +41,7 @@ from chia.simulator.keyring import TempKeyring
 from chia.simulator.wallet_tools import WalletTool
 from chia.types.blockchain_format.classgroup import ClassgroupElement
 from chia.types.blockchain_format.coin import Coin
-from chia.types.blockchain_format.foliage import TransactionsInfo
 from chia.types.blockchain_format.serialized_program import SerializedProgram
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.blockchain_format.slots import InfusedChallengeChainSubSlot
 from chia.types.blockchain_format.vdf import VDFInfo, VDFProof, validate_vdf
 from chia.types.condition_opcodes import ConditionOpcode
@@ -57,7 +56,6 @@ from chia.util.augmented_chain import AugmentedBlockchain
 from chia.util.errors import Err
 from chia.util.generator_tools import get_block_header
 from chia.util.hash import std_hash
-from chia.util.ints import uint8, uint32, uint64
 from chia.util.keychain import Keychain
 from chia.util.recursive_replace import recursive_replace
 from chia.util.vdf_prover import get_vdf_info_and_proof
@@ -271,8 +269,7 @@ class TestBlockHeaderValidation:
                 )
             await _validate_and_add_block(empty_blockchain, block, fork_info=fork_info)
             log.info(
-                f"Added block {block.height} total iters {block.total_iters} "
-                f"new slot? {len(block.finished_sub_slots)}"
+                f"Added block {block.height} total iters {block.total_iters} new slot? {len(block.finished_sub_slots)}"
             )
         peak = empty_blockchain.get_peak()
         assert peak is not None
@@ -3479,11 +3476,7 @@ class TestReorgs:
             if (block.height % 128) == 0:
                 peak = b.get_peak()
                 assert peak is not None
-                print(
-                    f"original chain: {block.height:4} "
-                    f"weight: {block.weight:7} "
-                    f"peak: {str(peak.header_hash)[:6]}"
-                )
+                print(f"original chain: {block.height:4} weight: {block.weight:7} peak: {str(peak.header_hash)[:6]}")
             if block.height <= chain_1_height:
                 expect = AddBlockResult.ALREADY_HAVE_BLOCK
             elif block.weight < chain_2_weight:

chia/_tests/blockchain/test_blockchain_transactions.py

@@ -3,6 +3,8 @@ from __future__ import annotations
 import logging
 
 import pytest
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32, uint64
 from clvm.casts import int_to_bytes
 
 from chia._tests.blockchain.blockchain_test_utils import _validate_and_add_block
@@ -14,12 +16,10 @@ from chia.server.server import ChiaServer
 from chia.simulator.add_blocks_in_batches import add_blocks_in_batches
 from chia.simulator.block_tools import BlockTools, test_constants
 from chia.simulator.wallet_tools import WalletTool
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.condition_opcodes import ConditionOpcode
 from chia.types.condition_with_args import ConditionWithArgs
 from chia.types.spend_bundle import SpendBundle, estimate_fees
 from chia.util.errors import Err
-from chia.util.ints import uint32, uint64
 from chia.wallet.conditions import AssertCoinAnnouncement, AssertPuzzleAnnouncement
 
 BURN_PUZZLE_HASH = bytes32(b"0" * 32)
@@ -65,9 +65,7 @@ class TestBlockchainTransactions:
         assert sb == spend_bundle
 
         last_block = blocks[-1]
-        result = await full_node_1.mempool_manager.create_bundle_from_mempool(
-            last_block.header_hash, full_node_1.coin_store.get_unspent_lineage_info_for_puzzle_hash
-        )
+        result = await full_node_1.mempool_manager.create_bundle_from_mempool(last_block.header_hash)
         assert result is not None
         next_spendbundle, _ = result
 

chia/_tests/blockchain/test_get_block_generator.py

@@ -4,13 +4,13 @@ from dataclasses import dataclass
 from typing import Optional
 
 import pytest
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32
 from clvm.casts import int_to_bytes
 
 from chia.consensus.get_block_generator import get_block_generator
 from chia.types.blockchain_format.serialized_program import SerializedProgram
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.generator_types import BlockGenerator
-from chia.util.ints import uint32
 
 
 @dataclass(frozen=True)

chia/_tests/blockchain/test_lookup_fork_chain.py

@@ -3,14 +3,14 @@ from __future__ import annotations
 from dataclasses import dataclass
 
 import pytest
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32
 
 from chia._tests.util.benchmarks import rand_hash
 from chia.consensus.block_record import BlockRecord
 from chia.consensus.blockchain_interface import BlockRecordsProtocol
 from chia.consensus.find_fork_point import find_fork_point_in_chain, lookup_fork_chain
 from chia.simulator.block_tools import test_constants
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint32
 
 
 class DummyChain:

chia/_tests/clvm/benchmark_costs.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from chia_rs.sized_ints import uint64
+
 from chia._tests.util.get_name_puzzle_conditions import get_name_puzzle_conditions
 from chia.consensus.cost_calculator import NPCResult
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
@@ -7,7 +9,6 @@ from chia.full_node.bundle_tools import simple_solution_generator
 from chia.types.blockchain_format.program import INFINITE_COST
 from chia.types.generator_types import BlockGenerator
 from chia.types.spend_bundle import SpendBundle
-from chia.util.ints import uint64
 
 
 def cost_of_spend_bundle(spend_bundle: SpendBundle) -> int:

chia/_tests/clvm/coin_store.py

@@ -5,17 +5,18 @@ from collections.abc import Iterator
 from dataclasses import dataclass, replace
 from typing import Optional
 
+from chia_rs import ConsensusConstants
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32, uint64
+
 from chia._tests.util.get_name_puzzle_conditions import get_name_puzzle_conditions
-from chia.consensus.constants import ConsensusConstants
 from chia.consensus.cost_calculator import NPCResult
 from chia.full_node.bundle_tools import simple_solution_generator
 from chia.full_node.mempool_check_conditions import mempool_check_time_locks
 from chia.types.blockchain_format.coin import Coin
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.coin_record import CoinRecord
 from chia.types.spend_bundle import SpendBundle
 from chia.util.errors import Err
-from chia.util.ints import uint32, uint64
 
 MAX_COST = 11000000000
 

chia/_tests/clvm/test_chialisp_deserialization.py

@@ -1,12 +1,12 @@
 from __future__ import annotations
 
 import pytest
+from chia_puzzles_py.programs import CHIALISP_DESERIALISATION
 
 from chia.types.blockchain_format.program import INFINITE_COST, Program
 from chia.util.byte_types import hexstr_to_bytes
-from chia.wallet.puzzles.load_clvm import load_clvm
 
-DESERIALIZE_MOD = load_clvm("chialisp_deserialisation.clsp", package_or_requirement="chia.consensus.puzzles")
+DESERIALIZE_MOD = Program.from_bytes(CHIALISP_DESERIALISATION)
 
 
 def serialized_atom_overflow(size):

chia/_tests/clvm/test_curry_and_treehash.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
 import pytest
+from chia_rs.sized_bytes import bytes32
 
 from chia.types.blockchain_format.program import Program
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.wallet.puzzles import p2_delegated_puzzle_or_hidden_puzzle  # import (puzzle_for_pk, puzzle_hash_for_pk, MOD)
 from chia.wallet.util.curry_and_treehash import (
     calculate_hash_of_quoted_mod_hash,

chia/_tests/clvm/test_puzzle_compression.py

@@ -6,13 +6,13 @@ from typing import Callable, SupportsBytes
 
 import pytest
 from chia_rs import G1Element, G2Element
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
 
 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.spend_bundle import SpendBundle
-from chia.util.ints import uint64
 from chia.wallet.cat_wallet.cat_utils import CAT_MOD, construct_cat_puzzle
 from chia.wallet.puzzles.p2_delegated_puzzle_or_hidden_puzzle import puzzle_for_pk
 from chia.wallet.trading.offer import OFFER_MOD

chia/_tests/clvm/test_puzzles.py

@@ -3,17 +3,17 @@ from __future__ import annotations
 from collections.abc import Iterable
 
 from chia_rs import AugSchemeMPL, G1Element
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32, uint64
 
 from chia._tests.clvm.coin_store import CoinStore, CoinTimestamp
 from chia._tests.core.make_block_generator import int_to_public_key
 from chia._tests.util.key_tool import KeyTool
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
 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.spend_bundle import SpendBundle
 from chia.util.hash import std_hash
-from chia.util.ints import uint32, uint64
 from chia.wallet.puzzles import (
     p2_conditions,
     p2_delegated_conditions,

chia/_tests/clvm/test_singletons.py

@@ -4,6 +4,8 @@ from typing import Optional
 
 import pytest
 from chia_rs import AugSchemeMPL, G1Element, G2Element, PrivateKey
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
 
 from chia._tests.clvm.test_puzzles import public_key_for_index, secret_exponent_for_index
 from chia._tests.util.key_tool import KeyTool
@@ -11,12 +13,10 @@ from chia._tests.util.spend_sim import CostLogger, SimClient, SpendSim, sim_and_
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
 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.condition_opcodes import ConditionOpcode
 from chia.types.spend_bundle import SpendBundle
 from chia.util.errors import Err
-from chia.util.ints import uint64
 from chia.wallet.lineage_proof import LineageProof
 from chia.wallet.puzzles import p2_conditions, p2_delegated_puzzle_or_hidden_puzzle
 

chia/_tests/clvm/test_spend_sim.py

@@ -2,10 +2,10 @@ from __future__ import annotations
 
 import pytest
 from chia_rs import G2Element
+from chia_rs.sized_bytes import bytes32
 
 from chia._tests.util.spend_sim import sim_and_client
 from chia.types.blockchain_format.program import Program
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.coin_spend import compute_additions, make_spend
 from chia.types.condition_opcodes import ConditionOpcode
 from chia.types.spend_bundle import SpendBundle

chia/_tests/cmds/cmd_test_utils.py

@@ -8,6 +8,8 @@ from pathlib import Path
 from typing import Any, Optional, Union, cast
 
 from chia_rs import Coin, G2Element
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint16, uint32, uint64
 
 import chia.cmds.wallet_funcs
 from chia._tests.cmds.testing_classes import create_test_block_record
@@ -23,12 +25,10 @@ from chia.rpc.rpc_client import RpcClient
 from chia.rpc.wallet_request_types import GetSyncStatusResponse, SendTransactionMultiResponse
 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.coin_record import CoinRecord
 from chia.types.signing_mode import SigningMode
 from chia.util.bech32m import encode_puzzle_hash
 from chia.util.config import load_config
-from chia.util.ints import uint8, uint16, uint32, uint64
 from chia.wallet.conditions import ConditionValidTimes
 from chia.wallet.nft_wallet.nft_info import NFTInfo
 from chia.wallet.nft_wallet.nft_wallet import NFTWallet

chia/_tests/cmds/test_click_types.py

@@ -5,6 +5,8 @@ from pathlib import Path
 
 import click
 import pytest
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
 from click import BadParameter
 
 from chia.cmds.cmd_classes import ChiaCliContext
@@ -18,9 +20,7 @@ from chia.cmds.param_types import (
     Uint64ParamType,
 )
 from chia.cmds.units import units
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.bech32m import encode_puzzle_hash
-from chia.util.ints import uint64
 from chia.wallet.util.address_type import AddressType
 
 """

chia/_tests/cmds/test_cmd_framework.py

@@ -9,6 +9,8 @@ from typing import Any, Optional
 
 import click
 import pytest
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
 from click.testing import CliRunner
 
 from chia._tests.environments.wallet import STANDARD_TX_ENDPOINT_ARGS, WalletTestFramework
@@ -25,8 +27,6 @@ from chia.cmds.cmd_helpers import (
 )
 from chia.cmds.cmds_util import coin_selection_args, tx_config_args, tx_out_cmd
 from chia.cmds.param_types import 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
 from chia.wallet.util.tx_config import CoinSelectionConfig, TXConfig
@@ -602,13 +602,13 @@ def test_old_decorator_support() -> None:
     def tx_config_cmd(**kwargs: Any) -> None:
         pass  # pragma: no cover
 
-    @cmd.command("tx_cmd_dec")  # type: ignore[arg-type]
-    @tx_out_cmd(enable_timelock_args=False)
+    @cmd.command("tx_cmd_dec")
+    @tx_out_cmd(enable_timelock_args=False)  # type: ignore[arg-type]
     def tx_cmd(**kwargs: Any) -> None:
         pass  # pragma: no cover
 
-    @cmd.command("tx_w_tl_cmd_dec")  # type: ignore[arg-type]
-    @tx_out_cmd(enable_timelock_args=True)
+    @cmd.command("tx_w_tl_cmd_dec")
+    @tx_out_cmd(enable_timelock_args=True)  # type: ignore[arg-type]
     def tx_w_tl_cmd(**kwargs: Any) -> None:
         pass  # pragma: no cover
 

chia/_tests/cmds/test_show.py

@@ -4,14 +4,15 @@ from dataclasses import dataclass
 from pathlib import Path
 from typing import Any, Optional
 
+from chia_rs import FoliageTransactionBlock
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32, uint64
+
 from chia._tests.cmds.cmd_test_utils import TestFullNodeRpcClient, TestRpcClients, run_cli_command_and_assert
 from chia._tests.cmds.testing_classes import hash_to_height, height_hash
 from chia._tests.util.test_full_block_utils import get_foliage, get_reward_chain_block, get_transactions_info, vdf_proof
-from chia.types.blockchain_format.foliage import FoliageTransactionBlock
 from chia.types.blockchain_format.serialized_program import SerializedProgram
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.full_block import FullBlock
-from chia.util.ints import uint32, uint64
 
 
 @dataclass

chia/_tests/cmds/test_tx_config_args.py

@@ -5,11 +5,11 @@ from pathlib import Path
 from typing import Optional
 
 import click
+from chia_rs.sized_bytes import bytes32
 from click.testing import CliRunner
 
 from chia.cmds.cmds_util import CMDCoinSelectionConfigLoader, CMDTXConfigLoader, coin_selection_args, tx_config_args
 from chia.cmds.param_types import CliAmount
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.config import create_default_chia_config, load_config
 
 

chia/_tests/cmds/testing_classes.py

@@ -3,8 +3,8 @@ from __future__ import annotations
 from dataclasses import dataclass
 from typing import Optional
 
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint8, uint32, uint64
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint32, uint64
 
 # This is a modified version of the TestBlockRecord from test_mempool_manager.py
 

chia/_tests/cmds/wallet/test_consts.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
 from chia_rs import Coin, G2Element
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32, uint64
 
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint32, uint64
 from chia.wallet.conditions import ConditionValidTimes
 from chia.wallet.signer_protocol import KeyHints, SigningInstructions, TransactionInfo, UnsignedTransaction
 from chia.wallet.transaction_record import TransactionRecord

chia/_tests/cmds/wallet/test_did.py

@@ -4,15 +4,15 @@ from pathlib import Path
 from typing import Optional, Union
 
 from chia_rs import G2Element
+from chia_rs.sized_bytes import bytes48
+from chia_rs.sized_ints import uint32, uint64
 
 from chia._tests.cmds.cmd_test_utils import TestRpcClients, TestWalletRpcClient, logType, run_cli_command_and_assert
 from chia._tests.cmds.wallet.test_consts import FINGERPRINT_ARG, STD_TX, STD_UTX, get_bytes32
 from chia.rpc.wallet_request_types import DIDMessageSpendResponse, DIDTransferDIDResponse, DIDUpdateMetadataResponse
-from chia.types.blockchain_format.sized_bytes import bytes48
 from chia.types.signing_mode import SigningMode
 from chia.util.bech32m import encode_puzzle_hash
 from chia.util.config import load_config
-from chia.util.ints import uint32, uint64
 from chia.wallet.conditions import Condition, ConditionValidTimes, CreateCoinAnnouncement, CreatePuzzleAnnouncement
 from chia.wallet.util.tx_config import DEFAULT_TX_CONFIG, TXConfig
 from chia.wallet.wallet_spend_bundle import WalletSpendBundle

chia/_tests/cmds/wallet/test_nft.py

@@ -4,6 +4,8 @@ from pathlib import Path
 from typing import Any, Optional
 
 from chia_rs import G2Element
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint16, uint32, uint64
 
 from chia._tests.cmds.cmd_test_utils import TestRpcClients, TestWalletRpcClient, logType, run_cli_command_and_assert
 from chia._tests.cmds.wallet.test_consts import FINGERPRINT, FINGERPRINT_ARG, STD_TX, STD_UTX, get_bytes32
@@ -13,10 +15,8 @@ from chia.rpc.wallet_request_types import (
     NFTSetNFTDIDResponse,
     NFTTransferNFTResponse,
 )
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.signing_mode import SigningMode
 from chia.util.bech32m import encode_puzzle_hash
-from chia.util.ints import uint8, uint16, uint32, uint64
 from chia.wallet.conditions import ConditionValidTimes
 from chia.wallet.nft_wallet.nft_info import NFTInfo
 from chia.wallet.util.tx_config import DEFAULT_TX_CONFIG, TXConfig

chia/_tests/cmds/wallet/test_notifications.py

@@ -3,12 +3,13 @@ from __future__ import annotations
 from pathlib import Path
 from typing import Optional, cast
 
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32, uint64
+
 from chia._tests.cmds.cmd_test_utils import TestRpcClients, TestWalletRpcClient, logType, run_cli_command_and_assert
 from chia._tests.cmds.wallet.test_consts import FINGERPRINT, FINGERPRINT_ARG, get_bytes32
 from chia.rpc.wallet_request_types import GetNotifications, GetNotificationsResponse
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.bech32m import encode_puzzle_hash
-from chia.util.ints import uint32, uint64
 from chia.wallet.conditions import ConditionValidTimes
 from chia.wallet.notification_store import Notification
 from chia.wallet.transaction_record import TransactionRecord

chia/_tests/cmds/wallet/test_vcs.py

@@ -3,6 +3,8 @@ from __future__ import annotations
 from pathlib import Path
 
 from chia_rs import Coin
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32, uint64
 
 from chia._tests.cmds.cmd_test_utils import TestRpcClients, TestWalletRpcClient, logType, run_cli_command_and_assert
 from chia._tests.cmds.wallet.test_consts import FINGERPRINT_ARG, STD_TX, STD_UTX, get_bytes32
@@ -24,9 +26,7 @@ from chia.rpc.wallet_request_types import (
     VCSpend,
     VCSpendResponse,
 )
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.bech32m import encode_puzzle_hash
-from chia.util.ints import uint32, uint64
 from chia.wallet.conditions import ConditionValidTimes
 from chia.wallet.lineage_proof import LineageProof
 from chia.wallet.transaction_record import TransactionRecord

chia/_tests/cmds/wallet/test_wallet.py

@@ -8,6 +8,8 @@ from typing import Any, Optional, Union
 import importlib_resources
 import pytest
 from chia_rs import Coin, G2Element
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint32, uint64
 from click.testing import CliRunner
 
 from chia._tests.cmds.cmd_test_utils import TestRpcClients, TestWalletRpcClient, logType, run_cli_command_and_assert
@@ -33,10 +35,8 @@ from chia.rpc.wallet_request_types import (
 )
 from chia.server.outbound_message import NodeType
 from chia.types.blockchain_format.program import Program
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.signing_mode import SigningMode
 from chia.util.bech32m import encode_puzzle_hash
-from chia.util.ints import uint8, uint32, uint64
 from chia.wallet.conditions import ConditionValidTimes
 from chia.wallet.trade_record import TradeRecord
 from chia.wallet.trading.offer import Offer
@@ -1004,9 +1004,7 @@ def test_take_offer(capsys: object, get_test_cli_clients: tuple[TestRpcClients,
     cat1 = bytes32.from_hexstr("fd6a341ed39c05c31157d5bfea395a0e142398ced24deea1e82f836d7ec2909c")
     cat2 = bytes32.from_hexstr("dc59bcd60ce5fc9c93a5d3b11875486b03efb53a53da61e453f5cf61a7746860")
     assert_list = [
-        "  OFFERED:\n"
-        "    - XCH (Wallet ID: 1): 10.0 (10000000000000 mojos)\n"
-        f"    - {cat1.hex()}: 100.0 (100000 mojos)",
+        f"  OFFERED:\n    - XCH (Wallet ID: 1): 10.0 (10000000000000 mojos)\n    - {cat1.hex()}: 100.0 (100000 mojos)",
         "  REQUESTED:\n"
         f"    - {cat2.hex()}: 10.0 (10000 mojos)\n"
         "    - accce8e1c71b56624f2ecaeff5af57eac41365080449904d0717bd333c04806d: 0.001 (1 mojo)",
@@ -1101,9 +1099,7 @@ def test_cancel_offer(capsys: object, get_test_cli_clients: tuple[TestRpcClients
     cat1 = bytes32.from_hexstr("fd6a341ed39c05c31157d5bfea395a0e142398ced24deea1e82f836d7ec2909c")
     cat2 = bytes32.from_hexstr("dc59bcd60ce5fc9c93a5d3b11875486b03efb53a53da61e453f5cf61a7746860")
     assert_list = [
-        "  OFFERED:\n"
-        "    - XCH (Wallet ID: 1): 10.0 (10000000000000 mojos)\n"
-        f"    - {cat1.hex()}: 100.0 (100000 mojos)",
+        f"  OFFERED:\n    - XCH (Wallet ID: 1): 10.0 (10000000000000 mojos)\n    - {cat1.hex()}: 100.0 (100000 mojos)",
         "  REQUESTED:\n"
         f"    - {cat2.hex()}: 10.0 (10000 mojos)\n"
         "    - accce8e1c71b56624f2ecaeff5af57eac41365080449904d0717bd333c04806d: 0.001 (1 mojo)",