typing fixes

Author: matt-o-how

chia/_tests/clvm/coin_store.py

@@ -2,7 +2,7 @@
 
 from collections import defaultdict
 from collections.abc import Iterator
-from dataclasses import dataclass, replace
+from dataclasses import dataclass
 from typing import Optional
 
 from chia_rs import ConsensusConstants, SpendBundle, check_time_locks
@@ -113,8 +113,13 @@ def update_coin_store_for_spend_bundle(
             self._add_coin_entry(new_coin, now)
         for spent_coin in removals:
             coin_name = spent_coin.name()
-            coin_record = self._db[coin_name]
-            self._db[coin_name] = replace(coin_record, spent_block_index=now.height)
+            self._db[coin_name] = CoinRecord(
+                self._db[coin_name].coin,
+                self._db[coin_name].confirmed_block_index,
+                now.height,
+                self._db[coin_name].coinbase,
+                self._db[coin_name].timestamp,
+            )
         return additions, spend_bundle.coin_spends
 
     def coins_for_puzzle_hash(self, puzzle_hash: bytes32) -> Iterator[Coin]:

chia/_tests/core/mempool/test_mempool_manager.py

@@ -431,7 +431,7 @@ def test_conditions(
         conds: SpendBundleConditions,
         expected: Optional[Err],
     ) -> None:
-        res = check_time_locks(
+        res: Optional[Union[int, Err]] = check_time_locks(
             dict(self.REMOVALS),
             conds,
             self.PREV_BLOCK_HEIGHT,
@@ -2340,7 +2340,13 @@ def __init__(self, coins: list[Coin], lineage: dict[bytes32, Coin]) -> None:
             self.lineage_info[ph] = UnspentLineageInfo(c.name(), c.parent_coin_info, bytes32([42] * 32))
 
     def spend_coin(self, coin_id: bytes32, height: uint32 = uint32(10)) -> None:
-        self.coin_records[coin_id] = dataclasses.replace(self.coin_records[coin_id], spent_block_index=height)
+        self.coin_records[coin_id] = CoinRecord(
+            self.coin_records[coin_id].coin,
+            self.coin_records[coin_id].confirmed_block_index,
+            height,
+            self.coin_records[coin_id].coinbase,
+            self.coin_records[coin_id].timestamp,
+        )
 
     def update_lineage(self, puzzle_hash: bytes32, coin: Optional[Coin]) -> None:
         if coin is None:

chia/full_node/mempool_manager.py

@@ -6,7 +6,7 @@
 from collections.abc import Awaitable, Collection
 from concurrent.futures import Executor, ThreadPoolExecutor
 from dataclasses import dataclass, field
-from typing import Callable, Optional, TypeVar
+from typing import Callable, Optional, TypeVar, Union
 
 from chia_rs import (
     ELIGIBLE_FOR_DEDUP,
@@ -734,7 +734,7 @@ async def validate_spend_bundle(
         # point-of-view of the next block to be farmed. Therefore we pass in the
         # current peak's height and timestamp
         assert self.peak.timestamp is not None
-        tl_error: Optional[Err] = check_time_locks(
+        tl_error: Optional[Union[int, Err]] = check_time_locks(
             removal_record_dict,
             conds,
             self.peak.height,