bump chia_rs (#19802)

Author: arvidn

chia/_tests/blockchain/test_blockchain.py

@@ -4334,6 +4334,8 @@ async def test_include_spends_same_as_parent(
                 [],
                 [],
                 0,
+                0,
+                0,
             )
         ],
         0,
@@ -4388,7 +4390,10 @@ async def test_include_block_same_as_parent_coins(
     test_setup = ForkInfoTestSetup.create(same_ph_as_parent, same_amount_as_parent)
     # Now let's run the test
     test_setup.fork_info.include_block(
-        [(test_setup.child_coin, None)], [test_setup.coin], test_setup.test_block, test_setup.test_block.header_hash
+        [(test_setup.child_coin, None)],
+        [(test_setup.coin.name(), test_setup.coin)],
+        test_setup.test_block,
+        test_setup.test_block.header_hash,
     )
     # Let's make sure the results are as expected
     expected_same_as_parent_additions = (

chia/_tests/blockchain/test_build_chains.py

@@ -77,7 +77,7 @@ def validate_coins(constants: ConsensusConstants, blocks: list[FullBlock]) -> No
                 constants,
             )
 
-            for rem in removals:
+            for _, rem in removals:
                 try:
                     unspent_coins.remove(rem)
                 except KeyError:  # pragma: no cover

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

@@ -106,7 +106,7 @@ async def test_basic_coin_store(db_version: int, softfork_height: uint32, bt: Bl
                 additions, removals = additions_and_removals(
                     bytes(block.transactions_generator), [], flags, bt.constants
                 )
-                tx_removals = [removal.name() for removal in removals]
+                tx_removals = [name for name, _ in removals]
                 tx_additions = [(addition.name(), addition, False) for addition, _ in additions]
             else:
                 tx_removals, tx_additions = [], []

chia/_tests/core/full_node/test_full_node.py

@@ -2551,11 +2551,12 @@ async def validate_coin_set(coin_store: CoinStoreProtocol, blocks: list[FullBloc
         assert records == {}
 
         records = {rec.coin.name(): rec for rec in await coin_store.get_coins_removed_at_height(block.height)}
-        for rem in removals:
-            rec = records.pop(rem.name())
+        for name, rem in removals:
+            rec = records.pop(name)
             assert rec is not None
             assert rec.spent_block_index == block.height
             assert rec.coin == rem
+            assert name == rem.name()
 
         if len(records) > 0:  # pragma: no cover
             print(f"height: {block.height} unexpected removals: {records} TX: Yes")

chia/_tests/core/full_node/test_generator_tools.py

@@ -41,6 +41,8 @@
         [],
         [],
         0,
+        execution_cost=0,
+        condition_cost=0,
     ),
     SpendConditions(
         coin_ids[1],
@@ -66,6 +68,8 @@
         [],
         [],
         0,
+        execution_cost=0,
+        condition_cost=0,
     ),
 ]
 

chia/_tests/core/mempool/test_mempool_manager.py

@@ -359,6 +359,8 @@ def make_test_conds(
                 [],
                 [],
                 flags,
+                execution_cost=0,
+                condition_cost=0,
             )
             for coin_id, parent_id, puzzle_hash, amount, flags, create_coin in spend_info
         ],

chia/_tests/generator/test_rom.py

@@ -155,6 +155,10 @@ def test_get_name_puzzle_conditions(self, softfork_height: int) -> None:
             agg_sig_parent_amount=[],
             agg_sig_parent_puzzle=[],
             flags=0,
+            # in run_block_generator() we don't have access to separate
+            # execution cost, just in run_block_generator2()
+            execution_cost=0 if softfork_height < DEFAULT_CONSTANTS.HARD_FORK_HEIGHT else 44,
+            condition_cost=1800000,
         )
 
         assert npc_result.conds.spends == [spend]

chia/_tests/util/test_condition_tools.py

@@ -49,6 +49,8 @@ def mk_agg_sig_conditions(
         agg_sig_puzzle=agg_sig_data if opcode == ConditionOpcode.AGG_SIG_PUZZLE else [],
         agg_sig_puzzle_amount=agg_sig_data if opcode == ConditionOpcode.AGG_SIG_PUZZLE_AMOUNT else [],
         flags=0,
+        execution_cost=0,
+        condition_cost=0,
     )
     return SpendBundleConditions([spend], 0, 0, 0, None, None, agg_sig_unsafe_data, 0, 0, 0, False, 0, 0)
 

chia/_tests/util/test_replace_str_to_bytes.py

@@ -61,6 +61,7 @@
     POOL_SUB_SLOT_ITERS=uint64(37600000000),
     HARD_FORK_HEIGHT=uint32(5496000),
     HARD_FORK2_HEIGHT=uint32(0xFFFFFFFF),
+    PLOT_V1_PHASE_OUT=uint32(1179648),
     PLOT_FILTER_128_HEIGHT=uint32(10542000),
     PLOT_FILTER_64_HEIGHT=uint32(15592000),
     PLOT_FILTER_32_HEIGHT=uint32(20643000),

chia/consensus/block_body_validation.py

@@ -128,18 +128,17 @@ def include_spends(self, conds: Optional[SpendBundleConditions], block: FullBloc
     def include_block(
         self,
         additions: list[tuple[Coin, Optional[bytes]]],
-        removals: list[Coin],
+        removals: list[tuple[bytes32, Coin]],
         block: FullBlock,
         header_hash: bytes32,
     ) -> None:
         self.update_fork_peak(block, header_hash)
         if block.foliage_transaction_block is not None:
             timestamp = block.foliage_transaction_block.timestamp
             spent_coins: dict[bytes32, Coin] = {}
-            for spend in removals:
-                spend_id = bytes32(spend.name())
-                spent_coins[spend_id] = spend
-                self.removals_since_fork[spend_id] = ForkRem(bytes32(spend.puzzle_hash), block.height)
+            for spend_id, spend in removals:
+                spent_coins[bytes32(spend_id)] = spend
+                self.removals_since_fork[bytes32(spend_id)] = ForkRem(bytes32(spend.puzzle_hash), block.height)
             for coin, hint in additions:
                 parent = spent_coins.get(coin.parent_coin_info)
                 assert parent is not None