Bump chia rs 0.28 (#19891)

* bump chia_rs to 0.29

* correct return value from get_spends_for_trusted_block()

* remove unnecessary casts

* adjust test for the new error messages in chia_rs

* Update chia/full_node/full_node_rpc_api.py

Co-authored-by: Kyle Altendorf <[email protected]>

---------

Co-authored-by: Kyle Altendorf <[email protected]>

Author: arvidn

chia/_tests/clvm/coin_store.py

@@ -73,7 +73,7 @@ def validate_spend_bundle(self, spend_bundle: SpendBundle, now: CoinTimestamp, m
         assert result.conds is not None
         for spend in result.conds.spends:
             for puzzle_hash, amount, hint in spend.create_coin:
-                coin = Coin(bytes32(spend.coin_id), bytes32(puzzle_hash), uint64(amount))
+                coin = Coin(spend.coin_id, puzzle_hash, uint64(amount))
                 name = coin.name()
                 ephemeral_db[name] = CoinRecord(
                     coin,

chia/_tests/core/full_node/test_generator_tools.py

@@ -8,7 +8,6 @@
     get_spends_for_trusted_block,
     get_spends_for_trusted_block_with_conditions,
 )
-from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint32, uint64
 
 from chia.consensus.generator_tools import tx_removals_and_additions
@@ -86,7 +85,7 @@ def test_tx_removals_and_additions() -> None:
     expected_additions = []
     for spend in spends:
         for puzzle_hash, am, _ in spend.create_coin:
-            expected_additions.append(Coin(bytes32(spend.coin_id), bytes32(puzzle_hash), uint64(am)))
+            expected_additions.append(Coin(spend.coin_id, puzzle_hash, uint64(am)))
     rems, adds = tx_removals_and_additions(conditions)
     assert rems == expected_rems
     assert adds == expected_additions
@@ -109,7 +108,7 @@ def test_get_spends_for_block(caplog: pytest.LogCaptureFixture) -> None:
     conditions = get_spends_for_trusted_block(
         test_constants, TEST_GENERATOR.program, TEST_GENERATOR.generator_refs, 100
     )
-    assert conditions[0]["block_spends"] == []
+    assert conditions["block_spends"] == []
 
 
 def test_get_spends_for_block_with_conditions(caplog: pytest.LogCaptureFixture) -> None:

chia/_tests/core/mempool/test_mempool.py

@@ -3197,7 +3197,9 @@ def add_spend_bundles(spend_bundles: list[SpendBundle]) -> None:
 
 def test_get_puzzle_and_solution_for_coin_failure() -> None:
     with pytest.raises(
-        ValueError, match=f"Failed to get puzzle and solution for coin {TEST_COIN}, error: \\('coin not found', '80'\\)"
+        ValueError,
+        match=f"Failed to get puzzle and solution for coin {TEST_COIN}, "
+        "error: \\('InvalidOperatorArg: coin not found', '80'\\)",
     ):
         try:
             get_puzzle_and_solution_for_coin(

chia/_tests/generator/test_rom.py

@@ -146,7 +146,7 @@ def test_get_name_puzzle_conditions(self, softfork_height: int) -> None:
             before_seconds_relative=None,
             birth_height=None,
             birth_seconds=None,
-            create_coin=[(bytes([0] * 31 + [1]), 500, None)],
+            create_coin=[(bytes32([0] * 31 + [1]), 500, None)],
             agg_sig_me=[],
             agg_sig_parent=[],
             agg_sig_puzzle=[],

chia/cmds/show_funcs.py

@@ -39,7 +39,7 @@ async def print_blockchain_state(node_client: FullNodeRpcClient, config: dict[st
 
     if synced:
         print("Current Blockchain Status: Full Node Synced")
-        print("\nPeak: Hash:", bytes32(peak.header_hash) if peak is not None else "")
+        print("\nPeak: Hash:", peak.header_hash if peak is not None else "")
     elif peak is not None and sync_mode:
         sync_max_block = blockchain_state["sync"]["sync_tip_height"]
         sync_current_block = blockchain_state["sync"]["sync_progress_height"]
@@ -48,7 +48,7 @@ async def print_blockchain_state(node_client: FullNodeRpcClient, config: dict[st
             f"({sync_max_block - sync_current_block} behind). "
             f"({sync_current_block * 100.0 / sync_max_block:2.2f}% synced)"
         )
-        print("Peak: Hash:", bytes32(peak.header_hash) if peak is not None else "")
+        print("Peak: Hash:", peak.header_hash if peak is not None else "")
     elif peak is not None:
         print(f"Current Blockchain Status: Not Synced. Peak height: {peak.height}")
     else:
@@ -59,7 +59,7 @@ async def print_blockchain_state(node_client: FullNodeRpcClient, config: dict[st
         if peak.is_transaction_block:
             peak_time = peak.timestamp
         else:
-            peak_hash = bytes32(peak.header_hash)
+            peak_hash = peak.header_hash
             curr = await node_client.get_block_record(peak_hash)
             while curr is not None and not curr.is_transaction_block:
                 curr = await node_client.get_block_record(curr.prev_hash)
@@ -88,7 +88,7 @@ async def print_blockchain_state(node_client: FullNodeRpcClient, config: dict[st
             curr = await node_client.get_block_record(curr.prev_hash)
 
         for b in added_blocks:
-            print(f"{b.height:>9} | {bytes32(b.header_hash)}")
+            print(f"{b.height:>9} | {b.header_hash}")
     else:
         print("Blockchain has no blocks yet")
     return False
@@ -125,7 +125,7 @@ async def print_block_from_hash(
             cost = str(full_block.transactions_info.cost)
             tx_filter_hash: Union[str, bytes32] = "Not a transaction block"
             if full_block.foliage_transaction_block:
-                tx_filter_hash = bytes32(full_block.foliage_transaction_block.filter_hash)
+                tx_filter_hash = full_block.foliage_transaction_block.filter_hash
             fees: Any = block.fees
         else:
             block_time_string = "Not a transaction block"

chia/consensus/block_body_validation.py

@@ -116,9 +116,9 @@ def include_spends(self, conds: Optional[SpendBundleConditions], block: FullBloc
             timestamp = block.foliage_transaction_block.timestamp
             for spend in conds.spends:
                 spend_coin_id = bytes32(spend.coin_id)
-                self.removals_since_fork[spend_coin_id] = ForkRem(bytes32(spend.puzzle_hash), block.height)
+                self.removals_since_fork[spend_coin_id] = ForkRem(spend.puzzle_hash, block.height)
                 for puzzle_hash, amount, hint in spend.create_coin:
-                    coin = Coin(spend_coin_id, bytes32(puzzle_hash), uint64(amount))
+                    coin = Coin(spend_coin_id, puzzle_hash, uint64(amount))
                     same_as_parent = coin.puzzle_hash == spend.puzzle_hash and amount == spend.coin_amount
                     self.additions_since_fork[coin.name()] = ForkAdd(
                         coin, block.height, timestamp, hint=hint, is_coinbase=False, same_as_parent=same_as_parent
@@ -137,8 +137,8 @@ def include_block(
             timestamp = block.foliage_transaction_block.timestamp
             spent_coins: dict[bytes32, Coin] = {}
             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)
+                spent_coins[spend_id] = spend
+                self.removals_since_fork[spend_id] = ForkRem(spend.puzzle_hash, block.height)
             for coin, hint in additions:
                 parent = spent_coins.get(coin.parent_coin_info)
                 assert parent is not None
@@ -382,9 +382,9 @@ async def validate_block_body(
 
         for spend in conds.spends:
             removals.append(bytes32(spend.coin_id))
-            removals_puzzle_dic[bytes32(spend.coin_id)] = bytes32(spend.puzzle_hash)
+            removals_puzzle_dic[spend.coin_id] = spend.puzzle_hash
             for puzzle_hash, amount, _ in spend.create_coin:
-                c = Coin(bytes32(spend.coin_id), bytes32(puzzle_hash), uint64(amount))
+                c = Coin(spend.coin_id, puzzle_hash, uint64(amount))
                 additions.append((c, c.name()))
     else:
         assert conds is None

chia/consensus/generator_tools.py

@@ -65,6 +65,6 @@ def tx_removals_and_additions(results: Optional[SpendBundleConditions]) -> tuple
     for spend in results.spends:
         removals.append(bytes32(spend.coin_id))
         for puzzle_hash, amount, _ in spend.create_coin:
-            additions.append(Coin(bytes32(spend.coin_id), bytes32(puzzle_hash), uint64(amount)))
+            additions.append(Coin(spend.coin_id, puzzle_hash, uint64(amount)))
 
     return removals, additions

chia/full_node/full_node_rpc_api.py

@@ -481,10 +481,9 @@ async def get_block_spends(self, request: dict[str, Any]) -> EndpointResult:
         if full_block is None:
             raise ValueError(f"Block {header_hash.hex()} not found")
 
-        spends: list[dict[str, list[CoinSpend]]] = []
         block_generator = await get_block_generator(self.service.blockchain.lookup_block_generators, full_block)
         if block_generator is None:  # if block is not a transaction block.
-            return {"block_spends": spends}
+            return {"block_spends": []}
 
         spends = get_spends_for_trusted_block(
             self.service.constants,
@@ -493,9 +492,7 @@ async def get_block_spends(self, request: dict[str, Any]) -> EndpointResult:
             get_flags_for_height_and_constants(full_block.height, self.service.constants),
         )
 
-        # chia_rs returning a list is a mistake that will be fixed in the next release
-        # it ought to be returning a dict of {"block_spends": [spends]}
-        return spends[0]
+        return spends
 
     async def get_block_spends_with_conditions(self, request: dict[str, Any]) -> EndpointResult:
         if "header_hash" not in request:

chia/full_node/mempool_manager.py

@@ -609,7 +609,7 @@ async def validate_spend_bundle(
                 # Make sure the fast forward spend still has a version that is
                 # still unspent, because if the singleton has been melted, the
                 # fast forward spend will never become valid.
-                lineage_info = await get_unspent_lineage_info_for_puzzle_hash(bytes32(spend_conds.puzzle_hash))
+                lineage_info = await get_unspent_lineage_info_for_puzzle_hash(spend_conds.puzzle_hash)
                 if lineage_info is None:
                     return Err.DOUBLE_SPEND, None, []
 

chia/full_node/subscriptions.py

@@ -225,11 +225,11 @@ def peers_for_spend_bundle(
 
     for spend in conds.spends:
         coin_ids.add(bytes32(spend.coin_id))
-        puzzle_hashes.add(bytes32(spend.puzzle_hash))
+        puzzle_hashes.add(spend.puzzle_hash)
 
         for puzzle_hash, amount, memo in spend.create_coin:
             coin_ids.add(Coin(spend.coin_id, puzzle_hash, uint64(amount)).name())
-            puzzle_hashes.add(bytes32(puzzle_hash))
+            puzzle_hashes.add(puzzle_hash)
 
             if memo is not None and len(memo) == 32:
                 puzzle_hashes.add(bytes32(memo))