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

chia/_tests/wallet/test_transaction_store.py

@@ -5,13 +5,13 @@ import random
 from typing import Any, Optional
 
 import pytest
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint32, uint64
 
 from chia._tests.util.db_connection import DBConnection
 from chia.types.blockchain_format.coin import Coin
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.mempool_inclusion_status import MempoolInclusionStatus
 from chia.util.errors import Err
-from chia.util.ints import uint8, uint32, uint64
 from chia.wallet.conditions import ConditionValidTimes
 from chia.wallet.transaction_record import TransactionRecord, TransactionRecordOld, minimum_send_attempts
 from chia.wallet.util.query_filter import TransactionTypeFilter

chia/_tests/wallet/test_util.py

@@ -3,15 +3,15 @@ from __future__ import annotations
 from typing import Any
 
 import pytest
+from chia_rs.sized_bytes import bytes32, bytes48
+from chia_rs.sized_ints import uint64
 
 from chia._tests.util.misc import CoinGenerator, coin_creation_args
 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, bytes48
 from chia.types.coin_spend import make_spend
 from chia.util.errors import ValidationError
-from chia.util.ints import uint64
 from chia.wallet.lineage_proof import LineageProof, LineageProofField
 from chia.wallet.util.compute_hints import HintedCoin, compute_spend_hints_and_additions
 from chia.wallet.util.merkle_utils import list_to_binary_tree

chia/_tests/wallet/test_wallet.py

@@ -6,6 +6,8 @@ from typing import Any, Optional
 
 import pytest
 from chia_rs import AugSchemeMPL, G1Element, G2Element
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint16, uint32, uint64
 
 from chia._tests.environments.wallet import WalletStateTransition, WalletTestFramework
 from chia._tests.util.time_out_assert import time_out_assert
@@ -15,17 +17,14 @@ from chia.simulator.block_tools import BlockTools
 from chia.simulator.full_node_simulator import FullNodeSimulator
 from chia.simulator.simulator_protocol import ReorgProtocol
 from chia.types.blockchain_format.program import Program
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.coin_spend import CoinSpend, compute_additions
 from chia.types.peer_info import PeerInfo
 from chia.types.signing_mode import CHIP_0002_SIGN_MESSAGE_PREFIX
 from chia.types.spend_bundle import estimate_fees
 from chia.util.bech32m import encode_puzzle_hash
 from chia.util.errors import Err
-from chia.util.ints import uint16, uint32, uint64
-from chia.wallet.conditions import ConditionValidTimes
+from chia.wallet.conditions import ConditionValidTimes, CreateCoin
 from chia.wallet.derive_keys import master_sk_to_wallet_sk
-from chia.wallet.payment import Payment
 from chia.wallet.puzzles.clawback.metadata import AutoClaimSettings
 from chia.wallet.transaction_record import TransactionRecord
 from chia.wallet.util.query_filter import TransactionTypeFilter
@@ -77,8 +76,8 @@ class TestWalletSimulator:
 
         async with wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
             await wallet.generate_signed_transaction(
-                uint64(tx_amount),
-                bytes32.zeros,
+                [uint64(tx_amount)],
+                [bytes32.zeros],
                 action_scope,
                 uint64(0),
             )
@@ -132,8 +131,8 @@ class TestWalletSimulator:
             DEFAULT_TX_CONFIG.override(reuse_puzhash=True), push=True
         ) as action_scope:
             await wallet.generate_signed_transaction(
-                uint64(tx_amount),
-                bytes32.zeros,
+                [uint64(tx_amount)],
+                [bytes32.zeros],
                 action_scope,
                 uint64(0),
             )
@@ -194,8 +193,8 @@ class TestWalletSimulator:
         for _ in range(0, number_of_coins):
             async with wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
                 await wallet.generate_signed_transaction(
-                    uint64(tx_amount),
-                    normal_puzhash,
+                    [uint64(tx_amount)],
+                    [normal_puzhash],
                     action_scope,
                     uint64(0),
                     puzzle_decorator_override=[{"decorator": "CLAWBACK", "clawback_timelock": 10}],
@@ -237,8 +236,8 @@ class TestWalletSimulator:
 
         async with wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
             await wallet.generate_signed_transaction(
-                uint64(tx_amount),
-                normal_puzhash,
+                [uint64(tx_amount)],
+                [normal_puzhash],
                 action_scope,
                 uint64(0),
                 puzzle_decorator_override=[{"decorator": "CLAWBACK", "clawback_timelock": 10}],
@@ -342,12 +341,12 @@ class TestWalletSimulator:
         # Transfer to normal wallet
         async with wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
             await wallet.generate_signed_transaction(
-                uint64(tx_amount),
-                normal_puzhash,
+                [uint64(tx_amount)],
+                [normal_puzhash],
                 action_scope,
                 uint64(0),
                 puzzle_decorator_override=[{"decorator": "CLAWBACK", "clawback_timelock": 500}],
-                memos=[b"Test"],
+                memos=[[b"Test"]],
             )
 
         await wallet_environments.process_pending_states(
@@ -484,12 +483,12 @@ class TestWalletSimulator:
         # Transfer to normal wallet
         async with wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
             await wallet.generate_signed_transaction(
-                uint64(tx_amount),
-                normal_puzhash,
+                [uint64(tx_amount)],
+                [normal_puzhash],
                 action_scope,
                 uint64(0),
                 puzzle_decorator_override=[{"decorator": "CLAWBACK", "clawback_timelock": 5}],
-                memos=[b"Test"],
+                memos=[[b"Test"]],
             )
 
         await wallet_environments.process_pending_states(
@@ -601,8 +600,8 @@ class TestWalletSimulator:
         # Transfer to normal wallet
         async with wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
             await wallet.generate_signed_transaction(
-                uint64(tx_amount),
-                normal_puzhash,
+                [uint64(tx_amount)],
+                [normal_puzhash],
                 action_scope,
                 uint64(0),
                 puzzle_decorator_override=[{"decorator": "CLAWBACK", "clawback_timelock": 5}],
@@ -733,8 +732,8 @@ class TestWalletSimulator:
         # Transfer to normal wallet
         async with wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
             await wallet.generate_signed_transaction(
-                uint64(tx_amount),
-                normal_puzhash,
+                [uint64(tx_amount)],
+                [normal_puzhash],
                 action_scope,
                 uint64(0),
                 puzzle_decorator_override=[{"decorator": "CLAWBACK", "clawback_timelock": 5}],
@@ -915,8 +914,8 @@ class TestWalletSimulator:
         # Transfer to normal wallet
         async with wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
             await wallet.generate_signed_transaction(
-                uint64(tx_amount),
-                bytes32.zeros,
+                [uint64(tx_amount)],
+                [bytes32.zeros],
                 action_scope,
                 uint64(0),
                 puzzle_decorator_override=[{"decorator": "CLAWBACK", "clawback_timelock": 500}],
@@ -984,8 +983,8 @@ class TestWalletSimulator:
         # Transfer to normal wallet
         async with wallet_1.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
             await wallet_1.generate_signed_transaction(
-                uint64(tx_amount),
-                wallet_2_puzhash,
+                [uint64(tx_amount)],
+                [wallet_2_puzhash],
                 action_scope,
                 uint64(0),
                 puzzle_decorator_override=[{"decorator": "CLAWBACK", "clawback_timelock": 5}],
@@ -1031,8 +1030,8 @@ class TestWalletSimulator:
         tx_amount2 = 700
         async with wallet_1.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
             await wallet_1.generate_signed_transaction(
-                uint64(tx_amount2),
-                wallet_1_puzhash,
+                [uint64(tx_amount2)],
+                [wallet_1_puzhash],
                 action_scope,
                 uint64(0),
                 puzzle_decorator_override=[{"decorator": "CLAWBACK", "clawback_timelock": 5}],
@@ -1304,8 +1303,8 @@ class TestWalletSimulator:
 
         async with wallet_0.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
             await wallet_0.wallet_state_manager.main_wallet.generate_signed_transaction(
-                uint64(10),
-                bytes32(32 * b"0"),
+                [uint64(10)],
+                [bytes32(32 * b"0")],
                 action_scope,
                 uint64(0),
             )
@@ -1335,8 +1334,8 @@ class TestWalletSimulator:
         tx_amount = 10
         async with wallet_0.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
             await wallet_0.generate_signed_transaction(
-                uint64(tx_amount),
-                await wallet_1.get_puzzle_hash(False),
+                [uint64(tx_amount)],
+                [await wallet_1.get_puzzle_hash(False)],
                 action_scope,
                 uint64(0),
             )
@@ -1381,7 +1380,7 @@ class TestWalletSimulator:
         tx_amount = 5
         async with wallet_1.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
             await wallet_1.generate_signed_transaction(
-                uint64(tx_amount), await wallet_0.get_puzzle_hash(False), action_scope, uint64(0)
+                [uint64(tx_amount)], [await wallet_0.get_puzzle_hash(False)], action_scope, uint64(0)
             )
 
         await wallet_environments.process_pending_states(
@@ -1438,8 +1437,8 @@ class TestWalletSimulator:
         tx_fee = 10
         async with wallet_0.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
             await wallet_0.generate_signed_transaction(
-                uint64(tx_amount),
-                await wallet_1.get_new_puzzlehash(),
+                [uint64(tx_amount)],
+                [await wallet_1.get_new_puzzlehash()],
                 action_scope,
                 uint64(tx_fee),
             )
@@ -1505,7 +1504,7 @@ class TestWalletSimulator:
         ph_2 = await wallet_1.get_new_puzzlehash()
         async with wallet_0.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
             await wallet_0.generate_signed_transaction(
-                uint64(tx_amount), ph_2, action_scope, uint64(tx_fee), memos=[ph_2]
+                [uint64(tx_amount)], [ph_2], action_scope, uint64(tx_fee), memos=[[ph_2]]
             )
         [tx] = action_scope.side_effects.transactions
         assert tx.spend_bundle is not None
@@ -1580,9 +1579,14 @@ class TestWalletSimulator:
         wallet = env.xch_wallet
 
         ph = await wallet.get_puzzle_hash(False)
-        primaries = [Payment(ph, uint64(1000000000 + i)) for i in range(int(wallet.max_send_quantity) + 1)]
+        primaries = [CreateCoin(ph, uint64(1000000000 + i)) for i in range(int(wallet.max_send_quantity) + 1)]
         async with wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
-            await wallet.generate_signed_transaction(uint64(1), ph, action_scope, uint64(0), primaries=primaries)
+            await wallet.generate_signed_transaction(
+                [uint64(1)] + [uint64(1000000000 + i) for i in range(int(wallet.max_send_quantity) + 1)],
+                [ph] * (wallet.max_send_quantity + 2),
+                action_scope,
+                uint64(0),
+            )
 
         await wallet_environments.process_pending_states(
             [
@@ -1617,8 +1621,8 @@ class TestWalletSimulator:
         # 1) Generate transaction that is under the limit
         async with wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=False) as action_scope:
             await wallet.generate_signed_transaction(
-                uint64(max_sent_amount - 1),
-                ph,
+                [uint64(max_sent_amount - 1)],
+                [ph],
                 action_scope,
                 uint64(0),
             )
@@ -1628,8 +1632,8 @@ class TestWalletSimulator:
         # 2) Generate transaction that is equal to limit
         async with wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=False) as action_scope:
             await wallet.generate_signed_transaction(
-                uint64(max_sent_amount),
-                ph,
+                [uint64(max_sent_amount)],
+                [ph],
                 action_scope,
                 uint64(0),
             )
@@ -1644,8 +1648,8 @@ class TestWalletSimulator:
         ):
             async with wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=False) as action_scope:
                 await wallet.generate_signed_transaction(
-                    uint64(max_sent_amount + 1),
-                    ph,
+                    [uint64(max_sent_amount + 1)],
+                    [ph],
                     action_scope,
                     uint64(0),
                 )
@@ -1665,8 +1669,8 @@ class TestWalletSimulator:
         tx_fee = 2_000_000_000_000
         async with wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=False) as action_scope:
             await wallet.generate_signed_transaction(
-                uint64(tx_amount),
-                bytes32.zeros,
+                [uint64(tx_amount)],
+                [bytes32.zeros],
                 action_scope,
                 uint64(tx_fee),
             )
@@ -1741,7 +1745,7 @@ class TestWalletSimulator:
 
         async with wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
             await wallet.generate_signed_transaction(
-                uint64(tx_amount), await wallet_2.get_puzzle_hash(False), action_scope, coins={coin}
+                [uint64(tx_amount)], [await wallet_2.get_puzzle_hash(False)], action_scope, coins={coin}
             )
 
         await wallet_environments.process_pending_states(
@@ -2041,8 +2045,8 @@ class TestWalletSimulator:
             coins = await wallet.select_coins(uint64(AMOUNT_TO_SEND), action_scope)
             coin_list = list(coins)
             await wallet.generate_signed_transaction(
-                uint64(AMOUNT_TO_SEND),
-                bytes32.zeros,
+                [uint64(AMOUNT_TO_SEND)],
+                [bytes32.zeros],
                 action_scope,
                 uint64(0),
                 coins=coins,

chia/_tests/wallet/test_wallet_action_scope.py

@@ -5,11 +5,12 @@ from typing import 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.cmds.wallet.test_consts import STD_TX
+from chia.data_layer.singleton_record import SingletonRecord
 from chia.types.blockchain_format.coin import Coin
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint64
 from chia.wallet.signer_protocol import SigningResponse
 from chia.wallet.transaction_record import TransactionRecord
 from chia.wallet.util.tx_config import DEFAULT_TX_CONFIG
@@ -36,7 +37,15 @@ def test_back_and_forth_serialization() -> None:
 @dataclass
 class MockWalletStateManager:
     most_recent_call: Optional[
-        tuple[list[TransactionRecord], bool, bool, bool, list[SigningResponse], list[WalletSpendBundle]]
+        tuple[
+            list[TransactionRecord],
+            bool,
+            bool,
+            bool,
+            list[SigningResponse],
+            list[WalletSpendBundle],
+            list[SingletonRecord],
+        ],
     ] = None
 
     async def add_pending_transactions(
@@ -47,8 +56,17 @@ class MockWalletStateManager:
         sign: bool,
         additional_signing_responses: list[SigningResponse],
         extra_spends: list[WalletSpendBundle],
+        singleton_records: list[SingletonRecord],
     ) -> list[TransactionRecord]:
-        self.most_recent_call = (txs, push, merge_spends, sign, additional_signing_responses, extra_spends)
+        self.most_recent_call = (
+            txs,
+            push,
+            merge_spends,
+            sign,
+            additional_signing_responses,
+            extra_spends,
+            singleton_records,
+        )
         return txs
 
 
@@ -73,7 +91,7 @@ async def test_wallet_action_scope() -> None:
             action_scope.side_effects
 
     assert action_scope.side_effects.transactions == [STD_TX]
-    assert wsm.most_recent_call == ([STD_TX], True, False, True, [], [])
+    assert wsm.most_recent_call == ([STD_TX], True, False, True, [], [], [])
 
     async with wsm.new_action_scope(  # type: ignore[attr-defined]
         DEFAULT_TX_CONFIG, push=False, merge_spends=True, sign=True, additional_signing_responses=[], extra_spends=[]
@@ -82,4 +100,4 @@ async def test_wallet_action_scope() -> None:
             interface.side_effects.transactions = []
 
     assert action_scope.side_effects.transactions == []
-    assert wsm.most_recent_call == ([], False, True, True, [], [])
+    assert wsm.most_recent_call == ([], False, True, True, [], [], [])

chia/_tests/wallet/test_wallet_blockchain.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import pytest
+from chia_rs.sized_ints import uint8, uint32
 
 from chia._tests.util.db_connection import DBConnection
 from chia._tests.util.setup_nodes import OldSimulatorsAndWallets
@@ -11,7 +12,6 @@ from chia.types.blockchain_format.vdf import VDFProof
 from chia.types.full_block import FullBlock
 from chia.types.header_block import HeaderBlock
 from chia.util.generator_tools import get_block_header
-from chia.util.ints import uint8, uint32
 from chia.wallet.key_val_store import KeyValStore
 from chia.wallet.wallet_blockchain import WalletBlockchain
 

chia/_tests/wallet/test_wallet_coin_store.py

@@ -5,11 +5,11 @@ from dataclasses import dataclass, field, replace
 from typing import Optional
 
 import pytest
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint16, uint32, uint64
 
 from chia._tests.util.db_connection import DBConnection
 from chia.types.blockchain_format.coin import Coin
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint8, uint16, uint32, uint64
 from chia.util.streamable import Streamable, UInt32Range, UInt64Range, VersionedBlob
 from chia.wallet.puzzles.clawback.metadata import ClawbackMetadata
 from chia.wallet.util.query_filter import AmountFilter, HashFilter

chia/_tests/wallet/test_wallet_interested_store.py

@@ -3,11 +3,11 @@ from __future__ import annotations
 import random
 
 import pytest
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
 
 from chia._tests.util.db_connection import DBConnection
 from chia.types.blockchain_format.coin import Coin
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint64
 from chia.wallet.wallet_interested_store import WalletInterestedStore
 
 

chia/_tests/wallet/test_wallet_node.py

@@ -9,6 +9,8 @@ from typing import Any, Optional
 
 import pytest
 from chia_rs import G1Element, PrivateKey
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint32, uint64, uint128
 
 from chia._tests.util.misc import CoinGenerator, patch_request_handler
 from chia._tests.util.setup_nodes import OldSimulatorsAndWallets
@@ -21,13 +23,11 @@ from chia.server.outbound_message import Message, make_msg
 from chia.simulator.add_blocks_in_batches import add_blocks_in_batches
 from chia.simulator.block_tools import test_constants
 from chia.types.blockchain_format.coin import Coin
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.full_block import FullBlock
 from chia.types.mempool_inclusion_status import MempoolInclusionStatus
 from chia.types.peer_info import PeerInfo
 from chia.util.config import load_config
 from chia.util.errors import Err
-from chia.util.ints import uint8, uint32, uint64, uint128
 from chia.util.keychain import Keychain, KeyData, generate_mnemonic
 from chia.wallet.util.tx_config import DEFAULT_TX_CONFIG
 from chia.wallet.util.wallet_sync_utils import PeerRequestException
@@ -635,7 +635,7 @@ async def test_transaction_send_cache(
     with patch_request_handler(api=full_node_api.full_node._server.get_connections()[0].api, handler=send_transaction):
         # Generate the transaction
         async with wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
-            await wallet.generate_signed_transaction(uint64(0), bytes32.zeros, action_scope)
+            await wallet.generate_signed_transaction([uint64(0)], [bytes32.zeros], action_scope)
         [tx] = action_scope.side_effects.transactions
 
         # Make sure it is sent to the peer

chia/_tests/wallet/test_wallet_retry.py

@@ -4,6 +4,8 @@ import asyncio
 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, time_out_assert_custom_interval
 from chia.full_node.full_node_api import FullNodeAPI
@@ -11,9 +13,7 @@ from chia.full_node.mempool import MempoolRemoveReason
 from chia.simulator.block_tools import BlockTools
 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.ints import uint64
 from chia.wallet.transaction_record import TransactionRecord
 from chia.wallet.util.tx_config import DEFAULT_TX_CONFIG
 from chia.wallet.wallet_node import WalletNode
@@ -55,7 +55,7 @@ async def test_wallet_tx_retry(
     await full_node_1.wait_for_wallet_synced(wallet_node=wallet_node_1, timeout=wait_secs)
 
     async with wallet_1.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
-        await wallet_1.generate_signed_transaction(uint64(100), reward_ph, action_scope)
+        await wallet_1.generate_signed_transaction([uint64(100)], [reward_ph], action_scope)
     [transaction] = action_scope.side_effects.transactions
     sb1 = transaction.spend_bundle
     assert sb1 is not None

chia/_tests/wallet/test_wallet_state_manager.py

@@ -5,6 +5,8 @@ from contextlib import asynccontextmanager
 
 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.environments.wallet import WalletStateTransition, WalletTestFramework
 from chia._tests.util.setup_nodes import OldSimulatorsAndWallets
@@ -13,10 +15,8 @@ from chia.rpc.wallet_request_types import PushTransactions
 from chia.server.outbound_message import NodeType
 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.peer_info import PeerInfo
-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.transaction_record import TransactionRecord
@@ -125,14 +125,14 @@ async def test_commit_transactions_to_db(wallet_environments: WalletTestFramewor
     ) as action_scope:
         coins = list(await wsm.main_wallet.select_coins(uint64(2_000_000_000_000), action_scope))
         await wsm.main_wallet.generate_signed_transaction(
-            uint64(0),
-            bytes32.zeros,
+            [uint64(0)],
+            [bytes32.zeros],
             action_scope,
             coins={coins[0]},
         )
         await wsm.main_wallet.generate_signed_transaction(
-            uint64(0),
-            bytes32.zeros,
+            [uint64(0)],
+            [bytes32.zeros],
             action_scope,
             coins={coins[1]},
         )
@@ -220,8 +220,8 @@ async def test_confirming_txs_not_ours(wallet_environments: WalletTestFramework)
     # Some transaction, doesn't matter what
     async with env_1.wallet_state_manager.new_action_scope(wallet_environments.tx_config, push=False) as action_scope:
         await env_1.xch_wallet.generate_signed_transaction(
-            uint64(1),
-            await env_1.xch_wallet.get_puzzle_hash(new=False),
+            [uint64(1)],
+            [await env_1.xch_wallet.get_puzzle_hash(new=False)],
             action_scope,
         )
 

chia/_tests/wallet/test_wallet_test_framework.py

@@ -19,7 +19,7 @@ from chia.wallet.cat_wallet.cat_wallet import CATWallet
             "num_environments": 2,
             "config_overrides": {
                 "foo": "bar",  # A config value that never exists
-                "min_mainnet_k_size": 2,  # A config value overriden
+                "min_mainnet_k_size": 2,  # A config value overridden
             },
             "blocks_needed": [1, 0],
         }

chia/_tests/wallet/test_wallet_trade_store.py

@@ -5,11 +5,11 @@ import time
 
 import pytest
 from chia_rs import G2Element
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32, uint64
 
 from chia._tests.util.db_connection import DBConnection
 from chia.types.blockchain_format.coin import Coin
-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.trade_record import TradeRecord, TradeRecordOld
 from chia.wallet.trading.offer import Offer

chia/_tests/wallet/test_wallet_utils.py

@@ -5,9 +5,9 @@ from typing import Optional
 
 import pytest
 from chia_rs import Coin, CoinState
+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.util.peer_request_cache import PeerRequestCache
 from chia.wallet.util.wallet_sync_utils import sort_coin_states
 

chia/_tests/wallet/vc_wallet/test_cr_outer_puzzle.py

@@ -2,10 +2,11 @@ from __future__ import annotations
 
 from typing import Optional
 
+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.util.ints import uint64
 from chia.wallet.outer_puzzles import (
     construct_puzzle,
     create_asset_id,