chia-blockchain 2.5.7rc4__py3-none-any.whl → 2.5.8rc1__py3-none-any.whl

chia/_tests/util/network_protocol_data.py

@@ -13,6 +13,7 @@ from chia_rs import (
     G2Element,
     HeaderBlock,
     InfusedChallengeChainSubSlot,
+    PartialProof,
     PoolTarget,
     ProofOfSpace,
     RespondToPhUpdates,
@@ -155,9 +156,14 @@ partial_proof = harvester_protocol.PartialProofsData(
     bytes32.fromhex("42743566108589c11bb3811b347900b6351fd3e25bad6c956c0bf1c05a4d93fb"),
     bytes32.fromhex("8a346e8dc02e9b44c0571caa74fd99f163d4c5d7deaedac87125528721493f7a"),
     "plot-filename",
-    [b"partial-proof1", b"partial-proof2"],
+    [
+        PartialProof([uint64(256)] * 64),
+        PartialProof([uint64(257)] * 64),
+    ],
     uint8(4),
     uint8(32),
+    uint8(5),
+    bytes32.fromhex("346e8dc02e9b44c0571caa74fd99f163d4c5d7deaedac87125528721493f7a8a"),
     G1Element.from_bytes(
         bytes.fromhex(
             "a04c6b5ac7dfb935f6feecfdd72348ccf1d4be4fe7e26acf271ea3b7d308da61e0a308f7a62495328a81f5147b66634c"
@@ -237,6 +243,7 @@ sub_epochs = SubEpochData(
     uint8(190),
     uint64(10527522631566046685),
     uint64(989988965238543242),
+    None,
 )
 
 classgroup_element = ClassgroupElement.get_default_element()
@@ -314,6 +321,7 @@ reward_chain_block = RewardChainBlock(
     g2_element,
     vdf_info,
     vdf_info,
+    None,
     False,
 )
 
@@ -1051,6 +1059,7 @@ sub_epoch_summary = SubEpochSummary(
     uint8(4),
     uint64(14666749803532899046),
     uint64(10901191956946573440),
+    None,
 )
 
 new_peak_timelord = timelord_protocol.NewPeakTimelord(
@@ -1116,6 +1125,14 @@ respond_compact_proof_of_time = timelord_protocol.RespondCompactProofOfTime(
 )
 
 # SOLVER PROTOCOL
-solver_info = solver_protocol.SolverInfo(partial_proof=b"partial-proof")
+solver_info = solver_protocol.SolverInfo(
+    partial_proof=PartialProof([uint64(256)] * 64),
+    plot_id=bytes32.fromhex("071bef40d098cfadc2614d8b57db924788f7f2ea0fde8cf4bfaeae2894caa442"),
+    strength=uint8(5),
+    size=uint8(28),
+)
 
-solver_response = solver_protocol.SolverResponse(b"partial-proof", b"full-proof")
+solver_response = solver_protocol.SolverResponse(
+    PartialProof([uint64(256)] * 64),
+    b"full-proof",
+)

chia/_tests/util/protocol_messages_json.py

@@ -69,9 +69,148 @@ partial_proof_json: dict[str, Any] = {
     "challenge_hash": "0x42743566108589c11bb3811b347900b6351fd3e25bad6c956c0bf1c05a4d93fb",
     "sp_hash": "0x8a346e8dc02e9b44c0571caa74fd99f163d4c5d7deaedac87125528721493f7a",
     "plot_identifier": "plot-filename",
-    "partial_proofs": ["0x7061727469616c2d70726f6f6631", "0x7061727469616c2d70726f6f6632"],
+    "partial_proofs": [
+        {
+            "proof_fragments": [
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+                256,
+            ]
+        },
+        {
+            "proof_fragments": [
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+                257,
+            ]
+        },
+    ],
     "signage_point_index": 4,
     "plot_size": 32,
+    "strength": 5,
+    "plot_id": "0x346e8dc02e9b44c0571caa74fd99f163d4c5d7deaedac87125528721493f7a8a",
     "pool_public_key": "0xa04c6b5ac7dfb935f6feecfdd72348ccf1d4be4fe7e26acf271ea3b7d308da61e0a308f7a62495328a81f5147b66634c",
     "pool_contract_puzzle_hash": "0x91240fbacdf93b44c0571caa74fd99f163d4c5d7deaedac87125528721493f7a",
     "plot_public_key": "0xa04c6b5ac7dfb935f6feecfdd72348ccf1d4be4fe7e26acf271ea3b7d308da61e0a308f7a62495328a81f5147b66634c",
@@ -125,6 +264,7 @@ respond_proof_of_weight_json: dict[str, Any] = {
                 "num_blocks_overflow": 190,
                 "new_sub_slot_iters": 10527522631566046685,
                 "new_difficulty": 989988965238543242,
+                "challenge_merkle_root": None,
             }
         ],
         "sub_epoch_segments": [
@@ -321,6 +461,7 @@ respond_proof_of_weight_json: dict[str, Any] = {
                             "data": "0x08000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
                         },
                     },
+                    "header_mmr_root": None,
                     "is_transaction_block": False,
                 },
                 "challenge_chain_sp_proof": {
@@ -515,6 +656,7 @@ respond_blocks_json: dict[str, Any] = {
                         "data": "0x08000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
                     },
                 },
+                "header_mmr_root": None,
                 "is_transaction_block": False,
             },
             "challenge_chain_sp_proof": {
@@ -691,6 +833,7 @@ respond_blocks_json: dict[str, Any] = {
                         "data": "0x08000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
                     },
                 },
+                "header_mmr_root": None,
                 "is_transaction_block": False,
             },
             "challenge_chain_sp_proof": {
@@ -873,6 +1016,7 @@ respond_block_json: dict[str, Any] = {
                     "data": "0x08000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
                 },
             },
+            "header_mmr_root": None,
             "is_transaction_block": False,
         },
         "challenge_chain_sp_proof": {
@@ -1423,6 +1567,7 @@ respond_header_block_json: dict[str, Any] = {
                     "data": "0x08000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
                 },
             },
+            "header_mmr_root": None,
             "is_transaction_block": False,
         },
         "challenge_chain_sp_proof": {
@@ -1604,6 +1749,7 @@ respond_block_headers_json: dict[str, Any] = {
                         "data": "0x08000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
                     },
                 },
+                "header_mmr_root": None,
                 "is_transaction_block": False,
             },
             "challenge_chain_sp_proof": {
@@ -1859,6 +2005,7 @@ respond_header_blocks_json: dict[str, Any] = {
                         "data": "0x08000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
                     },
                 },
+                "header_mmr_root": None,
                 "is_transaction_block": False,
             },
             "challenge_chain_sp_proof": {
@@ -2493,6 +2640,7 @@ new_peak_timelord_json: dict[str, Any] = {
                 "data": "0x08000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
             },
         },
+        "header_mmr_root": None,
         "is_transaction_block": False,
     },
     "difficulty": 7661623532867338566,
@@ -2504,6 +2652,7 @@ new_peak_timelord_json: dict[str, Any] = {
         "num_blocks_overflow": 4,
         "new_difficulty": 14666749803532899046,
         "new_sub_slot_iters": 10901191956946573440,
+        "challenge_merkle_root": None,
     },
     "previous_reward_challenges": [
         ["0x5bb65d8662d561ed2fc17e4177ba61c43017ee7e5418091d38968e36ce380d11", 134240022887890669757150210097251845335]
@@ -2567,6 +2716,7 @@ new_unfinished_block_timelord_json: dict[str, Any] = {
         "num_blocks_overflow": 4,
         "new_difficulty": 14666749803532899046,
         "new_sub_slot_iters": 10901191956946573440,
+        "challenge_merkle_root": None,
     },
     "rc_prev": "0x0f90296b605904a794e4e98852e3b22e0d9bee2fa07abb12df6cecbdb778e1e5",
 }
@@ -2730,9 +2880,148 @@ error_without_data_json: dict[str, Any] = {"code": 1, "message": "Unknown", "dat
 
 error_with_data_json: dict[str, Any] = {"code": 1, "message": "Unknown", "data": "0x65787472612064617461"}
 
-solver_info_json: dict[str, Any] = {"partial_proof": "0x7061727469616c2d70726f6f66"}
+solver_info_json: dict[str, Any] = {
+    "partial_proof": {
+        "proof_fragments": [
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+        ]
+    },
+    "plot_id": "0x071bef40d098cfadc2614d8b57db924788f7f2ea0fde8cf4bfaeae2894caa442",
+    "strength": 5,
+    "size": 28,
+}
 
 solver_response_json: dict[str, Any] = {
-    "partial_proof": "0x7061727469616c2d70726f6f66",
+    "partial_proof": {
+        "proof_fragments": [
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+            256,
+        ]
+    },
     "proof": "0x66756c6c2d70726f6f66",
 }

chia/_tests/util/setup_nodes.py

@@ -7,7 +7,6 @@ from collections.abc import AsyncIterator
 from contextlib import AsyncExitStack, ExitStack, asynccontextmanager
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Optional, Union
 
 import anyio
 from chia_rs import ConsensusConstants
@@ -59,8 +58,8 @@ SimulatorsAndWalletsServices = tuple[list[SimulatorFullNodeService], list[Wallet
 
 @dataclass(frozen=True)
 class FullSystem:
-    node_1: Union[FullNodeService, SimulatorFullNodeService]
-    node_2: Union[FullNodeService, SimulatorFullNodeService]
+    node_1: FullNodeService | SimulatorFullNodeService
+    node_2: FullNodeService | SimulatorFullNodeService
     harvester: Harvester
     farmer: Farmer
     introducer: IntroducerAPI
@@ -94,27 +93,32 @@ async def setup_two_nodes(
 
     config_overrides = {"full_node.max_sync_wait": 0, "full_node.log_coins": True}
     with TempKeyring(populate=True) as keychain1, TempKeyring(populate=True) as keychain2:
-        bt1 = await create_block_tools_async(
-            constants=consensus_constants, keychain=keychain1, config_overrides=config_overrides
-        )
-        async with setup_full_node(
-            consensus_constants,
-            "blockchain_test.db",
-            self_hostname,
-            bt1,
-            simulator=False,
-            db_version=db_version,
-        ) as service1:
-            async with setup_full_node(
+        async with (
+            create_block_tools_async(
+                constants=consensus_constants, keychain=keychain1, config_overrides=config_overrides
+            ) as bt1,
+            setup_full_node(
                 consensus_constants,
-                "blockchain_test_2.db",
+                "blockchain_test.db",
                 self_hostname,
-                await create_block_tools_async(
-                    constants=consensus_constants, keychain=keychain2, config_overrides=config_overrides
-                ),
+                bt1,
                 simulator=False,
                 db_version=db_version,
-            ) as service2:
+            ) as service1,
+        ):
+            async with (
+                create_block_tools_async(
+                    constants=consensus_constants, keychain=keychain2, config_overrides=config_overrides
+                ) as bt2,
+                setup_full_node(
+                    consensus_constants,
+                    "blockchain_test_2.db",
+                    self_hostname,
+                    bt2,
+                    simulator=False,
+                    db_version=db_version,
+                ) as service2,
+            ):
                 fn1 = service1._api
                 fn2 = service2._api
 
@@ -138,8 +142,10 @@ async def setup_n_nodes(
                         consensus_constants,
                         f"blockchain_test_{i}.db",
                         self_hostname,
-                        await create_block_tools_async(
-                            constants=consensus_constants, keychain=keychain, config_overrides=config_overrides
+                        await async_exit_stack.enter_async_context(
+                            create_block_tools_async(
+                                constants=consensus_constants, keychain=keychain, config_overrides=config_overrides
+                            )
                         ),
                         simulator=False,
                         db_version=db_version,
@@ -159,11 +165,11 @@ async def setup_simulators_and_wallets(
     spam_filter_after_n_txs: int = 200,
     xch_spam_amount: int = 1000000,
     *,
-    key_seed: Optional[bytes32] = None,
+    key_seed: bytes32 | None = None,
     initial_num_public_keys: int = 5,
     db_version: int = 2,
-    config_overrides: Optional[dict[str, int]] = None,
-    disable_capabilities: Optional[list[Capability]] = None,
+    config_overrides: dict[str, int] | None = None,
+    disable_capabilities: list[Capability] | None = None,
 ) -> AsyncIterator[SimulatorsAndWallets]:
     with TempKeyring(populate=True) as keychain1, TempKeyring(populate=True) as keychain2:
         if config_overrides is None:
@@ -212,11 +218,11 @@ async def setup_simulators_and_wallets_service(
     spam_filter_after_n_txs: int = 200,
     xch_spam_amount: int = 1000000,
     *,
-    key_seed: Optional[bytes32] = None,
+    key_seed: bytes32 | None = None,
     initial_num_public_keys: int = 5,
     db_version: int = 2,
-    config_overrides: Optional[dict[str, int]] = None,
-    disable_capabilities: Optional[list[Capability]] = None,
+    config_overrides: dict[str, int] | None = None,
+    disable_capabilities: list[Capability] | None = None,
 ) -> AsyncIterator[tuple[list[SimulatorFullNodeService], list[WalletService], BlockTools]]:
     with TempKeyring(populate=True) as keychain1, TempKeyring(populate=True) as keychain2:
         async with setup_simulators_and_wallets_inner(
@@ -241,29 +247,33 @@ async def setup_simulators_and_wallets_inner(
     db_version: int,
     consensus_constants: ConsensusConstants,
     initial_num_public_keys: int,
-    key_seed: Optional[bytes32],
+    key_seed: bytes32 | None,
     keychain1: Keychain,
     keychain2: Keychain,
     simulator_count: int,
     spam_filter_after_n_txs: int,
     wallet_count: int,
     xch_spam_amount: int,
-    config_overrides: Optional[dict[str, int]],
-    disable_capabilities: Optional[list[Capability]],
+    config_overrides: dict[str, int] | None,
+    disable_capabilities: list[Capability] | None,
 ) -> AsyncIterator[tuple[list[BlockTools], list[SimulatorFullNodeService], list[WalletService]]]:
     if config_overrides is not None and "full_node.max_sync_wait" not in config_overrides:
         config_overrides["full_node.max_sync_wait"] = 0
         config_overrides["full_node.log_coins"] = True
     async with AsyncExitStack() as async_exit_stack:
         bt_tools: list[BlockTools] = [
-            await create_block_tools_async(consensus_constants, keychain=keychain1, config_overrides=config_overrides)
+            await async_exit_stack.enter_async_context(
+                create_block_tools_async(consensus_constants, keychain=keychain1, config_overrides=config_overrides)
+            )
             for _ in range(simulator_count)
         ]
         if wallet_count > simulator_count:
             for _ in range(wallet_count - simulator_count):
                 bt_tools.append(
-                    await create_block_tools_async(
-                        consensus_constants, keychain=keychain2, config_overrides=config_overrides
+                    await async_exit_stack.enter_async_context(
+                        create_block_tools_async(
+                            consensus_constants, keychain=keychain2, config_overrides=config_overrides
+                        )
                     )
                 )
 
@@ -310,7 +320,7 @@ async def setup_farmer_solver_multi_harvester(
     consensus_constants: ConsensusConstants,
     *,
     start_services: bool,
-    solver_peer: Optional[UnresolvedPeerInfo] = None,
+    solver_peer: UnresolvedPeerInfo | None = None,
 ) -> AsyncIterator[tuple[list[HarvesterService], FarmerService, BlockTools]]:
     async with AsyncExitStack() as async_exit_stack:
         farmer_service = await async_exit_stack.enter_async_context(
@@ -348,8 +358,8 @@ async def setup_farmer_solver_multi_harvester(
 async def setup_full_system(
     consensus_constants: ConsensusConstants,
     shared_b_tools: BlockTools,
-    b_tools: Optional[BlockTools] = None,
-    b_tools_1: Optional[BlockTools] = None,
+    b_tools: BlockTools | None = None,
+    b_tools_1: BlockTools | None = None,
     db_version: int = 2,
 ) -> AsyncIterator[FullSystem]:
     with TempKeyring(populate=True) as keychain1, TempKeyring(populate=True) as keychain2:
@@ -361,8 +371,8 @@ async def setup_full_system(
 
 @asynccontextmanager
 async def setup_full_system_inner(
-    b_tools: Optional[BlockTools],
-    b_tools_1: Optional[BlockTools],
+    b_tools: BlockTools | None,
+    b_tools_1: BlockTools | None,
     connect_to_daemon: bool,
     consensus_constants: ConsensusConstants,
     db_version: int,
@@ -371,18 +381,23 @@ async def setup_full_system_inner(
     shared_b_tools: BlockTools,
 ) -> AsyncIterator[FullSystem]:
     config_overrides = {"full_node.max_sync_wait": 0, "full_node.log_coins": True}
-    if b_tools is None:
-        b_tools = await create_block_tools_async(
-            constants=consensus_constants, keychain=keychain1, config_overrides=config_overrides
-        )
-    if b_tools_1 is None:
-        b_tools_1 = await create_block_tools_async(
-            constants=consensus_constants, keychain=keychain2, config_overrides=config_overrides
-        )
 
     self_hostname = shared_b_tools.config["self_hostname"]
 
     async with AsyncExitStack() as async_exit_stack:
+        if b_tools is None:
+            b_tools = await async_exit_stack.enter_async_context(
+                create_block_tools_async(
+                    constants=consensus_constants, keychain=keychain1, config_overrides=config_overrides
+                )
+            )
+        if b_tools_1 is None:
+            b_tools_1 = await async_exit_stack.enter_async_context(
+                create_block_tools_async(
+                    constants=consensus_constants, keychain=keychain2, config_overrides=config_overrides
+                )
+            )
+
         vdf1_port = uint16(find_available_listen_port("vdf1"))
         vdf2_port = uint16(find_available_listen_port("vdf2"))