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

chia/_tests/conftest.py

@@ -21,6 +21,8 @@ import pytest
 
 # TODO: update after resolution in https://github.com/pytest-dev/pytest/issues/7469
 from _pytest.fixtures import SubRequest
+from chia_rs import ConsensusConstants
+from chia_rs.sized_ints import uint8, uint16, uint32, uint64
 from pytest import MonkeyPatch
 
 from chia._tests import ether
@@ -47,7 +49,6 @@ from chia._tests.util.setup_nodes import (
 )
 from chia._tests.util.spend_sim import CostLogger
 from chia._tests.util.time_out_assert import time_out_assert
-from chia.consensus.constants import ConsensusConstants
 from chia.full_node.full_node_api import FullNodeAPI
 from chia.rpc.farmer_rpc_client import FarmerRpcClient
 from chia.rpc.harvester_rpc_client import HarvesterRpcClient
@@ -79,7 +80,6 @@ from chia.types.aliases import (
 from chia.types.peer_info import PeerInfo
 from chia.util.config import create_default_chia_config, lock_and_load_config
 from chia.util.db_wrapper import generate_in_memory_db_uri
-from chia.util.ints import uint8, uint16, uint32, uint64
 from chia.util.keychain import Keychain
 from chia.util.task_timing import main as task_instrumentation_main
 from chia.util.task_timing import start_task_instrumentation, stop_task_instrumentation
@@ -90,12 +90,13 @@ multiprocessing.set_start_method("spawn")
 from dataclasses import replace
 from pathlib import Path
 
+from chia_rs.sized_ints import uint128
+
 from chia._tests.environments.wallet import WalletEnvironment, WalletState, WalletTestFramework
 from chia._tests.util.setup_nodes import setup_farmer_multi_harvester
 from chia.rpc.full_node_rpc_client import FullNodeRpcClient
 from chia.simulator.block_tools import BlockTools, create_block_tools_async, test_constants
 from chia.simulator.keyring import TempKeyring
-from chia.util.ints import uint128
 from chia.util.keyring_wrapper import KeyringWrapper
 from chia.wallet.util.tx_config import DEFAULT_TX_CONFIG, TXConfig
 from chia.wallet.wallet_node import Balance

chia/_tests/connection_utils.py

@@ -5,6 +5,8 @@ import logging
 from pathlib import Path
 
 import aiohttp
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint16
 from cryptography import x509
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import hashes, serialization
@@ -17,10 +19,8 @@ from chia.server.server import ChiaServer, ssl_context_for_client
 from chia.server.ssl_context import chia_ssl_ca_paths, private_ssl_ca_paths
 from chia.server.ws_connection import WSChiaConnection
 from chia.ssl.create_ssl import generate_ca_signed_cert
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.peer_info import PeerInfo
 from chia.util.config import load_config
-from chia.util.ints import uint16
 from chia.util.timing import adjusted_timeout
 
 log = logging.getLogger(__name__)

chia/_tests/core/cmds/test_keys.py

@@ -1434,8 +1434,7 @@ class TestKeysCommands:
         assert result.exit_code == 0
         assert (
             result.output.find(
-                "Wallet address 9 (m/12381/8444/2/9): "
-                "txch1p33y7kv48u7l68m490mr8levl6nkyxm3x8tfcnnec555egxzd3gs2dzchv"
+                "Wallet address 9 (m/12381/8444/2/9): txch1p33y7kv48u7l68m490mr8levl6nkyxm3x8tfcnnec555egxzd3gs2dzchv"
             )
             != -1
         )

chia/_tests/core/cmds/test_wallet.py

@@ -3,10 +3,10 @@ from __future__ import annotations
 from typing import Any, Optional
 
 import pytest
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32
 
 from chia.cmds.wallet_funcs import print_offer_summary
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint32
 
 TEST_DUCKSAUCE_ASSET_ID = "1000000000000000000000000000000000000000000000000000000000000001"
 TEST_CRUNCHBERRIES_ASSET_ID = "1000000000000000000000000000000000000000000000000000000000000002"

chia/_tests/core/consensus/test_block_creation.py

@@ -1,14 +1,14 @@
 from __future__ import annotations
 
 import pytest
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint32, uint64
 
 from chia._tests.core.make_block_generator import make_block_generator
 from chia.consensus.block_creation import compute_block_cost, compute_block_fee
 from chia.consensus.condition_costs import ConditionCost
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
 from chia.types.blockchain_format.coin import Coin
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint32, uint64
 
 
 @pytest.mark.parametrize("add_amount", [[0], [1, 2, 3], []])

chia/_tests/core/consensus/test_pot_iterations.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from chia_rs.sized_ints import uint8, uint16, uint32, uint64, uint128
 from pytest import raises
 
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
@@ -11,7 +12,6 @@ from chia.consensus.pot_iterations import (
     is_overflow_block,
 )
 from chia.util.hash import std_hash
-from chia.util.ints import uint8, uint16, uint32, uint64, uint128
 
 test_constants = DEFAULT_CONSTANTS.replace(NUM_SPS_SUB_SLOT=uint32(32), SUB_SLOT_TIME_TARGET=uint16(300))
 

chia/_tests/core/custom_types/test_coin.py

@@ -1,11 +1,11 @@
 from __future__ import annotations
 
 import pytest
+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.sized_bytes import bytes32
 from chia.util.hash import std_hash
-from chia.util.ints import uint64
 
 
 def coin_serialize(amount: uint64, clvm_serialize: bytes, full_serialize: bytes):

chia/_tests/core/custom_types/test_proof_of_space.py

@@ -6,12 +6,12 @@ from typing import Optional
 
 import pytest
 from chia_rs import G1Element
+from chia_rs.sized_bytes import bytes32, bytes48
+from chia_rs.sized_ints import uint8, uint32
 
 from chia._tests.util.misc import Marks, datacases
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
 from chia.types.blockchain_format.proof_of_space import ProofOfSpace, passes_plot_filter, verify_and_get_quality_string
-from chia.types.blockchain_format.sized_bytes import bytes32, bytes48
-from chia.util.ints import uint8, uint32
 
 
 @dataclass

chia/_tests/core/custom_types/test_spend_bundle.py

@@ -5,14 +5,14 @@ import unittest
 
 import pytest
 from chia_rs import G2Element
+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, make_spend
 from chia.types.condition_opcodes import ConditionOpcode
 from chia.types.spend_bundle import SpendBundle
-from chia.util.ints import uint64
 
 BLANK_SPEND_BUNDLE = SpendBundle(coin_spends=[], aggregated_signature=G2Element())
 NULL_SIGNATURE = "0xc" + "0" * 191

chia/_tests/core/data_layer/conftest.py

@@ -11,6 +11,7 @@ import pytest
 
 # https://github.com/pytest-dev/pytest/issues/7469
 from _pytest.fixtures import SubRequest
+from chia_rs.sized_bytes import bytes32
 
 from chia._tests.core.data_layer.util import (
     ChiaRoot,
@@ -22,7 +23,6 @@ from chia._tests.core.data_layer.util import (
 from chia._tests.util.misc import closing_chia_root_popen
 from chia.data_layer.data_layer_util import NodeType, Status
 from chia.data_layer.data_store import DataStore
-from chia.types.blockchain_format.sized_bytes import bytes32
 
 # TODO: These are more general than the data layer and should either move elsewhere or
 #       be replaced with an existing common approach.  For now they can at least be

chia/_tests/core/data_layer/test_data_layer.py

@@ -4,12 +4,12 @@ from pathlib import Path
 from typing import Any, cast
 
 import pytest
+from chia_rs.sized_bytes import bytes32
 
 from chia._tests.util.misc import RecordingWebServer
 from chia.data_layer.data_layer import DataLayer
 from chia.data_layer.data_layer_util import PluginRemote
 from chia.rpc.wallet_rpc_client import WalletRpcClient
-from chia.types.blockchain_format.sized_bytes import bytes32
 
 
 async def create_sufficient_wallet_rpc_client() -> WalletRpcClient:

chia/_tests/core/data_layer/test_data_layer_util.py

@@ -7,6 +7,7 @@ import pytest
 
 # TODO: update after resolution in https://github.com/pytest-dev/pytest/issues/7469
 from _pytest.fixtures import SubRequest
+from chia_rs.sized_bytes import bytes32
 
 from chia._tests.util.misc import Marks, datacases, measure_runtime
 from chia.data_layer.data_layer_util import (
@@ -24,7 +25,6 @@ from chia.data_layer.data_layer_util import (
 from chia.rpc.data_layer_rpc_util import MarshallableProtocol
 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
 
 pytestmark = pytest.mark.data_layer
 

chia/_tests/core/data_layer/test_data_rpc.py

@@ -20,6 +20,8 @@ from typing import Any, Optional, cast
 
 import anyio
 import pytest
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint16, uint32, uint64
 
 from chia._tests.util.misc import boolean_datacases
 from chia._tests.util.setup_nodes import SimulatorsAndWalletsServices
@@ -60,12 +62,10 @@ from chia.simulator.block_tools import BlockTools
 from chia.simulator.full_node_simulator import FullNodeSimulator
 from chia.simulator.simulator_protocol import FarmNewBlockProtocol
 from chia.types.aliases import DataLayerService, WalletService
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.peer_info import PeerInfo
 from chia.util.byte_types import hexstr_to_bytes
 from chia.util.config import save_config
 from chia.util.hash import std_hash
-from chia.util.ints import uint8, uint16, uint32, uint64
 from chia.util.keychain import bytes_to_mnemonic
 from chia.util.task_referencer import create_referenced_task
 from chia.util.timing import adjusted_timeout, backoff_times

chia/_tests/core/data_layer/test_data_store.py

@@ -16,6 +16,7 @@ from typing import Any, Callable, Optional, cast
 import aiohttp
 import aiosqlite
 import pytest
+from chia_rs.sized_bytes import bytes32
 
 from chia._tests.core.data_layer.util import Example, add_0123_example, add_01234567_example
 from chia._tests.util.misc import BenchmarkRunner, Marks, boolean_datacases, datacases
@@ -46,7 +47,6 @@ from chia.data_layer.download_data import (
     write_files_for_root,
 )
 from chia.types.blockchain_format.program import Program
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.byte_types import hexstr_to_bytes
 from chia.util.db_wrapper import DBWrapper2, generate_in_memory_db_uri
 

chia/_tests/core/data_layer/test_data_store_schema.py

@@ -4,11 +4,11 @@ import sqlite3
 from typing import Any
 
 import pytest
+from chia_rs.sized_bytes import bytes32
 
 from chia._tests.core.data_layer.util import add_01234567_example, create_valid_node_values
 from chia.data_layer.data_layer_util import NodeType, Side, Status
 from chia.data_layer.data_store import DataStore
-from chia.types.blockchain_format.sized_bytes import bytes32
 
 pytestmark = pytest.mark.data_layer
 

chia/_tests/core/data_layer/util.py

@@ -10,10 +10,11 @@ from collections.abc import Iterator
 from dataclasses import dataclass
 from typing import IO, TYPE_CHECKING, Any, Literal, Optional, Union, overload
 
+from chia_rs.sized_bytes import bytes32
+
 from chia.data_layer.data_layer_util import InternalNode, Node, NodeType, Side, Status, TerminalNode
 from chia.data_layer.data_store import DataStore
 from chia.types.blockchain_format.program import Program
-from chia.types.blockchain_format.sized_bytes import bytes32
 
 # from subprocess.pyi
 _FILE = Union[int, IO[Any], None]

chia/_tests/core/farmer/test_farmer_api.py

@@ -5,6 +5,7 @@ from collections.abc import Coroutine
 from typing import Any, Optional, TypeVar
 
 import pytest
+from chia_rs.sized_ints import uint8, uint32, uint64
 
 from chia._tests.conftest import FarmerOneHarvester
 from chia._tests.connection_utils import add_dummy_connection, add_dummy_connection_wsc
@@ -19,7 +20,6 @@ from chia.protocols import farmer_protocol
 from chia.protocols.protocol_message_types import ProtocolMessageTypes
 from chia.server.outbound_message import Message, NodeType
 from chia.util.hash import std_hash
-from chia.util.ints import uint8, uint32, uint64
 from chia.util.task_referencer import create_referenced_task
 
 T = TypeVar("T")

chia/_tests/core/full_node/full_sync/test_full_sync.py

@@ -5,19 +5,17 @@ import logging
 import time
 
 import pytest
+from chia_rs.sized_ints import uint16
 
 from chia._tests.core.node_height import node_height_between, node_height_exactly
 from chia._tests.util.time_out_assert import time_out_assert
-from chia.full_node.full_node import FullNode
 from chia.full_node.full_node_api import FullNodeAPI
 from chia.protocols import full_node_protocol
 from chia.protocols.shared_protocol import Capability
-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.types.peer_info import PeerInfo
 from chia.util.hash import std_hash
-from chia.util.ints import uint16
 
 log = logging.getLogger(__name__)
 
@@ -437,7 +435,3 @@ class TestFullSync:
         block = blocks[-1]
         full_node_1.full_node.add_to_bad_peak_cache(block.header_hash, block.height)
         assert len(full_node_1.full_node.bad_peak_cache) == 1
-
-
-def has_peers_with_peak(node: FullNode, header_hash: bytes32) -> bool:
-    return len(node.sync_store.get_peers_that_have_peak([header_hash])) > 0

chia/_tests/core/full_node/ram_db.py

@@ -5,8 +5,9 @@ import random
 from collections.abc import AsyncIterator
 from pathlib import Path
 
+from chia_rs import ConsensusConstants
+
 from chia.consensus.blockchain import Blockchain
-from chia.consensus.constants import ConsensusConstants
 from chia.full_node.block_store import BlockStore
 from chia.full_node.coin_store import CoinStore
 from chia.util.db_wrapper import DBWrapper2

chia/_tests/core/full_node/stores/test_block_store.py

@@ -11,6 +11,8 @@ import pytest
 
 # TODO: update after resolution in https://github.com/pytest-dev/pytest/issues/7469
 from _pytest.fixtures import SubRequest
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint32, uint64
 from clvm.casts import int_to_bytes
 
 from chia._tests.blockchain.blockchain_test_utils import _validate_and_add_block
@@ -24,12 +26,10 @@ from chia.full_node.coin_store import CoinStore
 from chia.simulator.block_tools import BlockTools
 from chia.simulator.wallet_tools import WalletTool
 from chia.types.blockchain_format.serialized_program import SerializedProgram
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.blockchain_format.vdf import VDFProof
 from chia.types.full_block import FullBlock
 from chia.util.db_wrapper import get_host_parameter_limit
 from chia.util.full_block_utils import GeneratorBlockInfo
-from chia.util.ints import uint8, uint32, uint64
 from chia.util.task_referencer import create_referenced_task
 
 log = logging.getLogger(__name__)

chia/_tests/core/full_node/stores/test_coin_store.py

@@ -6,6 +6,8 @@ from pathlib import Path
 from typing import Optional
 
 import pytest
+from chia_rs.sized_bytes import bytes32
+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
@@ -23,14 +25,12 @@ from chia.protocols.wallet_protocol import CoinState
 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.blockchain_format.sized_bytes import bytes32
 from chia.types.coin_record import CoinRecord
 from chia.types.eligible_coin_spends import UnspentLineageInfo
 from chia.types.full_block import FullBlock
 from chia.types.generator_types import BlockGenerator
 from chia.util.generator_tools import tx_removals_and_additions
 from chia.util.hash import std_hash
-from chia.util.ints import uint32, uint64
 
 constants = test_constants
 

chia/_tests/core/full_node/stores/test_full_node_store.py

@@ -6,13 +6,15 @@ from collections.abc import AsyncIterator
 from typing import Optional
 
 import pytest
+from chia_rs import ConsensusConstants
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint16, uint32, uint64, uint128
 
 from chia._tests.blockchain.blockchain_test_utils import _validate_and_add_block, _validate_and_add_block_no_error
 from chia._tests.util.blockchain import create_blockchain
 from chia._tests.util.blockchain_mock import BlockchainMock
 from chia.consensus.block_body_validation import ForkInfo
 from chia.consensus.blockchain import AddBlockResult, Blockchain
-from chia.consensus.constants import ConsensusConstants
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
 from chia.consensus.difficulty_adjustment import get_next_sub_slot_iters_and_difficulty
 from chia.consensus.find_fork_point import find_fork_point_in_chain
@@ -24,11 +26,9 @@ from chia.protocols import timelord_protocol
 from chia.protocols.timelord_protocol import NewInfusionPointVDF
 from chia.simulator.block_tools import BlockTools, create_block_tools_async, get_signage_point, make_unfinished_block
 from chia.simulator.keyring import TempKeyring
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.full_block import FullBlock
 from chia.types.unfinished_block import UnfinishedBlock
 from chia.util.hash import std_hash
-from chia.util.ints import uint8, uint16, uint32, uint64, uint128
 from chia.util.recursive_replace import recursive_replace
 
 log = logging.getLogger(__name__)

chia/_tests/core/full_node/stores/test_hint_store.py

@@ -3,6 +3,8 @@ from __future__ import annotations
 import logging
 
 import pytest
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint64
 from clvm.casts import int_to_bytes
 
 from chia._tests.util.db_connection import DBConnection
@@ -12,10 +14,8 @@ from chia.simulator.block_tools import BlockTools
 from chia.simulator.full_node_simulator import FullNodeSimulator
 from chia.simulator.wallet_tools import WalletTool
 from chia.types.blockchain_format.coin import Coin
-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.util.ints import uint64
 
 log = logging.getLogger(__name__)
 

chia/_tests/core/full_node/stores/test_sync_store.py

@@ -3,9 +3,9 @@ from __future__ import annotations
 import random
 
 import pytest
+from chia_rs.sized_bytes import bytes32
 
 from chia.full_node.sync_store import SyncStore
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.hash import std_hash
 
 

chia/_tests/core/full_node/test_address_manager.py

@@ -5,11 +5,11 @@ import time
 from pathlib import Path
 
 import pytest
+from chia_rs.sized_ints import uint16, uint64
 
 from chia.server.address_manager import AddressManager, ExtendedPeerInfo
 from chia.server.address_manager_store import AddressManagerStore
 from chia.types.peer_info import PeerInfo, TimestampedPeerInfo
-from chia.util.ints import uint16, uint64
 
 
 class AddressManagerTest(AddressManager):

chia/_tests/core/full_node/test_block_height_map.py

@@ -6,14 +6,14 @@ from pathlib import Path
 from typing import Optional
 
 import pytest
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8, uint32
 
 from chia._tests.util.db_connection import DBConnection
 from chia.full_node.block_height_map import BlockHeightMap, SesCache
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.blockchain_format.sub_epoch_summary import SubEpochSummary
 from chia.util.db_wrapper import DBWrapper2
 from chia.util.files import write_file_async
-from chia.util.ints import uint8, uint32
 
 
 def gen_block_hash(height: int) -> bytes32:

chia/_tests/core/full_node/test_conditions.py

@@ -10,6 +10,7 @@ from typing import Optional
 
 import pytest
 from chia_rs import AugSchemeMPL, G2Element
+from chia_rs.sized_ints import uint32, uint64
 from clvm.casts import int_to_bytes
 from clvm_tools.binutils import assemble
 
@@ -27,7 +28,6 @@ from chia.types.full_block import FullBlock
 from chia.types.spend_bundle import SpendBundle
 from chia.util.condition_tools import agg_sig_additional_data
 from chia.util.errors import Err
-from chia.util.ints import uint32, uint64
 from chia.wallet.conditions import AssertCoinAnnouncement, AssertPuzzleAnnouncement