fix int to bool map

Author: matt-o-how

chia/consensus/block_body_validation.py

@@ -463,7 +463,7 @@ async def validate_block_body(
                 False,
                 block.foliage_transaction_block.timestamp,
             )
-            removal_coin_records[new_unspent.name] = new_unspent
+            removal_coin_records[new_unspent.name()] = new_unspent
         else:
             # This check applies to both coins created before fork (pulled from coin_store),
             # and coins created after fork (additions_since_fork)
@@ -485,17 +485,17 @@ async def validate_block_body(
             if unspent.spent() == 1 and unspent.spent_block_index <= fork_info.fork_height:
                 # Check for coins spent in an ancestor block
                 return Err.DOUBLE_SPEND
-            removal_coin_records[unspent.name] = unspent
+            removal_coin_records[unspent.name()] = unspent
         else:
-            look_in_fork.append(unspent.name)
+            look_in_fork.append(unspent.name())
 
     if log_coins and len(look_in_fork) > 0:
         log.info("%d coins spent after fork", len(look_in_fork))
 
     if len(unspent_records) != len(removals_from_db):
         # some coins could not be found in the DB. We need to find out which
         # ones and look for them in additions_since_fork
-        found: set[bytes32] = {u.name for u in unspent_records}
+        found: set[bytes32] = {u.name() for u in unspent_records}
         for rem in removals_from_db:
             if rem in found:
                 continue
@@ -553,7 +553,7 @@ async def validate_block_body(
 
     # 20. Verify that removed coin puzzle_hashes match with calculated puzzle_hashes
     for unspent in removal_coin_records.values():
-        if unspent.coin.puzzle_hash != removals_puzzle_dic[unspent.name]:
+        if unspent.coin.puzzle_hash != removals_puzzle_dic[unspent.name()]:
             return Err.WRONG_PUZZLE_HASH
 
     # 21. Verify conditions

chia/full_node/coin_store.py

@@ -173,7 +173,8 @@ async def get_coin_record(self, coin_name: bytes32) -> Optional[CoinRecord]:
                 if row is not None:
                     coin = self.row_to_coin(row)
                     spent_index = uint32(0) if row[1] <= 0 else uint32(row[1])
-                    return CoinRecord(coin, row[0], spent_index, row[2], row[6])
+                    coinbase = False if row[2] == 0 else True
+                    return CoinRecord(coin, row[0], spent_index, coinbase, row[6])
         return None
 
     async def get_coin_records(self, names: Collection[bytes32]) -> list[CoinRecord]:
@@ -199,7 +200,8 @@ async def get_coin_records(self, names: Collection[bytes32]) -> list[CoinRecord]
                 for row in await cursor.fetchall():
                     coin = self.row_to_coin(row)
                     spent_index = uint32(0) if row[1] <= 0 else uint32(row[1])
-                    record = CoinRecord(coin, row[0], spent_index, row[2], row[6])
+                    coinbase = False if row[2] == 0 else True
+                    record = CoinRecord(coin, row[0], spent_index, coinbase, row[6])
                     coins.append(record)
 
         return coins
@@ -233,7 +235,8 @@ async def get_coins_removed_at_height(self, height: uint32) -> list[CoinRecord]:
                 for row in await cursor.fetchall():
                     if row[1] > 0:
                         coin = self.row_to_coin(row)
-                        coin_record = CoinRecord(coin, row[0], row[1], row[2], row[6])
+                        coinbase = False if row[2] == 0 else True
+                        coin_record = CoinRecord(coin, row[0], row[1], coinbase, row[6])
                         coins.append(coin_record)
                 return coins
 
@@ -258,7 +261,8 @@ async def get_coin_records_by_puzzle_hash(
                 for row in await cursor.fetchall():
                     coin = self.row_to_coin(row)
                     spent_index = uint32(0) if row[1] <= 0 else uint32(row[1])
-                    coins.add(CoinRecord(coin, row[0], spent_index, row[2], row[6]))
+                    coinbase = False if row[2] == 0 else True
+                    coins.add(CoinRecord(coin, row[0], spent_index, coinbase, row[6]))
                 return list(coins)
 
     async def get_coin_records_by_puzzle_hashes(
@@ -287,7 +291,8 @@ async def get_coin_records_by_puzzle_hashes(
                 for row in await cursor.fetchall():
                     coin = self.row_to_coin(row)
                     spent_index = uint32(0) if row[1] <= 0 else uint32(row[1])
-                    coins.add(CoinRecord(coin, row[0], spent_index, row[2], row[6]))
+                    coinbase = False if row[2] == 0 else True
+                    coins.add(CoinRecord(coin, row[0], spent_index, coinbase, row[6]))
                 return list(coins)
 
     async def get_coin_records_by_names(
@@ -314,7 +319,8 @@ async def get_coin_records_by_names(
                 for row in await cursor.fetchall():
                     coin = self.row_to_coin(row)
                     spent_index = uint32(0) if row[1] <= 0 else uint32(row[1])
-                    coins.add(CoinRecord(coin, row[0], spent_index, row[2], row[6]))
+                    coinbase = False if row[2] == 0 else True
+                    coins.add(CoinRecord(coin, row[0], spent_index, coinbase, row[6]))
 
         return list(coins)
 
@@ -385,7 +391,8 @@ async def get_coin_records_by_parent_ids(
                     async for row in cursor:
                         coin = self.row_to_coin(row)
                         spent_index = uint32(0) if row[1] <= 0 else uint32(row[1])
-                        coins.add(CoinRecord(coin, row[0], spent_index, row[2], row[6]))
+                        coinbase = False if row[2] == 0 else True
+                        coins.add(CoinRecord(coin, row[0], spent_index, coinbase, row[6]))
 
         return list(coins)
 
@@ -559,7 +566,8 @@ async def rollback_to_block(self, block_index: int) -> dict[bytes32, CoinRecord]
             for row in rows:
                 coin = self.row_to_coin(row)
                 spent_index = uint32(0) if row[1] <= 0 else uint32(row[1])
-                record = CoinRecord(coin, uint32(0), spent_index, row[2], uint64(0))
+                coinbase = False if row[2] == 0 else True
+                record = CoinRecord(coin, uint32(0), spent_index, coinbase, uint64(0))
                 coin_name = bytes32(row[7])
                 coin_changes[coin_name] = record
 
@@ -574,7 +582,8 @@ async def rollback_to_block(self, block_index: int) -> dict[bytes32, CoinRecord]
             )
             for row in rows:
                 coin = self.row_to_coin(row)
-                record = CoinRecord(coin, row[0], uint32(0), row[2], row[6])
+                coinbase = False if row[2] == 0 else True
+                record = CoinRecord(coin, row[0], uint32(0), coinbase, row[6])
                 coin_name = bytes32(row[7])
                 if coin_name not in coin_changes:
                     coin_changes[coin_name] = record