import directly from rust and remove legacy file

matt-o-how · matt-o-how · commit 3c7e4563aadb · 2025-08-25T12:30:37.000+01:00
diff --git a/benchmarks/mempool-long-lived.py b/benchmarks/mempool-long-lived.py
@@ -6,15 +6,14 @@
 from time import monotonic
 from typing import Optional
 
-from chia_rs import CoinSpend, G2Element, SpendBundle
+from chia_rs import CoinRecord, CoinSpend, G2Element, SpendBundle
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint32, uint64
 
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
 from chia.full_node.mempool_manager import MempoolManager
 from chia.types.blockchain_format.coin import Coin
 from chia.types.blockchain_format.serialized_program import SerializedProgram
-from chia.types.coin_record import CoinRecord
 from chia.types.condition_opcodes import ConditionOpcode
 from chia.types.mempool_item import UnspentLineageInfo
 from chia.util.casts import int_to_bytes
diff --git a/benchmarks/mempool.py b/benchmarks/mempool.py
@@ -9,7 +9,7 @@
 from time import monotonic
 from typing import Optional
 
-from chia_rs import SpendBundle
+from chia_rs import CoinRecord, SpendBundle
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint32, uint64
 
@@ -18,7 +18,6 @@
 from chia.full_node.mempool_manager import MempoolManager
 from chia.simulator.wallet_tools import WalletTool
 from chia.types.blockchain_format.coin import Coin
-from chia.types.coin_record import CoinRecord
 from chia.types.mempool_inclusion_status import MempoolInclusionStatus
 from chia.types.mempool_item import UnspentLineageInfo
 from chia.util.batches import to_batches
diff --git a/chia/_tests/clvm/coin_store.py b/chia/_tests/clvm/coin_store.py
@@ -5,15 +5,14 @@
 from dataclasses import dataclass
 from typing import Optional
 
-from chia_rs import ConsensusConstants, SpendBundle, check_time_locks
+from chia_rs import CoinRecord, ConsensusConstants, SpendBundle, check_time_locks
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint32, uint64
 
 from chia._tests.util.get_name_puzzle_conditions import get_name_puzzle_conditions
 from chia.consensus.cost_calculator import NPCResult
 from chia.full_node.bundle_tools import simple_solution_generator
 from chia.types.blockchain_format.coin import Coin
-from chia.types.coin_record import CoinRecord
 from chia.util.errors import Err
 
 MAX_COST = 11000000000
diff --git a/chia/_tests/cmds/cmd_test_utils.py b/chia/_tests/cmds/cmd_test_utils.py
@@ -7,7 +7,7 @@
 from pathlib import Path
 from typing import Any, Optional, cast
 
-from chia_rs import BlockRecord, Coin, G1Element, G2Element
+from chia_rs import BlockRecord, Coin, CoinRecord, G1Element, G2Element
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint8, uint16, uint32, uint64
 
@@ -22,7 +22,6 @@
 from chia.full_node.full_node_rpc_client import FullNodeRpcClient
 from chia.rpc.rpc_client import RpcClient
 from chia.simulator.simulator_full_node_rpc_client import SimulatorFullNodeRpcClient
-from chia.types.coin_record import CoinRecord
 from chia.types.signing_mode import SigningMode
 from chia.util.bech32m import encode_puzzle_hash
 from chia.util.config import load_config
diff --git a/chia/_tests/core/full_node/stores/test_coin_store.py b/chia/_tests/core/full_node/stores/test_coin_store.py
@@ -7,7 +7,7 @@
 
 import aiosqlite
 import pytest
-from chia_rs import CoinState, FullBlock, additions_and_removals, get_flags_for_height_and_constants
+from chia_rs import CoinRecord, CoinState, FullBlock, additions_and_removals, get_flags_for_height_and_constants
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint32, uint64
 
@@ -26,7 +26,6 @@
 from chia.simulator.block_tools import BlockTools, test_constants
 from chia.simulator.wallet_tools import WalletTool
 from chia.types.blockchain_format.coin import Coin
-from chia.types.coin_record import CoinRecord
 from chia.types.mempool_item import UnspentLineageInfo
 from chia.util.casts import int_to_bytes
 from chia.util.db_wrapper import DBWrapper2
diff --git a/chia/_tests/core/full_node/test_conditions.py b/chia/_tests/core/full_node/test_conditions.py
@@ -9,7 +9,7 @@
 from typing import Optional
 
 import pytest
-from chia_rs import AugSchemeMPL, FullBlock, G2Element, SpendBundle
+from chia_rs import AugSchemeMPL, CoinRecord, FullBlock, G2Element, SpendBundle
 from chia_rs.sized_ints import uint32, uint64
 from clvm_tools.binutils import assemble
 
@@ -21,7 +21,6 @@
 from chia.simulator.keyring import TempKeyring
 from chia.types.blockchain_format.program import Program
 from chia.types.blockchain_format.serialized_program import SerializedProgram
-from chia.types.coin_record import CoinRecord
 from chia.types.coin_spend import make_spend
 from chia.types.condition_opcodes import ConditionOpcode
 from chia.util.casts import int_to_bytes
diff --git a/chia/_tests/core/full_node/test_full_node.py b/chia/_tests/core/full_node/test_full_node.py
@@ -12,6 +12,7 @@
 import pytest
 from chia_rs import (
     AugSchemeMPL,
+    CoinRecord,
     ConsensusConstants,
     Foliage,
     FoliageTransactionBlock,
@@ -91,7 +92,6 @@
 )
 from chia.types.blockchain_format.serialized_program import SerializedProgram
 from chia.types.blockchain_format.vdf import CompressibleVDFField, VDFProof
-from chia.types.coin_record import CoinRecord
 from chia.types.coin_spend import make_spend
 from chia.types.condition_opcodes import ConditionOpcode
 from chia.types.condition_with_args import ConditionWithArgs
diff --git a/chia/_tests/core/mempool/test_mempool_manager.py b/chia/_tests/core/mempool/test_mempool_manager.py
@@ -11,6 +11,7 @@
     ELIGIBLE_FOR_DEDUP,
     ELIGIBLE_FOR_FF,
     AugSchemeMPL,
+    CoinRecord,
     CoinSpend,
     ConsensusConstants,
     G2Element,
@@ -60,7 +61,6 @@
 from chia.types.blockchain_format.program import DEFAULT_FLAGS, INFINITE_COST, Program
 from chia.types.blockchain_format.serialized_program import SerializedProgram
 from chia.types.clvm_cost import CLVMCost
-from chia.types.coin_record import CoinRecord
 from chia.types.coin_spend import make_spend
 from chia.types.condition_opcodes import ConditionOpcode
 from chia.types.condition_with_args import ConditionWithArgs
diff --git a/chia/_tests/util/coin_store.py b/chia/_tests/util/coin_store.py
@@ -1,7 +1,8 @@
 from __future__ import annotations
 
+from chia_rs import CoinRecord
+
 from chia.consensus.coin_store_protocol import CoinStoreProtocol
-from chia.types.coin_record import CoinRecord
 from chia.util.db_wrapper import DBWrapper2
 
 
diff --git a/chia/_tests/util/spend_sim.py b/chia/_tests/util/spend_sim.py
@@ -12,6 +12,7 @@
 import anyio
 from chia_rs import (
     DONT_VALIDATE_SIGNATURE,
+    CoinRecord,
     CoinSpend,
     ConsensusConstants,
     G2Element,
@@ -34,7 +35,6 @@
 from chia.full_node.mempool_manager import MempoolManager
 from chia.types.blockchain_format.coin import Coin
 from chia.types.blockchain_format.program import INFINITE_COST
-from chia.types.coin_record import CoinRecord
 from chia.types.generator_types import BlockGenerator
 from chia.types.mempool_inclusion_status import MempoolInclusionStatus
 from chia.types.mempool_item import MempoolItem
diff --git a/chia/_tests/wallet/rpc/test_wallet_rpc.py b/chia/_tests/wallet/rpc/test_wallet_rpc.py
@@ -13,7 +13,7 @@
 
 import aiosqlite
 import pytest
-from chia_rs import CoinSpend, G1Element, G2Element
+from chia_rs import CoinRecord, CoinSpend, G1Element, G2Element
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint16, uint32, uint64, uint128
 
@@ -57,7 +57,6 @@
 from chia.simulator.simulator_protocol import FarmNewBlockProtocol
 from chia.types.blockchain_format.coin import Coin, coin_as_list
 from chia.types.blockchain_format.program import Program
-from chia.types.coin_record import CoinRecord
 from chia.types.coin_spend import make_spend
 from chia.types.peer_info import PeerInfo
 from chia.types.signing_mode import SigningMode
diff --git a/chia/_tests/wallet/test_new_wallet_protocol.py b/chia/_tests/wallet/test_new_wallet_protocol.py
@@ -8,7 +8,7 @@
 from typing import Optional
 
 import pytest
-from chia_rs import AugSchemeMPL, Coin, CoinSpend, CoinState, Program, SpendBundle
+from chia_rs import AugSchemeMPL, Coin, CoinRecord, CoinSpend, CoinState, Program, SpendBundle
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint8, uint16, uint32, uint64
 
@@ -26,7 +26,6 @@
 from chia.simulator.block_tools import BlockTools
 from chia.simulator.full_node_simulator import FullNodeSimulator
 from chia.simulator.start_simulator import SimulatorFullNodeService
-from chia.types.coin_record import CoinRecord
 from chia.types.mempool_inclusion_status import MempoolInclusionStatus
 from chia.util.hash import std_hash
 from chia.wallet.wallet_service import WalletService
diff --git a/chia/cmds/sim_funcs.py b/chia/cmds/sim_funcs.py
@@ -8,7 +8,7 @@
 from typing import Any, Optional
 
 from aiohttp import ClientConnectorError
-from chia_rs import PrivateKey
+from chia_rs import CoinRecord, PrivateKey
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint32
 
@@ -17,7 +17,6 @@
 from chia.protocols.outbound_message import NodeType
 from chia.server.resolve_peer_info import set_peer_info
 from chia.simulator.simulator_full_node_rpc_client import SimulatorFullNodeRpcClient
-from chia.types.coin_record import CoinRecord
 from chia.util.bech32m import decode_puzzle_hash, encode_puzzle_hash
 from chia.util.config import load_config, save_config
 from chia.util.errors import KeychainFingerprintExists
diff --git a/chia/consensus/block_body_validation.py b/chia/consensus/block_body_validation.py
@@ -8,6 +8,7 @@
 
 from chia_rs import (
     BlockRecord,
+    CoinRecord,
     ConsensusConstants,
     FullBlock,
     SpendBundleConditions,
@@ -24,7 +25,6 @@
 from chia.consensus.blockchain_interface import BlockRecordsProtocol
 from chia.consensus.coinbase import create_farmer_coin, create_pool_coin
 from chia.types.blockchain_format.coin import Coin, hash_coin_ids
-from chia.types.coin_record import CoinRecord
 from chia.util.errors import Err
 from chia.util.hash import std_hash
 
diff --git a/chia/consensus/blockchain.py b/chia/consensus/blockchain.py
@@ -11,6 +11,7 @@
 
 from chia_rs import (
     BlockRecord,
+    CoinRecord,
     ConsensusConstants,
     EndOfSubSlotBundle,
     FullBlock,
@@ -38,7 +39,6 @@
 from chia.full_node.block_store import BlockStore
 from chia.types.blockchain_format.coin import Coin
 from chia.types.blockchain_format.vdf import VDFInfo
-from chia.types.coin_record import CoinRecord
 from chia.types.generator_types import BlockGenerator
 from chia.types.unfinished_header_block import UnfinishedHeaderBlock
 from chia.types.validation_state import ValidationState
diff --git a/chia/consensus/coin_store_protocol.py b/chia/consensus/coin_store_protocol.py
@@ -3,12 +3,11 @@
 from collections.abc import Collection
 from typing import Optional, Protocol
 
-from chia_rs import CoinState
+from chia_rs import CoinRecord, 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.coin_record import CoinRecord
 from chia.types.mempool_item import UnspentLineageInfo
 
 
diff --git a/chia/full_node/coin_store.py b/chia/full_node/coin_store.py
@@ -9,12 +9,11 @@
 
 import typing_extensions
 from aiosqlite import Cursor
-from chia_rs import CoinState
+from chia_rs import CoinRecord, 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.coin_record import CoinRecord
 from chia.types.mempool_item import UnspentLineageInfo
 from chia.util.batches import to_batches
 from chia.util.db_wrapper import SQLITE_MAX_VARIABLE_NUMBER, DBWrapper2
diff --git a/chia/full_node/full_node.py b/chia/full_node/full_node.py
@@ -19,6 +19,7 @@
     AugSchemeMPL,
     BlockRecord,
     BLSCache,
+    CoinRecord,
     CoinState,
     ConsensusConstants,
     EndOfSubSlotBundle,
@@ -76,7 +77,6 @@
 from chia.server.ws_connection import WSChiaConnection
 from chia.types.blockchain_format.classgroup import ClassgroupElement
 from chia.types.blockchain_format.vdf import CompressibleVDFField, VDFInfo, VDFProof, validate_vdf
-from chia.types.coin_record import CoinRecord
 from chia.types.mempool_inclusion_status import MempoolInclusionStatus
 from chia.types.mempool_item import MempoolItem
 from chia.types.peer_info import PeerInfo
diff --git a/chia/full_node/full_node_api.py b/chia/full_node/full_node_api.py
@@ -13,6 +13,7 @@
 from chia_rs import (
     AugSchemeMPL,
     BlockRecord,
+    CoinRecord,
     CoinState,
     EndOfSubSlotBundle,
     FoliageBlockData,
@@ -66,7 +67,6 @@
 from chia.types.block_protocol import BlockInfo
 from chia.types.blockchain_format.coin import Coin, hash_coin_ids
 from chia.types.blockchain_format.proof_of_space import verify_and_get_quality_string
-from chia.types.coin_record import CoinRecord
 from chia.types.generator_types import BlockGenerator, NewBlockGenerator
 from chia.types.mempool_inclusion_status import MempoolInclusionStatus
 from chia.types.peer_info import PeerInfo
diff --git a/chia/full_node/full_node_rpc_api.py b/chia/full_node/full_node_rpc_api.py
@@ -9,6 +9,7 @@
 from chia_rs import (
     MEMPOOL_MODE,
     BlockRecord,
+    CoinRecord,
     CoinSpend,
     FullBlock,
     PlotSize,
@@ -31,7 +32,6 @@
 from chia.protocols.outbound_message import NodeType
 from chia.rpc.rpc_server import Endpoint, EndpointResult
 from chia.types.blockchain_format.proof_of_space import calculate_prefix_bits
-from chia.types.coin_record import CoinRecord
 from chia.types.generator_types import BlockGenerator, NewBlockGenerator
 from chia.types.mempool_inclusion_status import MempoolInclusionStatus
 from chia.types.unfinished_header_block import UnfinishedHeaderBlock
diff --git a/chia/full_node/full_node_rpc_client.py b/chia/full_node/full_node_rpc_client.py
@@ -2,13 +2,12 @@
 
 from typing import Any, Optional, cast
 
-from chia_rs import BlockRecord, CoinSpend, EndOfSubSlotBundle, FullBlock, SpendBundle
+from chia_rs import BlockRecord, CoinRecord, CoinSpend, EndOfSubSlotBundle, FullBlock, SpendBundle
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint32
 
 from chia.consensus.signage_point import SignagePoint
 from chia.rpc.rpc_client import ResponseFailureError, RpcClient
-from chia.types.coin_record import CoinRecord
 from chia.types.coin_spend import CoinSpendWithConditions
 from chia.types.condition_opcodes import ConditionOpcode
 from chia.types.condition_with_args import ConditionWithArgs
diff --git a/chia/full_node/mempool_manager.py b/chia/full_node/mempool_manager.py
@@ -13,6 +13,7 @@
     ELIGIBLE_FOR_FF,
     MEMPOOL_MODE,
     BLSCache,
+    CoinRecord,
     ConsensusConstants,
     SpendBundle,
     SpendBundleConditions,
@@ -34,7 +35,6 @@
 from chia.full_node.pending_tx_cache import ConflictTxCache, PendingTxCache
 from chia.types.blockchain_format.coin import Coin
 from chia.types.clvm_cost import CLVMCost
-from chia.types.coin_record import CoinRecord
 from chia.types.fee_rate import FeeRate
 from chia.types.generator_types import NewBlockGenerator
 from chia.types.mempool_inclusion_status import MempoolInclusionStatus
diff --git a/chia/simulator/full_node_simulator.py b/chia/simulator/full_node_simulator.py
@@ -7,7 +7,7 @@
 from typing import Any, Optional, Union
 
 import anyio
-from chia_rs import BlockRecord, FullBlock, SpendBundle
+from chia_rs import BlockRecord, CoinRecord, FullBlock, SpendBundle
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint8, uint32, uint64, uint128
 
@@ -24,7 +24,6 @@
 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.coin_record import CoinRecord
 from chia.types.validation_state import ValidationState
 from chia.util.config import lock_and_load_config, save_config
 from chia.util.timing import adjusted_timeout, backoff_times
diff --git a/chia/simulator/simulator_full_node_rpc_api.py b/chia/simulator/simulator_full_node_rpc_api.py
@@ -1,14 +1,13 @@
 from __future__ import annotations
 
-from chia_rs import FullBlock
+from chia_rs import CoinRecord, FullBlock
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint32
 
 from chia.full_node.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.coin_record import CoinRecord
 from chia.util.bech32m import decode_puzzle_hash
 
 
diff --git a/chia/simulator/simulator_full_node_rpc_client.py b/chia/simulator/simulator_full_node_rpc_client.py
@@ -1,11 +1,10 @@
 from __future__ import annotations
 
-from chia_rs import FullBlock
+from chia_rs import CoinRecord, FullBlock
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint128
 
 from chia.full_node.full_node_rpc_client import FullNodeRpcClient
-from chia.types.coin_record import CoinRecord
 from chia.util.bech32m import encode_puzzle_hash
 
 
diff --git a/chia/types/coin_record.py b/chia/types/coin_record.py
diff --git a/chia/wallet/wallet_coin_record.py b/chia/wallet/wallet_coin_record.py
diff --git a/chia/wallet/wallet_rpc_api.py b/chia/wallet/wallet_rpc_api.py
diff --git a/chia/wallet/wallet_rpc_client.py b/chia/wallet/wallet_rpc_client.py
diff --git a/chia/wallet/wallet_state_manager.py b/chia/wallet/wallet_state_manager.py
