catchup: into long_lived/datalayer_merkle_blob from main @ a803d18 (#19658)

Source hash: a803d18
Remaining commits: 0

Author: altendky

CONTRIBUTING.md

@@ -57,8 +57,8 @@ to configure how the tests are run. For example, for more logging: change the lo
 ```bash
 sh install.sh -d
 . ./activate
-ruff format && ruff check --fix && mypy
-pytest tests -v --durations 0
+ruff format && ruff check --fix && mypy .
+pytest . -v --durations 0
 ```
 
 The [Mypy library](https://mypy.readthedocs.io/en/stable/) is very useful for ensuring objects are of the correct type, so try to always add the type of the return value, and the type of local variables.

chia-blockchain-gui

@@ -45,11 +45,13 @@
 from chia.consensus.coinbase import create_farmer_coin
 from chia.consensus.find_fork_point import lookup_fork_chain
 from chia.consensus.full_block_to_block_record import block_to_block_record
+from chia.consensus.generator_tools import get_block_header
 from chia.consensus.get_block_generator import get_block_generator
 from chia.consensus.multiprocess_validation import PreValidationResult, pre_validate_block
 from chia.consensus.pot_iterations import is_overflow_block
 from chia.simulator.block_tools import BlockTools, create_block_tools_async
 from chia.simulator.keyring import TempKeyring
+from chia.simulator.vdf_prover import get_vdf_info_and_proof
 from chia.simulator.wallet_tools import WalletTool
 from chia.types.blockchain_format.classgroup import ClassgroupElement
 from chia.types.blockchain_format.coin import Coin
@@ -60,11 +62,9 @@
 from chia.types.generator_types import BlockGenerator
 from chia.types.validation_state import ValidationState
 from chia.util.errors import Err
-from chia.util.generator_tools import get_block_header
 from chia.util.hash import std_hash
 from chia.util.keychain import Keychain
 from chia.util.recursive_replace import recursive_replace
-from chia.util.vdf_prover import get_vdf_info_and_proof
 from chia.wallet.puzzles.p2_delegated_puzzle_or_hidden_puzzle import (
     DEFAULT_HIDDEN_PUZZLE_HASH,
     calculate_synthetic_secret_key,
@@ -1156,7 +1156,7 @@ async def test_bad_pos(self, empty_blockchain: Blockchain, bt: BlockTools) -> No
         )
         await _validate_and_add_block(empty_blockchain, block_bad, expected_error=Err.INVALID_POSPACE)
 
-        block_bad = recursive_replace(blocks[-1], "reward_chain_block.proof_of_space.size", 62)
+        block_bad = recursive_replace(blocks[-1], "reward_chain_block.proof_of_space.version_and_size", 62)
         await _validate_and_add_block(empty_blockchain, block_bad, expected_error=Err.INVALID_POSPACE)
 
         block_bad = recursive_replace(
@@ -1167,14 +1167,14 @@ async def test_bad_pos(self, empty_blockchain: Blockchain, bt: BlockTools) -> No
         await _validate_and_add_block(empty_blockchain, block_bad, expected_error=Err.INVALID_POSPACE)
         block_bad = recursive_replace(
             blocks[-1],
-            "reward_chain_block.proof_of_space.size",
+            "reward_chain_block.proof_of_space.version_and_size",
             32,
         )
         await _validate_and_add_block(empty_blockchain, block_bad, expected_error=Err.INVALID_POSPACE)
         block_bad = recursive_replace(
             blocks[-1],
             "reward_chain_block.proof_of_space.proof",
-            bytes([1] * int(blocks[-1].reward_chain_block.proof_of_space.size * 64 / 8)),
+            bytes([1] * int((blocks[-1].reward_chain_block.proof_of_space.version_and_size & 0x7F) * 64 / 8)),
         )
         await _validate_and_add_block(empty_blockchain, block_bad, expected_error=Err.INVALID_POSPACE)
 

chia/_tests/blockchain/test_blockchain.py

@@ -129,13 +129,13 @@ def test_message_error_conditions() -> None:
             mode_integer=uint8(0b111),
         ).necessary_args
 
-    with pytest.raises(ValueError, match="Must specify either mode_integer or both sender and reciever"):
+    with pytest.raises(ValueError, match="Must specify either mode_integer or both sender and receiver"):
         SendMessage(
             msg=b"foo",
             sender=MessageParticipant(coin_id_committed=test_coin.name()),
         )
 
-    with pytest.raises(ValueError, match="Must specify either mode_integer or both sender and reciever"):
+    with pytest.raises(ValueError, match="Must specify either mode_integer or both sender and receiver"):
         SendMessage(
             msg=b"foo",
             receiver=MessageParticipant(coin_id_committed=test_coin.name()),

chia/_tests/clvm/test_message_conditions.py

@@ -25,6 +25,7 @@
     get_bytes32,
 )
 from chia.cmds.cmds_util import TransactionBundle
+from chia.protocols.outbound_message import NodeType
 from chia.rpc.wallet_request_types import (
     CancelOfferResponse,
     CATSpendResponse,
@@ -33,7 +34,6 @@
     SendTransactionResponse,
     TakeOfferResponse,
 )
-from chia.server.outbound_message import NodeType
 from chia.types.blockchain_format.program import Program
 from chia.types.signing_mode import SigningMode
 from chia.util.bech32m import encode_puzzle_hash

chia/_tests/cmds/wallet/test_wallet.py

@@ -1257,7 +1257,7 @@ async def farmer_harvester_2_simulators_zero_bits_plot_filter(
     ]
 ]:
     zero_bit_plot_filter_consts = test_constants_modified.replace(
-        NUMBER_ZERO_BITS_PLOT_FILTER=uint8(0),
+        NUMBER_ZERO_BITS_PLOT_FILTER_V1=uint8(0),
         NUM_SPS_SUB_SLOT=uint32(8),
     )
 

chia/_tests/conftest.py

@@ -13,8 +13,8 @@
 
 from chia._tests.util.time_out_assert import time_out_assert
 from chia.apis import ApiProtocolRegistry
+from chia.protocols.outbound_message import NodeType
 from chia.protocols.shared_protocol import default_capabilities
-from chia.server.outbound_message import NodeType
 from chia.server.server import ChiaServer, ssl_context_for_client
 from chia.server.ssl_context import chia_ssl_ca_paths, private_ssl_ca_paths
 from chia.server.ws_connection import WSChiaConnection

chia/_tests/connection_utils.py

@@ -27,6 +27,7 @@ class ProofOfSpaceCase:
     marks: Marks = ()
 
 
+# TODO: test v2 plots
 @datacases(
     ProofOfSpaceCase(
         id="Neither pool public key nor pool contract puzzle hash",
@@ -108,7 +109,7 @@ def test_verify_and_get_quality_string(caplog: pytest.LogCaptureFixture, case: P
         pool_public_key=case.pool_public_key,
         pool_contract_puzzle_hash=case.pool_contract_puzzle_hash,
         plot_public_key=case.plot_public_key,
-        size=case.plot_size,
+        version_and_size=case.plot_size,
         proof=b"1",
     )
     quality_string = verify_and_get_quality_string(
@@ -125,7 +126,7 @@ def test_verify_and_get_quality_string(caplog: pytest.LogCaptureFixture, case: P
 
 
 class TestProofOfSpace:
-    @pytest.mark.parametrize("prefix_bits", [DEFAULT_CONSTANTS.NUMBER_ZERO_BITS_PLOT_FILTER, 8, 7, 6, 5, 1, 0])
+    @pytest.mark.parametrize("prefix_bits", [DEFAULT_CONSTANTS.NUMBER_ZERO_BITS_PLOT_FILTER_V1, 8, 7, 6, 5, 1, 0])
     def test_can_create_proof(self, prefix_bits: int, seeded_random: random.Random) -> None:
         """
         Tests that the change of getting a correct proof is exactly 1/target_filter.

chia/_tests/core/custom_types/test_proof_of_space.py

@@ -37,10 +37,15 @@ def create_valid_proof_of_inclusion(layer_count: int, other_hash_side: Side) ->
     other_hashes = [bytes32([i] * 32) for i in range(layer_count)]
 
     for other_hash in other_hashes:
-        new_layer = ProofOfInclusionLayer.from_hashes(
-            primary_hash=existing_hash,
+        if other_hash_side == Side.LEFT:
+            combined_hash = internal_hash(other_hash, existing_hash)
+        else:
+            combined_hash = internal_hash(existing_hash, other_hash)
+
+        new_layer = ProofOfInclusionLayer(
             other_hash_side=other_hash_side,
             other_hash=other_hash,
+            combined_hash=combined_hash,
         )
 
         layers.append(new_layer)

chia/_tests/core/data_layer/test_data_layer_util.py

@@ -17,8 +17,8 @@
 )
 from chia.farmer.farmer_api import FarmerAPI
 from chia.protocols import farmer_protocol
+from chia.protocols.outbound_message import Message, NodeType
 from chia.protocols.protocol_message_types import ProtocolMessageTypes
-from chia.server.outbound_message import Message, NodeType
 from chia.util.hash import std_hash
 from chia.util.task_referencer import create_referenced_task