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

chia/_tests/util/setup_nodes.py

@@ -10,10 +10,12 @@ from pathlib import Path
 from typing import Optional, Union
 
 import anyio
+from chia_rs import ConsensusConstants
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint16, uint32
 
 from chia._tests.environments.full_node import FullNodeEnvironment
 from chia._tests.environments.wallet import WalletEnvironment
-from chia.consensus.constants import ConsensusConstants
 from chia.daemon.server import WebSocketServer
 from chia.farmer.farmer import Farmer
 from chia.full_node.full_node_api import FullNodeAPI
@@ -39,10 +41,8 @@ from chia.simulator.setup_services import (
 from chia.simulator.socket import find_available_listen_port
 from chia.simulator.start_simulator import SimulatorFullNodeService
 from chia.types.aliases import FarmerService, FullNodeService, HarvesterService, TimelordService, WalletService
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.peer_info import UnresolvedPeerInfo
 from chia.util.hash import std_hash
-from chia.util.ints import uint16, uint32
 from chia.util.keychain import Keychain
 from chia.util.timing import adjusted_timeout, backoff_times
 from chia.wallet.wallet_node import WalletNode
@@ -390,6 +390,7 @@ async def setup_full_system_inner(
         introducer_service = await async_exit_stack.enter_async_context(setup_introducer(shared_b_tools, uint16(0)))
         introducer = introducer_service._api
         introducer_server = introducer_service._node.server
+        introducer.introducer.dns_servers = []
 
         # Then start the full node so we can use the port for the farmer and timelord
         node_1 = await async_exit_stack.enter_async_context(

chia/_tests/util/spend_sim.py

@@ -10,11 +10,18 @@ from pathlib import Path
 from typing import Any, Callable, Optional, TypeVar
 
 import anyio
-from chia_rs import DONT_VALIDATE_SIGNATURE, G2Element, get_flags_for_height_and_constants, run_block_generator2
+from chia_rs import (
+    DONT_VALIDATE_SIGNATURE,
+    ConsensusConstants,
+    G2Element,
+    get_flags_for_height_and_constants,
+    run_block_generator2,
+)
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32, uint64
 
 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.default_constants import DEFAULT_CONSTANTS
 from chia.full_node.bundle_tools import simple_solution_generator
 from chia.full_node.coin_store import CoinStore
@@ -24,7 +31,6 @@ from chia.full_node.mempool_check_conditions import get_puzzle_and_solution_for_
 from chia.full_node.mempool_manager import MempoolManager
 from chia.types.blockchain_format.coin import Coin
 from chia.types.blockchain_format.program import INFINITE_COST
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.coin_record import CoinRecord
 from chia.types.coin_spend import CoinSpend
 from chia.types.generator_types import BlockGenerator
@@ -34,7 +40,6 @@ from chia.types.spend_bundle import SpendBundle, T_SpendBundle
 from chia.util.db_wrapper import DBWrapper2
 from chia.util.errors import Err, ValidationError
 from chia.util.hash import std_hash
-from chia.util.ints import uint32, uint64
 from chia.util.streamable import Streamable, streamable
 from chia.wallet.util.compute_hints import HintedCoin, compute_spend_hints_and_additions
 
@@ -271,7 +276,6 @@ class SpendSim:
             if peak is not None:
                 result = await self.mempool_manager.create_bundle_from_mempool(
                     last_tb_header_hash=peak.header_hash,
-                    get_unspent_lineage_info_for_puzzle_hash=self.coin_store.get_unspent_lineage_info_for_puzzle_hash,
                     item_inclusion_filter=item_inclusion_filter,
                 )
 

chia/_tests/util/test_condition_tools.py

@@ -2,18 +2,18 @@ from __future__ import annotations
 
 import pytest
 from chia_rs import G1Element
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
 from clvm.casts import int_to_bytes
 
 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.condition_opcodes import ConditionOpcode
 from chia.types.condition_with_args import ConditionWithArgs
 from chia.types.spend_bundle_conditions import SpendBundleConditions, SpendConditions
 from chia.util.condition_tools import parse_sexp_to_conditions, pkm_pairs, pkm_pairs_for_conditions_dict
 from chia.util.errors import ConsensusError
 from chia.util.hash import std_hash
-from chia.util.ints import uint64
 
 H1 = bytes32(b"a" * 32)
 H2 = bytes32(b"b" * 32)

chia/_tests/util/test_config.py

@@ -3,11 +3,12 @@ from __future__ import annotations
 from dataclasses import dataclass
 from typing import Any, Optional
 
+from chia_rs.sized_ints import uint16
+
 from chia._tests.util.misc import DataCase, Marks, datacases
 from chia.server.outbound_message import NodeType
 from chia.types.peer_info import UnresolvedPeerInfo
 from chia.util.config import get_unresolved_peer_infos, set_peer_info
-from chia.util.ints import uint16
 
 
 @dataclass

chia/_tests/util/test_errors.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
+from chia_rs.sized_ints import int16
+
 from chia.util.errors import Err
-from chia.util.ints import int16
 
 
 def test_error_codes_int16() -> None:

chia/_tests/util/test_full_block_utils.py

@@ -5,15 +5,22 @@ from collections.abc import Generator, Iterator
 from typing import Optional
 
 import pytest
-from chia_rs import G1Element, G2Element
+from chia_rs import (
+    Foliage,
+    FoliageBlockData,
+    FoliageTransactionBlock,
+    G1Element,
+    G2Element,
+    PoolTarget,
+    RewardChainBlock,
+    TransactionsInfo,
+)
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint32, uint64, uint128
 
 from chia._tests.util.benchmarks import rand_bytes, rand_g1, rand_g2, rand_hash, rand_vdf, rand_vdf_proof, rewards
-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
 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 (
     ChallengeChainSubSlot,
     InfusedChallengeChainSubSlot,
@@ -31,7 +38,6 @@ from chia.util.full_block_utils import (
     header_block_from_block,
 )
 from chia.util.generator_tools import get_block_header
-from chia.util.ints import uint8, uint32, uint64, uint128
 
 test_g2s: list[G2Element] = [rand_g2() for _ in range(10)]
 test_g1s: list[G1Element] = [rand_g1() for _ in range(10)]
@@ -261,7 +267,11 @@ async def test_parser():
         assert height == block.height
         assert is_tx_block == (block.transactions_info is not None)
         gen = generator_from_block(block_bytes)
-        assert gen == bytes(block.transactions_generator)
+        if gen is None:
+            assert block.transactions_generator is None
+        else:
+            assert block.transactions_generator is not None
+            assert gen == bytes(block.transactions_generator)
         bi = block_info_from_block(block_bytes)
         assert block.transactions_generator == bi.transactions_generator
         assert block.prev_header_hash == bi.prev_header_hash

chia/_tests/util/test_misc.py

@@ -7,6 +7,7 @@ from typing import Optional, TypeVar
 import aiohttp
 import anyio
 import pytest
+from chia_rs.sized_ints import uint64
 
 from chia._tests.util.misc import RecordingWebServer
 from chia._tests.util.split_managers import SplitAsyncManager, SplitManager, split_async_manager, split_manager
@@ -16,7 +17,6 @@ from chia.types.blockchain_format.program import Program
 from chia.types.transaction_queue_entry import ValuedEvent
 from chia.util.batches import to_batches
 from chia.util.errors import InvalidPathError
-from chia.util.ints import uint64
 from chia.util.timing import adjusted_timeout, backoff_times
 
 T = TypeVar("T")

chia/_tests/util/test_network_protocol_test.py

@@ -223,34 +223,34 @@ def test_missing_messages() -> None:
     # if these asserts fail, make sure to add the new network protocol messages
     # to the visitor in build_network_protocol_files.py and rerun it. Then
     # update this test
-    assert (
-        types_in_module(wallet_protocol) == wallet_msgs
-    ), f"message types were added or removed from wallet_protocol. {STANDARD_ADVICE}"
+    assert types_in_module(wallet_protocol) == wallet_msgs, (
+        f"message types were added or removed from wallet_protocol. {STANDARD_ADVICE}"
+    )
 
-    assert (
-        types_in_module(farmer_protocol) == farmer_msgs
-    ), f"message types were added or removed from farmer_protocol. {STANDARD_ADVICE}"
+    assert types_in_module(farmer_protocol) == farmer_msgs, (
+        f"message types were added or removed from farmer_protocol. {STANDARD_ADVICE}"
+    )
 
-    assert (
-        types_in_module(full_node_protocol) == full_node_msgs
-    ), f"message types were added or removed from full_node_protocol. {STANDARD_ADVICE}"
+    assert types_in_module(full_node_protocol) == full_node_msgs, (
+        f"message types were added or removed from full_node_protocol. {STANDARD_ADVICE}"
+    )
 
-    assert (
-        types_in_module(harvester_protocol) == harvester_msgs
-    ), f"message types were added or removed from harvester_protocol. {STANDARD_ADVICE}"
+    assert types_in_module(harvester_protocol) == harvester_msgs, (
+        f"message types were added or removed from harvester_protocol. {STANDARD_ADVICE}"
+    )
 
-    assert (
-        types_in_module(introducer_protocol) == introducer_msgs
-    ), f"message types were added or removed from introducer_protocol. {STANDARD_ADVICE}"
+    assert types_in_module(introducer_protocol) == introducer_msgs, (
+        f"message types were added or removed from introducer_protocol. {STANDARD_ADVICE}"
+    )
 
-    assert (
-        types_in_module(pool_protocol) == pool_msgs
-    ), f"message types were added or removed from pool_protocol. {STANDARD_ADVICE}"
+    assert types_in_module(pool_protocol) == pool_msgs, (
+        f"message types were added or removed from pool_protocol. {STANDARD_ADVICE}"
+    )
 
-    assert (
-        types_in_module(timelord_protocol) == timelord_msgs
-    ), f"message types were added or removed from timelord_protocol. {STANDARD_ADVICE}"
+    assert types_in_module(timelord_protocol) == timelord_msgs, (
+        f"message types were added or removed from timelord_protocol. {STANDARD_ADVICE}"
+    )
 
-    assert (
-        types_in_module(shared_protocol) == shared_msgs
-    ), f"message types were added or removed from shared_protocol. {STANDARD_ADVICE}"
+    assert types_in_module(shared_protocol) == shared_msgs, (
+        f"message types were added or removed from shared_protocol. {STANDARD_ADVICE}"
+    )

chia/_tests/util/test_replace_str_to_bytes.py

@@ -2,11 +2,11 @@ from __future__ import annotations
 
 import pytest
 from chia_rs import ConsensusConstants
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint16, uint32, uint64, uint128
 
 from chia.consensus.constants import replace_str_to_bytes
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.hash import std_hash
-from chia.util.ints import uint8, uint16, uint32, uint64, uint128
 
 AGG_SIG_DATA = bytes32.fromhex("ccd5bb71183532bff220ba46c268991a3ff07eb358e8255a65c30a2dce0e5fbb")
 

chia/_tests/util/test_trusted_peer.py

@@ -3,8 +3,8 @@ from __future__ import annotations
 from typing import Any
 
 import pytest
+from chia_rs.sized_bytes import bytes32
 
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.network import is_trusted_peer
 
 

chia/_tests/util/time_out_assert.py

@@ -6,7 +6,7 @@ import json
 import logging
 import pathlib
 import time
-from collections.abc import Iterable
+from collections.abc import Awaitable, Iterable
 from inspect import getframeinfo, stack
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Callable, ClassVar, Protocol, TypeVar, cast, final
@@ -15,6 +15,7 @@ import chia
 import chia._tests
 from chia._tests import ether
 from chia.protocols.protocol_message_types import ProtocolMessageTypes
+from chia.server.outbound_message import Message
 from chia.util.timing import adjusted_timeout
 
 log = logging.getLogger(__name__)
@@ -80,8 +81,14 @@ class TimeOutAssertData:
 
 
 async def time_out_assert_custom_interval(
-    timeout: float, interval, function, value=True, *args, stack_distance=0, **kwargs
-):
+    timeout: float,
+    interval: float,
+    function: Callable[..., Any],
+    value: object = True,
+    *args: object,
+    stack_distance: int = 0,
+    **kwargs: object,
+) -> None:
     __tracebackhide__ = True
 
     entry_file, entry_line = caller_file_and_line(
@@ -131,7 +138,9 @@ async def time_out_assert_custom_interval(
             )
 
 
-async def time_out_assert(timeout: int, function, value=True, *args, **kwargs):
+async def time_out_assert(
+    timeout: int, function: Callable[..., Any], value: object = True, *args: object, **kwargs: object
+) -> None:
     __tracebackhide__ = True
     await time_out_assert_custom_interval(
         timeout,
@@ -144,7 +153,9 @@ async def time_out_assert(timeout: int, function, value=True, *args, **kwargs):
     )
 
 
-async def time_out_assert_not_none(timeout: float, function, *args, **kwargs):
+async def time_out_assert_not_none(
+    timeout: float, function: Callable[..., Any], *args: object, **kwargs: object
+) -> None:
     # TODO: rework to leverage time_out_assert_custom_interval() such as by allowing
     #       value to be a callable
     __tracebackhide__ = True
@@ -163,8 +174,10 @@ async def time_out_assert_not_none(timeout: float, function, *args, **kwargs):
     assert False, "Timed assertion timed out"
 
 
-def time_out_messages(incoming_queue: asyncio.Queue, msg_name: str, count: int = 1) -> Callable:
-    async def bool_f():
+def time_out_messages(
+    incoming_queue: asyncio.Queue[Message], msg_name: str, count: int = 1
+) -> Callable[[], Awaitable[bool]]:
+    async def bool_f() -> bool:
         if incoming_queue.qsize() < count:
             return False
         for _ in range(count):

chia/_tests/wallet/cat_wallet/test_cat_lifecycle.py

@@ -4,6 +4,7 @@ from typing import Optional
 
 import pytest
 from chia_rs import AugSchemeMPL, G2Element, PrivateKey
+from chia_rs.sized_ints import uint64
 from clvm.casts import int_to_bytes
 
 from chia._tests.clvm.benchmark_costs import cost_of_spend_bundle
@@ -15,7 +16,6 @@ from chia.types.blockchain_format.program import Program
 from chia.types.coin_spend import make_spend
 from chia.types.mempool_inclusion_status import MempoolInclusionStatus
 from chia.util.errors import Err
-from chia.util.ints import uint64
 from chia.wallet.cat_wallet.cat_utils import (
     CAT_MOD,
     SpendableCAT,

chia/_tests/wallet/cat_wallet/test_cat_outer_puzzle.py

@@ -3,14 +3,14 @@ from __future__ import annotations
 from typing import Optional
 
 import pytest
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
 from clvm_tools.binutils import disassemble
 
 from chia.types.blockchain_format.coin import Coin
 from chia.types.blockchain_format.program import Program
 from chia.types.blockchain_format.serialized_program import SerializedProgram
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.coin_spend import make_spend
-from chia.util.ints import uint64
 from chia.wallet.cat_wallet.cat_utils import CAT_MOD, construct_cat_puzzle
 from chia.wallet.outer_puzzles import construct_puzzle, get_inner_puzzle, get_inner_solution, match_puzzle, solve_puzzle
 from chia.wallet.puzzle_drivers import PuzzleInfo, Solver

chia/_tests/wallet/cat_wallet/test_cat_wallet.py

@@ -4,6 +4,8 @@ import tempfile
 from pathlib import Path
 
 import pytest
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32, uint64
 
 from chia._tests.conftest import ConsensusMode
 from chia._tests.environments.wallet import (
@@ -18,11 +20,9 @@ from chia.rpc.wallet_request_types import GetTransactionMemo, PushTX
 from chia.simulator.simulator_protocol import ReorgProtocol
 from chia.types.blockchain_format.coin import Coin, 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.util.bech32m import encode_puzzle_hash
 from chia.util.db_wrapper import DBWrapper2
-from chia.util.ints import uint32, uint64
 from chia.wallet.cat_wallet.cat_constants import DEFAULT_CATS
 from chia.wallet.cat_wallet.cat_info import LegacyCATInfo
 from chia.wallet.cat_wallet.cat_utils import CAT_MOD, construct_cat_puzzle
@@ -691,7 +691,7 @@ async def test_cat_doesnt_see_eve(wallet_environments: WalletTestFramework) -> N
 
     cc2_ph = await cat_wallet_2.get_cat_puzzle_hash(new=False)
     async with wallet.wallet_state_manager.new_action_scope(wallet_environments.tx_config, push=True) as action_scope:
-        await wallet.wallet_state_manager.main_wallet.generate_signed_transaction(uint64(10), cc2_ph, action_scope)
+        await wallet.wallet_state_manager.main_wallet.generate_signed_transaction([uint64(10)], [cc2_ph], action_scope)
 
     await wallet_environments.process_pending_states(
         [
@@ -1641,8 +1641,7 @@ async def test_cat_melt_balance(wallet_environments: WalletTestFramework) -> Non
 
     from chia.simulator.simulator_protocol import GetAllCoinsProtocol
     from chia.wallet.cat_wallet.cat_utils import SpendableCAT, unsigned_spend_bundle_for_spendable_cats
-    from chia.wallet.conditions import UnknownCondition
-    from chia.wallet.payment import Payment
+    from chia.wallet.conditions import CreateCoin, UnknownCondition
 
     await simulator.farm_blocks_to_puzzlehash(count=1, farm_to=CAT_w_ACS_HASH, guarantee_transaction_blocks=True)
     await simulator.farm_blocks_to_puzzlehash(count=1)
@@ -1703,7 +1702,7 @@ async def test_cat_melt_balance(wallet_environments: WalletTestFramework) -> Non
                     limitations_program_hash=ACS_TAIL_HASH,
                     inner_puzzle=await cat_wallet.inner_puzzle_for_cat_puzhash(new_coin.puzzle_hash),
                     inner_solution=wallet.make_solution(
-                        primaries=[Payment(wallet_ph, uint64(tx_amount), [wallet_ph])],
+                        primaries=[CreateCoin(wallet_ph, uint64(tx_amount), [wallet_ph])],
                         conditions=(
                             UnknownCondition(
                                 opcode=Program.to(51),

chia/_tests/wallet/cat_wallet/test_offer_lifecycle.py

@@ -4,24 +4,23 @@ from typing import Any, Optional
 
 import pytest
 from chia_rs import G2Element
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
 
 from chia._tests.util.spend_sim import CostLogger, SimClient, SpendSim, sim_and_client
 from chia.types.blockchain_format.coin import Coin
 from chia.types.blockchain_format.program import Program
 from chia.types.blockchain_format.serialized_program import SerializedProgram
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.coin_spend import make_spend
 from chia.types.mempool_inclusion_status import MempoolInclusionStatus
-from chia.util.ints import uint64
 from chia.wallet.cat_wallet.cat_utils import (
     CAT_MOD,
     SpendableCAT,
     construct_cat_puzzle,
     unsigned_spend_bundle_for_spendable_cats,
 )
-from chia.wallet.conditions import AssertPuzzleAnnouncement, ConditionValidTimes
+from chia.wallet.conditions import AssertPuzzleAnnouncement, ConditionValidTimes, CreateCoin
 from chia.wallet.outer_puzzles import AssetType
-from chia.wallet.payment import Payment
 from chia.wallet.puzzle_drivers import PuzzleInfo
 from chia.wallet.trading.offer import OFFER_MOD, Offer
 from chia.wallet.wallet_spend_bundle import WalletSpendBundle
@@ -60,7 +59,7 @@ async def generate_coins(
                 tail_hash = tail.get_tree_hash()
                 cat_puzzle = construct_cat_puzzle(CAT_MOD, tail_hash, acs)
                 cat_puzzle_hash = cat_puzzle.get_tree_hash()
-                payments.append(Payment(cat_puzzle_hash, uint64(amount)))
+                payments.append(CreateCoin(cat_puzzle_hash, uint64(amount)))
                 cat_bundles.append(
                     unsigned_spend_bundle_for_spendable_cats(
                         CAT_MOD,
@@ -75,7 +74,7 @@ async def generate_coins(
                     )
                 )
             else:
-                payments.append(Payment(acs_ph, uint64(amount)))
+                payments.append(CreateCoin(acs_ph, uint64(amount)))
 
     # This bundle creates all of the initial coins
     parent_bundle = WalletSpendBundle(
@@ -178,8 +177,11 @@ async def test_complex_offer(cost_logger: CostLogger) -> None:
         driver_dict_as_infos = {key.hex(): value.info for key, value in driver_dict.items()}
 
         # Create an XCH Offer for RED
-        chia_requested_payments: dict[Optional[bytes32], list[Payment]] = {
-            str_to_tail_hash("red"): [Payment(acs_ph, uint64(100), [b"memo"]), Payment(acs_ph, uint64(200), [b"memo"])]
+        chia_requested_payments: dict[Optional[bytes32], list[CreateCoin]] = {
+            str_to_tail_hash("red"): [
+                CreateCoin(acs_ph, uint64(100), [b"memo"]),
+                CreateCoin(acs_ph, uint64(200), [b"memo"]),
+            ]
         }
         chia_notarized_payments = Offer.notarize_payments(chia_requested_payments, chia_coins)
         chia_announcements = Offer.calculate_announcements(chia_notarized_payments, driver_dict)
@@ -190,8 +192,8 @@ async def test_complex_offer(cost_logger: CostLogger) -> None:
         # Create a RED Offer for XCH
         red_coins_1 = red_coins[0:1]
         red_coins_2 = red_coins[1:]
-        red_requested_payments: dict[Optional[bytes32], list[Payment]] = {
-            None: [Payment(acs_ph, uint64(300), [b"red memo"]), Payment(acs_ph, uint64(350), [b"red memo"])]
+        red_requested_payments: dict[Optional[bytes32], list[CreateCoin]] = {
+            None: [CreateCoin(acs_ph, uint64(300), [b"red memo"]), CreateCoin(acs_ph, uint64(350), [b"red memo"])]
         }
         red_notarized_payments = Offer.notarize_payments(red_requested_payments, red_coins_1)
         red_announcements = Offer.calculate_announcements(red_notarized_payments, driver_dict)
@@ -201,8 +203,8 @@ async def test_complex_offer(cost_logger: CostLogger) -> None:
         red_offer = Offer(red_notarized_payments, red_secured_bundle, driver_dict)
         assert not red_offer.is_valid()
 
-        red_requested_payments_2: dict[Optional[bytes32], list[Payment]] = {
-            None: [Payment(acs_ph, uint64(50), [b"red memo"])]
+        red_requested_payments_2: dict[Optional[bytes32], list[CreateCoin]] = {
+            None: [CreateCoin(acs_ph, uint64(50), [b"red memo"])]
         }
         red_notarized_payments_2 = Offer.notarize_payments(red_requested_payments_2, red_coins_2)
         red_announcements_2 = Offer.calculate_announcements(red_notarized_payments_2, driver_dict)
@@ -219,9 +221,9 @@ async def test_complex_offer(cost_logger: CostLogger) -> None:
         assert new_offer.is_valid()
 
         # Create yet another offer of BLUE for XCH and RED
-        blue_requested_payments: dict[Optional[bytes32], list[Payment]] = {
-            None: [Payment(acs_ph, uint64(200), [b"blue memo"])],
-            str_to_tail_hash("red"): [Payment(acs_ph, uint64(50), [b"blue memo"])],
+        blue_requested_payments: dict[Optional[bytes32], list[CreateCoin]] = {
+            None: [CreateCoin(acs_ph, uint64(200), [b"blue memo"])],
+            str_to_tail_hash("red"): [CreateCoin(acs_ph, uint64(50), [b"blue memo"])],
         }
         blue_notarized_payments = Offer.notarize_payments(blue_requested_payments, blue_coins)
         blue_announcements = Offer.calculate_announcements(blue_notarized_payments, driver_dict)

chia/_tests/wallet/cat_wallet/test_trades.py

@@ -5,6 +5,8 @@ from typing import Any, Union
 
 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.conftest import SOFTFORK_HEIGHTS
 from chia._tests.environments.wallet import WalletStateTransition, WalletTestFramework
@@ -16,11 +18,9 @@ from chia.consensus.default_constants import DEFAULT_CONSTANTS
 from chia.full_node.bundle_tools import simple_solution_generator
 from chia.rpc.wallet_request_types import VCAddProofs, VCGetList, VCGetProofsForRoot, VCMint, VCSpend
 from chia.types.blockchain_format.program import INFINITE_COST, Program
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.spend_bundle import SpendBundle
 from chia.util.bech32m import encode_puzzle_hash
 from chia.util.hash import std_hash
-from chia.util.ints import uint32, uint64
 from chia.wallet.cat_wallet.cat_wallet import CATWallet
 from chia.wallet.conditions import CreateCoinAnnouncement, parse_conditions_non_consensus
 from chia.wallet.did_wallet.did_wallet import DIDWallet

chia/_tests/wallet/clawback/test_clawback_lifecycle.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.benchmark_costs import cost_of_spend_bundle
 from chia._tests.clvm.test_puzzles import public_key_for_index, secret_exponent_for_index
@@ -12,13 +14,11 @@ from chia._tests.util.spend_sim import CostLogger, SimClient, SpendSim, sim_and_
 from chia._tests.util.time_out_assert import time_out_assert
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
 from chia.types.blockchain_format.program import INFINITE_COST, 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.mempool_inclusion_status import MempoolInclusionStatus
 from chia.util.condition_tools import conditions_dict_for_solution, pkm_pairs_for_conditions_dict
 from chia.util.errors import Err
-from chia.util.ints import uint64
 from chia.util.streamable import VersionedBlob
 from chia.wallet.puzzles.clawback.drivers import (
     create_augmented_cond_puzzle_hash,

chia/_tests/wallet/clawback/test_clawback_metadata.py

@@ -3,13 +3,13 @@ from __future__ import annotations
 import random
 
 import pytest
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
 
 from chia.server.server import ChiaServer
 from chia.simulator.block_tools import BlockTools
 from chia.simulator.full_node_simulator import FullNodeSimulator
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.peer_info import PeerInfo
-from chia.util.ints import uint64
 from chia.wallet.puzzles.clawback.metadata import ClawbackMetadata
 from chia.wallet.wallet_node import WalletNode
 

chia/_tests/wallet/conftest.py

@@ -10,23 +10,23 @@ from typing import Any, Callable, Literal, Optional
 import pytest
 from chia_rs import (
     DONT_VALIDATE_SIGNATURE,
+    ConsensusConstants,
     SpendBundleConditions,
     get_flags_for_height_and_constants,
     run_block_generator,
     run_block_generator2,
 )
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32, uint64, uint128
 
 from chia._tests.environments.wallet import NewPuzzleHashError, WalletEnvironment, WalletState, WalletTestFramework
 from chia._tests.util.setup_nodes import setup_simulators_and_wallets_service
 from chia._tests.wallet.wallet_block_tools import WalletBlockTools
-from chia.consensus.constants import ConsensusConstants
 from chia.full_node.full_node import FullNode
 from chia.rpc.full_node_rpc_client import FullNodeRpcClient
 from chia.rpc.wallet_rpc_client import WalletRpcClient
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.full_block import FullBlock
 from chia.types.peer_info import PeerInfo
-from chia.util.ints import uint32, uint64, uint128
 from chia.wallet.util.tx_config import DEFAULT_TX_CONFIG, TXConfig
 from chia.wallet.wallet_node import Balance
 from chia.wallet.wallet_state_manager import WalletStateManager

chia/_tests/wallet/db_wallet/test_db_graftroot.py

@@ -2,20 +2,18 @@ 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 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 make_spend
 from chia.types.mempool_inclusion_status import MempoolInclusionStatus
 from chia.util.errors import Err
-from chia.wallet.puzzles.load_clvm import load_clvm
+from chia.wallet.db_wallet.db_wallet_puzzles import GRAFTROOT_DL_OFFERS
 from chia.wallet.util.merkle_utils import build_merkle_tree, build_merkle_tree_from_binary_tree, simplify_merkle_proof
 from chia.wallet.wallet_spend_bundle import WalletSpendBundle
 
-GRAFTROOT_MOD = load_clvm("graftroot_dl_offers.clsp", package_or_requirement="chia.data_layer.puzzles")
-
 # Always returns the last value
 # (mod solution
 #
@@ -46,7 +44,7 @@ async def test_graftroot(cost_logger: CostLogger) -> None:
         desired_key_values = ((bytes32.zeros, bytes32([1] * 32)), (bytes32([7] * 32), bytes32([8] * 32)))
         desired_row_hashes: list[bytes32] = [build_merkle_tree_from_binary_tree(kv)[0] for kv in desired_key_values]
         fake_struct: Program = Program.to((ACS_PH, NIL_PH))
-        graftroot_puzzle: Program = GRAFTROOT_MOD.curry(
+        graftroot_puzzle: Program = GRAFTROOT_DL_OFFERS.curry(
             # Do everything twice to test depending on multiple singleton updates
             p2_conditions,
             [fake_struct, fake_struct],

chia/_tests/wallet/db_wallet/test_dl_offers.py

@@ -3,11 +3,11 @@ from __future__ import annotations
 from typing import Any
 
 import pytest
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
 
 from chia._tests.util.time_out_assert import time_out_assert
 from chia.data_layer.data_layer_wallet import DataLayerWallet
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint64
 from chia.wallet.puzzle_drivers import Solver
 from chia.wallet.trade_record import TradeRecord
 from chia.wallet.trading.offer import Offer