use chia_rs directly for sized ints (#19303)

* use chia_rs directly for sized ints

* Update data_layer_rpc_api.py

benchmarks/block_ref.py

@@ -10,6 +10,7 @@
 
 import aiosqlite
 import click
+from chia_rs.sized_ints import uint32
 
 from chia.consensus.blockchain import Blockchain
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
@@ -20,7 +21,6 @@
 from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.db_version import lookup_db_version
 from chia.util.db_wrapper import DBWrapper2
-from chia.util.ints import uint32
 
 # the first transaction block. Each byte in transaction_height_delta is the
 # number of blocks to skip forward to get to the next transaction block

benchmarks/block_store.py

@@ -7,6 +7,8 @@
 from pathlib import Path
 from time import monotonic
 
+from chia_rs.sized_ints import uint8, uint32, uint64, uint128
+
 from benchmarks.utils import setup_db
 from chia._tests.util.benchmarks import (
     clvm_generator,
@@ -29,7 +31,6 @@
 from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.blockchain_format.sub_epoch_summary import SubEpochSummary
 from chia.types.full_block import FullBlock
-from chia.util.ints import uint8, uint32, uint64, uint128
 
 # to run this benchmark:
 # python -m benchmarks.coin_store

benchmarks/coin_store.py

@@ -7,12 +7,13 @@
 from pathlib import Path
 from time import monotonic
 
+from chia_rs.sized_ints import uint32, uint64
+
 from benchmarks.utils import setup_db
 from chia._tests.util.benchmarks import rand_hash, rewards
 from chia.full_node.coin_store import CoinStore
 from chia.types.blockchain_format.coin import Coin
 from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint32, uint64
 
 # to run this benchmark:
 # python -m benchmarks.coin_store

benchmarks/mempool-long-lived.py

@@ -7,6 +7,7 @@
 from typing import Optional
 
 from chia_rs import G2Element
+from chia_rs.sized_ints import uint32, uint64
 from clvm.casts import int_to_bytes
 
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
@@ -19,7 +20,6 @@
 from chia.types.condition_opcodes import ConditionOpcode
 from chia.types.eligible_coin_spends import UnspentLineageInfo
 from chia.types.spend_bundle import SpendBundle
-from chia.util.ints import uint32, uint64
 
 # this is one week worth of blocks
 NUM_ITERS = 32256

benchmarks/mempool.py

@@ -9,6 +9,8 @@
 from time import monotonic
 from typing import Optional
 
+from chia_rs.sized_ints import uint32, uint64
+
 from chia.consensus.coinbase import create_farmer_coin, create_pool_coin
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
 from chia.full_node.mempool_manager import MempoolManager
@@ -20,7 +22,6 @@
 from chia.types.mempool_inclusion_status import MempoolInclusionStatus
 from chia.types.spend_bundle import SpendBundle
 from chia.util.batches import to_batches
-from chia.util.ints import uint32, uint64
 from chia.util.task_referencer import create_referenced_task
 
 NUM_ITERS = 200

benchmarks/streamable.py

@@ -9,12 +9,12 @@
 from typing import Any, Callable, Optional, TextIO, Union
 
 import click
+from chia_rs.sized_ints import uint8, uint64
 
 from benchmarks.utils import EnumType, get_commit_hash
 from chia._tests.util.benchmarks import rand_bytes, rand_full_block, rand_hash
 from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.full_block import FullBlock
-from chia.util.ints import uint8, uint64
 from chia.util.streamable import Streamable, streamable
 
 # to run this benchmark:

chia/_tests/blockchain/blockchain_test_utils.py

@@ -3,6 +3,7 @@
 from typing import Optional
 
 from chia_rs import SpendBundleConditions
+from chia_rs.sized_ints import uint32, uint64
 
 from chia.consensus.block_body_validation import ForkInfo
 from chia.consensus.blockchain import AddBlockResult, Blockchain
@@ -12,7 +13,6 @@
 from chia.types.validation_state import ValidationState
 from chia.util.augmented_chain import AugmentedBlockchain
 from chia.util.errors import Err
-from chia.util.ints import uint32, uint64
 
 
 async def check_block_store_invariant(bc: Blockchain):

chia/_tests/blockchain/test_augmented_chain.py

@@ -4,6 +4,7 @@
 from typing import TYPE_CHECKING, ClassVar, Optional, cast
 
 import pytest
+from chia_rs.sized_ints import uint32
 
 from chia._tests.blockchain.blockchain_test_utils import _validate_and_add_block
 from chia._tests.util.blockchain import create_blockchain
@@ -13,7 +14,6 @@
 from chia.types.full_block import FullBlock
 from chia.util.augmented_chain import AugmentedBlockchain
 from chia.util.errors import Err
-from chia.util.ints import uint32
 
 
 @dataclass

chia/_tests/blockchain/test_blockchain.py

@@ -11,6 +11,7 @@
 
 import pytest
 from chia_rs import AugSchemeMPL, ConsensusConstants, G2Element, MerkleSet
+from chia_rs.sized_ints import uint8, uint32, uint64
 from clvm.casts import int_to_bytes
 
 from chia._tests.blockchain.blockchain_test_utils import (
@@ -56,7 +57,6 @@
 from chia.util.errors import Err
 from chia.util.generator_tools import get_block_header
 from chia.util.hash import std_hash
-from chia.util.ints import uint8, uint32, uint64
 from chia.util.keychain import Keychain
 from chia.util.recursive_replace import recursive_replace
 from chia.util.vdf_prover import get_vdf_info_and_proof

chia/_tests/blockchain/test_blockchain_transactions.py

@@ -3,6 +3,7 @@
 import logging
 
 import pytest
+from chia_rs.sized_ints import uint32, uint64
 from clvm.casts import int_to_bytes
 
 from chia._tests.blockchain.blockchain_test_utils import _validate_and_add_block
@@ -19,7 +20,6 @@
 from chia.types.condition_with_args import ConditionWithArgs
 from chia.types.spend_bundle import SpendBundle, estimate_fees
 from chia.util.errors import Err
-from chia.util.ints import uint32, uint64
 from chia.wallet.conditions import AssertCoinAnnouncement, AssertPuzzleAnnouncement
 
 BURN_PUZZLE_HASH = bytes32(b"0" * 32)

chia/_tests/blockchain/test_get_block_generator.py

@@ -4,13 +4,13 @@
 from typing import Optional
 
 import pytest
+from chia_rs.sized_ints import uint32
 from clvm.casts import int_to_bytes
 
 from chia.consensus.get_block_generator import get_block_generator
 from chia.types.blockchain_format.serialized_program import SerializedProgram
 from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.generator_types import BlockGenerator
-from chia.util.ints import uint32
 
 
 @dataclass(frozen=True)

chia/_tests/blockchain/test_lookup_fork_chain.py

@@ -3,14 +3,14 @@
 from dataclasses import dataclass
 
 import pytest
+from chia_rs.sized_ints import uint32
 
 from chia._tests.util.benchmarks import rand_hash
 from chia.consensus.block_record import BlockRecord
 from chia.consensus.blockchain_interface import BlockRecordsProtocol
 from chia.consensus.find_fork_point import find_fork_point_in_chain, lookup_fork_chain
 from chia.simulator.block_tools import test_constants
 from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint32
 
 
 class DummyChain:

chia/_tests/clvm/benchmark_costs.py

@@ -1,13 +1,14 @@
 from __future__ import annotations
 
+from chia_rs.sized_ints import uint64
+
 from chia._tests.util.get_name_puzzle_conditions import get_name_puzzle_conditions
 from chia.consensus.cost_calculator import NPCResult
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
 from chia.full_node.bundle_tools import simple_solution_generator
 from chia.types.blockchain_format.program import INFINITE_COST
 from chia.types.generator_types import BlockGenerator
 from chia.types.spend_bundle import SpendBundle
-from chia.util.ints import uint64
 
 
 def cost_of_spend_bundle(spend_bundle: SpendBundle) -> int:

chia/_tests/clvm/coin_store.py

@@ -6,6 +6,7 @@
 from typing import Optional
 
 from chia_rs import ConsensusConstants
+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
@@ -16,7 +17,6 @@
 from chia.types.coin_record import CoinRecord
 from chia.types.spend_bundle import SpendBundle
 from chia.util.errors import Err
-from chia.util.ints import uint32, uint64
 
 MAX_COST = 11000000000
 

chia/_tests/clvm/test_puzzle_compression.py

@@ -6,13 +6,13 @@
 
 import pytest
 from chia_rs import G1Element, G2Element
+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, make_spend
 from chia.types.spend_bundle import SpendBundle
-from chia.util.ints import uint64
 from chia.wallet.cat_wallet.cat_utils import CAT_MOD, construct_cat_puzzle
 from chia.wallet.puzzles.p2_delegated_puzzle_or_hidden_puzzle import puzzle_for_pk
 from chia.wallet.trading.offer import OFFER_MOD

chia/_tests/clvm/test_puzzles.py

@@ -3,6 +3,7 @@
 from collections.abc import Iterable
 
 from chia_rs import AugSchemeMPL, G1Element
+from chia_rs.sized_ints import uint32, uint64
 
 from chia._tests.clvm.coin_store import CoinStore, CoinTimestamp
 from chia._tests.core.make_block_generator import int_to_public_key
@@ -13,7 +14,6 @@
 from chia.types.coin_spend import make_spend
 from chia.types.spend_bundle import SpendBundle
 from chia.util.hash import std_hash
-from chia.util.ints import uint32, uint64
 from chia.wallet.puzzles import (
     p2_conditions,
     p2_delegated_conditions,

chia/_tests/clvm/test_singletons.py

@@ -4,6 +4,7 @@
 
 import pytest
 from chia_rs import AugSchemeMPL, G1Element, G2Element, PrivateKey
+from chia_rs.sized_ints import uint64
 
 from chia._tests.clvm.test_puzzles import public_key_for_index, secret_exponent_for_index
 from chia._tests.util.key_tool import KeyTool
@@ -16,7 +17,6 @@
 from chia.types.condition_opcodes import ConditionOpcode
 from chia.types.spend_bundle import SpendBundle
 from chia.util.errors import Err
-from chia.util.ints import uint64
 from chia.wallet.lineage_proof import LineageProof
 from chia.wallet.puzzles import p2_conditions, p2_delegated_puzzle_or_hidden_puzzle
 

chia/_tests/cmds/cmd_test_utils.py

@@ -8,6 +8,7 @@
 from typing import Any, Optional, Union, cast
 
 from chia_rs import Coin, G2Element
+from chia_rs.sized_ints import uint8, uint16, uint32, uint64
 
 import chia.cmds.wallet_funcs
 from chia._tests.cmds.testing_classes import create_test_block_record
@@ -28,7 +29,6 @@
 from chia.types.signing_mode import SigningMode
 from chia.util.bech32m import encode_puzzle_hash
 from chia.util.config import load_config
-from chia.util.ints import uint8, uint16, uint32, uint64
 from chia.wallet.conditions import ConditionValidTimes
 from chia.wallet.nft_wallet.nft_info import NFTInfo
 from chia.wallet.nft_wallet.nft_wallet import NFTWallet

chia/_tests/cmds/test_click_types.py

@@ -5,6 +5,7 @@
 
 import click
 import pytest
+from chia_rs.sized_ints import uint64
 from click import BadParameter
 
 from chia.cmds.cmd_classes import ChiaCliContext
@@ -20,7 +21,6 @@
 from chia.cmds.units import units
 from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.bech32m import encode_puzzle_hash
-from chia.util.ints import uint64
 from chia.wallet.util.address_type import AddressType
 
 """

chia/_tests/cmds/test_cmd_framework.py

@@ -9,6 +9,7 @@
 
 import click
 import pytest
+from chia_rs.sized_ints import uint64
 from click.testing import CliRunner
 
 from chia._tests.environments.wallet import STANDARD_TX_ENDPOINT_ARGS, WalletTestFramework
@@ -26,7 +27,6 @@
 from chia.cmds.cmds_util import coin_selection_args, tx_config_args, tx_out_cmd
 from chia.cmds.param_types import CliAmount
 from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint64
 from chia.wallet.conditions import ConditionValidTimes
 from chia.wallet.transaction_record import TransactionRecord
 from chia.wallet.util.tx_config import CoinSelectionConfig, TXConfig

chia/_tests/cmds/test_show.py

@@ -4,14 +4,15 @@
 from pathlib import Path
 from typing import Any, Optional
 
+from chia_rs.sized_ints import uint32, uint64
+
 from chia._tests.cmds.cmd_test_utils import TestFullNodeRpcClient, TestRpcClients, run_cli_command_and_assert
 from chia._tests.cmds.testing_classes import hash_to_height, height_hash
 from chia._tests.util.test_full_block_utils import get_foliage, get_reward_chain_block, get_transactions_info, vdf_proof
 from chia.types.blockchain_format.foliage import FoliageTransactionBlock
 from chia.types.blockchain_format.serialized_program import SerializedProgram
 from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.full_block import FullBlock
-from chia.util.ints import uint32, uint64
 
 
 @dataclass

chia/_tests/cmds/testing_classes.py

@@ -3,8 +3,9 @@
 from dataclasses import dataclass
 from typing import Optional
 
+from chia_rs.sized_ints import uint8, uint32, uint64
+
 from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint8, uint32, uint64
 
 # This is a modified version of the TestBlockRecord from test_mempool_manager.py
 

chia/_tests/cmds/wallet/test_consts.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
 from chia_rs import Coin, G2Element
+from chia_rs.sized_ints import uint32, uint64
 
 from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint32, uint64
 from chia.wallet.conditions import ConditionValidTimes
 from chia.wallet.signer_protocol import KeyHints, SigningInstructions, TransactionInfo, UnsignedTransaction
 from chia.wallet.transaction_record import TransactionRecord

chia/_tests/cmds/wallet/test_did.py

@@ -4,6 +4,7 @@
 from typing import Optional, Union
 
 from chia_rs import G2Element
+from chia_rs.sized_ints import uint32, uint64
 
 from chia._tests.cmds.cmd_test_utils import TestRpcClients, TestWalletRpcClient, logType, run_cli_command_and_assert
 from chia._tests.cmds.wallet.test_consts import FINGERPRINT_ARG, STD_TX, STD_UTX, get_bytes32
@@ -12,7 +13,6 @@
 from chia.types.signing_mode import SigningMode
 from chia.util.bech32m import encode_puzzle_hash
 from chia.util.config import load_config
-from chia.util.ints import uint32, uint64
 from chia.wallet.conditions import Condition, ConditionValidTimes, CreateCoinAnnouncement, CreatePuzzleAnnouncement
 from chia.wallet.util.tx_config import DEFAULT_TX_CONFIG, TXConfig
 from chia.wallet.wallet_spend_bundle import WalletSpendBundle

chia/_tests/cmds/wallet/test_nft.py

@@ -4,6 +4,7 @@
 from typing import Any, Optional
 
 from chia_rs import G2Element
+from chia_rs.sized_ints import uint8, uint16, uint32, uint64
 
 from chia._tests.cmds.cmd_test_utils import TestRpcClients, TestWalletRpcClient, logType, run_cli_command_and_assert
 from chia._tests.cmds.wallet.test_consts import FINGERPRINT, FINGERPRINT_ARG, STD_TX, STD_UTX, get_bytes32
@@ -16,7 +17,6 @@
 from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.signing_mode import SigningMode
 from chia.util.bech32m import encode_puzzle_hash
-from chia.util.ints import uint8, uint16, uint32, uint64
 from chia.wallet.conditions import ConditionValidTimes
 from chia.wallet.nft_wallet.nft_info import NFTInfo
 from chia.wallet.util.tx_config import DEFAULT_TX_CONFIG, TXConfig