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

chia/_tests/core/full_node/stores/test_hint_store.py

@@ -6,6 +6,7 @@ import pytest
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint64
 
+from chia._tests.core.full_node.test_full_node import find_reward_coin
 from chia._tests.util.db_connection import DBConnection
 from chia.full_node.hint_store import HintStore
 from chia.server.server import ChiaServer
@@ -151,7 +152,6 @@ async def test_hints_in_blockchain(
         block_list_input=[],
         guarantee_transaction_block=True,
         farmer_reward_puzzle_hash=bt.pool_ph,
-        pool_reward_puzzle_hash=bt.pool_ph,
     )
     for block in blocks:
         await full_node_1.full_node.add_block(block, None)
@@ -160,7 +160,7 @@ async def test_hints_in_blockchain(
     puzzle_hash = bytes32(32 * b"\0")
     amount = int_to_bytes(1)
     hint = bytes32(32 * b"\5")
-    coin_spent = blocks[-1].get_included_reward_coins()[0]
+    coin_spent = find_reward_coin(blocks[-1], bt.pool_ph)
     condition_dict = {
         ConditionOpcode.CREATE_COIN: [ConditionWithArgs(ConditionOpcode.CREATE_COIN, [puzzle_hash, amount, hint])]
     }

chia/_tests/core/full_node/test_block_height_map.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 import os
 import struct
 from pathlib import Path
-from typing import Optional
 
 import pytest
 from chia_rs import SubEpochSummary
@@ -23,11 +22,11 @@ def gen_block_hash(height: int) -> bytes32:
 def gen_ses(height: int) -> SubEpochSummary:
     prev_ses = gen_block_hash(height + 0xFA0000)
     reward_chain_hash = gen_block_hash(height + 0xFC0000)
-    return SubEpochSummary(prev_ses, reward_chain_hash, uint8(0), None, None)
+    return SubEpochSummary(prev_ses, reward_chain_hash, uint8(0), None, None, None)
 
 
 async def new_block(
-    db: DBWrapper2, block_hash: bytes32, parent: bytes32, height: int, is_peak: bool, ses: Optional[SubEpochSummary]
+    db: DBWrapper2, block_hash: bytes32, parent: bytes32, height: int, is_peak: bool, ses: SubEpochSummary | None
 ) -> None:
     async with db.writer_maybe_transaction() as conn:
         cursor = await conn.execute(
@@ -67,7 +66,7 @@ async def setup_db(db: DBWrapper2) -> None:
 # and the chain_id will be mixed in to the hashes, to form a separate chain at
 # the same heights as the main chain
 async def setup_chain(
-    db: DBWrapper2, length: int, *, chain_id: int = 0, ses_every: Optional[int] = None, start_height: int = 0
+    db: DBWrapper2, length: int, *, chain_id: int = 0, ses_every: int | None = None, start_height: int = 0
 ) -> None:
     height = start_height
     peak_hash = gen_block_hash(height + chain_id * 65536)

chia/_tests/core/full_node/test_conditions.py

@@ -6,22 +6,21 @@ or that they're failing for the right reason when they're invalid.
 from __future__ import annotations
 
 import logging
-from typing import Optional
 
 import pytest
-from chia_rs import AugSchemeMPL, FullBlock, G2Element, SpendBundle
+from chia_rs import AugSchemeMPL, CoinRecord, FullBlock, G2Element, SpendBundle
 from chia_rs.sized_ints import uint32, uint64
 from clvm_tools.binutils import assemble
 
 from chia._tests.blockchain.blockchain_test_utils import _validate_and_add_block
 from chia._tests.conftest import ConsensusMode
 from chia._tests.core.full_node.ram_db import create_ram_blockchain
+from chia._tests.core.full_node.test_full_node import find_reward_coin
 from chia.consensus.condition_tools import agg_sig_additional_data
 from chia.simulator.block_tools import BlockTools
 from chia.simulator.keyring import TempKeyring
 from chia.types.blockchain_format.program import Program
 from chia.types.blockchain_format.serialized_program import SerializedProgram
-from chia.types.coin_record import CoinRecord
 from chia.types.coin_spend import make_spend
 from chia.types.condition_opcodes import ConditionOpcode
 from chia.util.casts import int_to_bytes
@@ -48,7 +47,6 @@ async def initial_blocks(bt: BlockTools, block_count: int = 4) -> list[FullBlock
         block_count,
         guarantee_transaction_block=True,
         farmer_reward_puzzle_hash=EASY_PUZZLE_HASH,
-        pool_reward_puzzle_hash=EASY_PUZZLE_HASH,
         genesis_timestamp=uint64(10000),
         time_per_block=10,
     )
@@ -59,7 +57,7 @@ async def check_spend_bundle_validity(
     bt: BlockTools,
     blocks: list[FullBlock],
     spend_bundle: SpendBundle,
-    expected_err: Optional[Err] = None,
+    expected_err: Err | None = None,
 ) -> tuple[list[CoinRecord], list[CoinRecord], FullBlock]:
     """
     This test helper create an extra block after the given blocks that contains the given
@@ -96,13 +94,13 @@ async def check_spend_bundle_validity(
 async def check_conditions(
     bt: BlockTools,
     condition_solution: Program,
-    expected_err: Optional[Err] = None,
+    expected_err: Err | None = None,
     spend_reward_index: int = -2,
     *,
     aggsig: G2Element = G2Element(),
 ) -> tuple[list[CoinRecord], list[CoinRecord], FullBlock]:
     blocks = await initial_blocks(bt)
-    coin = blocks[spend_reward_index].get_included_reward_coins()[0]
+    coin = find_reward_coin(blocks[spend_reward_index], EASY_PUZZLE_HASH)
 
     coin_spend = make_spend(coin, EASY_PUZZLE, condition_solution)
     spend_bundle = SpendBundle([coin_spend], aggsig)
@@ -144,9 +142,9 @@ class TestConditions:
         # once the hard fork activates, blocks no longer pay the cost of the ROM
         # generator (which includes hashing all puzzles).
         if consensus_mode >= ConsensusMode.HARD_FORK_2_0:
-            block_base_cost = 756064
+            block_base_cost = 756064 - 12000
         else:
-            block_base_cost = 761056
+            block_base_cost = 761056 - 12000
         assert new_block.transactions_info is not None
         assert new_block.transactions_info.cost - block_base_cost == expected_cost
 
@@ -165,11 +163,11 @@ class TestConditions:
         _additions, _removals, new_block = await check_conditions(bt, conditions)
 
         if consensus_mode < ConsensusMode.HARD_FORK_2_0:
-            block_base_cost = 737056
+            block_base_cost = 737056 - 12000
         else:
             # once the hard fork activates, blocks no longer pay the cost of the ROM
             # generator (which includes hashing all puzzles).
-            block_base_cost = 732064
+            block_base_cost = 732064 - 12000
 
         # the block_base_cost includes the cost of the bytes for the condition
         # with 2 bytes argument. This test works as long as the conditions it's
@@ -268,7 +266,7 @@ class TestConditions:
     @pytest.mark.anyio
     async def test_invalid_my_id(self, bt: BlockTools) -> None:
         blocks = await initial_blocks(bt)
-        coin = blocks[-2].get_included_reward_coins()[0]
+        coin = find_reward_coin(blocks[-2], EASY_PUZZLE_HASH)
         wrong_name = bytearray(coin.name())
         wrong_name[-1] ^= 1
         conditions = Program.to(assemble(f"(({ConditionOpcode.ASSERT_MY_COIN_ID[0]} 0x{wrong_name.hex()}))"))
@@ -277,14 +275,14 @@ class TestConditions:
     @pytest.mark.anyio
     async def test_valid_my_id(self, bt: BlockTools) -> None:
         blocks = await initial_blocks(bt)
-        coin = blocks[-2].get_included_reward_coins()[0]
+        coin = find_reward_coin(blocks[-2], EASY_PUZZLE_HASH)
         conditions = Program.to(assemble(f"(({ConditionOpcode.ASSERT_MY_COIN_ID[0]} 0x{coin.name().hex()}))"))
         await check_conditions(bt, conditions)
 
     @pytest.mark.anyio
     async def test_invalid_coin_announcement(self, bt: BlockTools) -> None:
         blocks = await initial_blocks(bt)
-        coin = blocks[-2].get_included_reward_coins()[0]
+        coin = find_reward_coin(blocks[-2], EASY_PUZZLE_HASH)
         announce = AssertCoinAnnouncement(asserted_id=coin.name(), asserted_msg=b"test_bad")
         conditions = Program.to(
             assemble(
@@ -297,7 +295,7 @@ class TestConditions:
     @pytest.mark.anyio
     async def test_valid_coin_announcement(self, bt: BlockTools) -> None:
         blocks = await initial_blocks(bt)
-        coin = blocks[-2].get_included_reward_coins()[0]
+        coin = find_reward_coin(blocks[-2], EASY_PUZZLE_HASH)
         announce = AssertCoinAnnouncement(asserted_id=coin.name(), asserted_msg=b"test")
         conditions = Program.to(
             assemble(
@@ -366,7 +364,7 @@ class TestConditions:
         condition1: str,
         condition2: str,
         num: int,
-        expect_err: Optional[Err],
+        expect_err: Err | None,
         bt: BlockTools,
     ) -> None:
         """
@@ -375,7 +373,7 @@ class TestConditions:
         """
 
         blocks = await initial_blocks(bt)
-        coin = blocks[-2].get_included_reward_coins()[0]
+        coin = find_reward_coin(blocks[-2], EASY_PUZZLE_HASH)
         coin_announcement = AssertCoinAnnouncement(asserted_id=coin.name(), asserted_msg=b"test")
         puzzle_announcement = AssertPuzzleAnnouncement(asserted_ph=EASY_PUZZLE_HASH, asserted_msg=b"test")
 
@@ -405,7 +403,7 @@ class TestConditions:
     @pytest.mark.anyio
     async def test_coin_messages(self, bt: BlockTools, consensus_mode: ConsensusMode) -> None:
         blocks = await initial_blocks(bt)
-        coin = blocks[-2].get_included_reward_coins()[0]
+        coin = find_reward_coin(blocks[-2], EASY_PUZZLE_HASH)
         conditions = Program.to(
             assemble(
                 f"(({ConditionOpcode.SEND_MESSAGE[0]} 0x3f 'test' 0x{coin.name().hex()})"
@@ -417,7 +415,7 @@ class TestConditions:
     @pytest.mark.anyio
     async def test_parent_messages(self, bt: BlockTools, consensus_mode: ConsensusMode) -> None:
         blocks = await initial_blocks(bt)
-        coin = blocks[-2].get_included_reward_coins()[0]
+        coin = find_reward_coin(blocks[-2], EASY_PUZZLE_HASH)
         conditions = Program.to(
             assemble(
                 f"(({ConditionOpcode.SEND_MESSAGE[0]} 0x24 'test' 0x{coin.parent_coin_info})"
@@ -438,7 +436,7 @@ class TestConditions:
             ('(66 0x27 "foo" {coin}) (67 0x3f "foo" {coin})', Err.MESSAGE_NOT_SENT_OR_RECEIVED),
             ('(66 0 "foo") (67 0 "foo")', None),
             ('(66 0 "foobar") (67 0 "foo")', Err.MESSAGE_NOT_SENT_OR_RECEIVED),
-            ('(66 0x09 "foo" 1750000000000) (67 0x09 "foo" 1750000000000)', None),
+            ('(66 0x09 "foo" 250000000000) (67 0x09 "foo" 250000000000)', None),
             ('(66 -1 "foo")', Err.INVALID_MESSAGE_MODE),
             ('(67 -1 "foo")', Err.INVALID_MESSAGE_MODE),
             ('(66 0x40 "foo")', Err.INVALID_MESSAGE_MODE),
@@ -446,10 +444,10 @@ class TestConditions:
         ],
     )
     async def test_message_conditions(
-        self, bt: BlockTools, consensus_mode: ConsensusMode, conds: str, expected: Optional[Err]
+        self, bt: BlockTools, consensus_mode: ConsensusMode, conds: str, expected: Err | None
     ) -> None:
         blocks = await initial_blocks(bt)
-        coin = blocks[-2].get_included_reward_coins()[0]
+        coin = find_reward_coin(blocks[-2], EASY_PUZZLE_HASH)
         conditions = Program.to(assemble("(" + conds.format(coin="0x" + coin.name().hex()) + ")"))
 
         await check_conditions(bt, conditions, expected_err=expected)
@@ -522,7 +520,7 @@ class TestConditions:
 
         sk = AugSchemeMPL.key_gen(b"8" * 32)
         pubkey = sk.get_g1()
-        coin = blocks[-2].get_included_reward_coins()[0]
+        coin = find_reward_coin(blocks[-2], EASY_PUZZLE_HASH)
         for msg in [
             c.AGG_SIG_ME_ADDITIONAL_DATA,
             c.AGG_SIG_PARENT_ADDITIONAL_DATA,