chia-blockchain 2.5.2rc2__py3-none-any.whl → 2.5.3rc1__py3-none-any.whl

chia/types/mempool_item.py

@@ -3,16 +3,17 @@ from __future__ import annotations
 from dataclasses import dataclass, field
 from typing import Any, Optional
 
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32, uint64
+
 from chia.types.blockchain_format.coin import Coin
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.coin_spend import CoinSpend
 from chia.types.spend_bundle import SpendBundle
 from chia.types.spend_bundle_conditions import SpendBundleConditions
-from chia.util.ints import uint32, uint64
 from chia.util.streamable import recurse_jsonify
 
 
-@dataclass(frozen=True)
+@dataclass
 class BundleCoinSpend:
     coin_spend: CoinSpend
     eligible_for_dedup: bool
@@ -21,6 +22,12 @@ class BundleCoinSpend:
     # cost on the specific solution in this item
     cost: Optional[uint64] = None
 
+    # if this spend is eligible for fast forward, this may be set to the
+    # current unspent coin belonging to this singleton, that we would rebase
+    # this spen on top of if we were to make a block now
+    # When finding MempoolItems by coin ID, we use this Coin ID if it's set
+    latest_singleton_coin: Optional[bytes32] = None
+
 
 @dataclass(frozen=True)
 class MempoolItem:

chia/types/mempool_submission_status.py

@@ -3,8 +3,9 @@ from __future__ import annotations
 from dataclasses import dataclass
 from typing import Optional, Union
 
+from chia_rs.sized_ints import uint8
+
 from chia.types.mempool_inclusion_status import MempoolInclusionStatus
-from chia.util.ints import uint8
 from chia.util.streamable import Streamable, streamable
 
 

chia/types/mojos.py

@@ -2,6 +2,6 @@ from __future__ import annotations
 
 from typing import NewType
 
-from chia.util.ints import uint64
+from chia_rs.sized_ints import uint64
 
 Mojos = NewType("Mojos", uint64)

chia/types/peer_info.py

@@ -4,7 +4,8 @@ import ipaddress
 from dataclasses import dataclass
 from typing import Union
 
-from chia.util.ints import uint16, uint64
+from chia_rs.sized_ints import uint16, uint64
+
 from chia.util.ip_address import IPAddress
 from chia.util.streamable import Streamable, streamable
 

chia/types/transaction_queue_entry.py

@@ -5,8 +5,9 @@ import dataclasses
 from dataclasses import dataclass, field
 from typing import ClassVar, Generic, Optional, TypeVar, Union
 
+from chia_rs.sized_bytes import bytes32
+
 from chia.server.ws_connection import WSChiaConnection
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.mempool_inclusion_status import MempoolInclusionStatus
 from chia.types.spend_bundle import SpendBundle
 from chia.util.errors import Err

chia/types/unfinished_header_block.py

@@ -3,12 +3,12 @@ from __future__ import annotations
 from dataclasses import dataclass
 from typing import Optional
 
-from chia.types.blockchain_format.foliage import Foliage, FoliageTransactionBlock
-from chia.types.blockchain_format.reward_chain_block import RewardChainBlockUnfinished
-from chia.types.blockchain_format.sized_bytes import bytes32
+from chia_rs import Foliage, FoliageTransactionBlock, RewardChainBlockUnfinished
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint128
+
 from chia.types.blockchain_format.vdf import VDFProof
 from chia.types.end_of_slot_bundle import EndOfSubSlotBundle
-from chia.util.ints import uint128
 from chia.util.streamable import Streamable, streamable
 
 

chia/types/validation_state.py

@@ -3,8 +3,9 @@ from __future__ import annotations
 import dataclasses
 from typing import Optional
 
+from chia_rs.sized_ints import uint64
+
 from chia.consensus.block_record import BlockRecord
-from chia.util.ints import uint64
 
 
 @dataclasses.dataclass

chia/types/weight_proof.py

@@ -2,15 +2,12 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 
-import chia_rs
+from chia_rs import RewardChainBlock, SubEpochChallengeSegment, SubEpochData
 
-from chia.types.blockchain_format.reward_chain_block import RewardChainBlock
 from chia.types.end_of_slot_bundle import EndOfSubSlotBundle
 from chia.types.header_block import HeaderBlock
 from chia.util.streamable import Streamable, streamable
 
-SubEpochData = chia_rs.SubEpochData
-
 # number of challenge blocks
 # Average iters for challenge blocks
 # |--A-R----R-------R--------R------R----R----------R-----R--R---|       Honest difficulty 1000
@@ -22,11 +19,6 @@ SubEpochData = chia_rs.SubEpochData
 # total number of challenge blocks == total number of reward chain blocks
 
 
-SubEpochChallengeSegment = chia_rs.SubEpochChallengeSegment
-SubEpochSegments = chia_rs.SubEpochSegments
-SubSlotData = chia_rs.SubSlotData
-
-
 @streamable
 @dataclass(frozen=True)
 # this is used only for serialization to database

chia/util/augmented_chain.py

@@ -2,12 +2,13 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, ClassVar, Optional, cast
 
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32
+
 from chia.consensus.block_record import BlockRecord
 from chia.consensus.blockchain_interface import BlocksProtocol
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.full_block import FullBlock
 from chia.util.errors import Err
-from chia.util.ints import uint32
 
 
 class AugmentedBlockchain:
@@ -46,9 +47,16 @@ class AugmentedBlockchain:
         self._height_to_hash[block_record.height] = block_record.header_hash
 
     def remove_extra_block(self, hh: bytes32) -> None:
-        if hh in self._extra_blocks:
-            block_record = self._extra_blocks.pop(hh)[1]
-            del self._height_to_hash[block_record.height]
+        if hh not in self._extra_blocks:
+            return
+
+        block_record = self._extra_blocks.pop(hh)[1]
+        if self._underlying.contains_block(block_record.header_hash, block_record.height):
+            height_to_remove = block_record.height
+            for h in range(height_to_remove, -1, -1):
+                if h not in self._height_to_hash:
+                    break
+                del self._height_to_hash[uint32(h)]
 
     # BlocksProtocol
     async def lookup_block_generators(self, header_hash: bytes32, generator_refs: set[uint32]) -> dict[uint32, bytes]:
@@ -82,12 +90,11 @@ class AugmentedBlockchain:
 
     def add_block_record(self, block_record: BlockRecord) -> None:
         self._underlying.add_block_record(block_record)
-
+        self._height_to_hash[block_record.height] = block_record.header_hash
         # now that we're adding the block to the underlying blockchain, we don't
         # need to keep the extra block around anymore
         hh = block_record.header_hash
         if hh in self._extra_blocks:
-            del self._height_to_hash[block_record.height]
             del self._extra_blocks[hh]
 
     # BlockRecordsProtocol
@@ -109,6 +116,7 @@ class AugmentedBlockchain:
             ret = self._get_block_record(header_hash)
             if ret is not None:
                 return ret
+            return self._underlying.block_record(header_hash)
         return self._underlying.height_to_block_record(height)
 
     def height_to_hash(self, height: uint32) -> Optional[bytes32]:
@@ -117,8 +125,11 @@ class AugmentedBlockchain:
             return ret
         return self._underlying.height_to_hash(height)
 
-    def contains_block(self, header_hash: bytes32) -> bool:
-        return (header_hash in self._extra_blocks) or self._underlying.contains_block(header_hash)
+    def contains_block(self, header_hash: bytes32, height: uint32) -> bool:
+        block_hash_from_hh = self.height_to_hash(height)
+        if block_hash_from_hh is None or block_hash_from_hh != header_hash:
+            return False
+        return True
 
     def contains_height(self, height: uint32) -> bool:
         return (height in self._height_to_hash) or self._underlying.contains_height(height)

chia/util/block_cache.py

@@ -2,9 +2,10 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, ClassVar, Optional, cast
 
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32
+
 from chia.consensus.block_record import BlockRecord
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint32
 
 
 # implements BlockRecordsProtocol
@@ -43,8 +44,11 @@ class BlockCache:
             return None
         return self._height_to_hash[height]
 
-    def contains_block(self, header_hash: bytes32) -> bool:
-        return header_hash in self._block_records
+    def contains_block(self, header_hash: bytes32, height: uint32) -> bool:
+        block_hash_from_hh = self.height_to_hash(height)
+        if block_hash_from_hh is None or block_hash_from_hh != header_hash:
+            return False
+        return True
 
     def contains_height(self, height: uint32) -> bool:
         return height in self._height_to_hash

chia/util/condition_tools.py

@@ -4,18 +4,18 @@ from functools import lru_cache
 from typing import Callable, Union
 
 from chia_rs import G1Element
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
 from clvm.casts import int_from_bytes, int_to_bytes
 
 from chia.types.blockchain_format.coin import Coin
 from chia.types.blockchain_format.program import Program
 from chia.types.blockchain_format.serialized_program import SerializedProgram
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.condition_opcodes import ConditionOpcode
 from chia.types.condition_with_args import ConditionWithArgs
 from chia.types.spend_bundle_conditions import SpendBundleConditions, SpendConditions
 from chia.util.errors import ConsensusError, Err
 from chia.util.hash import std_hash
-from chia.util.ints import uint64
 
 
 def parse_sexp_to_condition(sexp: Program) -> ConditionWithArgs:

chia/util/full_block_utils.py

@@ -3,14 +3,13 @@ from __future__ import annotations
 from dataclasses import dataclass
 from typing import Callable, Optional
 
-from chia_rs import G1Element, G2Element, serialized_length
+from chia_rs import G1Element, G2Element, TransactionsInfo, serialized_length
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32
 from chiabip158 import PyBIP158
 
 from chia.types.blockchain_format.coin import Coin
-from chia.types.blockchain_format.foliage import TransactionsInfo
 from chia.types.blockchain_format.serialized_program import SerializedProgram
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint32
 
 
 def skip_list(buf: memoryview, skip_item: Callable[[memoryview], memoryview]) -> memoryview:

chia/util/generator_tools.py

@@ -3,14 +3,14 @@ from __future__ import annotations
 from collections.abc import Collection
 from typing import Optional
 
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
 from chiabip158 import PyBIP158
 
 from chia.types.blockchain_format.coin import Coin
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.full_block import FullBlock
 from chia.types.header_block import HeaderBlock
 from chia.types.spend_bundle_conditions import SpendBundleConditions
-from chia.util.ints import uint64
 
 
 def get_block_header(

chia/util/initial-config.yaml

@@ -264,19 +264,9 @@ timelord:
   logging: *logging
   network_overrides: *network_overrides
   selected_network: *selected_network
-  # fast_algorithm is a faster proof generation algorithm. This speed increase
-  # requires much less memory usage and a does not have the risk of OOM that
-  # the normal timelord has but requires significantly more cores doing
-  # parallel proof generation and creates a larger and slower to verify
-  # resulting proof.
-  # An Intel Core i9-10900K can run 2 normal vdf_clients at ~221,000 ips
-  # without slowing down but running more than 1 with fast_algorithm will
-  # run each vdf_client slower.
-  fast_algorithm: False
   # Bluebox (sanitizing timelord):
   # If set 'True', the timelord will create compact proofs of time, instead of
-  # extending the chain. The attribute 'fast_algorithm' won't apply if timelord
-  # is running in bluebox_mode.
+  # extending the chain.
   # You must set 'send_uncompact_interval' in 'full_node' > 0 in the full_node
   # section below to have full_node send existing time proofs to be sanitized.
   bluebox_mode: False
@@ -488,6 +478,7 @@ introducer:
   logging: *logging
   network_overrides: *network_overrides
   selected_network: *selected_network
+  dns_servers: *dns_servers
 
   ssl:
     public_crt: "config/ssl/full_node/public_full_node.crt"

chia/util/network.py

@@ -12,10 +12,10 @@ from typing import Any, Literal, Optional, Union
 
 from aiohttp import web
 from aiohttp.log import web_logger
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint16
 from typing_extensions import final
 
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint16
 from chia.util.ip_address import IPAddress
 from chia.util.task_referencer import create_referenced_task
 

chia/util/prev_transaction_block.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
+from chia_rs.sized_ints import uint128
+
 from chia.consensus.block_record import BlockRecord
 from chia.consensus.blockchain_interface import BlockRecordsProtocol
-from chia.util.ints import uint128
 
 
 def get_prev_transaction_block(

chia/util/task_timing.py

@@ -250,7 +250,7 @@ def start_task_instrumentation() -> None:
 
 def color(pct: float) -> str:
     assert pct >= 0 and pct <= 100
-    return f"{int((100. - pct) // 10) + 1}"
+    return f"{((100 - pct) // 10) + 1}"
 
 
 def fontcolor(pct: float) -> str:

chia/util/vdf_prover.py

@@ -1,12 +1,12 @@
 from __future__ import annotations
 
+from chia_rs import ConsensusConstants
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint64
 from chiavdf import prove
 
-from chia.consensus.constants import ConsensusConstants
 from chia.types.blockchain_format.classgroup import ClassgroupElement
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.blockchain_format.vdf import VDFInfo, VDFProof
-from chia.util.ints import uint8, uint64
 
 
 def get_vdf_info_and_proof(

chia/util/ws_message.py

@@ -2,9 +2,9 @@ from __future__ import annotations
 
 from typing import Any, Optional
 
+from chia_rs.sized_bytes import bytes32
 from typing_extensions import TypedDict
 
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.json_util import dict_to_json_str
 
 # Messages must follow this format

chia/wallet/cat_wallet/cat_info.py

@@ -3,9 +3,10 @@ from __future__ import annotations
 from dataclasses import dataclass
 from typing import Optional
 
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
+
 from chia.types.blockchain_format.program import Program
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint64
 from chia.util.streamable import Streamable, streamable
 from chia.wallet.lineage_proof import LineageProof
 from chia.wallet.vc_wallet.cr_cat_drivers import ProofsChecker

chia/wallet/cat_wallet/cat_outer_puzzle.py

@@ -3,11 +3,12 @@ from __future__ import annotations
 from dataclasses import dataclass
 from typing import Any, Callable, Optional
 
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
+
 from chia.types.blockchain_format.coin import Coin
 from chia.types.blockchain_format.program import Program
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.coin_spend import CoinSpend
-from chia.util.ints import uint64
 from chia.wallet.cat_wallet.cat_utils import (
     CAT_MOD,
     SpendableCAT,

chia/wallet/cat_wallet/cat_utils.py

@@ -4,24 +4,26 @@ import dataclasses
 from collections.abc import Iterator
 from typing import Optional, Union
 
+from chia_puzzles_py.programs import CAT_PUZZLE, CAT_PUZZLE_HASH
 from chia_rs import G2Element
+from chia_rs.sized_bytes import bytes32
 
 from chia.types.blockchain_format.coin import Coin, coin_as_list
 from chia.types.blockchain_format.program import INFINITE_COST, Program
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.coin_spend import make_spend
 from chia.types.condition_opcodes import ConditionOpcode
 from chia.util.condition_tools import conditions_dict_for_solution
 from chia.wallet.lineage_proof import LineageProof
-from chia.wallet.puzzles.load_clvm import load_clvm_maybe_recompile
 from chia.wallet.uncurried_puzzle import UncurriedPuzzle
+from chia.wallet.util.curry_and_treehash import calculate_hash_of_quoted_mod_hash
 from chia.wallet.wallet_spend_bundle import WalletSpendBundle
 
 NULL_SIGNATURE = G2Element()
 
 ANYONE_CAN_SPEND_PUZZLE = Program.to(1)  # simply return the conditions
-CAT_MOD = load_clvm_maybe_recompile("cat_v2.clsp", package_or_requirement="chia.wallet.cat_wallet.puzzles")
-CAT_MOD_HASH = CAT_MOD.get_tree_hash()
+CAT_MOD = Program.from_bytes(CAT_PUZZLE)
+CAT_MOD_HASH = bytes32(CAT_PUZZLE_HASH)
+QUOTED_CAT_MOD_HASH = calculate_hash_of_quoted_mod_hash(CAT_MOD_HASH)
 CAT_MOD_HASH_HASH: bytes32 = Program.to(CAT_MOD_HASH).get_tree_hash()
 
 

chia/wallet/cat_wallet/cat_wallet.py

@@ -7,23 +7,25 @@ import traceback
 from typing import TYPE_CHECKING, Any, ClassVar, Optional, cast
 
 from chia_rs import G1Element
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32, uint64, uint128
 from typing_extensions import Unpack
 
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
 from chia.server.ws_connection import WSChiaConnection
 from chia.types.blockchain_format.coin import Coin
 from chia.types.blockchain_format.program import Program
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.coin_spend import compute_additions_with_cost
 from chia.types.condition_opcodes import ConditionOpcode
 from chia.util.byte_types import hexstr_to_bytes
 from chia.util.errors import Err, ValidationError
 from chia.util.hash import std_hash
-from chia.util.ints import uint32, uint64, uint128
 from chia.wallet.cat_wallet.cat_constants import DEFAULT_CATS
 from chia.wallet.cat_wallet.cat_info import CATCoinData, CATInfo, LegacyCATInfo
 from chia.wallet.cat_wallet.cat_utils import (
     CAT_MOD,
+    CAT_MOD_HASH_HASH,
+    QUOTED_CAT_MOD_HASH,
     SpendableCAT,
     construct_cat_puzzle,
     match_cat_puzzle,
@@ -35,6 +37,7 @@ from chia.wallet.conditions import (
     AssertCoinAnnouncement,
     Condition,
     ConditionValidTimes,
+    CreateCoin,
     CreateCoinAnnouncement,
     UnknownCondition,
     parse_timelock_info,
@@ -42,13 +45,12 @@ from chia.wallet.conditions import (
 from chia.wallet.derivation_record import DerivationRecord
 from chia.wallet.lineage_proof import LineageProof
 from chia.wallet.outer_puzzles import AssetType
-from chia.wallet.payment import Payment
 from chia.wallet.puzzle_drivers import PuzzleInfo
 from chia.wallet.puzzles.tails import ALL_LIMITATIONS_PROGRAMS
 from chia.wallet.transaction_record import TransactionRecord
 from chia.wallet.uncurried_puzzle import uncurry_puzzle
 from chia.wallet.util.compute_memos import compute_memos
-from chia.wallet.util.curry_and_treehash import calculate_hash_of_quoted_mod_hash, curry_and_treehash
+from chia.wallet.util.curry_and_treehash import curry_and_treehash
 from chia.wallet.util.transaction_type import TransactionType
 from chia.wallet.util.wallet_sync_utils import fetch_coin_spend_for_coin_state
 from chia.wallet.util.wallet_types import WalletType
@@ -62,12 +64,6 @@ from chia.wallet.wallet_spend_bundle import WalletSpendBundle
 if TYPE_CHECKING:
     from chia.wallet.wallet_state_manager import WalletStateManager
 
-# This should probably not live in this file but it's for experimental right now
-
-CAT_MOD_HASH = CAT_MOD.get_tree_hash()
-CAT_MOD_HASH_HASH = Program.to(CAT_MOD_HASH).get_tree_hash()
-QUOTED_MOD_HASH = calculate_hash_of_quoted_mod_hash(CAT_MOD_HASH)
-
 
 def not_ephemeral_additions(sp: WalletSpendBundle) -> list[Coin]:
     removals: set[Coin] = set()
@@ -433,7 +429,9 @@ class CATWallet:
     def puzzle_hash_for_pk(self, pubkey: G1Element) -> bytes32:
         inner_puzzle_hash = self.standard_wallet.puzzle_hash_for_pk(pubkey)
         limitations_program_hash_hash = Program.to(self.cat_info.limitations_program_hash).get_tree_hash()
-        return curry_and_treehash(QUOTED_MOD_HASH, CAT_MOD_HASH_HASH, limitations_program_hash_hash, inner_puzzle_hash)
+        return curry_and_treehash(
+            QUOTED_CAT_MOD_HASH, CAT_MOD_HASH_HASH, limitations_program_hash_hash, inner_puzzle_hash
+        )
 
     async def get_cat_puzzle_hash(self, new: bool) -> bytes32:
         if new:
@@ -567,8 +565,8 @@ class CATWallet:
                 )
                 origin_id = next(iter(chia_coins)).name()
                 await self.standard_wallet.generate_signed_transaction(
-                    uint64(0),
-                    (await self.standard_wallet.get_puzzle_hash(not action_scope.config.tx_config.reuse_puzhash)),
+                    [],
+                    [],
                     inner_action_scope,
                     fee=uint64(fee - amount_to_claim),
                     coins=chia_coins,
@@ -584,8 +582,8 @@ class CATWallet:
                 origin_id = next(iter(chia_coins)).name()
                 selected_amount = sum(c.amount for c in chia_coins)
                 await self.standard_wallet.generate_signed_transaction(
-                    uint64(selected_amount + amount_to_claim - fee),
-                    (await self.standard_wallet.get_puzzle_hash(not action_scope.config.tx_config.reuse_puzhash)),
+                    [uint64(selected_amount + amount_to_claim - fee)],
+                    [(await self.standard_wallet.get_puzzle_hash(not action_scope.config.tx_config.reuse_puzhash))],
                     inner_action_scope,
                     coins=chia_coins,
                     negative_change_allowed=True,
@@ -613,7 +611,7 @@ class CATWallet:
 
     async def generate_unsigned_spendbundle(
         self,
-        payments: list[Payment],
+        payments: list[CreateCoin],
         action_scope: WalletActionScope,
         fee: uint64 = uint64(0),
         cat_discrepancy: Optional[tuple[int, Program, Program]] = None,  # (extra_delta, tail_reveal, tail_solution)
@@ -663,7 +661,7 @@ class CATWallet:
                         break
             else:
                 change_puzhash = await self.standard_wallet.get_puzzle_hash(new=True)
-            primaries.append(Payment(change_puzhash, uint64(change), [change_puzhash]))
+            primaries.append(CreateCoin(change_puzhash, uint64(change), [change_puzhash]))
 
         # Loop through the coins we've selected and gather the information we need to spend them
         spendable_cat_list = []
@@ -763,7 +761,7 @@ class CATWallet:
         for amount, puzhash, memo_list in zip(amounts, puzzle_hashes, memos):
             memos_with_hint: list[bytes] = [puzhash]
             memos_with_hint.extend(memo_list)
-            payments.append(Payment(puzhash, amount, memos_with_hint))
+            payments.append(CreateCoin(puzhash, amount, memos_with_hint))
 
         payment_sum = sum(p.amount for p in payments)
         spend_bundle = await self.generate_unsigned_spendbundle(

chia/wallet/cat_wallet/lineage_store.py

@@ -3,7 +3,8 @@ from __future__ import annotations
 import logging
 from typing import Optional
 
-from chia.types.blockchain_format.sized_bytes import bytes32
+from chia_rs.sized_bytes import bytes32
+
 from chia.util.db_wrapper import DBWrapper2
 from chia.wallet.lineage_proof import LineageProof
 

chia/wallet/coin_selection.py

@@ -4,9 +4,10 @@ import logging
 import random
 from typing import Optional
 
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64, uint128
+
 from chia.types.blockchain_format.coin import Coin
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint64, uint128
 from chia.wallet.util.tx_config import CoinSelectionConfig
 from chia.wallet.wallet_coin_record import WalletCoinRecord
 
@@ -58,10 +59,9 @@ async def select_coins(
             f"Transaction for {amount} is greater than max spendable balance in a block of {sum_spendable_coins}. "
             "There may be other transactions pending or our minimum coin amount is too high."
         )
-    if amount == 0 and sum_spendable_coins == 0:
+    if amount == 0 and len(spendable_coins) == 0:
         raise ValueError(
-            "No coins available to spend, you can not create a coin with an amount of 0,"
-            " without already having coins."
+            "No coins available to spend, you can not create a coin with an amount of 0, without already having coins."
         )
 
     # Sort the coins by amount