chia-blockchain 2.5.6rc2__py3-none-any.whl → 2.5.7__py3-none-any.whl

chia/_tests/util/setup_nodes.py

@@ -18,11 +18,13 @@ from chia._tests.environments.full_node import FullNodeEnvironment
 from chia._tests.environments.wallet import WalletEnvironment
 from chia.daemon.server import WebSocketServer
 from chia.farmer.farmer import Farmer
+from chia.farmer.farmer_service import FarmerService
 from chia.full_node.full_node_api import FullNodeAPI
+from chia.full_node.full_node_service import FullNodeService
 from chia.harvester.harvester import Harvester
+from chia.harvester.harvester_service import HarvesterService
 from chia.introducer.introducer_api import IntroducerAPI
 from chia.protocols.shared_protocol import Capability
-from chia.server.aliases import FarmerService, FullNodeService, HarvesterService, TimelordService, WalletService
 from chia.server.server import ChiaServer
 from chia.simulator.block_tools import BlockTools, create_block_tools_async
 from chia.simulator.full_node_simulator import FullNodeSimulator
@@ -33,6 +35,7 @@ from chia.simulator.setup_services import (
     setup_full_node,
     setup_harvester,
     setup_introducer,
+    setup_solver,
     setup_timelord,
     setup_vdf_client,
     setup_vdf_clients,
@@ -40,12 +43,15 @@ from chia.simulator.setup_services import (
 )
 from chia.simulator.socket import find_available_listen_port
 from chia.simulator.start_simulator import SimulatorFullNodeService
+from chia.solver.solver_service import SolverService
+from chia.timelord.timelord_service import TimelordService
 from chia.types.peer_info import UnresolvedPeerInfo
 from chia.util.hash import std_hash
 from chia.util.keychain import Keychain
 from chia.util.timing import adjusted_timeout, backoff_times
 from chia.wallet.wallet_node import WalletNode
 from chia.wallet.wallet_rpc_client import WalletRpcClient
+from chia.wallet.wallet_service import WalletService
 
 OldSimulatorsAndWallets = tuple[list[FullNodeSimulator], list[tuple[WalletNode, ChiaServer]], BlockTools]
 SimulatorsAndWalletsServices = tuple[list[SimulatorFullNodeService], list[WalletService], BlockTools]
@@ -60,6 +66,7 @@ class FullSystem:
     introducer: IntroducerAPI
     timelord: TimelordService
     timelord_bluebox: TimelordService
+    solver: SolverService
     daemon: WebSocketServer
 
 
@@ -296,13 +303,14 @@ async def setup_simulators_and_wallets_inner(
 
 
 @asynccontextmanager
-async def setup_farmer_multi_harvester(
+async def setup_farmer_solver_multi_harvester(
     block_tools: BlockTools,
     harvester_count: int,
     temp_dir: Path,
     consensus_constants: ConsensusConstants,
     *,
     start_services: bool,
+    solver_peer: Optional[UnresolvedPeerInfo] = None,
 ) -> AsyncIterator[tuple[list[HarvesterService], FarmerService, BlockTools]]:
     async with AsyncExitStack() as async_exit_stack:
         farmer_service = await async_exit_stack.enter_async_context(
@@ -313,6 +321,7 @@ async def setup_farmer_multi_harvester(
                 consensus_constants,
                 port=uint16(0),
                 start_service=start_services,
+                solver_peer=solver_peer,
             )
         )
         if start_services:
@@ -469,6 +478,15 @@ async def setup_full_system_inner(
 
                 await asyncio.sleep(backoff)
 
+        solver_service = await async_exit_stack.enter_async_context(
+            setup_solver(
+                shared_b_tools.root_path / "solver",
+                shared_b_tools,
+                consensus_constants,
+                True,
+            )
+        )
+
         full_system = FullSystem(
             node_1=node_1,
             node_2=node_2,
@@ -477,6 +495,7 @@ async def setup_full_system_inner(
             introducer=introducer,
             timelord=timelord,
             timelord_bluebox=timelord_bluebox_service,
+            solver=solver_service,
             daemon=daemon_ws,
         )
         yield full_system

chia/_tests/util/spend_sim.py

@@ -19,6 +19,7 @@ from chia_rs import (
     get_flags_for_height_and_constants,
     run_block_generator2,
 )
+from chia_rs import get_puzzle_and_solution_for_coin2 as get_puzzle_and_solution_for_coin
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint32, uint64
 from typing_extensions import Self
@@ -30,7 +31,6 @@ from chia.full_node.bundle_tools import simple_solution_generator
 from chia.full_node.coin_store import CoinStore
 from chia.full_node.hint_store import HintStore
 from chia.full_node.mempool import Mempool
-from chia.full_node.mempool_check_conditions import get_puzzle_and_solution_for_coin
 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
@@ -442,8 +442,14 @@ class SimClient:
         generator: BlockGenerator = filtered_generators[0].transactions_generator  # type: ignore[assignment]
         coin_record = await self.service.coin_store.get_coin_record(coin_id)
         assert coin_record is not None
-        spend_info = get_puzzle_and_solution_for_coin(generator, coin_record.coin, height, self.service.defaults)
-        return CoinSpend(coin_record.coin, spend_info.puzzle, spend_info.solution)
+        puzzle, solution = get_puzzle_and_solution_for_coin(
+            generator.program,
+            generator.generator_refs,
+            self.service.defaults.MAX_BLOCK_COST_CLVM,
+            coin_record.coin,
+            get_flags_for_height_and_constants(height, self.service.defaults),
+        )
+        return CoinSpend(coin_record.coin, puzzle, solution)
 
     async def get_all_mempool_tx_ids(self) -> list[bytes32]:
         return self.service.mempool_manager.mempool.all_item_ids()

chia/_tests/util/test_condition_tools.py

@@ -51,8 +51,9 @@ def mk_agg_sig_conditions(
         flags=0,
         execution_cost=0,
         condition_cost=0,
+        fingerprint=b"",
     )
-    return SpendBundleConditions([spend], 0, 0, 0, None, None, agg_sig_unsafe_data, 0, 0, 0, False, 0, 0)
+    return SpendBundleConditions([spend], 0, 0, 0, None, None, agg_sig_unsafe_data, 0, 0, 0, False, 0, 0, 0, 0, 0)
 
 
 @pytest.mark.parametrize(
@@ -99,7 +100,7 @@ def test_pkm_pairs_vs_for_conditions_dict(opcode: ConditionOpcode) -> None:
 
 class TestPkmPairs:
     def test_empty_list(self) -> None:
-        conds = SpendBundleConditions([], 0, 0, 0, None, None, [], 0, 0, 0, False, 0, 0)
+        conds = SpendBundleConditions([], 0, 0, 0, None, None, [], 0, 0, 0, False, 0, 0, 0, 0, 0)
         pks, msgs = pkm_pairs(conds, b"foobar")
         assert pks == []
         assert msgs == []

chia/_tests/util/test_full_block_utils.py

@@ -26,7 +26,7 @@ from chia_rs import (
 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._tests.util.benchmarks import rand_g1, rand_g2, rand_hash, rand_vdf, rand_vdf_proof, rewards
 from chia.consensus.generator_tools import get_block_header
 from chia.full_node.full_block_utils import (
     block_info_from_block,
@@ -67,14 +67,15 @@ def vdf_proof() -> VDFProof:
 def get_proof_of_space() -> Generator[ProofOfSpace, None, None]:
     for pool_pk in [g1(), None]:
         for plot_hash in [hsh(), None]:
-            yield ProofOfSpace(
-                hsh(),  # challenge
-                pool_pk,
-                plot_hash,
-                g1(),  # plot_public_key
-                uint8(32),
-                rand_bytes(8 * 32),
-            )
+            for pos_version in [0, 0x80]:
+                yield ProofOfSpace(
+                    hsh(),  # challenge
+                    pool_pk,
+                    plot_hash,
+                    g1(),  # plot_public_key
+                    uint8(pos_version | 32),  # this is version and k-size
+                    random.randbytes(8 * 32),
+                )
 
 
 def get_reward_chain_block(height: uint32) -> Generator[RewardChainBlock, None, None]:

chia/_tests/util/test_misc.py

@@ -182,7 +182,7 @@ def test_split_manager_raises_on_second_entry() -> None:
     split = SplitManager(manager=sync_manager(y=x), object=None)
     split.enter()
 
-    with pytest.raises(Exception, match="^already entered$"):
+    with pytest.raises(Exception, match=r"^already entered$"):
         split.enter()
 
 
@@ -193,7 +193,7 @@ def test_split_manager_raises_on_second_entry_after_exiting() -> None:
     split.enter()
     split.exit()
 
-    with pytest.raises(Exception, match="^already entered, already exited$"):
+    with pytest.raises(Exception, match=r"^already entered, already exited$"):
         split.enter()
 
 
@@ -204,7 +204,7 @@ def test_split_manager_raises_on_second_exit() -> None:
     split.enter()
     split.exit()
 
-    with pytest.raises(Exception, match="^already exited$"):
+    with pytest.raises(Exception, match=r"^already exited$"):
         split.exit()
 
 
@@ -213,7 +213,7 @@ def test_split_manager_raises_on_exit_without_entry() -> None:
 
     split = SplitManager(manager=sync_manager(y=x), object=None)
 
-    with pytest.raises(Exception, match="^not yet entered$"):
+    with pytest.raises(Exception, match=r"^not yet entered$"):
         split.exit()
 
 
@@ -274,7 +274,7 @@ async def test_split_async_manager_raises_on_second_entry() -> None:
     split = SplitAsyncManager(manager=async_manager(y=x), object=None)
     await split.enter()
 
-    with pytest.raises(Exception, match="^already entered$"):
+    with pytest.raises(Exception, match=r"^already entered$"):
         await split.enter()
 
 
@@ -286,7 +286,7 @@ async def test_split_async_manager_raises_on_second_entry_after_exiting() -> Non
     await split.enter()
     await split.exit()
 
-    with pytest.raises(Exception, match="^already entered, already exited$"):
+    with pytest.raises(Exception, match=r"^already entered, already exited$"):
         await split.enter()
 
 
@@ -298,7 +298,7 @@ async def test_split_async_manager_raises_on_second_exit() -> None:
     await split.enter()
     await split.exit()
 
-    with pytest.raises(Exception, match="^already exited$"):
+    with pytest.raises(Exception, match=r"^already exited$"):
         await split.exit()
 
 
@@ -308,7 +308,7 @@ async def test_split_async_manager_raises_on_exit_without_entry() -> None:
 
     split = SplitAsyncManager(manager=async_manager(y=x), object=None)
 
-    with pytest.raises(Exception, match="^not yet entered$"):
+    with pytest.raises(Exception, match=r"^not yet entered$"):
         await split.exit()
 
 
@@ -390,7 +390,7 @@ async def test_valued_event_set_again_raises_and_does_not_change_value() -> None
     value = 37
     valued_event.set(value)
 
-    with pytest.raises(Exception, match="^Value already set$"):
+    with pytest.raises(Exception, match=r"^Value already set$"):
         valued_event.set(value + 1)
 
     with anyio.fail_after(adjusted_timeout(10)):
@@ -404,7 +404,7 @@ async def test_valued_event_wait_raises_if_not_set() -> None:
     valued_event = ValuedEvent[int]()
     valued_event._event.set()
 
-    with pytest.raises(Exception, match="^Value not set despite event being set$"):
+    with pytest.raises(Exception, match=r"^Value not set despite event being set$"):
         with anyio.fail_after(adjusted_timeout(10)):
             await valued_event.wait()
 

chia/_tests/util/test_network.py

@@ -8,7 +8,38 @@ from typing import Union
 import pytest
 
 from chia.util.ip_address import IPAddress
-from chia.util.network import resolve
+from chia.util.network import parse_host_port, resolve
+
+
+@pytest.mark.parametrize(
+    "host_port, expected_host, expected_port",
+    [
+        ("127.0.0.1:8080", "127.0.0.1", 8080),
+        ("[::1]:8080", "::1", 8080),
+        ("example.com:8080", "example.com", 8080),
+        ("localhost:8555", "localhost", 8555),
+    ],
+)
+def test_parse_host_port(host_port: str, expected_host: str, expected_port: int) -> None:
+    host, port = parse_host_port(host_port)
+    assert host == expected_host
+    assert port == expected_port
+
+
+@pytest.mark.parametrize(
+    "host_port",
+    [
+        "127.0.0.1",
+        "::1",
+        "example.com",
+        "localhost",
+        "127.0.0.1:",
+        ":8080",
+    ],
+)
+def test_parse_host_port_invalid(host_port: str) -> None:
+    with pytest.raises(ValueError):
+        parse_host_port(host_port)
 
 
 @pytest.mark.anyio