chia-blockchain 2.5.4rc2__py3-none-any.whl → 2.5.5__py3-none-any.whl

chia/_tests/wallet/test_sign_coin_spends.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import re
 
 import pytest
-from chia_rs import AugSchemeMPL, G1Element, G2Element, PrivateKey
+from chia_rs import AugSchemeMPL, CoinSpend, G1Element, G2Element, PrivateKey
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint32, uint64
 
@@ -11,7 +11,7 @@ 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.coin_spend import CoinSpend, make_spend
+from chia.types.coin_spend import make_spend
 from chia.types.condition_opcodes import ConditionOpcode
 from chia.util.db_wrapper import DBWrapper2, manage_connection
 from chia.wallet.derivation_record import DerivationRecord
@@ -47,11 +47,11 @@ additional_data: bytes32 = bytes32(DEFAULT_CONSTANTS.AGG_SIG_ME_ADDITIONAL_DATA)
 
 coin: Coin = Coin(bytes32.zeros, bytes32.zeros, uint64(0))
 puzzle = SerializedProgram.from_bytes(b"\x01")
-solution_h = SerializedProgram.from_program(
-    Program.to([[ConditionOpcode.AGG_SIG_UNSAFE, pk1_h, msg1], [ConditionOpcode.AGG_SIG_ME, pk2_h_synth, msg2]])
+solution_h = Program.to(
+    [[ConditionOpcode.AGG_SIG_UNSAFE, pk1_h, msg1], [ConditionOpcode.AGG_SIG_ME, pk2_h_synth, msg2]]
 )
-solution_u = SerializedProgram.from_program(
-    Program.to([[ConditionOpcode.AGG_SIG_UNSAFE, pk1_u, msg1], [ConditionOpcode.AGG_SIG_ME, pk2_u_synth, msg2]])
+solution_u = Program.to(
+    [[ConditionOpcode.AGG_SIG_UNSAFE, pk1_u, msg1], [ConditionOpcode.AGG_SIG_ME, pk2_u_synth, msg2]]
 )
 spend_h: CoinSpend = make_spend(
     coin,

chia/_tests/wallet/test_signer_protocol.py

@@ -5,7 +5,7 @@ from typing import Optional
 
 import click
 import pytest
-from chia_rs import AugSchemeMPL, G1Element, G2Element, PrivateKey
+from chia_rs import AugSchemeMPL, CoinSpend, G1Element, G2Element, PrivateKey
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint64
 from click.testing import CliRunner
@@ -26,17 +26,9 @@ from chia.cmds.signer import (
     SPOut,
 )
 from chia.rpc.util import ALL_TRANSLATION_LAYERS
-from chia.rpc.wallet_request_types import (
-    ApplySignatures,
-    ExecuteSigningInstructions,
-    GatherSigningInfo,
-    GatherSigningInfoResponse,
-    SubmitTransactions,
-)
-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.coin_spend import CoinSpend, make_spend
+from chia.types.coin_spend import make_spend
 from chia.util.hash import std_hash
 from chia.util.streamable import Streamable
 from chia.wallet.conditions import AggSigMe
@@ -76,8 +68,15 @@ from chia.wallet.util.clvm_streamable import (
     json_deserialize_with_clvm_streamable,
     json_serialize_with_clvm_streamable,
 )
-from chia.wallet.util.tx_config import DEFAULT_TX_CONFIG
 from chia.wallet.wallet import Wallet
+from chia.wallet.wallet_request_types import (
+    ApplySignatures,
+    ExecuteSigningInstructions,
+    GatherSigningInfo,
+    GatherSigningInfoResponse,
+    SubmitTransactions,
+)
+from chia.wallet.wallet_rpc_client import WalletRpcClient
 from chia.wallet.wallet_spend_bundle import WalletSpendBundle
 from chia.wallet.wallet_state_manager import WalletStateManager
 
@@ -614,7 +613,9 @@ 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:
+    async with wallet_state_manager.new_action_scope(
+        wallet_environments.tx_config, sign=False, push=False
+    ) as action_scope:
         await wallet.generate_signed_transaction([AMOUNT], [bytes32.zeros], action_scope)
     [tx] = action_scope.side_effects.transactions
 

chia/_tests/wallet/test_singleton.py

@@ -4,8 +4,8 @@ import pytest
 from chia_rs.sized_bytes import bytes32
 from clvm_tools import binutils
 
+from chia.consensus.condition_tools import parse_sexp_to_conditions
 from chia.types.blockchain_format.program import INFINITE_COST, Program
-from chia.util.condition_tools import parse_sexp_to_conditions
 from chia.wallet.conditions import AssertPuzzleAnnouncement
 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

chia/_tests/wallet/test_singleton_lifecycle_fast.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 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 import CoinSpend, G1Element, G2Element
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint32, uint64
 from clvm_tools import binutils
@@ -14,8 +14,7 @@ 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.coin_spend import CoinSpend, compute_additions, make_spend
+from chia.types.coin_spend import make_spend
 from chia.types.condition_opcodes import ConditionOpcode
 from chia.wallet.conditions import AssertCoinAnnouncement
 from chia.wallet.puzzles.singleton_top_layer import (
@@ -24,6 +23,7 @@ from chia.wallet.puzzles.singleton_top_layer import (
 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.compute_additions import compute_additions
 from chia.wallet.util.debug_spend_bundle import debug_spend_bundle
 from chia.wallet.wallet_spend_bundle import WalletSpendBundle
 
@@ -328,7 +328,7 @@ def launcher_conditions_and_spend_bundle(
         launcher_amount=launcher_amount,
         metadata=metadata,
     )
-    coin_spend = make_spend(launcher_coin, SerializedProgram.from_program(launcher_puzzle), solution)
+    coin_spend = make_spend(launcher_coin, launcher_puzzle, solution)
     spend_bundle = WalletSpendBundle([coin_spend], G2Element())
     return launcher_id, expected_conditions, spend_bundle
 
@@ -387,9 +387,7 @@ def claim_p2_singleton(
         singleton_inner_puzzle_hash=inner_puzzle_hash,
         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
-    )
+    p2_singleton_coin_spend = make_spend(p2_singleton_coin, p2_singleton_puzzle, p2_singleton_solution)
     expected_p2_singleton_announcement = AssertCoinAnnouncement(
         asserted_id=p2_singleton_coin_name, asserted_msg=b"$"
     ).msg_calc

chia/_tests/wallet/test_util.py

@@ -44,11 +44,11 @@ def test_compute_spend_hints_and_additions() -> None:
 
     with pytest.raises(ValidationError):
         compute_spend_hints_and_additions(
-            make_spend(parent_coin.coin, Program.to(1), Program.to([[51, bytes32.zeros, 0] for _ in range(0, 10000)]))
+            make_spend(parent_coin.coin, Program.to(1), Program.to([[51, bytes32.zeros, 0] for _ in range(10000)]))
         )
     with pytest.raises(ValidationError):
         compute_spend_hints_and_additions(
-            make_spend(parent_coin.coin, Program.to(1), Program.to([[50, bytes48.zeros, b""] for _ in range(0, 10000)]))
+            make_spend(parent_coin.coin, Program.to(1), Program.to([[50, bytes48.zeros, b""] for _ in range(10000)]))
         )
 
 

chia/_tests/wallet/test_wallet.py

@@ -5,33 +5,33 @@ from pathlib import Path
 from typing import Any, Optional
 
 import pytest
-from chia_rs import AugSchemeMPL, G1Element, G2Element
+from chia_rs import AugSchemeMPL, CoinSpend, 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
-from chia.rpc.wallet_request_types import GetTransactionMemo
 from chia.server.server import ChiaServer
 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.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.wallet.conditions import ConditionValidTimes, CreateCoin
+from chia.wallet.conditions import ConditionValidTimes
 from chia.wallet.derive_keys import master_sk_to_wallet_sk
+from chia.wallet.estimate_fees import estimate_fees
 from chia.wallet.puzzles.clawback.metadata import AutoClaimSettings
 from chia.wallet.transaction_record import TransactionRecord
+from chia.wallet.util.compute_additions import compute_additions
 from chia.wallet.util.query_filter import TransactionTypeFilter
 from chia.wallet.util.transaction_type import TransactionType
 from chia.wallet.util.tx_config import DEFAULT_TX_CONFIG
 from chia.wallet.util.wallet_types import CoinType
 from chia.wallet.wallet_node import WalletNode, get_wallet_db_path
+from chia.wallet.wallet_request_types import GetTransactionMemo
 
 
 class TestWalletSimulator:
@@ -187,10 +187,11 @@ class TestWalletSimulator:
         wsm_1 = env_1.wallet_state_manager
 
         tx_amount = 500
-        normal_puzhash = await wallet_1.get_new_puzzlehash()
+        async with wallet_1.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
+            normal_puzhash = await action_scope.get_puzzle_hash(wallet_1.wallet_state_manager)
 
         # Transfer to normal wallet
-        for _ in range(0, number_of_coins):
+        for _ in range(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)],
@@ -337,7 +338,9 @@ class TestWalletSimulator:
         api_1 = env_2.rpc_api
 
         tx_amount = 500
-        normal_puzhash = await wallet_1.get_new_puzzlehash()
+        async with wallet_1.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
+            normal_puzhash = await action_scope.get_puzzle_hash(wallet_1.wallet_state_manager)
+
         # 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(
@@ -398,7 +401,11 @@ class TestWalletSimulator:
 
         test_fee = 10
         resp = await api_0.spend_clawback_coins(
-            {"coin_ids": [normal_puzhash.hex(), merkle_coin.name().hex()], "fee": test_fee}
+            {
+                "coin_ids": [normal_puzhash.hex(), merkle_coin.name().hex()],
+                "fee": test_fee,
+                **wallet_environments.tx_config.to_json_dict(),
+            }
         )
         assert resp["success"]
         assert len(resp["transaction_ids"]) == 1
@@ -479,9 +486,9 @@ class TestWalletSimulator:
         api_0 = env.rpc_api
 
         tx_amount = 500
-        normal_puzhash = await wallet.get_new_puzzlehash()
         # Transfer to normal wallet
         async with wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
+            normal_puzhash = await action_scope.get_puzzle_hash(wallet.wallet_state_manager)
             await wallet.generate_signed_transaction(
                 [uint64(tx_amount)],
                 [normal_puzhash],
@@ -527,7 +534,11 @@ class TestWalletSimulator:
         merkle_coin = tx.additions[0] if tx.additions[0].amount == tx_amount else tx.additions[1]
         test_fee = 10
         resp = await api_0.spend_clawback_coins(
-            {"coin_ids": [merkle_coin.name().hex(), normal_puzhash.hex()], "fee": test_fee}
+            {
+                "coin_ids": [merkle_coin.name().hex(), normal_puzhash.hex()],
+                "fee": test_fee,
+                **wallet_environments.tx_config.to_json_dict(),
+            }
         )
         assert resp["success"]
         assert len(resp["transaction_ids"]) == 1
@@ -596,7 +607,8 @@ class TestWalletSimulator:
         api_1 = env_2.rpc_api
 
         tx_amount = 500
-        normal_puzhash = await wallet_1.get_new_puzzlehash()
+        async with wallet_1.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
+            normal_puzhash = await action_scope.get_puzzle_hash(wallet_1.wallet_state_manager)
         # 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(
@@ -659,7 +671,11 @@ class TestWalletSimulator:
         merkle_coin = tx.additions[0] if tx.additions[0].amount == tx_amount else tx.additions[1]
         test_fee = 10
         resp = await api_1.spend_clawback_coins(
-            {"coin_ids": [merkle_coin.name().hex(), normal_puzhash.hex()], "fee": test_fee}
+            {
+                "coin_ids": [merkle_coin.name().hex(), normal_puzhash.hex()],
+                "fee": test_fee,
+                **wallet_environments.tx_config.to_json_dict(),
+            }
         )
         assert resp["success"]
         assert len(resp["transaction_ids"]) == 1
@@ -728,7 +744,8 @@ class TestWalletSimulator:
         wallet_1 = env_2.xch_wallet
 
         tx_amount = 500
-        normal_puzhash = await wallet_1.get_new_puzzlehash()
+        async with wallet_1.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
+            normal_puzhash = await action_scope.get_puzzle_hash(wallet_1.wallet_state_manager)
         # 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(
@@ -976,8 +993,10 @@ class TestWalletSimulator:
         wallet_2 = env_2.xch_wallet
         api_1 = env_1.rpc_api
 
-        wallet_1_puzhash = await wallet_1.get_new_puzzlehash()
-        wallet_2_puzhash = await wallet_2.get_new_puzzlehash()
+        async with wallet_1.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
+            wallet_1_puzhash = await action_scope.get_puzzle_hash(wallet_1.wallet_state_manager)
+        async with wallet_2.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
+            wallet_2_puzhash = await action_scope.get_puzzle_hash(wallet_2.wallet_state_manager)
 
         tx_amount = 500
         # Transfer to normal wallet
@@ -1332,10 +1351,14 @@ class TestWalletSimulator:
         wallet_1 = env_1.xch_wallet
 
         tx_amount = 10
+        async with wallet_1.wallet_state_manager.new_action_scope(
+            wallet_environments.tx_config, push=True
+        ) as action_scope:
+            wallet_1_ph = await action_scope.get_puzzle_hash(wallet_1.wallet_state_manager)
         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)],
+                [wallet_1_ph],
                 action_scope,
                 uint64(0),
             )
@@ -1378,10 +1401,12 @@ class TestWalletSimulator:
         )
 
         tx_amount = 5
+        async with wallet_0.wallet_state_manager.new_action_scope(
+            wallet_environments.tx_config, push=True
+        ) as action_scope:
+            wallet_0_ph = await action_scope.get_puzzle_hash(wallet_0.wallet_state_manager)
         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)
-            )
+            await wallet_1.generate_signed_transaction([uint64(tx_amount)], [wallet_0_ph], action_scope, uint64(0))
 
         await wallet_environments.process_pending_states(
             [
@@ -1435,10 +1460,14 @@ class TestWalletSimulator:
 
         tx_amount = 1_750_000_000_000  # ensures we grab both coins
         tx_fee = 10
+        async with wallet_1.wallet_state_manager.new_action_scope(
+            wallet_environments.tx_config, push=True
+        ) as action_scope:
+            wallet_1_ph = await action_scope.get_puzzle_hash(wallet_1.wallet_state_manager)
         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()],
+                [wallet_1_ph],
                 action_scope,
                 uint64(tx_fee),
             )
@@ -1501,7 +1530,8 @@ class TestWalletSimulator:
 
         tx_amount = 1_750_000_000_000  # ensures we grab both coins
         tx_fee = 10
-        ph_2 = await wallet_1.get_new_puzzlehash()
+        async with wallet_1.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
+            ph_2 = await action_scope.get_puzzle_hash(wallet_1.wallet_state_manager)
         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]]
@@ -1578,9 +1608,8 @@ class TestWalletSimulator:
         env = wallet_environments.environments[0]
         wallet = env.xch_wallet
 
-        ph = await wallet.get_puzzle_hash(False)
-        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:
+            ph = await action_scope.get_puzzle_hash(wallet.wallet_state_manager)
             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),
@@ -1608,7 +1637,7 @@ class TestWalletSimulator:
                             ">=#max_send_amount": 1,  # any amount increase
                             "<=#pending_change": -1,  # any amount decrease
                             "pending_coin_removal_count": -1,
-                            "unspent_coin_count": len(primaries) + 1,
+                            "unspent_coin_count": wallet.max_send_quantity + 2,
                         }
                     },
                 ),
@@ -1743,10 +1772,12 @@ class TestWalletSimulator:
         assert reorg_height is not None
         await full_node_api.farm_blocks_to_puzzlehash(count=3)
 
+        async with wallet_2.wallet_state_manager.new_action_scope(
+            wallet_environments.tx_config, push=True
+        ) as action_scope:
+            wallet_2_ph = await action_scope.get_puzzle_hash(wallet_2.wallet_state_manager)
         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}
-            )
+            await wallet.generate_signed_transaction([uint64(tx_amount)], [wallet_2_ph], action_scope, coins={coin})
 
         await wallet_environments.process_pending_states(
             [
@@ -1973,7 +2004,9 @@ class TestWalletSimulator:
 
         # Test general string
         message = "Hello World"
-        ph = await env.xch_wallet.get_puzzle_hash(False)
+
+        async with env.wallet_state_manager.new_action_scope(wallet_environments.tx_config, push=True) as action_scope:
+            ph = await action_scope.get_puzzle_hash(env.wallet_state_manager)
         response = await api_0.sign_message_by_address({"address": encode_puzzle_hash(ph, "xch"), "message": message})
         puzzle: Program = Program.to((CHIP_0002_SIGN_MESSAGE_PREFIX, message))
 
@@ -2084,6 +2117,52 @@ class TestWalletSimulator:
             ]
         )
 
+    @pytest.mark.parametrize(
+        "wallet_environments",
+        [{"num_environments": 1, "blocks_needed": [1], "reuse_puzhash": True, "trusted": True}],
+        indirect=True,
+    )
+    @pytest.mark.limit_consensus_modes
+    @pytest.mark.anyio
+    async def test_forced_new_puzzle_hash(self, wallet_environments: WalletTestFramework) -> None:
+        env = wallet_environments.environments[0]
+        wallet = env.xch_wallet
+
+        with wallet_environments.new_puzzle_hashes_allowed():
+            async with wallet.wallet_state_manager.new_action_scope(
+                wallet_environments.tx_config, push=True
+            ) as action_scope:
+                coins = await wallet.select_coins(uint64(1), action_scope)
+                coin_list = list(coins)
+                assert len(coin_list) == 1
+                await wallet.generate_signed_transaction(
+                    [uint64(coin_list[0].amount / 2)],
+                    [coin_list[0].puzzle_hash],
+                    action_scope,
+                    coins=coins,
+                )
+        [tx] = action_scope.side_effects.transactions
+        assert tx.spend_bundle is not None
+        assert len(list(set(coin.puzzle_hash for coin in tx.spend_bundle.additions()))) == 2
+
+    @pytest.mark.parametrize(
+        "wallet_environments",
+        [{"num_environments": 1, "blocks_needed": [1], "reuse_puzhash": True, "trusted": True}],
+        indirect=True,
+    )
+    @pytest.mark.limit_consensus_modes
+    @pytest.mark.anyio
+    async def test_puzzle_hashes_not_committed(self, wallet_environments: WalletTestFramework) -> None:
+        env = wallet_environments.environments[0]
+        wallet = env.xch_wallet
+
+        # Our framework
+        async with wallet.wallet_state_manager.new_action_scope(
+            wallet_environments.tx_config,
+            push=False,
+        ) as action_scope:
+            await action_scope.get_puzzle_hash(wallet.wallet_state_manager, override_reuse_puzhash_with=False)
+
 
 def test_get_wallet_db_path_v2_r1() -> None:
     root_path: Path = Path("/x/y/z/.chia/mainnet").resolve()

chia/_tests/wallet/test_wallet_action_scope.py

@@ -4,7 +4,7 @@ from dataclasses import dataclass
 from typing import Optional
 
 import pytest
-from chia_rs import G2Element
+from chia_rs import G2Element, Program
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint64
 
@@ -83,6 +83,7 @@ async def test_wallet_action_scope() -> None:
         sign=True,
         additional_signing_responses=[],
         extra_spends=[],
+        puzzle_for_pk=lambda _: Program.to(1),
     ) as action_scope:
         async with action_scope.use() as interface:
             interface.side_effects.transactions = [STD_TX]
@@ -94,7 +95,13 @@ async def test_wallet_action_scope() -> None:
     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=[]
+        DEFAULT_TX_CONFIG,
+        push=False,
+        merge_spends=True,
+        sign=True,
+        additional_signing_responses=[],
+        extra_spends=[],
+        puzzle_for_pk=lambda _: Program.to(1),
     ) as action_scope:
         async with action_scope.use() as interface:
             interface.side_effects.transactions = []

chia/_tests/wallet/test_wallet_blockchain.py

@@ -1,17 +1,16 @@
 from __future__ import annotations
 
 import pytest
+from chia_rs import FullBlock, HeaderBlock
 from chia_rs.sized_ints import uint8, uint32
 
 from chia._tests.util.db_connection import DBConnection
 from chia._tests.util.setup_nodes import OldSimulatorsAndWallets
 from chia.consensus.blockchain import AddBlockResult
+from chia.consensus.generator_tools import get_block_header
 from chia.protocols import full_node_protocol
 from chia.simulator.add_blocks_in_batches import add_blocks_in_batches
 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.wallet.key_val_store import KeyValStore
 from chia.wallet.wallet_blockchain import WalletBlockchain
 

chia/_tests/wallet/test_wallet_key_val_store.py

@@ -1,11 +1,10 @@
 from __future__ import annotations
 
 import pytest
+from chia_rs import FullBlock, HeaderBlock
 
 from chia._tests.util.db_connection import DBConnection
 from chia.simulator.block_tools import BlockTools
-from chia.types.full_block import FullBlock
-from chia.types.header_block import HeaderBlock
 from chia.wallet.key_val_store import KeyValStore
 
 

chia/_tests/wallet/test_wallet_node.py

@@ -8,7 +8,7 @@ from pathlib import Path
 from typing import Any, Optional
 
 import pytest
-from chia_rs import G1Element, PrivateKey
+from chia_rs import CoinState, FullBlock, G1Element, PrivateKey
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint8, uint32, uint64, uint128
 
@@ -16,14 +16,12 @@ from chia._tests.util.misc import CoinGenerator, patch_request_handler
 from chia._tests.util.setup_nodes import OldSimulatorsAndWallets
 from chia._tests.util.time_out_assert import time_out_assert
 from chia.protocols import wallet_protocol
+from chia.protocols.outbound_message import Message, make_msg
 from chia.protocols.protocol_message_types import ProtocolMessageTypes
-from chia.protocols.wallet_protocol import CoinState
 from chia.server.api_protocol import Self
-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.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

chia/_tests/wallet/test_wallet_retry.py

@@ -47,7 +47,8 @@ async def test_wallet_tx_retry(
     wallet_node_1.config["tx_resend_timeout_secs"] = 5
     wallet_server_1 = wallets[0][1]
     wallet_1 = wallet_node_1.wallet_state_manager.main_wallet
-    reward_ph = await wallet_1.get_new_puzzlehash()
+    async with wallet_1.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
+        reward_ph = await action_scope.get_puzzle_hash(wallet_1.wallet_state_manager)
 
     await wallet_server_1.start_client(PeerInfo(self_hostname, server_1.get_port()), None)
 
@@ -74,7 +75,8 @@ async def test_wallet_tx_retry(
     # Wait some time so wallet will retry
     await asyncio.sleep(2)
 
-    our_ph = await wallet_1.get_new_puzzlehash()
+    async with wallet_1.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
+        our_ph = await action_scope.get_puzzle_hash(wallet_1.wallet_state_manager)
     await farm_blocks(full_node_1, our_ph, 2)
 
     # Wait for wallet to catch up