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

chia/_tests/wallet/sync/test_wallet_sync.py

@@ -11,7 +11,9 @@ from unittest.mock import MagicMock
 
 import pytest
 from aiosqlite import Error as AIOSqliteError
-from chia_rs import G2Element, confirm_not_included_already_hashed
+from chia_rs import ConsensusConstants, G2Element, confirm_not_included_already_hashed
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32, uint64, uint128
 from chiabip158 import PyBIP158
 from colorlog import getLogger
 
@@ -24,7 +26,6 @@ from chia._tests.weight_proof.test_weight_proof import load_blocks_dont_validate
 from chia.consensus.block_body_validation import ForkInfo
 from chia.consensus.block_record import BlockRecord
 from chia.consensus.block_rewards import calculate_base_farmer_reward, calculate_pool_reward
-from chia.consensus.constants import ConsensusConstants
 from chia.consensus.difficulty_adjustment import get_next_sub_slot_iters_and_difficulty
 from chia.full_node.full_node_api import FullNodeAPI
 from chia.full_node.weight_proof import WeightProofHandler
@@ -48,17 +49,16 @@ from chia.simulator.full_node_simulator import FullNodeSimulator
 from chia.simulator.simulator_protocol import FarmNewBlockProtocol
 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.condition_opcodes import ConditionOpcode
 from chia.types.full_block import FullBlock
 from chia.types.peer_info import PeerInfo
 from chia.types.spend_bundle import SpendBundle
 from chia.types.validation_state import ValidationState
+from chia.util.augmented_chain import AugmentedBlockchain
 from chia.util.hash import std_hash
-from chia.util.ints import uint32, uint64, uint128
+from chia.wallet.conditions import CreateCoin
 from chia.wallet.nft_wallet.nft_wallet import NFTWallet
-from chia.wallet.payment import Payment
 from chia.wallet.util.compute_memos import compute_memos
 from chia.wallet.util.tx_config import DEFAULT_TX_CONFIG
 from chia.wallet.util.wallet_sync_utils import PeerRequestException
@@ -444,11 +444,13 @@ async def test_long_sync_wallet(
         full_node.constants, True, block_record, full_node.blockchain
     )
     fork_height = blocks_reorg[-num_blocks - 10].height - 1
+    blockchain = AugmentedBlockchain(full_node.blockchain)
     await full_node.add_block_batch(
         blocks_reorg[-num_blocks - 10 : -1],
         PeerInfo("0.0.0.0", 0),
         ForkInfo(fork_height, fork_height, blocks_reorg[-num_blocks - 10].prev_header_hash),
         ValidationState(sub_slot_iters, difficulty, None),
+        blockchain,
     )
     await full_node.add_block(blocks_reorg[-1])
 
@@ -572,11 +574,13 @@ async def test_wallet_reorg_get_coinbase(
     sub_slot_iters, difficulty = get_next_sub_slot_iters_and_difficulty(
         full_node.constants, True, block_record, full_node.blockchain
     )
+    blockchain = AugmentedBlockchain(full_node.blockchain)
     await full_node.add_block_batch(
         blocks_reorg_2[-44:],
         PeerInfo("0.0.0.0", 0),
         ForkInfo(blocks_reorg_2[-45].height, blocks_reorg_2[-45].height, blocks_reorg_2[-45].header_hash),
         ValidationState(sub_slot_iters, difficulty, None),
+        blockchain,
     )
 
     for wallet_node, wallet_server in wallets:
@@ -665,14 +669,18 @@ async def test_request_additions_success(simulator_and_wallet: OldSimulatorsAndW
 
     await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node, timeout=20)
 
-    payees: list[Payment] = []
+    payees: list[CreateCoin] = []
     for i in range(10):
         payee_ph = await wallet.get_new_puzzlehash()
-        payees.append(Payment(payee_ph, uint64(i + 100)))
-        payees.append(Payment(payee_ph, uint64(i + 200)))
+        payees.append(CreateCoin(payee_ph, uint64(i + 100)))
+        payees.append(CreateCoin(payee_ph, uint64(i + 200)))
 
     async with wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
-        await wallet.generate_signed_transaction(uint64(0), ph, action_scope, primaries=payees)
+        await wallet.generate_signed_transaction(
+            [uint64(0), *(payee.amount for payee in payees)],
+            [ph, *(payee.puzzle_hash for payee in payees)],
+            action_scope,
+        )
     [tx] = action_scope.side_effects.transactions
     assert tx.spend_bundle is not None
     await full_node_api.send_transaction(SendTransaction(tx.spend_bundle))
@@ -880,13 +888,17 @@ async def test_dusted_wallet(
     await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
 
     # Part 1: create a single dust coin
-    payees: list[Payment] = []
+    payees: list[CreateCoin] = []
     payee_ph = await dust_wallet.get_new_puzzlehash()
-    payees.append(Payment(payee_ph, uint64(dust_value)))
+    payees.append(CreateCoin(payee_ph, uint64(dust_value)))
 
     # construct and send tx
     async with farm_wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
-        await farm_wallet.generate_signed_transaction(uint64(0), ph, action_scope, primaries=payees)
+        await farm_wallet.generate_signed_transaction(
+            [uint64(0), *(payee.amount for payee in payees)],
+            [ph, *(payee.puzzle_hash for payee in payees)],
+            action_scope,
+        )
     [tx] = action_scope.side_effects.transactions
     assert tx.spend_bundle is not None
     await full_node_api.send_transaction(SendTransaction(tx.spend_bundle))
@@ -939,14 +951,18 @@ async def test_dusted_wallet(
 
     while dust_remaining > 0:
         payee_ph = await dust_wallet.get_new_puzzlehash()
-        payees.append(Payment(payee_ph, uint64(dust_value)))
+        payees.append(CreateCoin(payee_ph, uint64(dust_value)))
 
         # After every 100 (at most) coins added, push the tx and advance the chain
         # This greatly speeds up the overall process
         if dust_remaining % 100 == 0 and dust_remaining != new_dust:
             # construct and send tx
             async with farm_wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
-                await farm_wallet.generate_signed_transaction(uint64(0), ph, action_scope, primaries=payees)
+                await farm_wallet.generate_signed_transaction(
+                    [uint64(0), *(payee.amount for payee in payees)],
+                    [ph, *(payee.puzzle_hash for payee in payees)],
+                    action_scope,
+                )
             [tx] = action_scope.side_effects.transactions
             assert tx.spend_bundle is not None
             await full_node_api.send_transaction(SendTransaction(tx.spend_bundle))
@@ -965,7 +981,11 @@ async def test_dusted_wallet(
     if new_dust >= 1:
         # construct and send tx
         async with farm_wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
-            await farm_wallet.generate_signed_transaction(uint64(0), ph, action_scope, primaries=payees)
+            await farm_wallet.generate_signed_transaction(
+                [uint64(0), *(payee.amount for payee in payees)],
+                [ph, *(payee.puzzle_hash for payee in payees)],
+                action_scope,
+            )
         [tx] = action_scope.side_effects.transactions
         assert tx.spend_bundle is not None
         await full_node_api.send_transaction(SendTransaction(tx.spend_bundle))
@@ -1007,11 +1027,15 @@ async def test_dusted_wallet(
 
     for _ in range(large_coins):
         payee_ph = await dust_wallet.get_new_puzzlehash()
-        payees.append(Payment(payee_ph, uint64(xch_spam_amount)))
+        payees.append(CreateCoin(payee_ph, uint64(xch_spam_amount)))
 
     # construct and send tx
     async with farm_wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
-        await farm_wallet.generate_signed_transaction(uint64(0), ph, action_scope, primaries=payees)
+        await farm_wallet.generate_signed_transaction(
+            [uint64(0), *(payee.amount for payee in payees)],
+            [ph, *(payee.puzzle_hash for payee in payees)],
+            action_scope,
+        )
     [tx] = action_scope.side_effects.transactions
     assert tx.spend_bundle is not None
     await full_node_api.send_transaction(SendTransaction(tx.spend_bundle))
@@ -1046,11 +1070,15 @@ async def test_dusted_wallet(
     payees = []
 
     payee_ph = await dust_wallet.get_new_puzzlehash()
-    payees.append(Payment(payee_ph, uint64(dust_value)))
+    payees.append(CreateCoin(payee_ph, uint64(dust_value)))
 
     # construct and send tx
     async with farm_wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
-        await farm_wallet.generate_signed_transaction(uint64(0), ph, action_scope, primaries=payees)
+        await farm_wallet.generate_signed_transaction(
+            [uint64(0), *(payee.amount for payee in payees)],
+            [ph, *(payee.puzzle_hash for payee in payees)],
+            action_scope,
+        )
     [tx] = action_scope.side_effects.transactions
     assert tx.spend_bundle is not None
     await full_node_api.send_transaction(SendTransaction(tx.spend_bundle))
@@ -1090,7 +1118,7 @@ async def test_dusted_wallet(
         payee_ph = await dust_wallet.get_new_puzzlehash()
 
         # Create a large coin and add on the appropriate balance.
-        payees.append(Payment(payee_ph, uint64(xch_spam_amount + i)))
+        payees.append(CreateCoin(payee_ph, uint64(xch_spam_amount + i)))
         large_coins += 1
         large_coin_balance += xch_spam_amount + i
 
@@ -1098,9 +1126,9 @@ async def test_dusted_wallet(
 
         # Make sure we are always creating coins with a positive value.
         if xch_spam_amount - dust_value - i > 0:
-            payees.append(Payment(payee_ph, uint64(xch_spam_amount - dust_value - i)))
+            payees.append(CreateCoin(payee_ph, uint64(xch_spam_amount - dust_value - i)))
         else:
-            payees.append(Payment(payee_ph, uint64(dust_value)))
+            payees.append(CreateCoin(payee_ph, uint64(dust_value)))
         # In cases where xch_spam_amount is sufficiently low,
         # the new dust should be considered a large coina and not be filtered.
         if xch_spam_amount <= dust_value:
@@ -1109,7 +1137,11 @@ async def test_dusted_wallet(
 
     # construct and send tx
     async with farm_wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
-        await farm_wallet.generate_signed_transaction(uint64(0), ph, action_scope, primaries=payees)
+        await farm_wallet.generate_signed_transaction(
+            [uint64(0), *(payee.amount for payee in payees)],
+            [ph, *(payee.puzzle_hash for payee in payees)],
+            action_scope,
+        )
     [tx] = action_scope.side_effects.transactions
     assert tx.spend_bundle is not None
     await full_node_api.send_transaction(SendTransaction(tx.spend_bundle))
@@ -1141,11 +1173,15 @@ async def test_dusted_wallet(
     # Send 1 mojo from the dust wallet. The dust wallet should receive a change coin valued at "xch_spam_amount-1".
 
     payee_ph = await farm_wallet.get_new_puzzlehash()
-    payees = [Payment(payee_ph, uint64(balance))]
+    payees = [CreateCoin(payee_ph, uint64(balance))]
 
     # construct and send tx
     async with dust_wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
-        await dust_wallet.generate_signed_transaction(uint64(0), ph, action_scope, primaries=payees)
+        await dust_wallet.generate_signed_transaction(
+            [uint64(0), *(payee.amount for payee in payees)],
+            [ph, *(payee.puzzle_hash for payee in payees)],
+            action_scope,
+        )
     [tx] = action_scope.side_effects.transactions
     assert tx.spend_bundle is not None
     await full_node_api.send_transaction(SendTransaction(tx.spend_bundle))
@@ -1182,14 +1218,18 @@ async def test_dusted_wallet(
 
     while coins_remaining > 0:
         payee_ph = await dust_wallet.get_new_puzzlehash()
-        payees.append(Payment(payee_ph, uint64(coin_value)))
+        payees.append(CreateCoin(payee_ph, uint64(coin_value)))
 
         # After every 100 (at most) coins added, push the tx and advance the chain
         # This greatly speeds up the overall process
         if coins_remaining % 100 == 0 and coins_remaining != spam_filter_after_n_txs:
             # construct and send tx
             async with farm_wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
-                await farm_wallet.generate_signed_transaction(uint64(0), ph, action_scope, primaries=payees)
+                await farm_wallet.generate_signed_transaction(
+                    [uint64(0), *(payee.amount for payee in payees)],
+                    [ph, *(payee.puzzle_hash for payee in payees)],
+                    action_scope,
+                )
             [tx] = action_scope.side_effects.transactions
             assert tx.spend_bundle is not None
             await full_node_api.send_transaction(SendTransaction(tx.spend_bundle))
@@ -1204,7 +1244,11 @@ async def test_dusted_wallet(
 
     # construct and send tx
     async with farm_wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
-        await farm_wallet.generate_signed_transaction(uint64(0), ph, action_scope, primaries=payees)
+        await farm_wallet.generate_signed_transaction(
+            [uint64(0), *(payee.amount for payee in payees)],
+            [ph, *(payee.puzzle_hash for payee in payees)],
+            action_scope,
+        )
     [tx] = action_scope.side_effects.transactions
     assert tx.spend_bundle is not None
     await full_node_api.send_transaction(SendTransaction(tx.spend_bundle))
@@ -1230,11 +1274,15 @@ async def test_dusted_wallet(
 
     # Send a 1 mojo coin from the dust wallet to the farm wallet
     payee_ph = await farm_wallet.get_new_puzzlehash()
-    payees = [Payment(payee_ph, uint64(1))]
+    payees = [CreateCoin(payee_ph, uint64(1))]
 
     # construct and send tx
     async with dust_wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
-        await dust_wallet.generate_signed_transaction(uint64(0), ph, action_scope, primaries=payees)
+        await dust_wallet.generate_signed_transaction(
+            [uint64(0), *(payee.amount for payee in payees)],
+            [ph, *(payee.puzzle_hash for payee in payees)],
+            action_scope,
+        )
     [tx] = action_scope.side_effects.transactions
     assert tx.spend_bundle is not None
     await full_node_api.send_transaction(SendTransaction(tx.spend_bundle))
@@ -1473,7 +1521,7 @@ async def test_retry_store(
 
             async with wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
                 await wallet.generate_signed_transaction(
-                    uint64(1_000_000_000_000), bytes32.zeros, action_scope, memos=[ph]
+                    [uint64(1_000_000_000_000)], [bytes32.zeros], action_scope, memos=[[ph]]
                 )
             [tx] = action_scope.side_effects.transactions
             await time_out_assert(30, wallet.get_confirmed_balance, 2_000_000_000_000)

chia/_tests/wallet/test_clvm_streamable.py

@@ -4,10 +4,10 @@ import dataclasses
 from typing import Optional
 
 import pytest
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
 
 from chia.types.blockchain_format.program import Program
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint64
 from chia.util.streamable import Streamable, streamable
 from chia.wallet.signer_protocol import Coin, Spend
 from chia.wallet.util.clvm_streamable import (

chia/_tests/wallet/test_coin_management.py

@@ -8,6 +8,8 @@ from typing import Any
 from unittest.mock import patch
 
 import pytest
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
 
 from chia._tests.cmds.test_cmd_framework import check_click_parsing
 from chia._tests.environments.wallet import STANDARD_TX_ENDPOINT_ARGS, WalletStateTransition, WalletTestFramework
@@ -15,8 +17,6 @@ from chia.cmds.cmd_helpers import NeedsCoinSelectionConfig, NeedsWalletRPC, Wall
 from chia.cmds.coins import CombineCMD, ListCMD, SplitCMD
 from chia.cmds.param_types import CliAmount, cli_amount_none
 from chia.rpc.wallet_request_types import GetSyncStatusResponse
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint64
 from chia.wallet.cat_wallet.cat_wallet import CATWallet
 
 ONE_TRILLION = 1_000_000_000_000
@@ -113,7 +113,7 @@ async def test_list(wallet_environments: WalletTestFramework, capsys: pytest.Cap
     assert (
         textwrap.dedent(
             f"""\
-        There are a total of {len(wallet_coins)} coins in wallet {env.wallet_aliases['xch']}.
+        There are a total of {len(wallet_coins)} coins in wallet {env.wallet_aliases["xch"]}.
         {len(wallet_coins)} confirmed coins.
         0 unconfirmed additions.
         0 unconfirmed removals.
@@ -134,7 +134,7 @@ async def test_list(wallet_environments: WalletTestFramework, capsys: pytest.Cap
     assert (
         textwrap.dedent(
             f"""\
-        There are a total of {len(wallet_coins)} coins in wallet {env.wallet_aliases['xch']}.
+        There are a total of {len(wallet_coins)} coins in wallet {env.wallet_aliases["xch"]}.
         {len(wallet_coins)} confirmed coins.
         0 unconfirmed additions.
         0 unconfirmed removals.
@@ -153,7 +153,7 @@ async def test_list(wallet_environments: WalletTestFramework, capsys: pytest.Cap
     assert (
         textwrap.dedent(
             f"""\
-        There are a total of {len(wallet_coins)} coins in wallet {env.wallet_aliases['xch']}.
+        There are a total of {len(wallet_coins)} coins in wallet {env.wallet_aliases["xch"]}.
         {len(wallet_coins)} confirmed coins.
         0 unconfirmed additions.
         0 unconfirmed removals.
@@ -197,7 +197,7 @@ async def test_list(wallet_environments: WalletTestFramework, capsys: pytest.Cap
     assert (
         textwrap.dedent(
             f"""\
-        There are a total of {len(wallet_coins)} coins in wallet {env.wallet_aliases['xch']}.
+        There are a total of {len(wallet_coins)} coins in wallet {env.wallet_aliases["xch"]}.
         {len(wallet_coins) - 1} confirmed coins.
         1 unconfirmed additions.
         1 unconfirmed removals.
@@ -240,7 +240,7 @@ async def test_list(wallet_environments: WalletTestFramework, capsys: pytest.Cap
     assert (
         textwrap.dedent(
             f"""\
-        There are a total of 1 coins in wallet {env.wallet_aliases['cat']}.
+        There are a total of 1 coins in wallet {env.wallet_aliases["cat"]}.
         1 confirmed coins.
         0 unconfirmed additions.
         0 unconfirmed removals.

chia/_tests/wallet/test_coin_selection.py

@@ -5,12 +5,12 @@ import time
 from random import randrange
 
 import pytest
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32, uint64, uint128
 
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
 from chia.types.blockchain_format.coin import Coin
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.hash import std_hash
-from chia.util.ints import uint32, uint64, uint128
 from chia.wallet.coin_selection import (
     check_for_exact_match,
     knapsack_coin_algorithm,
@@ -97,6 +97,24 @@ class TestCoinSelection:
             assert sum(coin.amount for coin in result) >= target_amount
             assert len(result) <= 500
 
+    @pytest.mark.anyio
+    async def test_coin_selection_zero_coins(self, a_hash: bytes32) -> None:
+        coin_list: list[WalletCoinRecord] = [
+            WalletCoinRecord(Coin(a_hash, a_hash, uint64(0)), uint32(1), uint32(1), False, True, WalletType(0), 1)
+            for _ in range(0, 100)
+        ]
+
+        result: set[Coin] = await select_coins(
+            uint128(0),
+            DEFAULT_COIN_SELECTION_CONFIG,
+            coin_list,
+            {},
+            logging.getLogger("test"),
+            uint128(0),
+        )
+
+        assert len(result) > 0
+
     @pytest.mark.anyio
     async def test_coin_selection_with_dust(self, a_hash: bytes32) -> None:
         spendable_amount = uint128(5000000000000 + 10000)

chia/_tests/wallet/test_conditions.py

@@ -4,13 +4,13 @@ from dataclasses import dataclass
 from typing import Any, Optional, Union
 
 import pytest
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32, uint64
 from clvm.casts import int_from_bytes
 from clvm.EvalError import EvalError
 
 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.util.ints import uint32, uint64
 from chia.wallet.conditions import (
     CONDITION_DRIVERS,
     CONDITION_DRIVERS_W_ABSTRACTIONS,

chia/_tests/wallet/test_debug_spend_bundle.py

@@ -2,14 +2,14 @@ from __future__ import annotations
 
 import pytest
 from chia_rs import AugSchemeMPL, PrivateKey
+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 make_spend
 from chia.types.condition_opcodes import ConditionOpcode
 from chia.util.hash import std_hash
-from chia.util.ints import uint64
 from chia.wallet.util.debug_spend_bundle import debug_spend_bundle
 from chia.wallet.wallet_spend_bundle import WalletSpendBundle
 

chia/_tests/wallet/test_new_wallet_protocol.py

@@ -9,6 +9,8 @@ from typing import Optional
 
 import pytest
 from chia_rs import AugSchemeMPL, Coin, CoinSpend, CoinState, Program
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint16, uint32, uint64
 
 from chia._tests.connection_utils import add_dummy_connection
 from chia.full_node.coin_store import CoinStore
@@ -24,12 +26,10 @@ from chia.simulator.block_tools import BlockTools
 from chia.simulator.full_node_simulator import FullNodeSimulator
 from chia.simulator.start_simulator import SimulatorFullNodeService
 from chia.types.aliases import WalletService
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.coin_record import CoinRecord
 from chia.types.mempool_inclusion_status import MempoolInclusionStatus
 from chia.types.spend_bundle import SpendBundle
 from chia.util.hash import std_hash
-from chia.util.ints import uint8, uint16, uint32, uint64
 
 IDENTITY_PUZZLE = Program.to(1)
 IDENTITY_PUZZLE_HASH = IDENTITY_PUZZLE.get_tree_hash()

chia/_tests/wallet/test_nft_store.py

@@ -4,12 +4,12 @@ import random
 from dataclasses import dataclass, field
 
 import pytest
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32, uint64
 
 from chia._tests.util.db_connection import DBConnection
 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.util.ints import uint32, uint64
 from chia.wallet.lineage_proof import LineageProof
 from chia.wallet.nft_wallet.nft_info import NFTCoinInfo
 from chia.wallet.wallet_nft_store import WalletNftStore

chia/_tests/wallet/test_notifications.py

@@ -6,15 +6,15 @@ from pathlib import Path
 from typing import Any, Optional
 
 import pytest
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32, uint64
 
 from chia._tests.util.time_out_assert import time_out_assert, time_out_assert_not_none
 from chia.consensus.block_rewards import calculate_base_farmer_reward, calculate_pool_reward
 from chia.simulator.full_node_simulator import FullNodeSimulator
 from chia.simulator.simulator_protocol import FarmNewBlockProtocol
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.peer_info import PeerInfo
 from chia.util.db_wrapper import DBWrapper2
-from chia.util.ints import uint32, uint64
 from chia.wallet.notification_store import NotificationStore
 from chia.wallet.util.tx_config import DEFAULT_TX_CONFIG
 

chia/_tests/wallet/test_puzzle_store.py

@@ -5,10 +5,10 @@ from dataclasses import dataclass, field
 
 import pytest
 from chia_rs import AugSchemeMPL
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32
 
 from chia._tests.util.db_connection import DBConnection
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint32
 from chia.wallet.derivation_record import DerivationRecord
 from chia.wallet.util.wallet_types import WalletIdentifier, WalletType
 from chia.wallet.wallet_puzzle_store import WalletPuzzleStore

chia/_tests/wallet/test_sign_coin_spends.py

@@ -4,16 +4,16 @@ import re
 
 import pytest
 from chia_rs import AugSchemeMPL, G1Element, G2Element, PrivateKey
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32, uint64
 
 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.serialized_program import SerializedProgram
-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.util.db_wrapper import DBWrapper2, manage_connection
-from chia.util.ints import uint32, uint64
 from chia.wallet.derivation_record import DerivationRecord
 from chia.wallet.derive_keys import master_sk_to_wallet_sk, master_sk_to_wallet_sk_unhardened
 from chia.wallet.puzzles.p2_delegated_puzzle_or_hidden_puzzle import (

chia/_tests/wallet/test_signer_protocol.py

@@ -6,6 +6,8 @@ from typing import Optional
 import click
 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 click.testing import CliRunner
 
 from chia._tests.cmds.test_cmd_framework import check_click_parsing
@@ -34,10 +36,8 @@ from chia.rpc.wallet_request_types import (
 from chia.rpc.wallet_rpc_client import WalletRpcClient
 from chia.types.blockchain_format.coin import Coin as ConsensusCoin
 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.util.hash import std_hash
-from chia.util.ints import uint64
 from chia.util.streamable import Streamable
 from chia.wallet.conditions import AggSigMe
 from chia.wallet.derivation_record import DerivationRecord
@@ -615,7 +615,7 @@ async def test_signer_commands(wallet_environments: WalletTestFramework) -> None
 
     AMOUNT = uint64(1)
     async with wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, sign=False, push=False) as action_scope:
-        await wallet.generate_signed_transaction(AMOUNT, bytes32.zeros, action_scope)
+        await wallet.generate_signed_transaction([AMOUNT], [bytes32.zeros], action_scope)
     [tx] = action_scope.side_effects.transactions
 
     runner = CliRunner()

chia/_tests/wallet/test_singleton.py

@@ -1,22 +1,14 @@
 from __future__ import annotations
 
 import pytest
+from chia_rs.sized_bytes import bytes32
 from clvm_tools import binutils
 
 from chia.types.blockchain_format.program import INFINITE_COST, Program
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.condition_tools import parse_sexp_to_conditions
 from chia.wallet.conditions import AssertPuzzleAnnouncement
-from chia.wallet.puzzles.load_clvm import load_clvm
-
-SINGLETON_MOD = load_clvm("singleton_top_layer.clsp")
-LAUNCHER_PUZZLE = load_clvm("singleton_launcher.clsp")
-P2_SINGLETON_MOD = load_clvm("p2_singleton.clsp")
-POOL_MEMBER_MOD = load_clvm("pool_member_innerpuz.clsp", package_or_requirement="chia.pools.puzzles")
-POOL_WAITINGROOM_MOD = load_clvm("pool_waitingroom_innerpuz.clsp", package_or_requirement="chia.pools.puzzles")
-
-LAUNCHER_PUZZLE_HASH = LAUNCHER_PUZZLE.get_tree_hash()
-SINGLETON_MOD_HASH = SINGLETON_MOD.get_tree_hash()
+from chia.wallet.puzzles.singleton_top_layer import P2_SINGLETON_MOD, SINGLETON_MOD, SINGLETON_MOD_HASH
+from chia.wallet.puzzles.singleton_top_layer import SINGLETON_LAUNCHER_HASH as LAUNCHER_PUZZLE_HASH
 
 LAUNCHER_ID = Program.to(b"launcher-id").get_tree_hash()
 POOL_REWARD_PREFIX_MAINNET = bytes32.fromhex("ccd5bb71183532bff220ba46c268991a00000000000000000000000000000000")

chia/_tests/wallet/test_singleton_lifecycle_fast.py

@@ -4,31 +4,30 @@ from dataclasses import dataclass
 from typing import Any, Callable, Optional, TypeVar, cast, get_args, get_origin
 
 from chia_rs import G1Element, G2Element
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32, uint64
 from clvm_tools import binutils
 
 from chia._tests.clvm.coin_store import BadSpendBundleError, CoinStore, CoinTimestamp
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
+from chia.pools.pool_puzzles import POOL_MEMBER_MOD
+from chia.pools.pool_puzzles import POOL_WAITING_ROOM_MOD as POOL_WAITINGROOM_MOD
 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 CoinSpend, compute_additions, make_spend
 from chia.types.condition_opcodes import ConditionOpcode
-from chia.util.ints import uint32, uint64
 from chia.wallet.conditions import AssertCoinAnnouncement
-from chia.wallet.puzzles.load_clvm import load_clvm
+from chia.wallet.puzzles.singleton_top_layer import (
+    P2_SINGLETON_OR_DELAYED_MOD as P2_SINGLETON_MOD,
+)
+from chia.wallet.puzzles.singleton_top_layer import P2_SINGLETON_OR_DELAYED_MOD_HASH as P2_SINGLETON_MOD_HASH
+from chia.wallet.puzzles.singleton_top_layer import SINGLETON_LAUNCHER, SINGLETON_MOD, SINGLETON_MOD_HASH
+from chia.wallet.puzzles.singleton_top_layer import SINGLETON_LAUNCHER_HASH as LAUNCHER_PUZZLE_HASH
 from chia.wallet.util.debug_spend_bundle import debug_spend_bundle
 from chia.wallet.wallet_spend_bundle import WalletSpendBundle
 
-SINGLETON_MOD = load_clvm("singleton_top_layer.clsp")
-LAUNCHER_PUZZLE = load_clvm("singleton_launcher.clsp")
-P2_SINGLETON_MOD = load_clvm("p2_singleton_or_delayed_puzhash.clsp")
-POOL_MEMBER_MOD = load_clvm("pool_member_innerpuz.clsp", package_or_requirement="chia.pools.puzzles")
-POOL_WAITINGROOM_MOD = load_clvm("pool_waitingroom_innerpuz.clsp", package_or_requirement="chia.pools.puzzles")
-
-LAUNCHER_PUZZLE_HASH = LAUNCHER_PUZZLE.get_tree_hash()
-SINGLETON_MOD_HASH = SINGLETON_MOD.get_tree_hash()
-P2_SINGLETON_MOD_HASH = P2_SINGLETON_MOD.get_tree_hash()
+LAUNCHER_PUZZLE = SINGLETON_LAUNCHER
 
 ANYONE_CAN_SPEND_PUZZLE = Program.to(1)
 ANYONE_CAN_SPEND_WITH_PADDING_PUZZLE_HASH = Program.to(binutils.assemble("(a (q . 1) 3)")).get_tree_hash()
@@ -386,7 +385,7 @@ def claim_p2_singleton(
         p2_singleton_puzzle,
         p2_singleton_spend_type="claim-p2-nft",
         singleton_inner_puzzle_hash=inner_puzzle_hash,
-        p2_singleton_coin_name=p2_singleton_coin_name,
+        p2_singleton_coin_name=bytes32(p2_singleton_coin_name),
     )
     p2_singleton_coin_spend = make_spend(
         p2_singleton_coin, SerializedProgram.from_program(p2_singleton_puzzle), p2_singleton_solution

chia/_tests/wallet/test_singleton_store.py

@@ -4,15 +4,13 @@ from __future__ import annotations
 from secrets import token_bytes
 
 import pytest
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32, uint64
 
 from chia._tests.util.db_connection import DBConnection
 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.util.ints import uint32, uint64
-
-# from chia.wallet.dao_wallet.dao_wallet import DAOInfo, DAOWallet
 from chia.wallet.lineage_proof import LineageProof
 from chia.wallet.singleton import create_singleton_puzzle
 from chia.wallet.singleton_record import SingletonRecord