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

chia/simulator/block_tools.py

@@ -17,14 +17,26 @@ from random import Random
 from typing import Any, Callable, Optional
 
 import anyio
-from chia_rs import MEMPOOL_MODE, AugSchemeMPL, G1Element, G2Element, PrivateKey, solution_generator
+from chia_puzzles_py.programs import CHIALISP_DESERIALISATION, ROM_BOOTSTRAP_GENERATOR
+from chia_rs import (
+    MEMPOOL_MODE,
+    AugSchemeMPL,
+    ConsensusConstants,
+    G1Element,
+    G2Element,
+    PoolTarget,
+    PrivateKey,
+    solution_generator,
+)
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint16, uint32, uint64, uint128
 
 from chia.consensus.block_creation import create_unfinished_block, unfinished_block_to_full_block
 from chia.consensus.block_record import BlockRecord
 from chia.consensus.blockchain_interface import BlockRecordsProtocol
 from chia.consensus.coinbase import create_puzzlehash_for_pk
 from chia.consensus.condition_costs import ConditionCost
-from chia.consensus.constants import ConsensusConstants, replace_str_to_bytes
+from chia.consensus.constants import replace_str_to_bytes
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
 from chia.consensus.deficit import calculate_deficit
 from chia.consensus.full_block_to_block_record import block_to_block_record
@@ -63,7 +75,6 @@ from chia.simulator.wallet_tools import WalletTool
 from chia.ssl.create_ssl import create_all_ssl
 from chia.types.blockchain_format.classgroup import ClassgroupElement
 from chia.types.blockchain_format.coin import Coin
-from chia.types.blockchain_format.pool_target import PoolTarget
 from chia.types.blockchain_format.program import INFINITE_COST, Program
 from chia.types.blockchain_format.proof_of_space import (
     ProofOfSpace,
@@ -75,7 +86,6 @@ from chia.types.blockchain_format.proof_of_space import (
     verify_and_get_quality_string,
 )
 from chia.types.blockchain_format.serialized_program import SerializedProgram
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.blockchain_format.slots import (
     ChallengeChainSubSlot,
     InfusedChallengeChainSubSlot,
@@ -102,7 +112,6 @@ from chia.util.config import (
 )
 from chia.util.default_root import DEFAULT_ROOT_PATH
 from chia.util.hash import std_hash
-from chia.util.ints import uint8, uint16, uint32, uint64, uint128
 from chia.util.keychain import Keychain, bytes_to_mnemonic
 from chia.util.ssl_check import fix_ssl
 from chia.util.timing import adjusted_timeout, backoff_times
@@ -113,15 +122,10 @@ from chia.wallet.derive_keys import (
     master_sk_to_pool_sk,
     master_sk_to_wallet_sk,
 )
-from chia.wallet.puzzles.load_clvm import load_serialized_clvm_maybe_recompile
 
-GENERATOR_MOD: SerializedProgram = load_serialized_clvm_maybe_recompile(
-    "rom_bootstrap_generator.clsp", package_or_requirement="chia.consensus.puzzles"
-)
+DESERIALIZE_MOD = Program.from_bytes(CHIALISP_DESERIALISATION)
 
-DESERIALIZE_MOD = load_serialized_clvm_maybe_recompile(
-    "chialisp_deserialisation.clsp", package_or_requirement="chia.consensus.puzzles"
-)
+GENERATOR_MOD: SerializedProgram = SerializedProgram.from_bytes(ROM_BOOTSTRAP_GENERATOR)
 
 test_constants = DEFAULT_CONSTANTS.replace(
     MIN_PLOT_SIZE=uint8(18),

chia/simulator/full_node_simulator.py

@@ -7,6 +7,8 @@ from collections.abc import Collection
 from typing import Any, Optional, Union
 
 import anyio
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint32, uint64, uint128
 
 from chia.consensus.block_body_validation import ForkInfo
 from chia.consensus.block_record import BlockRecord
@@ -21,16 +23,14 @@ from chia.simulator.add_blocks_in_batches import add_blocks_in_batches
 from chia.simulator.block_tools import BlockTools
 from chia.simulator.simulator_protocol import FarmNewBlockProtocol, GetAllCoinsProtocol, ReorgProtocol
 from chia.types.blockchain_format.coin import Coin
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.coin_record import CoinRecord
 from chia.types.full_block import FullBlock
 from chia.types.spend_bundle import SpendBundle
 from chia.types.validation_state import ValidationState
 from chia.util.augmented_chain import AugmentedBlockchain
 from chia.util.config import lock_and_load_config, save_config
-from chia.util.ints import uint8, uint32, uint64, uint128
 from chia.util.timing import adjusted_timeout, backoff_times
-from chia.wallet.payment import Payment
+from chia.wallet.conditions import CreateCoin
 from chia.wallet.transaction_record import LightTransactionRecord, TransactionRecord
 from chia.wallet.util.tx_config import DEFAULT_TX_CONFIG
 from chia.wallet.wallet import Wallet
@@ -205,9 +205,7 @@ class FullNodeSimulator(FullNodeAPI):
                     await asyncio.sleep(1)
                 else:
                     current_time = False
-            mempool_bundle = await self.full_node.mempool_manager.create_bundle_from_mempool(
-                curr.header_hash, self.full_node.coin_store.get_unspent_lineage_info_for_puzzle_hash
-            )
+            mempool_bundle = await self.full_node.mempool_manager.create_bundle_from_mempool(curr.header_hash)
             if mempool_bundle is None:
                 spend_bundle = None
             else:
@@ -260,9 +258,7 @@ class FullNodeSimulator(FullNodeAPI):
                     await asyncio.sleep(1)
                 else:
                     current_time = False
-            mempool_bundle = await self.full_node.mempool_manager.create_bundle_from_mempool(
-                curr.header_hash, self.full_node.coin_store.get_unspent_lineage_info_for_puzzle_hash
-            )
+            mempool_bundle = await self.full_node.mempool_manager.create_bundle_from_mempool(curr.header_hash)
             if mempool_bundle is None:
                 spend_bundle = None
             else:
@@ -686,13 +682,13 @@ class FullNodeSimulator(FullNodeAPI):
             if len(amounts) == 0:
                 return set()
 
-            outputs: list[Payment] = []
+            outputs: list[CreateCoin] = []
             amounts_seen: set[uint64] = set()
             for amount in amounts:
                 # We need unique puzzle hash amount combos so we'll only generate a new puzzle hash when we've already
                 # seen that amount sent to that puzzle hash
                 puzzle_hash = await wallet.get_puzzle_hash(new=amount in amounts_seen)
-                outputs.append(Payment(puzzle_hash, amount))
+                outputs.append(CreateCoin(puzzle_hash, amount))
                 amounts_seen.add(amount)
 
             transaction_records: list[TransactionRecord] = []
@@ -707,10 +703,9 @@ class FullNodeSimulator(FullNodeAPI):
                         DEFAULT_TX_CONFIG, push=True
                     ) as action_scope:
                         await wallet.generate_signed_transaction(
-                            amount=outputs_group[0].amount,
-                            puzzle_hash=outputs_group[0].puzzle_hash,
+                            amounts=[output.amount for output in outputs_group],
+                            puzzle_hashes=[output.puzzle_hash for output in outputs_group],
                             action_scope=action_scope,
-                            primaries=outputs_group[1:],
                         )
                     transaction_records.extend(action_scope.side_effects.transactions)
                 else:

chia/simulator/setup_services.py

@@ -11,8 +11,12 @@ from pathlib import Path
 from types import FrameType
 from typing import Any, Optional, Union
 
+from chia_rs import ConsensusConstants
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint16
+
 from chia.cmds.init_funcs import init
-from chia.consensus.constants import ConsensusConstants, replace_str_to_bytes
+from chia.consensus.constants import replace_str_to_bytes
 from chia.daemon.server import WebSocketServer, daemon_launch_lock_path
 from chia.protocols.shared_protocol import Capability, default_capabilities
 from chia.seeder.dns_server import DNSServer, create_dns_server_service
@@ -40,12 +44,10 @@ from chia.types.aliases import (
     TimelordService,
     WalletService,
 )
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.peer_info import UnresolvedPeerInfo
 from chia.util.bech32m import encode_puzzle_hash
 from chia.util.config import config_path_for_filename, load_config, lock_and_load_config, save_config, set_peer_info
 from chia.util.db_wrapper import generate_in_memory_db_uri
-from chia.util.ints import uint16
 from chia.util.keychain import bytes_to_mnemonic
 from chia.util.lock import Lockfile
 from chia.util.task_referencer import create_referenced_task

chia/simulator/simulator_full_node_rpc_api.py

@@ -1,14 +1,15 @@
 from __future__ import annotations
 
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32
+
 from chia.rpc.full_node_rpc_api import FullNodeRpcApi
 from chia.rpc.rpc_server import Endpoint, EndpointResult
 from chia.simulator.full_node_simulator import FullNodeSimulator
 from chia.simulator.simulator_protocol import FarmNewBlockProtocol, GetAllCoinsProtocol, ReorgProtocol
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.coin_record import CoinRecord
 from chia.types.full_block import FullBlock
 from chia.util.bech32m import decode_puzzle_hash
-from chia.util.ints import uint32
 
 
 class SimulatorFullNodeRpcApi(FullNodeRpcApi):

chia/simulator/simulator_full_node_rpc_client.py

@@ -1,11 +1,12 @@
 from __future__ import annotations
 
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint128
+
 from chia.rpc.full_node_rpc_client import FullNodeRpcClient
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.coin_record import CoinRecord
 from chia.types.full_block import FullBlock
 from chia.util.bech32m import encode_puzzle_hash
-from chia.util.ints import uint128
 
 
 class SimulatorFullNodeRpcClient(FullNodeRpcClient):

chia/simulator/simulator_protocol.py

@@ -3,8 +3,9 @@ from __future__ import annotations
 from dataclasses import dataclass
 from typing import Optional
 
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint32
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32
+
 from chia.util.streamable import Streamable, streamable
 
 

chia/simulator/simulator_test_tools.py

@@ -6,6 +6,8 @@ from pathlib import Path
 from typing import Any, Optional
 
 from chia_rs import PrivateKey
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32
 
 from chia.consensus.coinbase import create_puzzlehash_for_pk
 from chia.daemon.server import WebSocketServer, daemon_launch_lock_path
@@ -21,11 +23,9 @@ from chia.simulator.ssl_certs import (
 )
 from chia.simulator.start_simulator import async_main as start_simulator_main
 from chia.ssl.create_ssl import create_all_ssl
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.bech32m import encode_puzzle_hash
 from chia.util.config import create_default_chia_config, load_config, save_config
 from chia.util.errors import KeychainFingerprintExists
-from chia.util.ints import uint32
 from chia.util.keychain import Keychain
 from chia.util.lock import Lockfile
 from chia.wallet.derive_keys import master_sk_to_wallet_sk

chia/simulator/start_simulator.py

@@ -7,6 +7,9 @@ from multiprocessing import freeze_support
 from pathlib import Path
 from typing import Any, Optional
 
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint16
+
 from chia.apis import ApiProtocolRegistry
 from chia.full_node.full_node import FullNode
 from chia.server.outbound_message import NodeType
@@ -15,12 +18,10 @@ from chia.server.start_service import Service, async_run
 from chia.simulator.block_tools import BlockTools, test_constants
 from chia.simulator.full_node_simulator import FullNodeSimulator
 from chia.simulator.simulator_full_node_rpc_api import SimulatorFullNodeRpcApi
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.bech32m import decode_puzzle_hash
 from chia.util.chia_logging import initialize_logging
 from chia.util.config import load_config, load_config_cli, override_config
 from chia.util.default_root import resolve_root_path
-from chia.util.ints import uint16
 
 SimulatorFullNodeService = Service[FullNode, FullNodeSimulator, SimulatorFullNodeRpcApi]
 

chia/simulator/wallet_tools.py

@@ -2,21 +2,20 @@ from __future__ import annotations
 
 from typing import Any, Optional
 
-from chia_rs import AugSchemeMPL, G1Element, G2Element, PrivateKey
+from chia_rs import AugSchemeMPL, ConsensusConstants, G1Element, G2Element, PrivateKey
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32, uint64
 from clvm.casts import int_from_bytes, int_to_bytes
 
-from chia.consensus.constants import ConsensusConstants
 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.coin_spend import CoinSpend
 from chia.types.condition_opcodes import ConditionOpcode
 from chia.types.condition_with_args import ConditionWithArgs
 from chia.types.spend_bundle import SpendBundle
 from chia.util.condition_tools import agg_sig_additional_data, conditions_dict_for_solution, make_aggsig_final_message
 from chia.util.hash import std_hash
-from chia.util.ints import uint32, uint64
 from chia.wallet.conditions import AssertCoinAnnouncement
 from chia.wallet.derive_keys import master_sk_to_wallet_sk
 from chia.wallet.puzzles.p2_delegated_puzzle_or_hidden_puzzle import (

chia/timelord/iters_from_block.py

@@ -2,12 +2,12 @@ from __future__ import annotations
 
 from typing import Optional, Union
 
-from chia.consensus.constants import ConsensusConstants
+from chia_rs import ConsensusConstants, RewardChainBlock, RewardChainBlockUnfinished
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32, uint64
+
 from chia.consensus.pot_iterations import calculate_ip_iters, calculate_iterations_quality, calculate_sp_iters
 from chia.types.blockchain_format.proof_of_space import verify_and_get_quality_string
-from chia.types.blockchain_format.reward_chain_block import RewardChainBlock, RewardChainBlockUnfinished
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint32, uint64
 
 
 def iters_from_block(

chia/timelord/timelord.py

@@ -15,9 +15,11 @@ from concurrent.futures import ThreadPoolExecutor
 from pathlib import Path
 from typing import IO, TYPE_CHECKING, Any, ClassVar, Optional, cast
 
+from chia_rs import ConsensusConstants, RewardChainBlock
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint16, uint32, uint64, uint128
 from chiavdf import create_discriminant, prove
 
-from chia.consensus.constants import ConsensusConstants
 from chia.consensus.pot_iterations import calculate_sp_iters, is_overflow_block
 from chia.protocols import timelord_protocol
 from chia.protocols.protocol_message_types import ProtocolMessageTypes
@@ -29,8 +31,6 @@ from chia.timelord.iters_from_block import iters_from_block
 from chia.timelord.timelord_state import LastState
 from chia.timelord.types import Chain, IterationType, StateType
 from chia.types.blockchain_format.classgroup import ClassgroupElement
-from chia.types.blockchain_format.reward_chain_block import RewardChainBlock
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.blockchain_format.slots import (
     ChallengeChainSubSlot,
     InfusedChallengeChainSubSlot,
@@ -40,7 +40,6 @@ from chia.types.blockchain_format.slots import (
 from chia.types.blockchain_format.sub_epoch_summary import SubEpochSummary
 from chia.types.blockchain_format.vdf import VDFInfo, VDFProof, validate_vdf
 from chia.types.end_of_slot_bundle import EndOfSubSlotBundle
-from chia.util.ints import uint8, uint16, uint32, uint64, uint128
 from chia.util.streamable import Streamable, streamable
 from chia.util.task_referencer import create_referenced_task
 
@@ -167,6 +166,7 @@ class Timelord:
                 self._executor_shutdown_tempfile = _create_shutdown_file()
                 self.bluebox_pool = ThreadPoolExecutor(
                     max_workers=workers,
+                    thread_name_prefix="blue-box-",
                 )
                 self.main_loop = create_referenced_task(
                     self._start_manage_discriminant_queue_sanitizer_slow(self.bluebox_pool, workers)
@@ -937,18 +937,13 @@ class Timelord:
         disc: int = create_discriminant(challenge, self.constants.DISCRIMINANT_SIZE_BITS)
 
         try:
-            # Depending on the flags 'fast_algorithm' and 'bluebox_mode',
-            # the timelord tells the vdf_client what to execute.
+            # Depending on the flag 'bluebox_mode', the timelord tells the vdf_client what to execute.
             async with self.lock:
                 if self.bluebox_mode:
                     writer.write(b"S")
                 else:
-                    if self.config["fast_algorithm"]:
-                        # Run n-wesolowski (fast) algorithm.
-                        writer.write(b"N")
-                    else:
-                        # Run two-wesolowski (slow) algorithm.
-                        writer.write(b"T")
+                    # Run two-wesolowski algorithm.
+                    writer.write(b"T")
                 await writer.drain()
 
             prefix = str(len(str(disc)))

chia/timelord/timelord_api.py

@@ -4,6 +4,8 @@ import logging
 import time
 from typing import TYPE_CHECKING, ClassVar, Optional, cast
 
+from chia_rs.sized_ints import uint64
+
 from chia.protocols import timelord_protocol
 from chia.protocols.timelord_protocol import NewPeakTimelord
 from chia.rpc.rpc_server import StateChangedProtocol
@@ -11,7 +13,6 @@ from chia.server.api_protocol import ApiMetadata
 from chia.timelord.iters_from_block import iters_from_block
 from chia.timelord.timelord import Timelord
 from chia.timelord.types import Chain, IterationType
-from chia.util.ints import uint64
 
 log = logging.getLogger(__name__)
 
@@ -76,8 +77,7 @@ class TimelordAPI:
             else:
                 log.info("Skipping peak, block has equal or lower weight then our peak.")
                 log.debug(
-                    f"new peak height {new_peak.reward_chain_block.height} "
-                    f"weight {new_peak.reward_chain_block.weight}"
+                    f"new peak height {new_peak.reward_chain_block.height} weight {new_peak.reward_chain_block.weight}"
                 )
 
             self.timelord.state_changed("skipping_peak", {"height": new_peak.reward_chain_block.height})

chia/timelord/timelord_state.py

@@ -3,16 +3,17 @@ from __future__ import annotations
 import logging
 from typing import Optional, Union
 
-from chia.consensus.constants import ConsensusConstants
+from chia_rs import ConsensusConstants
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint32, uint64, uint128
+
 from chia.protocols import timelord_protocol
 from chia.timelord.iters_from_block import iters_from_block
 from chia.timelord.types import Chain, StateType
 from chia.types.blockchain_format.classgroup import ClassgroupElement
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.blockchain_format.slots import ChallengeBlockInfo
 from chia.types.blockchain_format.sub_epoch_summary import SubEpochSummary
 from chia.types.end_of_slot_bundle import EndOfSubSlotBundle
-from chia.util.ints import uint8, uint32, uint64, uint128
 
 log = logging.getLogger(__name__)
 

chia/types/block_protocol.py

@@ -2,11 +2,11 @@ from __future__ import annotations
 
 from typing import Optional
 
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32
 from typing_extensions import Protocol
 
 from chia.types.blockchain_format.serialized_program import SerializedProgram
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint32
 
 
 class BlockInfo(Protocol):

chia/types/blockchain_format/coin.py

@@ -3,10 +3,10 @@ from __future__ import annotations
 from typing import Union
 
 from chia_rs import Coin
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
 
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.hash import std_hash
-from chia.util.ints import uint64
 
 __all__ = ["Coin", "coin_as_list", "hash_coin_ids"]
 

chia/types/blockchain_format/program.py

@@ -4,13 +4,13 @@ import io
 from typing import TYPE_CHECKING, Any, Callable, Optional, TypeVar
 
 from chia_rs import MEMPOOL_MODE, run_chia_program, tree_hash
+from chia_rs.sized_bytes import bytes32
 from clvm.casts import int_from_bytes
 from clvm.CLVMObject import CLVMStorage
 from clvm.EvalError import EvalError
 from clvm.serialize import sexp_from_stream, sexp_to_stream
 from clvm.SExp import SExp
 
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.blockchain_format.tree_hash import sha256_treehash
 from chia.util.byte_types import hexstr_to_bytes
 from chia.util.hash import std_hash

chia/types/blockchain_format/proof_of_space.py

@@ -5,13 +5,12 @@ from typing import Optional, cast
 
 import chia_rs
 from bitstring import BitArray
-from chia_rs import AugSchemeMPL, G1Element, PrivateKey
+from chia_rs import AugSchemeMPL, ConsensusConstants, G1Element, PrivateKey
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32
 from chiapos import Verifier
 
-from chia.consensus.constants import ConsensusConstants
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.hash import std_hash
-from chia.util.ints import uint32
 
 ProofOfSpace = chia_rs.ProofOfSpace
 

chia/types/blockchain_format/tree_hash.py

@@ -10,10 +10,10 @@ from __future__ import annotations
 
 from typing import Callable, Optional, Union
 
+from chia_rs.sized_bytes import bytes32
 from clvm.CLVMObject import CLVMStorage
 from clvm.SExp import SExp
 
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.hash import std_hash
 
 ValueType = Union[bytes, CLVMStorage]

chia/types/blockchain_format/vdf.py

@@ -6,13 +6,12 @@ from enum import IntEnum
 from functools import lru_cache
 from typing import Optional
 
-from chia_rs import VDFInfo, VDFProof
+from chia_rs import ConsensusConstants, VDFInfo, VDFProof
+from chia_rs.sized_bytes import bytes32, bytes100
+from chia_rs.sized_ints import uint8, uint64
 from chiavdf import create_discriminant, verify_n_wesolowski
 
-from chia.consensus.constants import ConsensusConstants
 from chia.types.blockchain_format.classgroup import ClassgroupElement
-from chia.types.blockchain_format.sized_bytes import bytes32, bytes100
-from chia.util.ints import uint8, uint64
 
 log = logging.getLogger(__name__)
 

chia/types/clvm_cost.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import NewType
 
-from chia.util.ints import uint64
+from chia_rs.sized_ints import uint64
 
 """
 CLVM Cost is the cost to run a CLVM program on the CLVM.

chia/types/coin_record.py

@@ -3,10 +3,11 @@ from __future__ import annotations
 from dataclasses import dataclass
 from typing import Optional
 
-from chia.protocols.wallet_protocol import CoinState
+from chia_rs import CoinState
+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.util.ints import uint32, uint64
 from chia.util.streamable import Streamable, streamable
 
 

chia/types/coin_spend.py

@@ -4,6 +4,7 @@ from dataclasses import dataclass
 from typing import Any, Union
 
 import chia_rs
+from chia_rs.sized_ints import uint64
 
 from chia.consensus.condition_costs import ConditionCost
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
@@ -13,7 +14,6 @@ from chia.types.blockchain_format.serialized_program import SerializedProgram
 from chia.types.condition_opcodes import ConditionOpcode
 from chia.types.condition_with_args import ConditionWithArgs
 from chia.util.errors import Err, ValidationError
-from chia.util.ints import uint64
 from chia.util.streamable import Streamable, streamable
 
 CoinSpend = chia_rs.CoinSpend

chia/types/eligible_coin_spends.py

@@ -5,19 +5,18 @@ import dataclasses
 from collections.abc import Awaitable
 from typing import Callable, Optional
 
-from chia_rs import fast_forward_singleton, get_conditions_from_spendbundle
+from chia_rs import ConsensusConstants, fast_forward_singleton, get_conditions_from_spendbundle
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32, uint64
 
 from chia.consensus.condition_costs import ConditionCost
-from chia.consensus.constants import ConsensusConstants
 from chia.types.blockchain_format.coin import Coin
 from chia.types.blockchain_format.serialized_program import SerializedProgram
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.coin_spend import CoinSpend
 from chia.types.internal_mempool_item import InternalMempoolItem
 from chia.types.mempool_item import BundleCoinSpend
 from chia.types.spend_bundle import SpendBundle
 from chia.util.errors import Err
-from chia.util.ints import uint32, uint64
 
 
 @dataclasses.dataclass(frozen=True)
@@ -144,6 +143,11 @@ def perform_the_fast_forward(
     return new_coin_spend, patched_additions
 
 
+@dataclasses.dataclass
+class SkipDedup(BaseException):
+    msg: str
+
+
 @dataclasses.dataclass(frozen=True)
 class EligibleCoinSpends:
     deduplication_spends: dict[bytes32, DedupCoinSpend] = dataclasses.field(default_factory=dict)
@@ -201,7 +205,7 @@ class EligibleCoinSpends:
                 # even if they end up saving more cost, as we're going for the first
                 # solution we see from the relatively highest FPC item, to avoid
                 # severe performance and/or time-complexity impact
-                raise ValueError("Solution is different from what we're deduplicating on")
+                raise SkipDedup("Solution is different from what we're deduplicating on")
             # Let's calculate the saved cost if we never did that before
             if duplicate_cost is None:
                 # See first if this mempool item had this cost computed before

chia/types/fee_rate.py

@@ -4,10 +4,10 @@ import math
 from dataclasses import dataclass
 
 import typing_extensions
+from chia_rs.sized_ints import uint64
 
 from chia.types.clvm_cost import CLVMCost
 from chia.types.mojos import Mojos
-from chia.util.ints import uint64
 from chia.util.streamable import Streamable, streamable
 
 

chia/types/generator_types.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 
 from chia.types.blockchain_format.serialized_program import SerializedProgram
 from chia.util.streamable import Streamable, streamable
@@ -9,5 +9,5 @@ from chia.util.streamable import Streamable, streamable
 @streamable
 @dataclass(frozen=True)
 class BlockGenerator(Streamable):
-    program: SerializedProgram
-    generator_refs: list[bytes]
+    program: SerializedProgram = field(default_factory=SerializedProgram.default)
+    generator_refs: list[bytes] = field(default_factory=list)

chia/types/internal_mempool_item.py

@@ -2,11 +2,12 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 
-from chia.types.blockchain_format.sized_bytes import bytes32
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32
+
 from chia.types.mempool_item import BundleCoinSpend
 from chia.types.spend_bundle import SpendBundle
 from chia.types.spend_bundle_conditions import SpendBundleConditions
-from chia.util.ints import uint32
 
 
 @dataclass(frozen=True)