From 2c4c0df9322d09ac22a049d24f0a44a5c26d0e9c Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Wed, 26 Feb 2025 12:48:13 -0500 Subject: [PATCH] use chia_rs directly for sized bytes --- benchmarks/block_ref.py | 2 +- benchmarks/block_store.py | 2 +- benchmarks/coin_store.py | 2 +- benchmarks/mempool-long-lived.py | 2 +- benchmarks/mempool.py | 2 +- benchmarks/streamable.py | 2 +- chia/_tests/blockchain/test_augmented_chain.py | 2 +- chia/_tests/blockchain/test_blockchain.py | 2 +- .../_tests/blockchain/test_blockchain_transactions.py | 2 +- chia/_tests/blockchain/test_get_block_generator.py | 2 +- chia/_tests/blockchain/test_lookup_fork_chain.py | 2 +- chia/_tests/clvm/coin_store.py | 2 +- chia/_tests/clvm/test_curry_and_treehash.py | 2 +- chia/_tests/clvm/test_puzzle_compression.py | 2 +- chia/_tests/clvm/test_puzzles.py | 2 +- chia/_tests/clvm/test_singletons.py | 2 +- chia/_tests/clvm/test_spend_sim.py | 2 +- chia/_tests/cmds/cmd_test_utils.py | 2 +- chia/_tests/cmds/test_click_types.py | 2 +- chia/_tests/cmds/test_cmd_framework.py | 2 +- chia/_tests/cmds/test_show.py | 2 +- chia/_tests/cmds/test_tx_config_args.py | 2 +- chia/_tests/cmds/testing_classes.py | 3 +-- chia/_tests/cmds/wallet/test_consts.py | 2 +- chia/_tests/cmds/wallet/test_did.py | 2 +- chia/_tests/cmds/wallet/test_nft.py | 2 +- chia/_tests/cmds/wallet/test_notifications.py | 2 +- chia/_tests/cmds/wallet/test_vcs.py | 2 +- chia/_tests/cmds/wallet/test_wallet.py | 2 +- chia/_tests/connection_utils.py | 2 +- chia/_tests/core/cmds/test_wallet.py | 2 +- chia/_tests/core/consensus/test_block_creation.py | 2 +- chia/_tests/core/custom_types/test_coin.py | 2 +- chia/_tests/core/custom_types/test_proof_of_space.py | 2 +- chia/_tests/core/custom_types/test_spend_bundle.py | 2 +- chia/_tests/core/data_layer/conftest.py | 2 +- chia/_tests/core/data_layer/test_data_layer.py | 2 +- chia/_tests/core/data_layer/test_data_layer_util.py | 2 +- chia/_tests/core/data_layer/test_data_rpc.py | 2 +- chia/_tests/core/data_layer/test_data_store.py | 2 +- chia/_tests/core/data_layer/test_data_store_schema.py | 2 +- chia/_tests/core/data_layer/util.py | 3 ++- chia/_tests/core/full_node/stores/test_block_store.py | 2 +- chia/_tests/core/full_node/stores/test_coin_store.py | 2 +- .../core/full_node/stores/test_full_node_store.py | 2 +- chia/_tests/core/full_node/stores/test_hint_store.py | 2 +- chia/_tests/core/full_node/stores/test_sync_store.py | 2 +- chia/_tests/core/full_node/test_block_height_map.py | 2 +- chia/_tests/core/full_node/test_full_node.py | 2 +- chia/_tests/core/full_node/test_generator_tools.py | 2 +- chia/_tests/core/full_node/test_hint_management.py | 2 +- chia/_tests/core/full_node/test_subscriptions.py | 2 +- chia/_tests/core/full_node/test_transactions.py | 2 +- .../_tests/core/full_node/test_tx_processing_queue.py | 2 +- chia/_tests/core/make_block_generator.py | 2 +- chia/_tests/core/mempool/test_mempool.py | 2 +- chia/_tests/core/mempool/test_mempool_manager.py | 2 +- .../core/mempool/test_singleton_fast_forward.py | 2 +- chia/_tests/core/server/test_server.py | 2 +- chia/_tests/core/ssl/test_ssl.py | 2 +- chia/_tests/core/test_coins.py | 3 ++- chia/_tests/core/test_cost_calculation.py | 2 +- chia/_tests/core/test_crawler.py | 2 +- chia/_tests/core/test_db_conversion.py | 2 +- chia/_tests/core/test_db_validation.py | 2 +- chia/_tests/core/test_farmer_harvester_rpc.py | 2 +- chia/_tests/core/test_full_node_rpc.py | 2 +- chia/_tests/core/test_merkle_set.py | 2 +- chia/_tests/core/test_program.py | 2 +- chia/_tests/core/util/test_block_cache.py | 2 +- chia/_tests/core/util/test_jsonify.py | 2 +- chia/_tests/core/util/test_keychain.py | 2 +- chia/_tests/core/util/test_streamable.py | 2 +- chia/_tests/environments/wallet.py | 2 +- chia/_tests/farmer_harvester/test_farmer.py | 2 +- chia/_tests/farmer_harvester/test_farmer_harvester.py | 2 +- .../farmer_harvester/test_filter_prefix_bits.py | 2 +- .../farmer_harvester/test_third_party_harvesters.py | 2 +- chia/_tests/fee_estimation/test_fee_estimation_rpc.py | 2 +- .../fee_estimation/test_mempoolitem_height_added.py | 2 +- chia/_tests/generator/test_rom.py | 2 +- chia/_tests/plot_sync/test_delta.py | 2 +- chia/_tests/plot_sync/test_plot_sync.py | 2 +- chia/_tests/plot_sync/test_receiver.py | 2 +- chia/_tests/plot_sync/test_sender.py | 2 +- chia/_tests/plot_sync/test_sync_simulated.py | 2 +- chia/_tests/plot_sync/util.py | 2 +- chia/_tests/pools/test_pool_cli_parsing.py | 2 +- chia/_tests/pools/test_pool_cmdline.py | 2 +- chia/_tests/pools/test_pool_puzzles_lifecycle.py | 2 +- chia/_tests/pools/test_pool_rpc.py | 2 +- chia/_tests/pools/test_pool_wallet.py | 2 +- chia/_tests/pools/test_wallet_pool_store.py | 2 +- chia/_tests/simulation/test_simulation.py | 2 +- chia/_tests/simulation/test_start_simulator.py | 2 +- chia/_tests/timelord/test_new_peak.py | 2 +- chia/_tests/tools/test_run_block.py | 2 +- chia/_tests/util/benchmark_cost.py | 2 +- chia/_tests/util/benchmarks.py | 2 +- chia/_tests/util/blockchain_mock.py | 2 +- chia/_tests/util/full_sync.py | 2 +- chia/_tests/util/generator_tools_testing.py | 2 +- chia/_tests/util/misc.py | 2 +- chia/_tests/util/network_protocol_data.py | 2 +- chia/_tests/util/run_block.py | 2 +- chia/_tests/util/setup_nodes.py | 2 +- chia/_tests/util/spend_sim.py | 2 +- chia/_tests/util/test_condition_tools.py | 2 +- chia/_tests/util/test_full_block_utils.py | 2 +- chia/_tests/util/test_replace_str_to_bytes.py | 2 +- chia/_tests/util/test_trusted_peer.py | 2 +- .../_tests/wallet/cat_wallet/test_cat_outer_puzzle.py | 2 +- chia/_tests/wallet/cat_wallet/test_cat_wallet.py | 2 +- chia/_tests/wallet/cat_wallet/test_offer_lifecycle.py | 2 +- chia/_tests/wallet/cat_wallet/test_trades.py | 2 +- .../_tests/wallet/clawback/test_clawback_lifecycle.py | 2 +- chia/_tests/wallet/clawback/test_clawback_metadata.py | 2 +- chia/_tests/wallet/conftest.py | 2 +- chia/_tests/wallet/db_wallet/test_db_graftroot.py | 2 +- chia/_tests/wallet/db_wallet/test_dl_offers.py | 2 +- chia/_tests/wallet/db_wallet/test_dl_wallet.py | 2 +- chia/_tests/wallet/did_wallet/test_did.py | 2 +- chia/_tests/wallet/nft_wallet/test_nft_1_offers.py | 2 +- chia/_tests/wallet/nft_wallet/test_nft_bulk_mint.py | 2 +- chia/_tests/wallet/nft_wallet/test_nft_lifecycle.py | 2 +- chia/_tests/wallet/nft_wallet/test_nft_offers.py | 2 +- chia/_tests/wallet/nft_wallet/test_nft_puzzles.py | 3 ++- chia/_tests/wallet/nft_wallet/test_nft_wallet.py | 2 +- .../wallet/nft_wallet/test_ownership_outer_puzzle.py | 2 +- chia/_tests/wallet/rpc/test_dl_wallet_rpc.py | 2 +- chia/_tests/wallet/rpc/test_wallet_rpc.py | 2 +- .../wallet/simple_sync/test_simple_sync_protocol.py | 2 +- chia/_tests/wallet/sync/test_wallet_sync.py | 2 +- chia/_tests/wallet/test_clvm_streamable.py | 2 +- chia/_tests/wallet/test_coin_management.py | 2 +- chia/_tests/wallet/test_coin_selection.py | 2 +- chia/_tests/wallet/test_conditions.py | 2 +- chia/_tests/wallet/test_debug_spend_bundle.py | 2 +- chia/_tests/wallet/test_new_wallet_protocol.py | 2 +- chia/_tests/wallet/test_nft_store.py | 2 +- chia/_tests/wallet/test_notifications.py | 2 +- chia/_tests/wallet/test_puzzle_store.py | 2 +- chia/_tests/wallet/test_sign_coin_spends.py | 2 +- chia/_tests/wallet/test_signer_protocol.py | 2 +- chia/_tests/wallet/test_singleton.py | 2 +- chia/_tests/wallet/test_singleton_lifecycle_fast.py | 2 +- chia/_tests/wallet/test_singleton_store.py | 2 +- chia/_tests/wallet/test_transaction_store.py | 2 +- chia/_tests/wallet/test_util.py | 2 +- chia/_tests/wallet/test_wallet.py | 2 +- chia/_tests/wallet/test_wallet_action_scope.py | 2 +- chia/_tests/wallet/test_wallet_coin_store.py | 2 +- chia/_tests/wallet/test_wallet_interested_store.py | 2 +- chia/_tests/wallet/test_wallet_node.py | 2 +- chia/_tests/wallet/test_wallet_retry.py | 2 +- chia/_tests/wallet/test_wallet_state_manager.py | 2 +- chia/_tests/wallet/test_wallet_trade_store.py | 2 +- chia/_tests/wallet/test_wallet_utils.py | 2 +- chia/_tests/wallet/vc_wallet/test_cr_outer_puzzle.py | 2 +- chia/_tests/wallet/vc_wallet/test_vc_lifecycle.py | 2 +- chia/_tests/wallet/vc_wallet/test_vc_wallet.py | 2 +- chia/_tests/wallet/wallet_block_tools.py | 2 +- chia/_tests/weight_proof/test_weight_proof.py | 2 +- chia/cmds/cmd_classes.py | 2 +- chia/cmds/cmd_helpers.py | 2 +- chia/cmds/cmds_util.py | 2 +- chia/cmds/coin_funcs.py | 2 +- chia/cmds/coins.py | 2 +- chia/cmds/data.py | 2 +- chia/cmds/data_funcs.py | 2 +- chia/cmds/db_validate_func.py | 3 ++- chia/cmds/netspace_funcs.py | 3 ++- chia/cmds/param_types.py | 2 +- chia/cmds/plotnft.py | 2 +- chia/cmds/plotnft_funcs.py | 2 +- chia/cmds/show_funcs.py | 6 ++++-- chia/cmds/sim_funcs.py | 2 +- chia/cmds/wallet.py | 2 +- chia/cmds/wallet_funcs.py | 2 +- chia/consensus/block_body_validation.py | 2 +- chia/consensus/block_creation.py | 2 +- chia/consensus/block_header_validation.py | 2 +- chia/consensus/block_record.py | 3 +-- chia/consensus/blockchain.py | 2 +- chia/consensus/blockchain_interface.py | 2 +- chia/consensus/coinbase.py | 2 +- chia/consensus/default_constants.py | 2 +- chia/consensus/difficulty_adjustment.py | 2 +- chia/consensus/find_fork_point.py | 2 +- chia/consensus/full_block_to_block_record.py | 2 +- chia/consensus/get_block_challenge.py | 2 +- chia/consensus/get_block_generator.py | 2 +- chia/consensus/multiprocess_validation.py | 2 +- chia/consensus/pot_iterations.py | 2 +- chia/consensus/vdf_info_computation.py | 2 +- chia/data_layer/data_layer.py | 2 +- chia/data_layer/data_layer_errors.py | 2 +- chia/data_layer/data_layer_util.py | 2 +- chia/data_layer/data_layer_wallet.py | 2 +- chia/data_layer/data_store.py | 2 +- chia/data_layer/dl_wallet_store.py | 2 +- chia/data_layer/download_data.py | 2 +- chia/data_layer/s3_plugin_service.py | 2 +- chia/data_layer/singleton_record.py | 2 +- chia/data_layer/util/benchmark.py | 3 ++- chia/farmer/farmer.py | 2 +- chia/farmer/farmer_api.py | 2 +- chia/full_node/block_height_map.py | 2 +- chia/full_node/block_store.py | 2 +- chia/full_node/coin_store.py | 2 +- chia/full_node/full_node.py | 2 +- chia/full_node/full_node_api.py | 2 +- chia/full_node/full_node_store.py | 2 +- chia/full_node/hint_management.py | 3 ++- chia/full_node/hint_store.py | 2 +- chia/full_node/mempool.py | 2 +- chia/full_node/mempool_check_conditions.py | 2 +- chia/full_node/mempool_manager.py | 2 +- chia/full_node/pending_tx_cache.py | 2 +- chia/full_node/subscriptions.py | 2 +- chia/full_node/sync_store.py | 3 +-- chia/full_node/tx_processing_queue.py | 3 ++- chia/full_node/weight_proof.py | 2 +- chia/harvester/harvester_api.py | 2 +- chia/plot_sync/receiver.py | 2 +- chia/plotting/cache.py | 2 +- chia/plotting/create_plots.py | 2 +- chia/plotting/util.py | 2 +- chia/pools/pool_config.py | 2 +- chia/pools/pool_puzzles.py | 2 +- chia/pools/pool_wallet.py | 2 +- chia/pools/pool_wallet_info.py | 2 +- chia/protocols/farmer_protocol.py | 2 +- chia/protocols/full_node_protocol.py | 2 +- chia/protocols/harvester_protocol.py | 2 +- chia/protocols/pool_protocol.py | 2 +- chia/protocols/timelord_protocol.py | 2 +- chia/protocols/wallet_protocol.py | 2 +- chia/rpc/data_layer_rpc_api.py | 2 +- chia/rpc/data_layer_rpc_client.py | 2 +- chia/rpc/farmer_rpc_api.py | 2 +- chia/rpc/farmer_rpc_client.py | 3 ++- chia/rpc/full_node_rpc_api.py | 2 +- chia/rpc/full_node_rpc_client.py | 2 +- chia/rpc/rpc_client.py | 2 +- chia/rpc/wallet_request_types.py | 2 +- chia/rpc/wallet_rpc_api.py | 2 +- chia/rpc/wallet_rpc_client.py | 2 +- chia/server/server.py | 2 +- chia/server/ws_connection.py | 2 +- chia/simulator/block_tools.py | 2 +- chia/simulator/full_node_simulator.py | 2 +- chia/simulator/setup_services.py | 2 +- chia/simulator/simulator_full_node_rpc_api.py | 2 +- chia/simulator/simulator_full_node_rpc_client.py | 2 +- chia/simulator/simulator_protocol.py | 2 +- chia/simulator/simulator_test_tools.py | 2 +- chia/simulator/start_simulator.py | 2 +- chia/simulator/wallet_tools.py | 2 +- chia/timelord/iters_from_block.py | 2 +- chia/timelord/timelord.py | 2 +- chia/timelord/timelord_state.py | 2 +- chia/types/block_protocol.py | 2 +- chia/types/blockchain_format/coin.py | 2 +- chia/types/blockchain_format/program.py | 2 +- chia/types/blockchain_format/proof_of_space.py | 2 +- chia/types/blockchain_format/sized_bytes.py | 11 ----------- chia/types/blockchain_format/tree_hash.py | 2 +- chia/types/blockchain_format/vdf.py | 2 +- chia/types/coin_record.py | 2 +- chia/types/eligible_coin_spends.py | 2 +- chia/types/internal_mempool_item.py | 2 +- chia/types/mempool_item.py | 2 +- chia/types/transaction_queue_entry.py | 3 ++- chia/types/unfinished_header_block.py | 2 +- chia/util/augmented_chain.py | 2 +- chia/util/block_cache.py | 2 +- chia/util/condition_tools.py | 2 +- chia/util/full_block_utils.py | 2 +- chia/util/generator_tools.py | 2 +- chia/util/network.py | 2 +- chia/util/vdf_prover.py | 2 +- chia/util/ws_message.py | 2 +- chia/wallet/cat_wallet/cat_info.py | 2 +- chia/wallet/cat_wallet/cat_outer_puzzle.py | 2 +- chia/wallet/cat_wallet/cat_utils.py | 2 +- chia/wallet/cat_wallet/cat_wallet.py | 2 +- chia/wallet/cat_wallet/lineage_store.py | 3 ++- chia/wallet/coin_selection.py | 2 +- chia/wallet/conditions.py | 2 +- chia/wallet/db_wallet/db_wallet_puzzles.py | 2 +- chia/wallet/derivation_record.py | 2 +- chia/wallet/derive_keys.py | 2 +- chia/wallet/did_wallet/did_info.py | 2 +- chia/wallet/did_wallet/did_wallet.py | 2 +- chia/wallet/did_wallet/did_wallet_puzzles.py | 2 +- chia/wallet/driver_protocol.py | 2 +- chia/wallet/lineage_proof.py | 2 +- chia/wallet/nft_wallet/metadata_outer_puzzle.py | 3 ++- chia/wallet/nft_wallet/nft_info.py | 2 +- chia/wallet/nft_wallet/nft_puzzle_utils.py | 2 +- chia/wallet/nft_wallet/nft_puzzles.py | 2 +- chia/wallet/nft_wallet/nft_wallet.py | 2 +- chia/wallet/nft_wallet/ownership_outer_puzzle.py | 2 +- chia/wallet/nft_wallet/singleton_outer_puzzle.py | 2 +- chia/wallet/nft_wallet/transfer_program_puzzle.py | 2 +- chia/wallet/nft_wallet/uncurry_nft.py | 2 +- chia/wallet/notification_manager.py | 2 +- chia/wallet/notification_store.py | 2 +- chia/wallet/outer_puzzles.py | 3 ++- chia/wallet/puzzles/clawback/drivers.py | 2 +- chia/wallet/puzzles/clawback/metadata.py | 2 +- chia/wallet/puzzles/clawback/puzzle_decorator.py | 2 +- .../puzzles/p2_delegated_puzzle_or_hidden_puzzle.py | 2 +- chia/wallet/puzzles/p2_puzzle_hash.py | 2 +- chia/wallet/puzzles/puzzle_utils.py | 2 +- chia/wallet/puzzles/singleton_top_layer.py | 2 +- chia/wallet/puzzles/singleton_top_layer_v1_1.py | 2 +- chia/wallet/puzzles/tails.py | 2 +- chia/wallet/signer_protocol.py | 2 +- chia/wallet/singleton.py | 2 +- chia/wallet/singleton_record.py | 2 +- chia/wallet/trade_manager.py | 2 +- chia/wallet/trade_record.py | 2 +- chia/wallet/trading/offer.py | 2 +- chia/wallet/trading/trade_store.py | 2 +- chia/wallet/transaction_record.py | 2 +- chia/wallet/util/blind_signer_tl.py | 2 +- chia/wallet/util/compute_hints.py | 2 +- chia/wallet/util/compute_memos.py | 2 +- chia/wallet/util/curry_and_treehash.py | 3 +-- chia/wallet/util/merkle_tree.py | 2 +- chia/wallet/util/merkle_utils.py | 2 +- chia/wallet/util/new_peak_queue.py | 3 ++- chia/wallet/util/notifications.py | 2 +- chia/wallet/util/peer_request_cache.py | 2 +- chia/wallet/util/puzzle_decorator.py | 2 +- chia/wallet/util/query_filter.py | 2 +- chia/wallet/util/tx_config.py | 2 +- chia/wallet/util/wallet_sync_utils.py | 2 +- chia/wallet/vc_wallet/cr_cat_drivers.py | 2 +- chia/wallet/vc_wallet/cr_cat_wallet.py | 2 +- chia/wallet/vc_wallet/cr_outer_puzzle.py | 2 +- chia/wallet/vc_wallet/vc_drivers.py | 2 +- chia/wallet/vc_wallet/vc_store.py | 2 +- chia/wallet/vc_wallet/vc_wallet.py | 2 +- chia/wallet/wallet.py | 2 +- chia/wallet/wallet_blockchain.py | 2 +- chia/wallet/wallet_coin_record.py | 2 +- chia/wallet/wallet_coin_store.py | 2 +- chia/wallet/wallet_interested_store.py | 2 +- chia/wallet/wallet_nft_store.py | 2 +- chia/wallet/wallet_node.py | 2 +- chia/wallet/wallet_protocol.py | 2 +- chia/wallet/wallet_puzzle_store.py | 2 +- chia/wallet/wallet_retry_store.py | 2 +- chia/wallet/wallet_singleton_store.py | 2 +- chia/wallet/wallet_state_manager.py | 2 +- chia/wallet/wallet_transaction_store.py | 2 +- tools/analyze-chain.py | 2 +- tools/manage_clvm.py | 3 +-- 361 files changed, 377 insertions(+), 377 deletions(-) delete mode 100644 chia/types/blockchain_format/sized_bytes.py diff --git a/benchmarks/block_ref.py b/benchmarks/block_ref.py index 3d88c26df3ec..1bb3228bac56 100644 --- a/benchmarks/block_ref.py +++ b/benchmarks/block_ref.py @@ -10,6 +10,7 @@ import aiosqlite import click +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32 from chia.consensus.blockchain import Blockchain @@ -18,7 +19,6 @@ from chia.full_node.block_store import BlockStore from chia.full_node.coin_store import CoinStore from chia.types.blockchain_format.serialized_program import SerializedProgram -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 diff --git a/benchmarks/block_store.py b/benchmarks/block_store.py index abfaef7db8d0..5273f9c0d356 100644 --- a/benchmarks/block_store.py +++ b/benchmarks/block_store.py @@ -8,6 +8,7 @@ from time import monotonic from chia_rs import Foliage, FoliageBlockData, FoliageTransactionBlock, TransactionsInfo +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64, uint128 from benchmarks.utils import setup_db @@ -28,7 +29,6 @@ from chia.types.blockchain_format.proof_of_space import ProofOfSpace from chia.types.blockchain_format.reward_chain_block import RewardChainBlock from chia.types.blockchain_format.serialized_program import SerializedProgram -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 diff --git a/benchmarks/coin_store.py b/benchmarks/coin_store.py index 0031f80d0524..00367c22f6f2 100644 --- a/benchmarks/coin_store.py +++ b/benchmarks/coin_store.py @@ -7,13 +7,13 @@ from pathlib import Path from time import monotonic +from chia_rs.sized_bytes import bytes32 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 # to run this benchmark: # python -m benchmarks.coin_store diff --git a/benchmarks/mempool-long-lived.py b/benchmarks/mempool-long-lived.py index 2e010461552c..3b07282d1b80 100644 --- a/benchmarks/mempool-long-lived.py +++ b/benchmarks/mempool-long-lived.py @@ -7,6 +7,7 @@ from typing import Optional from chia_rs import G2Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from clvm.casts import int_to_bytes @@ -14,7 +15,6 @@ 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.blockchain_format.sized_bytes import bytes32 from chia.types.coin_record import CoinRecord from chia.types.coin_spend import CoinSpend from chia.types.condition_opcodes import ConditionOpcode diff --git a/benchmarks/mempool.py b/benchmarks/mempool.py index 4828640d020b..fa7fda1a10e5 100644 --- a/benchmarks/mempool.py +++ b/benchmarks/mempool.py @@ -9,6 +9,7 @@ from time import monotonic from typing import Optional +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from chia.consensus.coinbase import create_farmer_coin, create_pool_coin @@ -16,7 +17,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.blockchain_format.sized_bytes import bytes32 from chia.types.coin_record import CoinRecord from chia.types.eligible_coin_spends import UnspentLineageInfo from chia.types.mempool_inclusion_status import MempoolInclusionStatus diff --git a/benchmarks/streamable.py b/benchmarks/streamable.py index ae794d406044..b8105896bf55 100644 --- a/benchmarks/streamable.py +++ b/benchmarks/streamable.py @@ -9,11 +9,11 @@ from typing import Any, Callable, Optional, TextIO, Union import click +from chia_rs.sized_bytes import bytes32 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.streamable import Streamable, streamable diff --git a/chia/_tests/blockchain/test_augmented_chain.py b/chia/_tests/blockchain/test_augmented_chain.py index 2e6590107b79..8e4594311b34 100644 --- a/chia/_tests/blockchain/test_augmented_chain.py +++ b/chia/_tests/blockchain/test_augmented_chain.py @@ -4,13 +4,13 @@ from typing import TYPE_CHECKING, ClassVar, Optional, cast import pytest +from chia_rs.sized_bytes import bytes32 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 from chia.consensus.block_record import BlockRecord from chia.simulator.block_tools import BlockTools -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.full_block import FullBlock from chia.util.augmented_chain import AugmentedBlockchain from chia.util.errors import Err diff --git a/chia/_tests/blockchain/test_blockchain.py b/chia/_tests/blockchain/test_blockchain.py index c167bb771b03..dc74b6d0ae4a 100644 --- a/chia/_tests/blockchain/test_blockchain.py +++ b/chia/_tests/blockchain/test_blockchain.py @@ -11,6 +11,7 @@ import pytest from chia_rs import AugSchemeMPL, ConsensusConstants, G2Element, MerkleSet, TransactionsInfo +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64 from clvm.casts import int_to_bytes @@ -41,7 +42,6 @@ from chia.types.blockchain_format.classgroup import ClassgroupElement 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.blockchain_format.slots import InfusedChallengeChainSubSlot from chia.types.blockchain_format.vdf import VDFInfo, VDFProof, validate_vdf from chia.types.condition_opcodes import ConditionOpcode diff --git a/chia/_tests/blockchain/test_blockchain_transactions.py b/chia/_tests/blockchain/test_blockchain_transactions.py index 2f6a5098b64c..dcf9a35f3e6f 100644 --- a/chia/_tests/blockchain/test_blockchain_transactions.py +++ b/chia/_tests/blockchain/test_blockchain_transactions.py @@ -3,6 +3,7 @@ import logging import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from clvm.casts import int_to_bytes @@ -15,7 +16,6 @@ from chia.simulator.add_blocks_in_batches import add_blocks_in_batches from chia.simulator.block_tools import BlockTools, test_constants from chia.simulator.wallet_tools import WalletTool -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 import SpendBundle, estimate_fees diff --git a/chia/_tests/blockchain/test_get_block_generator.py b/chia/_tests/blockchain/test_get_block_generator.py index 0f841fdcc7fe..9e1d48082f94 100644 --- a/chia/_tests/blockchain/test_get_block_generator.py +++ b/chia/_tests/blockchain/test_get_block_generator.py @@ -4,12 +4,12 @@ from typing import Optional import pytest +from chia_rs.sized_bytes import bytes32 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 diff --git a/chia/_tests/blockchain/test_lookup_fork_chain.py b/chia/_tests/blockchain/test_lookup_fork_chain.py index 39222072e579..c99ffae94dfd 100644 --- a/chia/_tests/blockchain/test_lookup_fork_chain.py +++ b/chia/_tests/blockchain/test_lookup_fork_chain.py @@ -3,6 +3,7 @@ from dataclasses import dataclass import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32 from chia._tests.util.benchmarks import rand_hash @@ -10,7 +11,6 @@ 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 class DummyChain: diff --git a/chia/_tests/clvm/coin_store.py b/chia/_tests/clvm/coin_store.py index 0c4ec9c18298..8e0d852c9cc2 100644 --- a/chia/_tests/clvm/coin_store.py +++ b/chia/_tests/clvm/coin_store.py @@ -6,6 +6,7 @@ from typing import Optional from chia_rs import ConsensusConstants +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 @@ -13,7 +14,6 @@ from chia.full_node.bundle_tools import simple_solution_generator from chia.full_node.mempool_check_conditions import mempool_check_time_locks 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.spend_bundle import SpendBundle from chia.util.errors import Err diff --git a/chia/_tests/clvm/test_curry_and_treehash.py b/chia/_tests/clvm/test_curry_and_treehash.py index deae36bf6952..a2b198bc052a 100644 --- a/chia/_tests/clvm/test_curry_and_treehash.py +++ b/chia/_tests/clvm/test_curry_and_treehash.py @@ -1,9 +1,9 @@ from __future__ import annotations import pytest +from chia_rs.sized_bytes import bytes32 from chia.types.blockchain_format.program import Program -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.wallet.puzzles import p2_delegated_puzzle_or_hidden_puzzle # import (puzzle_for_pk, puzzle_hash_for_pk, MOD) from chia.wallet.util.curry_and_treehash import ( calculate_hash_of_quoted_mod_hash, diff --git a/chia/_tests/clvm/test_puzzle_compression.py b/chia/_tests/clvm/test_puzzle_compression.py index 9f53dc64b6f8..817d67cd0614 100644 --- a/chia/_tests/clvm/test_puzzle_compression.py +++ b/chia/_tests/clvm/test_puzzle_compression.py @@ -6,11 +6,11 @@ import pytest from chia_rs import G1Element, 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.spend_bundle import SpendBundle from chia.wallet.cat_wallet.cat_utils import CAT_MOD, construct_cat_puzzle diff --git a/chia/_tests/clvm/test_puzzles.py b/chia/_tests/clvm/test_puzzles.py index e2fa1705eb74..047d1b609098 100644 --- a/chia/_tests/clvm/test_puzzles.py +++ b/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_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from chia._tests.clvm.coin_store import CoinStore, CoinTimestamp @@ -10,7 +11,6 @@ from chia._tests.util.key_tool import KeyTool from chia.consensus.default_constants import DEFAULT_CONSTANTS from chia.types.blockchain_format.program import Program -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.coin_spend import make_spend from chia.types.spend_bundle import SpendBundle from chia.util.hash import std_hash diff --git a/chia/_tests/clvm/test_singletons.py b/chia/_tests/clvm/test_singletons.py index 96b65d7e1e7e..2027048ab6fc 100644 --- a/chia/_tests/clvm/test_singletons.py +++ b/chia/_tests/clvm/test_singletons.py @@ -4,6 +4,7 @@ import pytest from chia_rs import AugSchemeMPL, G1Element, G2Element, PrivateKey +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from chia._tests.clvm.test_puzzles import public_key_for_index, secret_exponent_for_index @@ -12,7 +13,6 @@ from chia.consensus.default_constants import DEFAULT_CONSTANTS 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 diff --git a/chia/_tests/clvm/test_spend_sim.py b/chia/_tests/clvm/test_spend_sim.py index 1deb89fe8eca..7c95ec221d9f 100644 --- a/chia/_tests/clvm/test_spend_sim.py +++ b/chia/_tests/clvm/test_spend_sim.py @@ -2,10 +2,10 @@ import pytest from chia_rs import G2Element +from chia_rs.sized_bytes import bytes32 from chia._tests.util.spend_sim import sim_and_client 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, make_spend from chia.types.condition_opcodes import ConditionOpcode from chia.types.spend_bundle import SpendBundle diff --git a/chia/_tests/cmds/cmd_test_utils.py b/chia/_tests/cmds/cmd_test_utils.py index c566bd999699..43df70527f18 100644 --- a/chia/_tests/cmds/cmd_test_utils.py +++ b/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_bytes import bytes32 from chia_rs.sized_ints import uint8, uint16, uint32, uint64 import chia.cmds.wallet_funcs @@ -24,7 +25,6 @@ from chia.rpc.wallet_request_types import GetSyncStatusResponse, SendTransactionMultiResponse from chia.rpc.wallet_rpc_client import WalletRpcClient from chia.simulator.simulator_full_node_rpc_client import SimulatorFullNodeRpcClient -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.coin_record import CoinRecord from chia.types.signing_mode import SigningMode from chia.util.bech32m import encode_puzzle_hash diff --git a/chia/_tests/cmds/test_click_types.py b/chia/_tests/cmds/test_click_types.py index b503e5a36482..71148dd66b70 100644 --- a/chia/_tests/cmds/test_click_types.py +++ b/chia/_tests/cmds/test_click_types.py @@ -5,6 +5,7 @@ import click import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from click import BadParameter @@ -19,7 +20,6 @@ Uint64ParamType, ) 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.wallet.util.address_type import AddressType diff --git a/chia/_tests/cmds/test_cmd_framework.py b/chia/_tests/cmds/test_cmd_framework.py index a87b50894818..d679ec4b0713 100644 --- a/chia/_tests/cmds/test_cmd_framework.py +++ b/chia/_tests/cmds/test_cmd_framework.py @@ -9,6 +9,7 @@ import click import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from click.testing import CliRunner @@ -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.wallet.conditions import ConditionValidTimes from chia.wallet.transaction_record import TransactionRecord from chia.wallet.util.tx_config import CoinSelectionConfig, TXConfig diff --git a/chia/_tests/cmds/test_show.py b/chia/_tests/cmds/test_show.py index b9b60b32c0ac..77f099692665 100644 --- a/chia/_tests/cmds/test_show.py +++ b/chia/_tests/cmds/test_show.py @@ -5,13 +5,13 @@ from typing import Any, Optional from chia_rs import FoliageTransactionBlock +from chia_rs.sized_bytes import bytes32 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.serialized_program import SerializedProgram -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.full_block import FullBlock diff --git a/chia/_tests/cmds/test_tx_config_args.py b/chia/_tests/cmds/test_tx_config_args.py index e7b2312f6beb..cfbb5bfe3c51 100644 --- a/chia/_tests/cmds/test_tx_config_args.py +++ b/chia/_tests/cmds/test_tx_config_args.py @@ -5,11 +5,11 @@ from typing import Optional import click +from chia_rs.sized_bytes import bytes32 from click.testing import CliRunner from chia.cmds.cmds_util import CMDCoinSelectionConfigLoader, CMDTXConfigLoader, coin_selection_args, tx_config_args from chia.cmds.param_types import CliAmount -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.config import create_default_chia_config, load_config diff --git a/chia/_tests/cmds/testing_classes.py b/chia/_tests/cmds/testing_classes.py index f2c848b08813..1afa54e89423 100644 --- a/chia/_tests/cmds/testing_classes.py +++ b/chia/_tests/cmds/testing_classes.py @@ -3,10 +3,9 @@ from dataclasses import dataclass from typing import Optional +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64 -from chia.types.blockchain_format.sized_bytes import bytes32 - # This is a modified version of the TestBlockRecord from test_mempool_manager.py diff --git a/chia/_tests/cmds/wallet/test_consts.py b/chia/_tests/cmds/wallet/test_consts.py index 8b7cbe25c0a2..a4b5db919b07 100644 --- a/chia/_tests/cmds/wallet/test_consts.py +++ b/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_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.wallet.conditions import ConditionValidTimes from chia.wallet.signer_protocol import KeyHints, SigningInstructions, TransactionInfo, UnsignedTransaction from chia.wallet.transaction_record import TransactionRecord diff --git a/chia/_tests/cmds/wallet/test_did.py b/chia/_tests/cmds/wallet/test_did.py index 4d4fdf48b388..c488df2eae97 100644 --- a/chia/_tests/cmds/wallet/test_did.py +++ b/chia/_tests/cmds/wallet/test_did.py @@ -4,12 +4,12 @@ from typing import Optional, Union from chia_rs import G2Element +from chia_rs.sized_bytes import bytes48 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 from chia.rpc.wallet_request_types import DIDMessageSpendResponse, DIDTransferDIDResponse, DIDUpdateMetadataResponse -from chia.types.blockchain_format.sized_bytes import bytes48 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/cmds/wallet/test_nft.py b/chia/_tests/cmds/wallet/test_nft.py index 22e25ff09bc3..542422f626fd 100644 --- a/chia/_tests/cmds/wallet/test_nft.py +++ b/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_bytes import bytes32 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 @@ -14,7 +15,6 @@ NFTSetNFTDIDResponse, NFTTransferNFTResponse, ) -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.wallet.conditions import ConditionValidTimes diff --git a/chia/_tests/cmds/wallet/test_notifications.py b/chia/_tests/cmds/wallet/test_notifications.py index e4e14d9a0286..827cb91f2abd 100644 --- a/chia/_tests/cmds/wallet/test_notifications.py +++ b/chia/_tests/cmds/wallet/test_notifications.py @@ -3,12 +3,12 @@ from pathlib import Path from typing import Optional, cast +from chia_rs.sized_bytes import bytes32 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, FINGERPRINT_ARG, get_bytes32 from chia.rpc.wallet_request_types import GetNotifications, GetNotificationsResponse -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.bech32m import encode_puzzle_hash from chia.wallet.conditions import ConditionValidTimes from chia.wallet.notification_store import Notification diff --git a/chia/_tests/cmds/wallet/test_vcs.py b/chia/_tests/cmds/wallet/test_vcs.py index 4efd447f1027..7528f283a821 100644 --- a/chia/_tests/cmds/wallet/test_vcs.py +++ b/chia/_tests/cmds/wallet/test_vcs.py @@ -3,6 +3,7 @@ from pathlib import Path from chia_rs import Coin +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from chia._tests.cmds.cmd_test_utils import TestRpcClients, TestWalletRpcClient, logType, run_cli_command_and_assert @@ -25,7 +26,6 @@ VCSpend, VCSpendResponse, ) -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.bech32m import encode_puzzle_hash from chia.wallet.conditions import ConditionValidTimes from chia.wallet.lineage_proof import LineageProof diff --git a/chia/_tests/cmds/wallet/test_wallet.py b/chia/_tests/cmds/wallet/test_wallet.py index a7498aa5a9d1..fc83fca2f967 100644 --- a/chia/_tests/cmds/wallet/test_wallet.py +++ b/chia/_tests/cmds/wallet/test_wallet.py @@ -8,6 +8,7 @@ import importlib_resources import pytest from chia_rs import Coin, G2Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64 from click.testing import CliRunner @@ -34,7 +35,6 @@ ) from chia.server.outbound_message import NodeType from chia.types.blockchain_format.program import Program -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.wallet.conditions import ConditionValidTimes diff --git a/chia/_tests/connection_utils.py b/chia/_tests/connection_utils.py index 7e44c720cc90..8b7e46744fa4 100644 --- a/chia/_tests/connection_utils.py +++ b/chia/_tests/connection_utils.py @@ -5,6 +5,7 @@ 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 @@ -18,7 +19,6 @@ 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.timing import adjusted_timeout diff --git a/chia/_tests/core/cmds/test_wallet.py b/chia/_tests/core/cmds/test_wallet.py index 169f16274feb..218b1b0ee39f 100644 --- a/chia/_tests/core/cmds/test_wallet.py +++ b/chia/_tests/core/cmds/test_wallet.py @@ -3,10 +3,10 @@ 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 TEST_DUCKSAUCE_ASSET_ID = "1000000000000000000000000000000000000000000000000000000000000001" TEST_CRUNCHBERRIES_ASSET_ID = "1000000000000000000000000000000000000000000000000000000000000002" diff --git a/chia/_tests/core/consensus/test_block_creation.py b/chia/_tests/core/consensus/test_block_creation.py index 4c713b648c72..b36f9b4292ef 100644 --- a/chia/_tests/core/consensus/test_block_creation.py +++ b/chia/_tests/core/consensus/test_block_creation.py @@ -1,6 +1,7 @@ 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 @@ -8,7 +9,6 @@ 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 @pytest.mark.parametrize("add_amount", [[0], [1, 2, 3], []]) diff --git a/chia/_tests/core/custom_types/test_coin.py b/chia/_tests/core/custom_types/test_coin.py index f978ecf10709..f18d89819b9d 100644 --- a/chia/_tests/core/custom_types/test_coin.py +++ b/chia/_tests/core/custom_types/test_coin.py @@ -1,10 +1,10 @@ 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 diff --git a/chia/_tests/core/custom_types/test_proof_of_space.py b/chia/_tests/core/custom_types/test_proof_of_space.py index 5a34fecc6e06..e8b0484ccfaa 100644 --- a/chia/_tests/core/custom_types/test_proof_of_space.py +++ b/chia/_tests/core/custom_types/test_proof_of_space.py @@ -6,12 +6,12 @@ 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 @dataclass diff --git a/chia/_tests/core/custom_types/test_spend_bundle.py b/chia/_tests/core/custom_types/test_spend_bundle.py index ae66c751d9cb..a69c20eede36 100644 --- a/chia/_tests/core/custom_types/test_spend_bundle.py +++ b/chia/_tests/core/custom_types/test_spend_bundle.py @@ -5,11 +5,11 @@ 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 diff --git a/chia/_tests/core/data_layer/conftest.py b/chia/_tests/core/data_layer/conftest.py index 822ab6fa5e40..cf7f1ea18bfc 100644 --- a/chia/_tests/core/data_layer/conftest.py +++ b/chia/_tests/core/data_layer/conftest.py @@ -11,6 +11,7 @@ # 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.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 diff --git a/chia/_tests/core/data_layer/test_data_layer.py b/chia/_tests/core/data_layer/test_data_layer.py index 3a0eb6fbced0..e2c36e514856 100644 --- a/chia/_tests/core/data_layer/test_data_layer.py +++ b/chia/_tests/core/data_layer/test_data_layer.py @@ -4,12 +4,12 @@ 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: diff --git a/chia/_tests/core/data_layer/test_data_layer_util.py b/chia/_tests/core/data_layer/test_data_layer_util.py index 0821f996fb8c..5fbffed5ec0d 100644 --- a/chia/_tests/core/data_layer/test_data_layer_util.py +++ b/chia/_tests/core/data_layer/test_data_layer_util.py @@ -7,6 +7,7 @@ # 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.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 diff --git a/chia/_tests/core/data_layer/test_data_rpc.py b/chia/_tests/core/data_layer/test_data_rpc.py index c095eed917c1..83d8a6928977 100644 --- a/chia/_tests/core/data_layer/test_data_rpc.py +++ b/chia/_tests/core/data_layer/test_data_rpc.py @@ -20,6 +20,7 @@ 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 @@ -61,7 +62,6 @@ 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 diff --git a/chia/_tests/core/data_layer/test_data_store.py b/chia/_tests/core/data_layer/test_data_store.py index 470c44f653f8..7c5149ef8528 100644 --- a/chia/_tests/core/data_layer/test_data_store.py +++ b/chia/_tests/core/data_layer/test_data_store.py @@ -16,6 +16,7 @@ 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 @@ 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 diff --git a/chia/_tests/core/data_layer/test_data_store_schema.py b/chia/_tests/core/data_layer/test_data_store_schema.py index 6e6ea10eb928..5f39426a8ed6 100644 --- a/chia/_tests/core/data_layer/test_data_store_schema.py +++ b/chia/_tests/core/data_layer/test_data_store_schema.py @@ -4,11 +4,11 @@ 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 diff --git a/chia/_tests/core/data_layer/util.py b/chia/_tests/core/data_layer/util.py index 8cee61b453b5..8ee3f825d91d 100644 --- a/chia/_tests/core/data_layer/util.py +++ b/chia/_tests/core/data_layer/util.py @@ -10,10 +10,11 @@ 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] diff --git a/chia/_tests/core/full_node/stores/test_block_store.py b/chia/_tests/core/full_node/stores/test_block_store.py index 2b4fe66e9008..f20f067fbc4c 100644 --- a/chia/_tests/core/full_node/stores/test_block_store.py +++ b/chia/_tests/core/full_node/stores/test_block_store.py @@ -11,6 +11,7 @@ # 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 @@ -25,7 +26,6 @@ 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 diff --git a/chia/_tests/core/full_node/stores/test_coin_store.py b/chia/_tests/core/full_node/stores/test_coin_store.py index 14db7f20d091..ab1501d0603f 100644 --- a/chia/_tests/core/full_node/stores/test_coin_store.py +++ b/chia/_tests/core/full_node/stores/test_coin_store.py @@ -6,6 +6,7 @@ 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 @@ -24,7 +25,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.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 diff --git a/chia/_tests/core/full_node/stores/test_full_node_store.py b/chia/_tests/core/full_node/stores/test_full_node_store.py index 44bcf69e3dbf..438b76f4fd1f 100644 --- a/chia/_tests/core/full_node/stores/test_full_node_store.py +++ b/chia/_tests/core/full_node/stores/test_full_node_store.py @@ -7,6 +7,7 @@ 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 @@ -25,7 +26,6 @@ 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 diff --git a/chia/_tests/core/full_node/stores/test_hint_store.py b/chia/_tests/core/full_node/stores/test_hint_store.py index 107eb870f7cb..d732b2be005d 100644 --- a/chia/_tests/core/full_node/stores/test_hint_store.py +++ b/chia/_tests/core/full_node/stores/test_hint_store.py @@ -3,6 +3,7 @@ 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 @@ -13,7 +14,6 @@ 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 diff --git a/chia/_tests/core/full_node/stores/test_sync_store.py b/chia/_tests/core/full_node/stores/test_sync_store.py index db8343b678cc..1bb4421ebcfa 100644 --- a/chia/_tests/core/full_node/stores/test_sync_store.py +++ b/chia/_tests/core/full_node/stores/test_sync_store.py @@ -3,9 +3,9 @@ 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 diff --git a/chia/_tests/core/full_node/test_block_height_map.py b/chia/_tests/core/full_node/test_block_height_map.py index edc011907fe6..ec3b779b37d3 100644 --- a/chia/_tests/core/full_node/test_block_height_map.py +++ b/chia/_tests/core/full_node/test_block_height_map.py @@ -6,11 +6,11 @@ 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 diff --git a/chia/_tests/core/full_node/test_full_node.py b/chia/_tests/core/full_node/test_full_node.py index f1c9feae6b56..ce0145a664b3 100644 --- a/chia/_tests/core/full_node/test_full_node.py +++ b/chia/_tests/core/full_node/test_full_node.py @@ -21,6 +21,7 @@ additions_and_removals, get_flags_for_height_and_constants, ) +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint16, uint32, uint64, uint128 from clvm.casts import int_to_bytes from packaging.version import Version @@ -76,7 +77,6 @@ ) from chia.types.blockchain_format.reward_chain_block import RewardChainBlockUnfinished 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 CompressibleVDFField, VDFProof from chia.types.coin_record import CoinRecord from chia.types.coin_spend import make_spend diff --git a/chia/_tests/core/full_node/test_generator_tools.py b/chia/_tests/core/full_node/test_generator_tools.py index 89e5277c2676..72c690b4d07b 100644 --- a/chia/_tests/core/full_node/test_generator_tools.py +++ b/chia/_tests/core/full_node/test_generator_tools.py @@ -1,9 +1,9 @@ from __future__ import annotations +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.spend_bundle_conditions import SpendBundleConditions, SpendConditions from chia.util.generator_tools import tx_removals_and_additions from chia.util.hash import std_hash diff --git a/chia/_tests/core/full_node/test_hint_management.py b/chia/_tests/core/full_node/test_hint_management.py index c20a136c1482..0307646bd150 100644 --- a/chia/_tests/core/full_node/test_hint_management.py +++ b/chia/_tests/core/full_node/test_hint_management.py @@ -3,6 +3,7 @@ from typing import Optional import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from chia._tests.blockchain.blockchain_test_utils import _validate_and_add_block @@ -11,7 +12,6 @@ from chia.full_node.hint_management import get_hints_and_subscription_coin_ids from chia.simulator.block_tools import BlockTools from chia.types.blockchain_format.coin import Coin -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.hash import std_hash coin_ids = [std_hash(i.to_bytes(4, "big")) for i in range(10)] diff --git a/chia/_tests/core/full_node/test_subscriptions.py b/chia/_tests/core/full_node/test_subscriptions.py index 782e254958e7..6c7ff325c752 100644 --- a/chia/_tests/core/full_node/test_subscriptions.py +++ b/chia/_tests/core/full_node/test_subscriptions.py @@ -1,6 +1,7 @@ from __future__ import annotations from chia_rs import AugSchemeMPL, Coin, CoinSpend, G2Element, Program +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 @@ -8,7 +9,6 @@ from chia.full_node.bundle_tools import simple_solution_generator from chia.full_node.subscriptions import PeerSubscriptions, peers_for_spend_bundle from chia.types.blockchain_format.program import INFINITE_COST -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.spend_bundle import SpendBundle IDENTITY_PUZZLE = Program.to(1) diff --git a/chia/_tests/core/full_node/test_transactions.py b/chia/_tests/core/full_node/test_transactions.py index ff71a6d3469d..846c395ac3a7 100644 --- a/chia/_tests/core/full_node/test_transactions.py +++ b/chia/_tests/core/full_node/test_transactions.py @@ -5,6 +5,7 @@ from typing import Optional import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32 from chia._tests.util.time_out_assert import time_out_assert @@ -12,7 +13,6 @@ from chia.consensus.block_rewards import calculate_base_farmer_reward, calculate_pool_reward from chia.full_node.full_node_api import FullNodeAPI from chia.simulator.simulator_protocol import FarmNewBlockProtocol -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.peer_info import PeerInfo from chia.wallet.util.tx_config import DEFAULT_TX_CONFIG diff --git a/chia/_tests/core/full_node/test_tx_processing_queue.py b/chia/_tests/core/full_node/test_tx_processing_queue.py index 73a0c096e987..698441275c8f 100644 --- a/chia/_tests/core/full_node/test_tx_processing_queue.py +++ b/chia/_tests/core/full_node/test_tx_processing_queue.py @@ -7,9 +7,9 @@ from typing import Optional, cast import pytest +from chia_rs.sized_bytes import bytes32 from chia.full_node.tx_processing_queue import TransactionQueue, TransactionQueueFull -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.transaction_queue_entry import TransactionQueueEntry from chia.util.task_referencer import create_referenced_task diff --git a/chia/_tests/core/make_block_generator.py b/chia/_tests/core/make_block_generator.py index 55e02f33fe5a..cb6c725b48a8 100644 --- a/chia/_tests/core/make_block_generator.py +++ b/chia/_tests/core/make_block_generator.py @@ -1,13 +1,13 @@ from __future__ import annotations from chia_rs import G1Element, G2Element, PrivateKey +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from chia.full_node.bundle_tools import simple_solution_generator 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 make_spend from chia.types.condition_opcodes import ConditionOpcode from chia.types.generator_types import BlockGenerator diff --git a/chia/_tests/core/mempool/test_mempool.py b/chia/_tests/core/mempool/test_mempool.py index 94e3ebe8cb31..29f3b02fca9d 100644 --- a/chia/_tests/core/mempool/test_mempool.py +++ b/chia/_tests/core/mempool/test_mempool.py @@ -15,6 +15,7 @@ get_flags_for_height_and_constants, run_block_generator2, ) +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from clvm.casts import int_to_bytes from clvm_tools import binutils @@ -60,7 +61,6 @@ 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.clvm_cost import CLVMCost from chia.types.coin_spend import CoinSpend, make_spend from chia.types.condition_opcodes import ConditionOpcode diff --git a/chia/_tests/core/mempool/test_mempool_manager.py b/chia/_tests/core/mempool/test_mempool_manager.py index 0bb48fc923c9..bd89ed95e73d 100644 --- a/chia/_tests/core/mempool/test_mempool_manager.py +++ b/chia/_tests/core/mempool/test_mempool_manager.py @@ -14,6 +14,7 @@ G2Element, get_conditions_from_spendbundle, ) +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64 from chiabip158 import PyBIP158 @@ -43,7 +44,6 @@ from chia.types.blockchain_format.coin import Coin from chia.types.blockchain_format.program import INFINITE_COST, Program from chia.types.blockchain_format.serialized_program import SerializedProgram -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.clvm_cost import CLVMCost from chia.types.coin_record import CoinRecord from chia.types.coin_spend import CoinSpend, make_spend diff --git a/chia/_tests/core/mempool/test_singleton_fast_forward.py b/chia/_tests/core/mempool/test_singleton_fast_forward.py index 9e2f60a2717c..04fe242f32ff 100644 --- a/chia/_tests/core/mempool/test_singleton_fast_forward.py +++ b/chia/_tests/core/mempool/test_singleton_fast_forward.py @@ -6,6 +6,7 @@ import pytest from chia_rs import AugSchemeMPL, G1Element, G2Element, PrivateKey +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from chiabip158 import PyBIP158 @@ -25,7 +26,6 @@ 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, make_spend from chia.types.condition_opcodes import ConditionOpcode from chia.types.eligible_coin_spends import EligibleCoinSpends, UnspentLineageInfo, perform_the_fast_forward diff --git a/chia/_tests/core/server/test_server.py b/chia/_tests/core/server/test_server.py index 029a9dbc2041..79f1eafa147b 100644 --- a/chia/_tests/core/server/test_server.py +++ b/chia/_tests/core/server/test_server.py @@ -5,6 +5,7 @@ from typing import Callable, ClassVar, cast import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import int16, uint32 from packaging.version import Version @@ -24,7 +25,6 @@ from chia.server.start_wallet import create_wallet_service from chia.server.ws_connection import WSChiaConnection, error_response_version from chia.simulator.block_tools import BlockTools -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.peer_info import PeerInfo from chia.util.errors import ApiError, Err diff --git a/chia/_tests/core/ssl/test_ssl.py b/chia/_tests/core/ssl/test_ssl.py index dad1a57d9da3..a0eeffed30f4 100644 --- a/chia/_tests/core/ssl/test_ssl.py +++ b/chia/_tests/core/ssl/test_ssl.py @@ -7,6 +7,7 @@ import aiohttp import pytest +from chia_rs.sized_bytes import bytes32 from chia.apis import ApiProtocolRegistry from chia.protocols.shared_protocol import default_capabilities @@ -15,7 +16,6 @@ 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 diff --git a/chia/_tests/core/test_coins.py b/chia/_tests/core/test_coins.py index 198c97529f6e..9bfc5634f93c 100644 --- a/chia/_tests/core/test_coins.py +++ b/chia/_tests/core/test_coins.py @@ -2,9 +2,10 @@ from itertools import permutations +from chia_rs.sized_bytes import bytes32 + from chia._tests.util.benchmarks import rand_hash from chia.types.blockchain_format.coin import hash_coin_ids -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.hash import std_hash diff --git a/chia/_tests/core/test_cost_calculation.py b/chia/_tests/core/test_cost_calculation.py index 08639388359f..6d59e8a0a6ff 100644 --- a/chia/_tests/core/test_cost_calculation.py +++ b/chia/_tests/core/test_cost_calculation.py @@ -5,6 +5,7 @@ import pytest from chia_rs import G1Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from clvm_tools import binutils @@ -20,7 +21,6 @@ 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.generator_types import BlockGenerator from chia.wallet.puzzles import p2_delegated_puzzle_or_hidden_puzzle diff --git a/chia/_tests/core/test_crawler.py b/chia/_tests/core/test_crawler.py index 878a80c1871b..ca66989fbe95 100644 --- a/chia/_tests/core/test_crawler.py +++ b/chia/_tests/core/test_crawler.py @@ -6,6 +6,7 @@ from typing import cast import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64, uint128 from chia._tests.util.setup_nodes import SimulatorsAndWalletsServices @@ -17,7 +18,6 @@ from chia.seeder.peer_record import PeerRecord, PeerReliability from chia.server.outbound_message import make_msg from chia.types.aliases import CrawlerService -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.peer_info import PeerInfo diff --git a/chia/_tests/core/test_db_conversion.py b/chia/_tests/core/test_db_conversion.py index e47dfa3a4a15..48e8535b024a 100644 --- a/chia/_tests/core/test_db_conversion.py +++ b/chia/_tests/core/test_db_conversion.py @@ -4,6 +4,7 @@ from pathlib import Path import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from chia._tests.util.temp_file import TempFile @@ -15,7 +16,6 @@ from chia.full_node.coin_store import CoinStore from chia.full_node.hint_store import HintStore from chia.simulator.block_tools import test_constants -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.db_wrapper import DBWrapper2 diff --git a/chia/_tests/core/test_db_validation.py b/chia/_tests/core/test_db_validation.py index 6eee8856d06f..2b71d5640741 100644 --- a/chia/_tests/core/test_db_validation.py +++ b/chia/_tests/core/test_db_validation.py @@ -7,6 +7,7 @@ from typing import Any import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from chia._tests.util.temp_file import TempFile @@ -18,7 +19,6 @@ from chia.full_node.block_store import BlockStore from chia.full_node.coin_store import CoinStore from chia.simulator.block_tools import test_constants -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.full_block import FullBlock from chia.util.db_wrapper import DBWrapper2 diff --git a/chia/_tests/core/test_farmer_harvester_rpc.py b/chia/_tests/core/test_farmer_harvester_rpc.py index 33ab646a328b..d2813d80eded 100644 --- a/chia/_tests/core/test_farmer_harvester_rpc.py +++ b/chia/_tests/core/test_farmer_harvester_rpc.py @@ -13,6 +13,7 @@ from typing import Any, Callable, Union, cast import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64 from chia._tests.conftest import HarvesterFarmerEnvironment @@ -35,7 +36,6 @@ ) from chia.rpc.farmer_rpc_client import FarmerRpcClient from chia.simulator.block_tools import get_plot_dir -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.bech32m import decode_puzzle_hash, encode_puzzle_hash from chia.util.config import load_config, lock_and_load_config, save_config from chia.util.hash import std_hash diff --git a/chia/_tests/core/test_full_node_rpc.py b/chia/_tests/core/test_full_node_rpc.py index 4e404e257e4d..526d2ff65f98 100644 --- a/chia/_tests/core/test_full_node_rpc.py +++ b/chia/_tests/core/test_full_node_rpc.py @@ -2,6 +2,7 @@ import pytest from chia_rs import AugSchemeMPL +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8 from clvm.casts import int_to_bytes @@ -23,7 +24,6 @@ from chia.simulator.wallet_tools import WalletTool 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 from chia.types.condition_opcodes import ConditionOpcode from chia.types.condition_with_args import ConditionWithArgs diff --git a/chia/_tests/core/test_merkle_set.py b/chia/_tests/core/test_merkle_set.py index 55d877224cdc..9bb0d12c7bca 100644 --- a/chia/_tests/core/test_merkle_set.py +++ b/chia/_tests/core/test_merkle_set.py @@ -9,10 +9,10 @@ import pytest from chia_rs import Coin, MerkleSet, compute_merkle_set_root, confirm_included_already_hashed +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from chia.simulator.block_tools import BlockTools -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.batches import to_batches from chia.util.hash import std_hash from chia.wallet.util.wallet_sync_utils import validate_additions, validate_removals diff --git a/chia/_tests/core/test_program.py b/chia/_tests/core/test_program.py index 99df9c00503a..9c22da63dcf6 100644 --- a/chia/_tests/core/test_program.py +++ b/chia/_tests/core/test_program.py @@ -1,12 +1,12 @@ from __future__ import annotations +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from clvm.SExp import CastableType from clvm_tools import binutils 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 def program_roundtrip(o: CastableType) -> None: diff --git a/chia/_tests/core/util/test_block_cache.py b/chia/_tests/core/util/test_block_cache.py index 0caed5cae7d5..f75ba97e2639 100644 --- a/chia/_tests/core/util/test_block_cache.py +++ b/chia/_tests/core/util/test_block_cache.py @@ -4,10 +4,10 @@ from dataclasses import dataclass import pytest +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.block_cache import BlockCache diff --git a/chia/_tests/core/util/test_jsonify.py b/chia/_tests/core/util/test_jsonify.py index 616359d82df6..91604e14a7a2 100644 --- a/chia/_tests/core/util/test_jsonify.py +++ b/chia/_tests/core/util/test_jsonify.py @@ -3,9 +3,9 @@ from dataclasses import dataclass from typing import Any, Optional +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32 -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.streamable import Streamable, recurse_jsonify, streamable diff --git a/chia/_tests/core/util/test_keychain.py b/chia/_tests/core/util/test_keychain.py index eb84401a4187..a024e0e20158 100644 --- a/chia/_tests/core/util/test_keychain.py +++ b/chia/_tests/core/util/test_keychain.py @@ -8,11 +8,11 @@ import importlib_resources import pytest from chia_rs import AugSchemeMPL, G1Element, PrivateKey +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32 import chia._tests.util from chia.simulator.keyring import TempKeyring -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.errors import ( KeychainFingerprintExists, KeychainFingerprintNotFound, diff --git a/chia/_tests/core/util/test_streamable.py b/chia/_tests/core/util/test_streamable.py index 1632a221cffc..a71680e0e98c 100644 --- a/chia/_tests/core/util/test_streamable.py +++ b/chia/_tests/core/util/test_streamable.py @@ -7,6 +7,7 @@ import pytest from chia_rs import G1Element, SubEpochChallengeSegment +from chia_rs.sized_bytes import bytes4, bytes32 from chia_rs.sized_ints import uint8, uint32, uint64 from clvm_tools import binutils from typing_extensions import Literal, get_args @@ -15,7 +16,6 @@ from chia.simulator.block_tools import BlockTools, test_constants from chia.types.blockchain_format.coin import Coin from chia.types.blockchain_format.program import Program -from chia.types.blockchain_format.sized_bytes import bytes4, bytes32 from chia.types.full_block import FullBlock from chia.util.streamable import ( ConversionError, diff --git a/chia/_tests/environments/wallet.py b/chia/_tests/environments/wallet.py index cbc4d957dd7a..3a1a4d9941f7 100644 --- a/chia/_tests/environments/wallet.py +++ b/chia/_tests/environments/wallet.py @@ -8,6 +8,7 @@ from dataclasses import asdict, dataclass, field from typing import TYPE_CHECKING, Any, ClassVar, Union, cast +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from chia._tests.environments.common import ServiceEnvironment @@ -20,7 +21,6 @@ from chia.server.server import ChiaServer from chia.server.start_service import Service from chia.simulator.full_node_simulator import FullNodeSimulator -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.wallet.transaction_record import LightTransactionRecord from chia.wallet.util.transaction_type import CLAWBACK_INCOMING_TRANSACTION_TYPES from chia.wallet.util.tx_config import DEFAULT_TX_CONFIG, TXConfig diff --git a/chia/_tests/farmer_harvester/test_farmer.py b/chia/_tests/farmer_harvester/test_farmer.py index df0ca43f2cfc..a3f92e7c32ee 100644 --- a/chia/_tests/farmer_harvester/test_farmer.py +++ b/chia/_tests/farmer_harvester/test_farmer.py @@ -10,6 +10,7 @@ import pytest from chia_rs import AugSchemeMPL, G1Element, G2Element, PrivateKey +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint16, uint32, uint64 from pytest_mock import MockerFixture from yarl import URL @@ -31,7 +32,6 @@ generate_plot_public_key, verify_and_get_quality_string, ) -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.config import load_config, save_config from chia.util.hash import std_hash diff --git a/chia/_tests/farmer_harvester/test_farmer_harvester.py b/chia/_tests/farmer_harvester/test_farmer_harvester.py index 04afdbfda1fc..aa64efafad52 100644 --- a/chia/_tests/farmer_harvester/test_farmer_harvester.py +++ b/chia/_tests/farmer_harvester/test_farmer_harvester.py @@ -7,6 +7,7 @@ import pytest from chia_rs import G1Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64 from chia._tests.conftest import HarvesterFarmerEnvironment @@ -21,7 +22,6 @@ from chia.server.outbound_message import NodeType, make_msg from chia.simulator.block_tools import BlockTools from chia.types.aliases import FarmerService, HarvesterService -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.peer_info import UnresolvedPeerInfo from chia.util.config import load_config from chia.util.hash import std_hash diff --git a/chia/_tests/farmer_harvester/test_filter_prefix_bits.py b/chia/_tests/farmer_harvester/test_filter_prefix_bits.py index 69e86d8cb58a..3ab0ec37b1ff 100644 --- a/chia/_tests/farmer_harvester/test_filter_prefix_bits.py +++ b/chia/_tests/farmer_harvester/test_filter_prefix_bits.py @@ -5,6 +5,7 @@ from typing import Any, Optional import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64 from chia._tests.conftest import ConsensusMode @@ -18,7 +19,6 @@ from chia.simulator.block_tools import create_block_tools_async, test_constants from chia.types.aliases import HarvesterService from chia.types.blockchain_format.proof_of_space import get_plot_id, passes_plot_filter -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.full_block import FullBlock from chia.util.keychain import Keychain diff --git a/chia/_tests/farmer_harvester/test_third_party_harvesters.py b/chia/_tests/farmer_harvester/test_third_party_harvesters.py index 5a14c40f0b7a..2bd2e096bcc0 100644 --- a/chia/_tests/farmer_harvester/test_third_party_harvesters.py +++ b/chia/_tests/farmer_harvester/test_third_party_harvesters.py @@ -11,6 +11,7 @@ import pytest from chia_rs import FoliageBlockData, FoliageTransactionBlock, G1Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64 from chia._tests.util.misc import patch_request_handler @@ -36,7 +37,6 @@ from chia.types.aliases import FarmerService, FullNodeService, HarvesterService from chia.types.blockchain_format.classgroup import ClassgroupElement from chia.types.blockchain_format.proof_of_space import ProofOfSpace -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.blockchain_format.slots import ChallengeChainSubSlot, RewardChainSubSlot from chia.types.full_block import FullBlock from chia.types.peer_info import UnresolvedPeerInfo diff --git a/chia/_tests/fee_estimation/test_fee_estimation_rpc.py b/chia/_tests/fee_estimation/test_fee_estimation_rpc.py index 1b258bc71030..8101b92d58ae 100644 --- a/chia/_tests/fee_estimation/test_fee_estimation_rpc.py +++ b/chia/_tests/fee_estimation/test_fee_estimation_rpc.py @@ -4,6 +4,7 @@ from typing import Any import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from chia.rpc.full_node_rpc_api import FullNodeRpcApi @@ -15,7 +16,6 @@ from chia.simulator.wallet_tools import WalletTool from chia.types.aliases import WalletService from chia.types.blockchain_format.coin import Coin -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.spend_bundle import SpendBundle diff --git a/chia/_tests/fee_estimation/test_mempoolitem_height_added.py b/chia/_tests/fee_estimation/test_mempoolitem_height_added.py index 450443732c74..2dbc3a3e7651 100644 --- a/chia/_tests/fee_estimation/test_mempoolitem_height_added.py +++ b/chia/_tests/fee_estimation/test_mempoolitem_height_added.py @@ -5,13 +5,13 @@ import pytest from chia_rs import Coin, ConsensusConstants, G2Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint64 from chia._tests.util.spend_sim import SimClient, SpendSim, sim_and_client from chia.consensus.default_constants import DEFAULT_CONSTANTS from chia.full_node.bitcoin_fee_estimator import BitcoinFeeEstimator from chia.types.blockchain_format.program import Program -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.coin_spend import make_spend from chia.types.spend_bundle import SpendBundle diff --git a/chia/_tests/generator/test_rom.py b/chia/_tests/generator/test_rom.py index 0ed71475d239..22f07b401933 100644 --- a/chia/_tests/generator/test_rom.py +++ b/chia/_tests/generator/test_rom.py @@ -1,6 +1,7 @@ from __future__ import annotations from chia_puzzles_py.programs import CHIALISP_DESERIALISATION, ROM_BOOTSTRAP_GENERATOR +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32 from clvm.CLVMObject import CLVMStorage from clvm_tools import binutils @@ -11,7 +12,6 @@ from chia.consensus.default_constants import DEFAULT_CONSTANTS 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.generator_types import BlockGenerator from chia.types.spend_bundle_conditions import SpendConditions diff --git a/chia/_tests/plot_sync/test_delta.py b/chia/_tests/plot_sync/test_delta.py index b72b8788d411..c5b4b5b1ff97 100644 --- a/chia/_tests/plot_sync/test_delta.py +++ b/chia/_tests/plot_sync/test_delta.py @@ -4,11 +4,11 @@ import pytest from chia_rs import G1Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint64 from chia.plot_sync.delta import Delta, DeltaType, PathListDelta, PlotListDelta from chia.protocols.harvester_protocol import Plot -from chia.types.blockchain_format.sized_bytes import bytes32 log = logging.getLogger(__name__) diff --git a/chia/_tests/plot_sync/test_plot_sync.py b/chia/_tests/plot_sync/test_plot_sync.py index b417e0b272dc..7a8fd87fdd09 100644 --- a/chia/_tests/plot_sync/test_plot_sync.py +++ b/chia/_tests/plot_sync/test_plot_sync.py @@ -11,6 +11,7 @@ import pytest from chia_rs import G1Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64 from chia._tests.plot_sync.util import start_harvester_service @@ -30,7 +31,6 @@ from chia.protocols.protocol_message_types import ProtocolMessageTypes from chia.simulator.block_tools import BlockTools from chia.types.aliases import FarmerService, HarvesterService -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.config import create_default_chia_config, lock_and_load_config, save_config from chia.util.streamable import _T_Streamable diff --git a/chia/_tests/plot_sync/test_receiver.py b/chia/_tests/plot_sync/test_receiver.py index f79b804613c2..493c17eaf90d 100644 --- a/chia/_tests/plot_sync/test_receiver.py +++ b/chia/_tests/plot_sync/test_receiver.py @@ -8,6 +8,7 @@ import pytest from chia_rs import G1Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64 from chia._tests.plot_sync.util import get_dummy_connection @@ -26,7 +27,6 @@ PlotSyncStart, ) from chia.server.outbound_message import NodeType -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.streamable import _T_Streamable log = logging.getLogger(__name__) diff --git a/chia/_tests/plot_sync/test_sender.py b/chia/_tests/plot_sync/test_sender.py index 787bbd0362ea..b792c62e186b 100644 --- a/chia/_tests/plot_sync/test_sender.py +++ b/chia/_tests/plot_sync/test_sender.py @@ -3,6 +3,7 @@ import random import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import int16, uint64 from chia._tests.plot_sync.util import get_dummy_connection, plot_sync_identifier @@ -14,7 +15,6 @@ from chia.protocols.protocol_message_types import ProtocolMessageTypes from chia.server.outbound_message import NodeType from chia.simulator.block_tools import BlockTools -from chia.types.blockchain_format.sized_bytes import bytes32 def test_default_values(bt: BlockTools) -> None: diff --git a/chia/_tests/plot_sync/test_sync_simulated.py b/chia/_tests/plot_sync/test_sync_simulated.py index 131c198e93f0..44b3fad42287 100644 --- a/chia/_tests/plot_sync/test_sync_simulated.py +++ b/chia/_tests/plot_sync/test_sync_simulated.py @@ -14,6 +14,7 @@ import pytest from chia_rs import G1Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import int16, uint8, uint64 from chia._tests.plot_sync.util import start_harvester_service @@ -31,7 +32,6 @@ from chia.server.ws_connection import WSChiaConnection from chia.simulator.block_tools import BlockTools from chia.types.aliases import FarmerService, HarvesterService -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.batches import to_batches log = logging.getLogger(__name__) diff --git a/chia/_tests/plot_sync/util.py b/chia/_tests/plot_sync/util.py index d888b3790a39..a1183d19dbf9 100644 --- a/chia/_tests/plot_sync/util.py +++ b/chia/_tests/plot_sync/util.py @@ -6,6 +6,7 @@ from dataclasses import dataclass from typing import Optional +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint16, uint64 from chia._tests.util.split_managers import SplitAsyncManager, split_async_manager @@ -15,7 +16,6 @@ from chia.protocols.harvester_protocol import PlotSyncIdentifier from chia.server.outbound_message import Message, NodeType from chia.types.aliases import FarmerService, HarvesterService -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.peer_info import PeerInfo, UnresolvedPeerInfo diff --git a/chia/_tests/pools/test_pool_cli_parsing.py b/chia/_tests/pools/test_pool_cli_parsing.py index 0a313ba34117..1ef8c99c06ba 100644 --- a/chia/_tests/pools/test_pool_cli_parsing.py +++ b/chia/_tests/pools/test_pool_cli_parsing.py @@ -1,5 +1,6 @@ from __future__ import annotations +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from chia._tests.cmds.test_cmd_framework import check_click_parsing @@ -16,7 +17,6 @@ LeavePlotNFTCMD, ShowPlotNFTCMD, ) -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.bech32m import encode_puzzle_hash from chia.wallet.util.address_type import AddressType diff --git a/chia/_tests/pools/test_pool_cmdline.py b/chia/_tests/pools/test_pool_cmdline.py index 9001cc5fd8b5..0ded8cd17773 100644 --- a/chia/_tests/pools/test_pool_cmdline.py +++ b/chia/_tests/pools/test_pool_cmdline.py @@ -7,6 +7,7 @@ import pytest from chia_rs import G1Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 # TODO: update after resolution in https://github.com/pytest-dev/pytest/issues/7469 @@ -39,7 +40,6 @@ from chia.pools.pool_wallet_info import PoolSingletonState, PoolWalletInfo from chia.rpc.wallet_rpc_client import WalletRpcClient from chia.simulator.setup_services import setup_farmer -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.bech32m import encode_puzzle_hash from chia.util.config import lock_and_load_config, save_config from chia.util.errors import CliRpcConnectionError diff --git a/chia/_tests/pools/test_pool_puzzles_lifecycle.py b/chia/_tests/pools/test_pool_puzzles_lifecycle.py index d700b434ac85..881972a46347 100644 --- a/chia/_tests/pools/test_pool_puzzles_lifecycle.py +++ b/chia/_tests/pools/test_pool_puzzles_lifecycle.py @@ -5,6 +5,7 @@ import pytest from chia_rs import AugSchemeMPL, G1Element, G2Element, PrivateKey +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from chia._tests.clvm.coin_store import BadSpendBundleError, CoinStore, CoinTimestamp @@ -29,7 +30,6 @@ from chia.pools.pool_wallet_info import PoolState 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.wallet.puzzles import singleton_top_layer diff --git a/chia/_tests/pools/test_pool_rpc.py b/chia/_tests/pools/test_pool_rpc.py index 3e5e2c7df74e..6440642b9691 100644 --- a/chia/_tests/pools/test_pool_rpc.py +++ b/chia/_tests/pools/test_pool_rpc.py @@ -15,6 +15,7 @@ # TODO: update after resolution in https://github.com/pytest-dev/pytest/issues/7469 from _pytest.fixtures import SubRequest from chia_rs import ConsensusConstants, G1Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from chia._tests.environments.wallet import WalletStateTransition, WalletTestFramework @@ -28,7 +29,6 @@ from chia.simulator.simulator_protocol import ReorgProtocol from chia.simulator.start_simulator import SimulatorFullNodeService from chia.types.aliases import WalletService -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.peer_info import PeerInfo from chia.util.bech32m import encode_puzzle_hash from chia.util.byte_types import hexstr_to_bytes diff --git a/chia/_tests/pools/test_pool_wallet.py b/chia/_tests/pools/test_pool_wallet.py index 3445f3151c2c..d38812ee8c34 100644 --- a/chia/_tests/pools/test_pool_wallet.py +++ b/chia/_tests/pools/test_pool_wallet.py @@ -7,10 +7,10 @@ import pytest from chia_rs import G1Element +from chia_rs.sized_bytes import bytes32 from chia._tests.util.benchmarks import rand_g1, rand_hash from chia.pools.pool_wallet import PoolWallet -from chia.types.blockchain_format.sized_bytes import bytes32 @dataclass diff --git a/chia/_tests/pools/test_wallet_pool_store.py b/chia/_tests/pools/test_wallet_pool_store.py index 875b7afbf64a..9dbff097fe86 100644 --- a/chia/_tests/pools/test_wallet_pool_store.py +++ b/chia/_tests/pools/test_wallet_pool_store.py @@ -5,6 +5,7 @@ from typing import Optional import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from clvm_tools import binutils @@ -12,7 +13,6 @@ 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, compute_additions, make_spend from chia.wallet.wallet_pool_store import WalletPoolStore diff --git a/chia/_tests/simulation/test_simulation.py b/chia/_tests/simulation/test_simulation.py index 70b12d158de8..8aabc33352f7 100644 --- a/chia/_tests/simulation/test_simulation.py +++ b/chia/_tests/simulation/test_simulation.py @@ -6,6 +6,7 @@ import aiohttp import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint16, uint32, uint64 from chia._tests.core.node_height import node_height_at_least @@ -24,7 +25,6 @@ from chia.simulator.keyring import TempKeyring from chia.simulator.setup_services import setup_full_node from chia.simulator.simulator_protocol import FarmNewBlockProtocol, GetAllCoinsProtocol, ReorgProtocol -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.peer_info import PeerInfo from chia.util.ws_message import create_payload from chia.wallet.util.tx_config import DEFAULT_TX_CONFIG diff --git a/chia/_tests/simulation/test_start_simulator.py b/chia/_tests/simulation/test_start_simulator.py index bfaa163f5c88..4cac069afb3b 100644 --- a/chia/_tests/simulation/test_start_simulator.py +++ b/chia/_tests/simulation/test_start_simulator.py @@ -6,13 +6,13 @@ from typing import Any import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint16 from chia._tests.util.time_out_assert import time_out_assert from chia.simulator.full_node_simulator import FullNodeSimulator from chia.simulator.simulator_full_node_rpc_client import SimulatorFullNodeRpcClient from chia.simulator.simulator_test_tools import get_full_chia_simulator, get_puzzle_hash_from_key -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.hash import std_hash from chia.util.keychain import Keychain diff --git a/chia/_tests/timelord/test_new_peak.py b/chia/_tests/timelord/test_new_peak.py index e97910cd4811..764a5be59853 100644 --- a/chia/_tests/timelord/test_new_peak.py +++ b/chia/_tests/timelord/test_new_peak.py @@ -3,6 +3,7 @@ from typing import Optional import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint128 from chia._tests.blockchain.blockchain_test_utils import _validate_and_add_block @@ -18,7 +19,6 @@ from chia.simulator.full_node_simulator import FullNodeSimulator from chia.timelord.timelord_api import TimelordAPI from chia.types.aliases import FullNodeService -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.unfinished_block import UnfinishedBlock diff --git a/chia/_tests/tools/test_run_block.py b/chia/_tests/tools/test_run_block.py index b9ba5272849f..a88c5891d033 100644 --- a/chia/_tests/tools/test_run_block.py +++ b/chia/_tests/tools/test_run_block.py @@ -3,11 +3,11 @@ import json from pathlib import Path +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64, uint128 from chia._tests.util.run_block import run_json_block from chia.consensus.default_constants import DEFAULT_CONSTANTS -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.hash import std_hash diff --git a/chia/_tests/util/benchmark_cost.py b/chia/_tests/util/benchmark_cost.py index 7458f383d614..cba61982b803 100644 --- a/chia/_tests/util/benchmark_cost.py +++ b/chia/_tests/util/benchmark_cost.py @@ -4,13 +4,13 @@ import time from chia_rs import AugSchemeMPL, PrivateKey +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32 from clvm_tools import binutils from chia.consensus.default_constants import DEFAULT_CONSTANTS from chia.simulator.wallet_tools import WalletTool from chia.types.blockchain_format.program import INFINITE_COST, Program -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.wallet.derive_keys import master_sk_to_wallet_sk diff --git a/chia/_tests/util/benchmarks.py b/chia/_tests/util/benchmarks.py index beb25c9b8fb3..bac4f8ed80e3 100644 --- a/chia/_tests/util/benchmarks.py +++ b/chia/_tests/util/benchmarks.py @@ -16,6 +16,7 @@ VDFInfo, VDFProof, ) +from chia_rs.sized_bytes import bytes32, bytes100 from chia_rs.sized_ints import uint8, uint32, uint64, uint128 from chia.consensus.coinbase import create_farmer_coin, create_pool_coin @@ -24,7 +25,6 @@ from chia.types.blockchain_format.proof_of_space import ProofOfSpace from chia.types.blockchain_format.reward_chain_block import RewardChainBlock from chia.types.blockchain_format.serialized_program import SerializedProgram -from chia.types.blockchain_format.sized_bytes import bytes32, bytes100 from chia.types.full_block import FullBlock # farmer puzzle hash diff --git a/chia/_tests/util/blockchain_mock.py b/chia/_tests/util/blockchain_mock.py index c19f5ce0e002..307b708ec435 100644 --- a/chia/_tests/util/blockchain_mock.py +++ b/chia/_tests/util/blockchain_mock.py @@ -4,10 +4,10 @@ from typing import TYPE_CHECKING, ClassVar, Optional, cast from chia_rs import SubEpochChallengeSegment, SubEpochSegments +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.types.blockchain_format.sub_epoch_summary import SubEpochSummary from chia.types.blockchain_format.vdf import VDFInfo from chia.types.header_block import HeaderBlock diff --git a/chia/_tests/util/full_sync.py b/chia/_tests/util/full_sync.py index 7646f76dc7ff..f72980004726 100644 --- a/chia/_tests/util/full_sync.py +++ b/chia/_tests/util/full_sync.py @@ -12,6 +12,7 @@ import aiosqlite import zstd +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint16 from chia._tests.util.constants import test_constants as TEST_CONSTANTS @@ -25,7 +26,6 @@ from chia.server.server import ChiaServer from chia.server.ws_connection import ConnectionCallback, WSChiaConnection from chia.simulator.block_tools import make_unfinished_block -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.full_block import FullBlock from chia.types.peer_info import PeerInfo from chia.types.validation_state import ValidationState diff --git a/chia/_tests/util/generator_tools_testing.py b/chia/_tests/util/generator_tools_testing.py index 01c621903526..ccf922bc6456 100644 --- a/chia/_tests/util/generator_tools_testing.py +++ b/chia/_tests/util/generator_tools_testing.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 uint32 from chia._tests.util.get_name_puzzle_conditions import get_name_puzzle_conditions 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.types.full_block import FullBlock from chia.types.generator_types import BlockGenerator from chia.util.generator_tools import tx_removals_and_additions diff --git a/chia/_tests/util/misc.py b/chia/_tests/util/misc.py index 053e5e243852..e8c34252783c 100644 --- a/chia/_tests/util/misc.py +++ b/chia/_tests/util/misc.py @@ -29,6 +29,7 @@ from _pytest.nodes import Node from aiohttp import web from chia_rs import Coin +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint16, uint32, uint64 import chia @@ -40,7 +41,6 @@ from chia.protocols.protocol_message_types import ProtocolMessageTypes from chia.server.api_protocol import ApiMetadata, ApiProtocol from chia.server.outbound_message import Message -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.condition_opcodes import ConditionOpcode from chia.util.hash import std_hash from chia.util.network import WebServer diff --git a/chia/_tests/util/network_protocol_data.py b/chia/_tests/util/network_protocol_data.py index dd34fd13ad2e..bdb8233839b7 100644 --- a/chia/_tests/util/network_protocol_data.py +++ b/chia/_tests/util/network_protocol_data.py @@ -12,6 +12,7 @@ SubSlotData, TransactionsInfo, ) +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import int16, uint8, uint16, uint32, uint64, uint128 from chia.protocols import ( @@ -30,7 +31,6 @@ from chia.types.blockchain_format.proof_of_space import ProofOfSpace from chia.types.blockchain_format.reward_chain_block import RewardChainBlock 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, diff --git a/chia/_tests/util/run_block.py b/chia/_tests/util/run_block.py index 04b6b1451f4a..bd60815d14d2 100644 --- a/chia/_tests/util/run_block.py +++ b/chia/_tests/util/run_block.py @@ -7,11 +7,11 @@ from chia_puzzles_py.programs import CHIALISP_DESERIALISATION from chia_rs import Coin, ConsensusConstants +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 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.generator_types import BlockGenerator diff --git a/chia/_tests/util/setup_nodes.py b/chia/_tests/util/setup_nodes.py index 4698739fcbf6..4ccccea3be0a 100644 --- a/chia/_tests/util/setup_nodes.py +++ b/chia/_tests/util/setup_nodes.py @@ -11,6 +11,7 @@ import anyio from chia_rs import ConsensusConstants +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint16, uint32 from chia._tests.environments.full_node import FullNodeEnvironment @@ -40,7 +41,6 @@ from chia.simulator.socket import find_available_listen_port from chia.simulator.start_simulator import SimulatorFullNodeService from chia.types.aliases import FarmerService, FullNodeService, HarvesterService, TimelordService, WalletService -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.peer_info import UnresolvedPeerInfo from chia.util.hash import std_hash from chia.util.keychain import Keychain diff --git a/chia/_tests/util/spend_sim.py b/chia/_tests/util/spend_sim.py index dd11a6f80314..6a1210667842 100644 --- a/chia/_tests/util/spend_sim.py +++ b/chia/_tests/util/spend_sim.py @@ -17,6 +17,7 @@ get_flags_for_height_and_constants, run_block_generator2, ) +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from chia.consensus.block_rewards import calculate_base_farmer_reward, calculate_pool_reward @@ -30,7 +31,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.blockchain_format.sized_bytes import bytes32 from chia.types.coin_record import CoinRecord from chia.types.coin_spend import CoinSpend from chia.types.generator_types import BlockGenerator diff --git a/chia/_tests/util/test_condition_tools.py b/chia/_tests/util/test_condition_tools.py index 3cd0286f318a..6294f3f3ecbb 100644 --- a/chia/_tests/util/test_condition_tools.py +++ b/chia/_tests/util/test_condition_tools.py @@ -2,12 +2,12 @@ import pytest from chia_rs import G1Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from clvm.casts import int_to_bytes 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.condition_opcodes import ConditionOpcode from chia.types.condition_with_args import ConditionWithArgs from chia.types.spend_bundle_conditions import SpendBundleConditions, SpendConditions diff --git a/chia/_tests/util/test_full_block_utils.py b/chia/_tests/util/test_full_block_utils.py index 7be698f6a0bd..86b9fab5a1d9 100644 --- a/chia/_tests/util/test_full_block_utils.py +++ b/chia/_tests/util/test_full_block_utils.py @@ -6,6 +6,7 @@ import pytest from chia_rs import Foliage, FoliageBlockData, FoliageTransactionBlock, G1Element, G2Element, TransactionsInfo +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64, uint128 from chia._tests.util.benchmarks import rand_bytes, rand_g1, rand_g2, rand_hash, rand_vdf, rand_vdf_proof, rewards @@ -13,7 +14,6 @@ from chia.types.blockchain_format.proof_of_space import ProofOfSpace from chia.types.blockchain_format.reward_chain_block import RewardChainBlock 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, diff --git a/chia/_tests/util/test_replace_str_to_bytes.py b/chia/_tests/util/test_replace_str_to_bytes.py index ee57a6575e53..3827286ba597 100644 --- a/chia/_tests/util/test_replace_str_to_bytes.py +++ b/chia/_tests/util/test_replace_str_to_bytes.py @@ -2,10 +2,10 @@ 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.consensus.constants import replace_str_to_bytes -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.hash import std_hash AGG_SIG_DATA = bytes32.fromhex("ccd5bb71183532bff220ba46c268991a3ff07eb358e8255a65c30a2dce0e5fbb") diff --git a/chia/_tests/util/test_trusted_peer.py b/chia/_tests/util/test_trusted_peer.py index 9bafd15fb6b4..0bb63272adda 100644 --- a/chia/_tests/util/test_trusted_peer.py +++ b/chia/_tests/util/test_trusted_peer.py @@ -3,8 +3,8 @@ from typing import Any import pytest +from chia_rs.sized_bytes import bytes32 -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.network import is_trusted_peer diff --git a/chia/_tests/wallet/cat_wallet/test_cat_outer_puzzle.py b/chia/_tests/wallet/cat_wallet/test_cat_outer_puzzle.py index 5c6a94ce80b8..fc992dbb5e31 100644 --- a/chia/_tests/wallet/cat_wallet/test_cat_outer_puzzle.py +++ b/chia/_tests/wallet/cat_wallet/test_cat_outer_puzzle.py @@ -3,13 +3,13 @@ from typing import Optional import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from clvm_tools.binutils import disassemble 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 make_spend from chia.wallet.cat_wallet.cat_utils import CAT_MOD, construct_cat_puzzle from chia.wallet.outer_puzzles import construct_puzzle, get_inner_puzzle, get_inner_solution, match_puzzle, solve_puzzle diff --git a/chia/_tests/wallet/cat_wallet/test_cat_wallet.py b/chia/_tests/wallet/cat_wallet/test_cat_wallet.py index 6e5154d38006..af2ba1215cfb 100644 --- a/chia/_tests/wallet/cat_wallet/test_cat_wallet.py +++ b/chia/_tests/wallet/cat_wallet/test_cat_wallet.py @@ -4,6 +4,7 @@ from pathlib import Path import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from chia._tests.conftest import ConsensusMode @@ -19,7 +20,6 @@ from chia.simulator.simulator_protocol import ReorgProtocol from chia.types.blockchain_format.coin import Coin, coin_as_list from chia.types.blockchain_format.program import Program -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.coin_spend import make_spend from chia.util.bech32m import encode_puzzle_hash from chia.util.db_wrapper import DBWrapper2 diff --git a/chia/_tests/wallet/cat_wallet/test_offer_lifecycle.py b/chia/_tests/wallet/cat_wallet/test_offer_lifecycle.py index 34c890a7b2f5..8a8d78b7b141 100644 --- a/chia/_tests/wallet/cat_wallet/test_offer_lifecycle.py +++ b/chia/_tests/wallet/cat_wallet/test_offer_lifecycle.py @@ -4,13 +4,13 @@ import pytest from chia_rs import G2Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from chia._tests.util.spend_sim import CostLogger, SimClient, SpendSim, sim_and_client 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 make_spend from chia.types.mempool_inclusion_status import MempoolInclusionStatus from chia.wallet.cat_wallet.cat_utils import ( diff --git a/chia/_tests/wallet/cat_wallet/test_trades.py b/chia/_tests/wallet/cat_wallet/test_trades.py index dc63fd7f0eb8..1ea4a5b4e108 100644 --- a/chia/_tests/wallet/cat_wallet/test_trades.py +++ b/chia/_tests/wallet/cat_wallet/test_trades.py @@ -5,6 +5,7 @@ import pytest from chia_rs import G2Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from chia._tests.conftest import SOFTFORK_HEIGHTS @@ -17,7 +18,6 @@ from chia.full_node.bundle_tools import simple_solution_generator from chia.rpc.wallet_request_types import VCAddProofs, VCGetList, VCGetProofsForRoot, VCMint, VCSpend from chia.types.blockchain_format.program import INFINITE_COST, Program -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.spend_bundle import SpendBundle from chia.util.bech32m import encode_puzzle_hash from chia.util.hash import std_hash diff --git a/chia/_tests/wallet/clawback/test_clawback_lifecycle.py b/chia/_tests/wallet/clawback/test_clawback_lifecycle.py index a4bbf528c053..2674a26615b4 100644 --- a/chia/_tests/wallet/clawback/test_clawback_lifecycle.py +++ b/chia/_tests/wallet/clawback/test_clawback_lifecycle.py @@ -4,6 +4,7 @@ import pytest from chia_rs import AugSchemeMPL, G1Element, G2Element, PrivateKey +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from chia._tests.clvm.benchmark_costs import cost_of_spend_bundle @@ -13,7 +14,6 @@ from chia._tests.util.time_out_assert import time_out_assert from chia.consensus.default_constants import DEFAULT_CONSTANTS 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 CoinSpend, make_spend from chia.types.condition_opcodes import ConditionOpcode from chia.types.mempool_inclusion_status import MempoolInclusionStatus diff --git a/chia/_tests/wallet/clawback/test_clawback_metadata.py b/chia/_tests/wallet/clawback/test_clawback_metadata.py index cbed9616ef91..e18d655b770b 100644 --- a/chia/_tests/wallet/clawback/test_clawback_metadata.py +++ b/chia/_tests/wallet/clawback/test_clawback_metadata.py @@ -3,12 +3,12 @@ import random import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from chia.server.server import ChiaServer from chia.simulator.block_tools import BlockTools from chia.simulator.full_node_simulator import FullNodeSimulator -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.peer_info import PeerInfo from chia.wallet.puzzles.clawback.metadata import ClawbackMetadata from chia.wallet.wallet_node import WalletNode diff --git a/chia/_tests/wallet/conftest.py b/chia/_tests/wallet/conftest.py index 908e83924ad6..17b3cf4fd4c0 100644 --- a/chia/_tests/wallet/conftest.py +++ b/chia/_tests/wallet/conftest.py @@ -16,6 +16,7 @@ run_block_generator, run_block_generator2, ) +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64, uint128 from chia._tests.environments.wallet import NewPuzzleHashError, WalletEnvironment, WalletState, WalletTestFramework @@ -24,7 +25,6 @@ from chia.full_node.full_node import FullNode from chia.rpc.full_node_rpc_client import FullNodeRpcClient from chia.rpc.wallet_rpc_client import WalletRpcClient -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.full_block import FullBlock from chia.types.peer_info import PeerInfo from chia.wallet.util.tx_config import DEFAULT_TX_CONFIG, TXConfig diff --git a/chia/_tests/wallet/db_wallet/test_db_graftroot.py b/chia/_tests/wallet/db_wallet/test_db_graftroot.py index 1c93a8821d5b..dbc18f363c31 100644 --- a/chia/_tests/wallet/db_wallet/test_db_graftroot.py +++ b/chia/_tests/wallet/db_wallet/test_db_graftroot.py @@ -2,11 +2,11 @@ import pytest from chia_rs import G2Element +from chia_rs.sized_bytes import bytes32 from chia._tests.util.spend_sim import CostLogger, sim_and_client 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 make_spend from chia.types.mempool_inclusion_status import MempoolInclusionStatus from chia.util.errors import Err diff --git a/chia/_tests/wallet/db_wallet/test_dl_offers.py b/chia/_tests/wallet/db_wallet/test_dl_offers.py index 5b1c14e1cead..f2b54f7a3797 100644 --- a/chia/_tests/wallet/db_wallet/test_dl_offers.py +++ b/chia/_tests/wallet/db_wallet/test_dl_offers.py @@ -3,11 +3,11 @@ from typing import Any import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from chia._tests.util.time_out_assert import time_out_assert from chia.data_layer.data_layer_wallet import DataLayerWallet -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.wallet.puzzle_drivers import Solver from chia.wallet.trade_record import TradeRecord from chia.wallet.trading.offer import Offer diff --git a/chia/_tests/wallet/db_wallet/test_dl_wallet.py b/chia/_tests/wallet/db_wallet/test_dl_wallet.py index 125f87981736..77e3a8b9eada 100644 --- a/chia/_tests/wallet/db_wallet/test_dl_wallet.py +++ b/chia/_tests/wallet/db_wallet/test_dl_wallet.py @@ -3,6 +3,7 @@ import dataclasses import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from chia._tests.environments.wallet import WalletStateTransition, WalletTestFramework @@ -13,7 +14,6 @@ from chia.simulator.simulator_protocol import ReorgProtocol 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.wallet.db_wallet.db_wallet_puzzles import create_mirror_puzzle from chia.wallet.util.merkle_tree import MerkleTree from chia.wallet.util.tx_config import DEFAULT_TX_CONFIG diff --git a/chia/_tests/wallet/did_wallet/test_did.py b/chia/_tests/wallet/did_wallet/test_did.py index ac6c1df0de0f..6a51c3c3c63b 100644 --- a/chia/_tests/wallet/did_wallet/test_did.py +++ b/chia/_tests/wallet/did_wallet/test_did.py @@ -5,6 +5,7 @@ import pytest from chia_rs import AugSchemeMPL, G1Element, G2Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint16, uint32, uint64 from chia._tests.conftest import ConsensusMode @@ -18,7 +19,6 @@ from chia.simulator.full_node_simulator import FullNodeSimulator from chia.simulator.simulator_protocol import FarmNewBlockProtocol from chia.types.blockchain_format.program import Program -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.condition_opcodes import ConditionOpcode from chia.types.peer_info import PeerInfo from chia.types.signing_mode import CHIP_0002_SIGN_MESSAGE_PREFIX diff --git a/chia/_tests/wallet/nft_wallet/test_nft_1_offers.py b/chia/_tests/wallet/nft_wallet/test_nft_1_offers.py index 44df6ae1fe75..1d3c7f9bc3ea 100644 --- a/chia/_tests/wallet/nft_wallet/test_nft_1_offers.py +++ b/chia/_tests/wallet/nft_wallet/test_nft_1_offers.py @@ -7,6 +7,7 @@ from typing import Any, Callable, Optional import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint16, uint32, uint64, uint128 from chia._tests.util.time_out_assert import time_out_assert, time_out_assert_not_none @@ -14,7 +15,6 @@ from chia.simulator.full_node_simulator import FullNodeSimulator from chia.simulator.simulator_protocol import FarmNewBlockProtocol from chia.types.blockchain_format.program import Program -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.peer_info import PeerInfo from chia.wallet.cat_wallet.cat_wallet import CATWallet from chia.wallet.did_wallet.did_wallet import DIDWallet diff --git a/chia/_tests/wallet/nft_wallet/test_nft_bulk_mint.py b/chia/_tests/wallet/nft_wallet/test_nft_bulk_mint.py index bb78d74daae8..797727cb0f65 100644 --- a/chia/_tests/wallet/nft_wallet/test_nft_bulk_mint.py +++ b/chia/_tests/wallet/nft_wallet/test_nft_bulk_mint.py @@ -5,6 +5,7 @@ from typing import Any import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint16, uint32, uint64 from chia._tests.util.setup_nodes import SimulatorsAndWalletsServices @@ -16,7 +17,6 @@ from chia.simulator.full_node_simulator import FullNodeSimulator from chia.simulator.simulator_protocol import FarmNewBlockProtocol from chia.types.blockchain_format.program import Program -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.peer_info import PeerInfo from chia.util.bech32m import decode_puzzle_hash, encode_puzzle_hash from chia.wallet.did_wallet.did_wallet import DIDWallet diff --git a/chia/_tests/wallet/nft_wallet/test_nft_lifecycle.py b/chia/_tests/wallet/nft_wallet/test_nft_lifecycle.py index 1bed036835ce..8101cc1c6589 100644 --- a/chia/_tests/wallet/nft_wallet/test_nft_lifecycle.py +++ b/chia/_tests/wallet/nft_wallet/test_nft_lifecycle.py @@ -4,10 +4,10 @@ import pytest from chia_rs import G2Element +from chia_rs.sized_bytes import bytes32 from chia._tests.util.spend_sim import CostLogger, sim_and_client from chia.types.blockchain_format.program import Program -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.coin_spend import make_spend from chia.types.mempool_inclusion_status import MempoolInclusionStatus from chia.util.errors import Err diff --git a/chia/_tests/wallet/nft_wallet/test_nft_offers.py b/chia/_tests/wallet/nft_wallet/test_nft_offers.py index 1602938b8a64..80eb211f06cf 100644 --- a/chia/_tests/wallet/nft_wallet/test_nft_offers.py +++ b/chia/_tests/wallet/nft_wallet/test_nft_offers.py @@ -3,12 +3,12 @@ from typing import Optional, Union import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from chia._tests.environments.wallet import WalletStateTransition, WalletTestFramework from chia._tests.util.time_out_assert import time_out_assert from chia.types.blockchain_format.program import Program -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.wallet.cat_wallet.cat_wallet import CATWallet from chia.wallet.nft_wallet.nft_wallet import NFTWallet from chia.wallet.outer_puzzles import create_asset_id, match_puzzle diff --git a/chia/_tests/wallet/nft_wallet/test_nft_puzzles.py b/chia/_tests/wallet/nft_wallet/test_nft_puzzles.py index 589ed0846963..736e7b066e68 100644 --- a/chia/_tests/wallet/nft_wallet/test_nft_puzzles.py +++ b/chia/_tests/wallet/nft_wallet/test_nft_puzzles.py @@ -3,9 +3,10 @@ import random from typing import Optional +from chia_rs.sized_bytes import bytes32 + from chia._tests.core.make_block_generator import int_to_public_key from chia.types.blockchain_format.program import Program -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.wallet.nft_wallet import uncurry_nft from chia.wallet.nft_wallet.nft_puzzle_utils import ( construct_ownership_layer, diff --git a/chia/_tests/wallet/nft_wallet/test_nft_wallet.py b/chia/_tests/wallet/nft_wallet/test_nft_wallet.py index 38adf2a6b580..452fa59f042e 100644 --- a/chia/_tests/wallet/nft_wallet/test_nft_wallet.py +++ b/chia/_tests/wallet/nft_wallet/test_nft_wallet.py @@ -6,6 +6,7 @@ import pytest from chia_rs import AugSchemeMPL, G1Element, G2Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from clvm_tools.binutils import disassemble @@ -23,7 +24,6 @@ ) from chia.simulator.simulator_protocol import ReorgProtocol from chia.types.blockchain_format.program import Program -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.signing_mode import CHIP_0002_SIGN_MESSAGE_PREFIX from chia.util.bech32m import decode_puzzle_hash, encode_puzzle_hash from chia.util.byte_types import hexstr_to_bytes diff --git a/chia/_tests/wallet/nft_wallet/test_ownership_outer_puzzle.py b/chia/_tests/wallet/nft_wallet/test_ownership_outer_puzzle.py index 7db29842e98e..c229b9d342e7 100644 --- a/chia/_tests/wallet/nft_wallet/test_ownership_outer_puzzle.py +++ b/chia/_tests/wallet/nft_wallet/test_ownership_outer_puzzle.py @@ -2,11 +2,11 @@ from typing import Optional +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint16 from clvm_tools.binutils import assemble from chia.types.blockchain_format.program import Program -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.wallet.nft_wallet.ownership_outer_puzzle import puzzle_for_ownership_layer from chia.wallet.nft_wallet.transfer_program_puzzle import puzzle_for_transfer_program from chia.wallet.outer_puzzles import construct_puzzle, get_inner_puzzle, get_inner_solution, match_puzzle, solve_puzzle diff --git a/chia/_tests/wallet/rpc/test_dl_wallet_rpc.py b/chia/_tests/wallet/rpc/test_dl_wallet_rpc.py index bff8c45a0b6f..398769b68476 100644 --- a/chia/_tests/wallet/rpc/test_dl_wallet_rpc.py +++ b/chia/_tests/wallet/rpc/test_dl_wallet_rpc.py @@ -5,6 +5,7 @@ import logging import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64 from chia._tests.util.rpc import validate_get_routes @@ -15,7 +16,6 @@ from chia.data_layer.data_layer_wallet import Mirror from chia.rpc.wallet_rpc_client import WalletRpcClient from chia.simulator.simulator_protocol import FarmNewBlockProtocol -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.peer_info import PeerInfo from chia.wallet.db_wallet.db_wallet_puzzles import create_mirror_puzzle diff --git a/chia/_tests/wallet/rpc/test_wallet_rpc.py b/chia/_tests/wallet/rpc/test_wallet_rpc.py index f461a223fd92..e996e2481a38 100644 --- a/chia/_tests/wallet/rpc/test_wallet_rpc.py +++ b/chia/_tests/wallet/rpc/test_wallet_rpc.py @@ -13,6 +13,7 @@ import aiosqlite import pytest from chia_rs import G1Element, G2Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint16, uint32, uint64 from chia._tests.environments.wallet import WalletStateTransition, WalletTestFramework @@ -77,7 +78,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.blockchain_format.sized_bytes import bytes32 from chia.types.coin_record import CoinRecord from chia.types.coin_spend import CoinSpend, make_spend from chia.types.peer_info import PeerInfo diff --git a/chia/_tests/wallet/simple_sync/test_simple_sync_protocol.py b/chia/_tests/wallet/simple_sync/test_simple_sync_protocol.py index c6682e0e3156..0b4d9cb70116 100644 --- a/chia/_tests/wallet/simple_sync/test_simple_sync_protocol.py +++ b/chia/_tests/wallet/simple_sync/test_simple_sync_protocol.py @@ -3,6 +3,7 @@ import asyncio 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 colorlog import getLogger @@ -18,7 +19,6 @@ from chia.server.outbound_message import Message, NodeType from chia.simulator.simulator_protocol import FarmNewBlockProtocol, ReorgProtocol 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.types.peer_info import PeerInfo diff --git a/chia/_tests/wallet/sync/test_wallet_sync.py b/chia/_tests/wallet/sync/test_wallet_sync.py index 0d1197b08928..85aff1d0b2e4 100644 --- a/chia/_tests/wallet/sync/test_wallet_sync.py +++ b/chia/_tests/wallet/sync/test_wallet_sync.py @@ -12,6 +12,7 @@ import pytest from aiosqlite import Error as AIOSqliteError from chia_rs import ConsensusConstants, G2Element, confirm_not_included_already_hashed +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64, uint128 from chiabip158 import PyBIP158 from colorlog import getLogger @@ -48,7 +49,6 @@ from chia.simulator.simulator_protocol import FarmNewBlockProtocol 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 make_spend from chia.types.condition_opcodes import ConditionOpcode from chia.types.full_block import FullBlock diff --git a/chia/_tests/wallet/test_clvm_streamable.py b/chia/_tests/wallet/test_clvm_streamable.py index 3e35f87c978d..d444287d0847 100644 --- a/chia/_tests/wallet/test_clvm_streamable.py +++ b/chia/_tests/wallet/test_clvm_streamable.py @@ -4,10 +4,10 @@ from typing import Optional import pytest +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.streamable import Streamable, streamable from chia.wallet.signer_protocol import Coin, Spend from chia.wallet.util.clvm_streamable import ( diff --git a/chia/_tests/wallet/test_coin_management.py b/chia/_tests/wallet/test_coin_management.py index 2a3aad964ca5..9bc6254aa307 100644 --- a/chia/_tests/wallet/test_coin_management.py +++ b/chia/_tests/wallet/test_coin_management.py @@ -8,6 +8,7 @@ from unittest.mock import patch import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from chia._tests.cmds.test_cmd_framework import check_click_parsing @@ -16,7 +17,6 @@ from chia.cmds.coins import CombineCMD, ListCMD, SplitCMD from chia.cmds.param_types import CliAmount, cli_amount_none from chia.rpc.wallet_request_types import GetSyncStatusResponse -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.wallet.cat_wallet.cat_wallet import CATWallet ONE_TRILLION = 1_000_000_000_000 diff --git a/chia/_tests/wallet/test_coin_selection.py b/chia/_tests/wallet/test_coin_selection.py index 0106a5f9784d..2c2f9327235d 100644 --- a/chia/_tests/wallet/test_coin_selection.py +++ b/chia/_tests/wallet/test_coin_selection.py @@ -5,11 +5,11 @@ from random import randrange import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64, uint128 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.hash import std_hash from chia.wallet.coin_selection import ( check_for_exact_match, diff --git a/chia/_tests/wallet/test_conditions.py b/chia/_tests/wallet/test_conditions.py index 1f88e5b4ba0d..39b5a8e205af 100644 --- a/chia/_tests/wallet/test_conditions.py +++ b/chia/_tests/wallet/test_conditions.py @@ -4,12 +4,12 @@ from typing import Any, Optional, Union import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from clvm.casts import int_from_bytes from clvm.EvalError import EvalError from chia.types.blockchain_format.program import Program -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.condition_opcodes import ConditionOpcode from chia.wallet.conditions import ( CONDITION_DRIVERS, diff --git a/chia/_tests/wallet/test_debug_spend_bundle.py b/chia/_tests/wallet/test_debug_spend_bundle.py index 8fee30b81ac2..8eccb1472fb2 100644 --- a/chia/_tests/wallet/test_debug_spend_bundle.py +++ b/chia/_tests/wallet/test_debug_spend_bundle.py @@ -2,11 +2,11 @@ import pytest from chia_rs import AugSchemeMPL, PrivateKey +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 make_spend from chia.types.condition_opcodes import ConditionOpcode from chia.util.hash import std_hash diff --git a/chia/_tests/wallet/test_new_wallet_protocol.py b/chia/_tests/wallet/test_new_wallet_protocol.py index 3cd80eb3589b..5aed8ce1dc9a 100644 --- a/chia/_tests/wallet/test_new_wallet_protocol.py +++ b/chia/_tests/wallet/test_new_wallet_protocol.py @@ -9,6 +9,7 @@ import pytest from chia_rs import AugSchemeMPL, Coin, CoinSpend, CoinState, Program +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint16, uint32, uint64 from chia._tests.connection_utils import add_dummy_connection @@ -25,7 +26,6 @@ from chia.simulator.full_node_simulator import FullNodeSimulator from chia.simulator.start_simulator import SimulatorFullNodeService from chia.types.aliases import WalletService -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.coin_record import CoinRecord from chia.types.mempool_inclusion_status import MempoolInclusionStatus from chia.types.spend_bundle import SpendBundle diff --git a/chia/_tests/wallet/test_nft_store.py b/chia/_tests/wallet/test_nft_store.py index 41b2b9c5aa94..c36255fefca5 100644 --- a/chia/_tests/wallet/test_nft_store.py +++ b/chia/_tests/wallet/test_nft_store.py @@ -4,12 +4,12 @@ from dataclasses import dataclass, field import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from chia._tests.util.db_connection import DBConnection 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.wallet.lineage_proof import LineageProof from chia.wallet.nft_wallet.nft_info import NFTCoinInfo from chia.wallet.wallet_nft_store import WalletNftStore diff --git a/chia/_tests/wallet/test_notifications.py b/chia/_tests/wallet/test_notifications.py index 5413227549bb..b27e8e4dc9eb 100644 --- a/chia/_tests/wallet/test_notifications.py +++ b/chia/_tests/wallet/test_notifications.py @@ -6,13 +6,13 @@ from typing import Any, Optional import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from chia._tests.util.time_out_assert import time_out_assert, time_out_assert_not_none from chia.consensus.block_rewards import calculate_base_farmer_reward, calculate_pool_reward from chia.simulator.full_node_simulator import FullNodeSimulator from chia.simulator.simulator_protocol import FarmNewBlockProtocol -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.peer_info import PeerInfo from chia.util.db_wrapper import DBWrapper2 from chia.wallet.notification_store import NotificationStore diff --git a/chia/_tests/wallet/test_puzzle_store.py b/chia/_tests/wallet/test_puzzle_store.py index 398248cee825..c071d46b93b9 100644 --- a/chia/_tests/wallet/test_puzzle_store.py +++ b/chia/_tests/wallet/test_puzzle_store.py @@ -5,10 +5,10 @@ import pytest from chia_rs import AugSchemeMPL +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32 from chia._tests.util.db_connection import DBConnection -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.wallet.derivation_record import DerivationRecord from chia.wallet.util.wallet_types import WalletIdentifier, WalletType from chia.wallet.wallet_puzzle_store import WalletPuzzleStore diff --git a/chia/_tests/wallet/test_sign_coin_spends.py b/chia/_tests/wallet/test_sign_coin_spends.py index e7413fda9de5..2e815eab361b 100644 --- a/chia/_tests/wallet/test_sign_coin_spends.py +++ b/chia/_tests/wallet/test_sign_coin_spends.py @@ -4,13 +4,13 @@ import pytest from chia_rs import AugSchemeMPL, G1Element, G2Element, PrivateKey +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.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, make_spend from chia.types.condition_opcodes import ConditionOpcode from chia.util.db_wrapper import DBWrapper2, manage_connection diff --git a/chia/_tests/wallet/test_signer_protocol.py b/chia/_tests/wallet/test_signer_protocol.py index 7cac081e8f79..824b4148685b 100644 --- a/chia/_tests/wallet/test_signer_protocol.py +++ b/chia/_tests/wallet/test_signer_protocol.py @@ -6,6 +6,7 @@ import click import pytest from chia_rs import AugSchemeMPL, G1Element, G2Element, PrivateKey +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from click.testing import CliRunner @@ -35,7 +36,6 @@ from chia.rpc.wallet_rpc_client import WalletRpcClient from chia.types.blockchain_format.coin import Coin as ConsensusCoin 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.util.hash import std_hash from chia.util.streamable import Streamable diff --git a/chia/_tests/wallet/test_singleton.py b/chia/_tests/wallet/test_singleton.py index f73abd3c120b..75b56429c628 100644 --- a/chia/_tests/wallet/test_singleton.py +++ b/chia/_tests/wallet/test_singleton.py @@ -1,10 +1,10 @@ from __future__ import annotations import pytest +from chia_rs.sized_bytes import bytes32 from clvm_tools import binutils from chia.types.blockchain_format.program import INFINITE_COST, Program -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.condition_tools import parse_sexp_to_conditions from chia.wallet.conditions import AssertPuzzleAnnouncement from chia.wallet.puzzles.singleton_top_layer import P2_SINGLETON_MOD, SINGLETON_MOD, SINGLETON_MOD_HASH diff --git a/chia/_tests/wallet/test_singleton_lifecycle_fast.py b/chia/_tests/wallet/test_singleton_lifecycle_fast.py index 3b6c191dab84..8007074fb526 100644 --- a/chia/_tests/wallet/test_singleton_lifecycle_fast.py +++ b/chia/_tests/wallet/test_singleton_lifecycle_fast.py @@ -4,6 +4,7 @@ from typing import Any, Callable, Optional, TypeVar, cast, get_args, get_origin from chia_rs import G1Element, G2Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from clvm_tools import binutils @@ -14,7 +15,6 @@ 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, compute_additions, make_spend from chia.types.condition_opcodes import ConditionOpcode from chia.wallet.conditions import AssertCoinAnnouncement diff --git a/chia/_tests/wallet/test_singleton_store.py b/chia/_tests/wallet/test_singleton_store.py index f4cf67df3d73..57186c0c66cb 100644 --- a/chia/_tests/wallet/test_singleton_store.py +++ b/chia/_tests/wallet/test_singleton_store.py @@ -4,12 +4,12 @@ from secrets import token_bytes import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from chia._tests.util.db_connection import DBConnection 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 make_spend from chia.wallet.lineage_proof import LineageProof from chia.wallet.singleton import create_singleton_puzzle diff --git a/chia/_tests/wallet/test_transaction_store.py b/chia/_tests/wallet/test_transaction_store.py index 254af9b07be0..195932faab7e 100644 --- a/chia/_tests/wallet/test_transaction_store.py +++ b/chia/_tests/wallet/test_transaction_store.py @@ -5,11 +5,11 @@ from typing import Any, Optional import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64 from chia._tests.util.db_connection import DBConnection from chia.types.blockchain_format.coin import Coin -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.mempool_inclusion_status import MempoolInclusionStatus from chia.util.errors import Err from chia.wallet.conditions import ConditionValidTimes diff --git a/chia/_tests/wallet/test_util.py b/chia/_tests/wallet/test_util.py index 71784fb78ada..0bb9157b2db7 100644 --- a/chia/_tests/wallet/test_util.py +++ b/chia/_tests/wallet/test_util.py @@ -3,13 +3,13 @@ from typing import Any import pytest +from chia_rs.sized_bytes import bytes32, bytes48 from chia_rs.sized_ints import uint64 from chia._tests.util.misc import CoinGenerator, coin_creation_args from chia.consensus.default_constants import DEFAULT_CONSTANTS 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, bytes48 from chia.types.coin_spend import make_spend from chia.util.errors import ValidationError from chia.wallet.lineage_proof import LineageProof, LineageProofField diff --git a/chia/_tests/wallet/test_wallet.py b/chia/_tests/wallet/test_wallet.py index 6350f194c378..a62ba0c3b889 100644 --- a/chia/_tests/wallet/test_wallet.py +++ b/chia/_tests/wallet/test_wallet.py @@ -6,6 +6,7 @@ import pytest from chia_rs import AugSchemeMPL, G1Element, G2Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint16, uint32, uint64 from chia._tests.environments.wallet import WalletStateTransition, WalletTestFramework @@ -16,7 +17,6 @@ from chia.simulator.full_node_simulator import FullNodeSimulator from chia.simulator.simulator_protocol import ReorgProtocol from chia.types.blockchain_format.program import Program -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.coin_spend import CoinSpend, compute_additions from chia.types.peer_info import PeerInfo from chia.types.signing_mode import CHIP_0002_SIGN_MESSAGE_PREFIX diff --git a/chia/_tests/wallet/test_wallet_action_scope.py b/chia/_tests/wallet/test_wallet_action_scope.py index 0a6f9228126f..48ea46d44e31 100644 --- a/chia/_tests/wallet/test_wallet_action_scope.py +++ b/chia/_tests/wallet/test_wallet_action_scope.py @@ -5,12 +5,12 @@ import pytest from chia_rs import G2Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from chia._tests.cmds.wallet.test_consts import STD_TX from chia.data_layer.singleton_record import SingletonRecord from chia.types.blockchain_format.coin import Coin -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.wallet.signer_protocol import SigningResponse from chia.wallet.transaction_record import TransactionRecord from chia.wallet.util.tx_config import DEFAULT_TX_CONFIG diff --git a/chia/_tests/wallet/test_wallet_coin_store.py b/chia/_tests/wallet/test_wallet_coin_store.py index d36f93244f7d..8efbc15fa989 100644 --- a/chia/_tests/wallet/test_wallet_coin_store.py +++ b/chia/_tests/wallet/test_wallet_coin_store.py @@ -5,11 +5,11 @@ from typing import Optional import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint16, uint32, uint64 from chia._tests.util.db_connection import DBConnection from chia.types.blockchain_format.coin import Coin -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.streamable import Streamable, UInt32Range, UInt64Range, VersionedBlob from chia.wallet.puzzles.clawback.metadata import ClawbackMetadata from chia.wallet.util.query_filter import AmountFilter, HashFilter diff --git a/chia/_tests/wallet/test_wallet_interested_store.py b/chia/_tests/wallet/test_wallet_interested_store.py index 14818a9c3c0a..9238a14d5952 100644 --- a/chia/_tests/wallet/test_wallet_interested_store.py +++ b/chia/_tests/wallet/test_wallet_interested_store.py @@ -3,11 +3,11 @@ import random import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from chia._tests.util.db_connection import DBConnection from chia.types.blockchain_format.coin import Coin -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.wallet.wallet_interested_store import WalletInterestedStore diff --git a/chia/_tests/wallet/test_wallet_node.py b/chia/_tests/wallet/test_wallet_node.py index 621c931bbf9b..794bf9d8ee70 100644 --- a/chia/_tests/wallet/test_wallet_node.py +++ b/chia/_tests/wallet/test_wallet_node.py @@ -9,6 +9,7 @@ import pytest from chia_rs import G1Element, PrivateKey +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64, uint128 from chia._tests.util.misc import CoinGenerator, patch_request_handler @@ -22,7 +23,6 @@ from chia.simulator.add_blocks_in_batches import add_blocks_in_batches from chia.simulator.block_tools import test_constants 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.mempool_inclusion_status import MempoolInclusionStatus from chia.types.peer_info import PeerInfo diff --git a/chia/_tests/wallet/test_wallet_retry.py b/chia/_tests/wallet/test_wallet_retry.py index 9d05ad97648b..95e7f9419b4b 100644 --- a/chia/_tests/wallet/test_wallet_retry.py +++ b/chia/_tests/wallet/test_wallet_retry.py @@ -4,6 +4,7 @@ from typing import Any import pytest +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from chia._tests.util.time_out_assert import time_out_assert, time_out_assert_custom_interval @@ -12,7 +13,6 @@ 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.blockchain_format.sized_bytes import bytes32 from chia.types.peer_info import PeerInfo from chia.wallet.transaction_record import TransactionRecord from chia.wallet.util.tx_config import DEFAULT_TX_CONFIG diff --git a/chia/_tests/wallet/test_wallet_state_manager.py b/chia/_tests/wallet/test_wallet_state_manager.py index 97c2f631921c..703635f3299e 100644 --- a/chia/_tests/wallet/test_wallet_state_manager.py +++ b/chia/_tests/wallet/test_wallet_state_manager.py @@ -5,6 +5,7 @@ import pytest from chia_rs import G2Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from chia._tests.environments.wallet import WalletStateTransition, WalletTestFramework @@ -14,7 +15,6 @@ from chia.server.outbound_message import NodeType 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 make_spend from chia.types.peer_info import PeerInfo from chia.wallet.derivation_record import DerivationRecord diff --git a/chia/_tests/wallet/test_wallet_trade_store.py b/chia/_tests/wallet/test_wallet_trade_store.py index 1f3778bd86ab..a7b2352e92c8 100644 --- a/chia/_tests/wallet/test_wallet_trade_store.py +++ b/chia/_tests/wallet/test_wallet_trade_store.py @@ -5,11 +5,11 @@ import pytest from chia_rs import G2Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from chia._tests.util.db_connection import DBConnection from chia.types.blockchain_format.coin import Coin -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.wallet.conditions import ConditionValidTimes from chia.wallet.trade_record import TradeRecord, TradeRecordOld from chia.wallet.trading.offer import Offer diff --git a/chia/_tests/wallet/test_wallet_utils.py b/chia/_tests/wallet/test_wallet_utils.py index f635cbb4ddaf..dadf27e90417 100644 --- a/chia/_tests/wallet/test_wallet_utils.py +++ b/chia/_tests/wallet/test_wallet_utils.py @@ -5,9 +5,9 @@ import pytest from chia_rs import Coin, CoinState +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.wallet.util.peer_request_cache import PeerRequestCache from chia.wallet.util.wallet_sync_utils import sort_coin_states diff --git a/chia/_tests/wallet/vc_wallet/test_cr_outer_puzzle.py b/chia/_tests/wallet/vc_wallet/test_cr_outer_puzzle.py index 2499b2d1d28a..74ea5729b304 100644 --- a/chia/_tests/wallet/vc_wallet/test_cr_outer_puzzle.py +++ b/chia/_tests/wallet/vc_wallet/test_cr_outer_puzzle.py @@ -2,11 +2,11 @@ from typing import 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.wallet.outer_puzzles import ( construct_puzzle, create_asset_id, diff --git a/chia/_tests/wallet/vc_wallet/test_vc_lifecycle.py b/chia/_tests/wallet/vc_wallet/test_vc_lifecycle.py index a2adafe0fe69..5f9855753c67 100644 --- a/chia/_tests/wallet/vc_wallet/test_vc_lifecycle.py +++ b/chia/_tests/wallet/vc_wallet/test_vc_lifecycle.py @@ -5,12 +5,12 @@ import pytest from chia_rs import G2Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from chia._tests.util.spend_sim import CostLogger, sim_and_client 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.mempool_inclusion_status import MempoolInclusionStatus from chia.util.errors import Err diff --git a/chia/_tests/wallet/vc_wallet/test_vc_wallet.py b/chia/_tests/wallet/vc_wallet/test_vc_wallet.py index 35d2a30961d9..654bfd5cc711 100644 --- a/chia/_tests/wallet/vc_wallet/test_vc_wallet.py +++ b/chia/_tests/wallet/vc_wallet/test_vc_wallet.py @@ -6,6 +6,7 @@ import pytest from chia_rs import G2Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from typing_extensions import Literal @@ -16,7 +17,6 @@ from chia.simulator.full_node_simulator import FullNodeSimulator from chia.types.blockchain_format.coin import coin_as_list from chia.types.blockchain_format.program import Program -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.coin_spend import make_spend from chia.types.peer_info import PeerInfo from chia.util.bech32m import encode_puzzle_hash diff --git a/chia/_tests/wallet/wallet_block_tools.py b/chia/_tests/wallet/wallet_block_tools.py index 14ae1cbcffa8..d87f3f018435 100644 --- a/chia/_tests/wallet/wallet_block_tools.py +++ b/chia/_tests/wallet/wallet_block_tools.py @@ -13,6 +13,7 @@ TransactionsInfo, compute_merkle_set_root, ) +from chia_rs.sized_bytes import bytes32, bytes100 from chia_rs.sized_ints import uint8, uint32, uint64, uint128 from chiabip158 import PyBIP158 @@ -27,7 +28,6 @@ from chia.types.blockchain_format.pool_target import PoolTarget from chia.types.blockchain_format.proof_of_space import ProofOfSpace from chia.types.blockchain_format.reward_chain_block import RewardChainBlock, RewardChainBlockUnfinished -from chia.types.blockchain_format.sized_bytes import bytes32, bytes100 from chia.types.blockchain_format.vdf import VDFInfo, VDFProof from chia.types.full_block import FullBlock from chia.types.generator_types import BlockGenerator diff --git a/chia/_tests/weight_proof/test_weight_proof.py b/chia/_tests/weight_proof/test_weight_proof.py index f2737abd1582..1b62608c3cca 100644 --- a/chia/_tests/weight_proof/test_weight_proof.py +++ b/chia/_tests/weight_proof/test_weight_proof.py @@ -4,6 +4,7 @@ import pytest from chia_rs import ConsensusConstants +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64 from chia._tests.util.blockchain_mock import BlockchainMock @@ -14,7 +15,6 @@ from chia.full_node.weight_proof import WeightProofHandler, _map_sub_epoch_summaries, _validate_summaries_weight from chia.simulator.block_tools import BlockTools from chia.types.blockchain_format.proof_of_space import calculate_prefix_bits, verify_and_get_quality_string -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.header_block import HeaderBlock diff --git a/chia/cmds/cmd_classes.py b/chia/cmds/cmd_classes.py index 9c4d37b9a974..c7e49495d009 100644 --- a/chia/cmds/cmd_classes.py +++ b/chia/cmds/cmd_classes.py @@ -21,9 +21,9 @@ ) import click +from chia_rs.sized_bytes import bytes32 from typing_extensions import dataclass_transform -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.byte_types import hexstr_to_bytes from chia.util.default_root import DEFAULT_ROOT_PATH from chia.util.streamable import is_type_SpecificOptional diff --git a/chia/cmds/cmd_helpers.py b/chia/cmds/cmd_helpers.py index 6c819a129803..8705b1ecb766 100644 --- a/chia/cmds/cmd_helpers.py +++ b/chia/cmds/cmd_helpers.py @@ -7,13 +7,13 @@ from pathlib import Path from typing import Any, Callable, Optional, TypeVar +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from chia.cmds.cmd_classes import ChiaCliContext, command_helper, option from chia.cmds.cmds_util import CMDCoinSelectionConfigLoader, CMDTXConfigLoader, TransactionBundle, get_wallet_client from chia.cmds.param_types import AmountParamType, Bytes32ParamType, CliAmount, TransactionFeeParamType, cli_amount_none from chia.rpc.wallet_rpc_client import WalletRpcClient -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.wallet.conditions import ConditionValidTimes from chia.wallet.transaction_record import TransactionRecord from chia.wallet.util.tx_config import CoinSelectionConfig, TXConfig diff --git a/chia/cmds/cmds_util.py b/chia/cmds/cmds_util.py index 8c772e315e3a..06262aad3d03 100644 --- a/chia/cmds/cmds_util.py +++ b/chia/cmds/cmds_util.py @@ -11,6 +11,7 @@ import click from aiohttp import ClientConnectorCertificateError, ClientConnectorError +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint16, uint32, uint64 from chia.cmds.param_types import AmountParamType, Bytes32ParamType, CliAmount, cli_amount_none @@ -24,7 +25,6 @@ from chia.rpc.wallet_request_types import LogIn from chia.rpc.wallet_rpc_client import WalletRpcClient from chia.simulator.simulator_full_node_rpc_client import SimulatorFullNodeRpcClient -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.mempool_submission_status import MempoolSubmissionStatus from chia.util.config import load_config from chia.util.errors import CliRpcConnectionError, InvalidPathError diff --git a/chia/cmds/coin_funcs.py b/chia/cmds/coin_funcs.py index 7e706554e0ef..bf45551a32d2 100644 --- a/chia/cmds/coin_funcs.py +++ b/chia/cmds/coin_funcs.py @@ -5,6 +5,7 @@ from collections.abc import Sequence from typing import Optional +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint16, uint32, uint64 from chia.cmds.cmd_helpers import WalletClientInfo @@ -13,7 +14,6 @@ from chia.cmds.wallet_funcs import get_mojo_per_unit, get_wallet_type, print_balance from chia.rpc.wallet_request_types import CombineCoins, SplitCoins from chia.types.blockchain_format.coin import Coin -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.bech32m import encode_puzzle_hash from chia.util.config import selected_network_address_prefix from chia.wallet.conditions import ConditionValidTimes diff --git a/chia/cmds/coins.py b/chia/cmds/coins.py index 2db57caa3dab..2bba73a25790 100644 --- a/chia/cmds/coins.py +++ b/chia/cmds/coins.py @@ -4,6 +4,7 @@ from typing import Optional import click +from chia_rs.sized_bytes import bytes32 from chia.cmds.cmd_classes import ( chia_command, @@ -16,7 +17,6 @@ transaction_endpoint_runner, ) from chia.cmds.param_types import AmountParamType, Bytes32ParamType, CliAmount -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.wallet.transaction_record import TransactionRecord diff --git a/chia/cmds/data.py b/chia/cmds/data.py index 2dad2c703ba8..da67c90e76cb 100644 --- a/chia/cmds/data.py +++ b/chia/cmds/data.py @@ -7,11 +7,11 @@ from typing import Any, Callable, Optional, TypeVar, Union import click +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from chia.cmds import options from chia.cmds.param_types import Bytes32ParamType -from chia.types.blockchain_format.sized_bytes import bytes32 _T = TypeVar("_T") diff --git a/chia/cmds/data_funcs.py b/chia/cmds/data_funcs.py index e087cf70c061..24632ef75f81 100644 --- a/chia/cmds/data_funcs.py +++ b/chia/cmds/data_funcs.py @@ -6,11 +6,11 @@ from pathlib import Path from typing import Any, Optional +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from chia.cmds.cmds_util import get_any_service_client from chia.rpc.data_layer_rpc_client import DataLayerRpcClient -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.byte_types import hexstr_to_bytes from chia.util.default_root import resolve_root_path diff --git a/chia/cmds/db_validate_func.py b/chia/cmds/db_validate_func.py index 058bf7bc18e7..8035eb0cd4d9 100644 --- a/chia/cmds/db_validate_func.py +++ b/chia/cmds/db_validate_func.py @@ -3,10 +3,11 @@ from pathlib import Path from typing import Any, Optional +from chia_rs.sized_bytes import bytes32 + from chia.consensus.block_record import BlockRecord from chia.consensus.constants import replace_str_to_bytes from chia.consensus.default_constants import DEFAULT_CONSTANTS -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.full_block import FullBlock from chia.util.config import load_config from chia.util.path import path_from_root diff --git a/chia/cmds/netspace_funcs.py b/chia/cmds/netspace_funcs.py index 7ff3be558926..85f43be4d62c 100644 --- a/chia/cmds/netspace_funcs.py +++ b/chia/cmds/netspace_funcs.py @@ -3,9 +3,10 @@ from pathlib import Path from typing import Optional +from chia_rs.sized_bytes import bytes32 + from chia.cmds.cmds_util import format_bytes, get_any_service_client from chia.rpc.full_node_rpc_client import FullNodeRpcClient -from chia.types.blockchain_format.sized_bytes import bytes32 async def netstorge_async(root_path: Path, rpc_port: Optional[int], delta_block_height: str, start: str) -> None: diff --git a/chia/cmds/param_types.py b/chia/cmds/param_types.py index bd58809aaf99..306203d00d61 100644 --- a/chia/cmds/param_types.py +++ b/chia/cmds/param_types.py @@ -5,11 +5,11 @@ from typing import Any, Callable, Optional, Union import click +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from chia.cmds.cmd_classes import ChiaCliContext from chia.cmds.units import units -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.bech32m import bech32_decode, decode_puzzle_hash from chia.util.config import load_config, selected_network_address_prefix from chia.util.default_root import DEFAULT_ROOT_PATH diff --git a/chia/cmds/plotnft.py b/chia/cmds/plotnft.py index c0735f8ae969..9e5cdedf3e44 100644 --- a/chia/cmds/plotnft.py +++ b/chia/cmds/plotnft.py @@ -4,6 +4,7 @@ from typing import Optional import click +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from chia.cmds.cmd_classes import ChiaCliContext, chia_command, option @@ -14,7 +15,6 @@ CliAddress, TransactionFeeParamType, ) -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.errors import CliRpcConnectionError diff --git a/chia/cmds/plotnft_funcs.py b/chia/cmds/plotnft_funcs.py index 091a1e272906..663b3f83c7a9 100644 --- a/chia/cmds/plotnft_funcs.py +++ b/chia/cmds/plotnft_funcs.py @@ -11,6 +11,7 @@ from typing import Any, Callable, Optional import aiohttp +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from chia.cmds.cmd_helpers import WalletClientInfo @@ -29,7 +30,6 @@ from chia.rpc.wallet_rpc_client import WalletRpcClient from chia.server.server import ssl_context_for_root from chia.ssl.create_ssl import get_mozilla_ca_crt -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.bech32m import encode_puzzle_hash from chia.util.default_root import DEFAULT_ROOT_PATH from chia.util.errors import CliRpcConnectionError diff --git a/chia/cmds/show_funcs.py b/chia/cmds/show_funcs.py index e6677ff3cd98..d635748e4985 100644 --- a/chia/cmds/show_funcs.py +++ b/chia/cmds/show_funcs.py @@ -4,8 +4,9 @@ from pathlib import Path from typing import Any, Optional, Union +from chia_rs.sized_bytes import bytes32 + from chia.rpc.full_node_rpc_client import FullNodeRpcClient -from chia.types.blockchain_format.sized_bytes import bytes32 async def print_blockchain_state(node_client: FullNodeRpcClient, config: dict[str, Any]) -> bool: @@ -98,8 +99,9 @@ async def print_block_from_hash( ) -> None: import time + from chia_rs.sized_bytes import bytes32 + from chia.consensus.block_record import BlockRecord - from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.full_block import FullBlock from chia.util.bech32m import encode_puzzle_hash diff --git a/chia/cmds/sim_funcs.py b/chia/cmds/sim_funcs.py index b3c761682159..d361fb140f44 100644 --- a/chia/cmds/sim_funcs.py +++ b/chia/cmds/sim_funcs.py @@ -9,6 +9,7 @@ from aiohttp import ClientConnectorError from chia_rs import PrivateKey +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32 from chia.cmds.cmds_util import get_any_service_client @@ -16,7 +17,6 @@ from chia.consensus.coinbase import create_puzzlehash_for_pk from chia.server.outbound_message import NodeType from chia.simulator.simulator_full_node_rpc_client import SimulatorFullNodeRpcClient -from chia.types.blockchain_format.sized_bytes import bytes32 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, set_peer_info diff --git a/chia/cmds/wallet.py b/chia/cmds/wallet.py index 3eaa99ae9d0b..7b0e2f1e0cbe 100644 --- a/chia/cmds/wallet.py +++ b/chia/cmds/wallet.py @@ -6,6 +6,7 @@ from typing import Optional import click +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from chia.cmds import options @@ -22,7 +23,6 @@ cli_amount_none, ) from chia.cmds.signer import PushTransactionsCMD, signer_cmd -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.wallet.conditions import ConditionValidTimes from chia.wallet.transaction_record import TransactionRecord from chia.wallet.transaction_sorting import SortKey diff --git a/chia/cmds/wallet_funcs.py b/chia/cmds/wallet_funcs.py index 802dff49bfe7..fce2953c3f4b 100644 --- a/chia/cmds/wallet_funcs.py +++ b/chia/cmds/wallet_funcs.py @@ -11,6 +11,7 @@ from decimal import Decimal from typing import Any, Callable, Optional, Union +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint16, uint32, uint64 from chia.cmds.cmds_util import ( @@ -36,7 +37,6 @@ VCSpend, ) from chia.rpc.wallet_rpc_client import WalletRpcClient -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.bech32m import bech32_decode, decode_puzzle_hash, encode_puzzle_hash from chia.util.byte_types import hexstr_to_bytes from chia.util.config import selected_network_address_prefix diff --git a/chia/consensus/block_body_validation.py b/chia/consensus/block_body_validation.py index 08d4adc430bb..c54a5481b21d 100644 --- a/chia/consensus/block_body_validation.py +++ b/chia/consensus/block_body_validation.py @@ -7,6 +7,7 @@ from typing import Callable, Optional, Union from chia_rs import ConsensusConstants, SpendBundleConditions, compute_merkle_set_root +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from chiabip158 import PyBIP158 @@ -16,7 +17,6 @@ from chia.consensus.coinbase import create_farmer_coin, create_pool_coin from chia.full_node.mempool_check_conditions import mempool_check_time_locks from chia.types.blockchain_format.coin import Coin, hash_coin_ids -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.unfinished_block import UnfinishedBlock diff --git a/chia/consensus/block_creation.py b/chia/consensus/block_creation.py index d710070ff5e4..c5c3b8db446f 100644 --- a/chia/consensus/block_creation.py +++ b/chia/consensus/block_creation.py @@ -21,6 +21,7 @@ run_block_generator, run_block_generator2, ) +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64, uint128 from chiabip158 import PyBIP158 @@ -33,7 +34,6 @@ from chia.types.blockchain_format.pool_target import PoolTarget from chia.types.blockchain_format.proof_of_space import ProofOfSpace from chia.types.blockchain_format.reward_chain_block import RewardChainBlock, RewardChainBlockUnfinished -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.blockchain_format.vdf import VDFInfo, VDFProof from chia.types.end_of_slot_bundle import EndOfSubSlotBundle from chia.types.full_block import FullBlock diff --git a/chia/consensus/block_header_validation.py b/chia/consensus/block_header_validation.py index 3cd2a086c637..eae5b758e326 100644 --- a/chia/consensus/block_header_validation.py +++ b/chia/consensus/block_header_validation.py @@ -5,6 +5,7 @@ from typing import Optional from chia_rs import AugSchemeMPL, ConsensusConstants +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64, uint128 from chia.consensus.block_record import BlockRecord @@ -23,7 +24,6 @@ from chia.consensus.vdf_info_computation import get_signage_point_vdf_info from chia.types.blockchain_format.classgroup import ClassgroupElement from chia.types.blockchain_format.proof_of_space import verify_and_get_quality_string -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.blockchain_format.slots import ChallengeChainSubSlot, RewardChainSubSlot, SubSlotProofs from chia.types.blockchain_format.vdf import VDFInfo, VDFProof, validate_vdf from chia.types.end_of_slot_bundle import EndOfSubSlotBundle diff --git a/chia/consensus/block_record.py b/chia/consensus/block_record.py index 5110dfa0e558..30bdf62e514a 100644 --- a/chia/consensus/block_record.py +++ b/chia/consensus/block_record.py @@ -3,11 +3,10 @@ from typing import Optional import chia_rs +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from typing_extensions import Protocol -from chia.types.blockchain_format.sized_bytes import bytes32 - BlockRecord = chia_rs.BlockRecord diff --git a/chia/consensus/blockchain.py b/chia/consensus/blockchain.py index 632085818e62..a252e346024d 100644 --- a/chia/consensus/blockchain.py +++ b/chia/consensus/blockchain.py @@ -16,6 +16,7 @@ additions_and_removals, get_flags_for_height_and_constants, ) +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint16, uint32, uint64, uint128 from chia.consensus.block_body_validation import ForkInfo, validate_block_body @@ -31,7 +32,6 @@ from chia.full_node.block_store import BlockStore 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.types.blockchain_format.sub_epoch_summary import SubEpochSummary from chia.types.blockchain_format.vdf import VDFInfo from chia.types.coin_record import CoinRecord diff --git a/chia/consensus/blockchain_interface.py b/chia/consensus/blockchain_interface.py index b098af43adf5..1df91833a117 100644 --- a/chia/consensus/blockchain_interface.py +++ b/chia/consensus/blockchain_interface.py @@ -3,10 +3,10 @@ from typing import Optional, Protocol from chia_rs import SubEpochChallengeSegment +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.types.blockchain_format.sub_epoch_summary import SubEpochSummary from chia.types.header_block import HeaderBlock diff --git a/chia/consensus/coinbase.py b/chia/consensus/coinbase.py index 67ed45755660..92ca7705ae04 100644 --- a/chia/consensus/coinbase.py +++ b/chia/consensus/coinbase.py @@ -1,10 +1,10 @@ from __future__ import annotations from chia_rs import G1Element +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.wallet.puzzles.p2_delegated_puzzle_or_hidden_puzzle import puzzle_hash_for_pk diff --git a/chia/consensus/default_constants.py b/chia/consensus/default_constants.py index 541adc820cb7..7063e649ce2a 100644 --- a/chia/consensus/default_constants.py +++ b/chia/consensus/default_constants.py @@ -3,9 +3,9 @@ from typing import Any 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.types.blockchain_format.sized_bytes import bytes32 from chia.util.hash import std_hash AGG_SIG_DATA = bytes32.fromhex("ccd5bb71183532bff220ba46c268991a3ff07eb358e8255a65c30a2dce0e5fbb") diff --git a/chia/consensus/difficulty_adjustment.py b/chia/consensus/difficulty_adjustment.py index f81a540e21a3..29ebe914d84f 100644 --- a/chia/consensus/difficulty_adjustment.py +++ b/chia/consensus/difficulty_adjustment.py @@ -3,11 +3,11 @@ from typing import Optional from chia_rs import ConsensusConstants +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64, uint128 from chia.consensus.block_record import BlockRecord from chia.consensus.blockchain_interface import BlockRecordsProtocol -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.significant_bits import count_significant_bits, truncate_to_significant_bits diff --git a/chia/consensus/find_fork_point.py b/chia/consensus/find_fork_point.py index d6b8b4a9fc2e..90eae9928fdc 100644 --- a/chia/consensus/find_fork_point.py +++ b/chia/consensus/find_fork_point.py @@ -3,11 +3,11 @@ from typing import Union from chia_rs import ConsensusConstants +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 BlockRecordsProtocol -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.header_block import HeaderBlock diff --git a/chia/consensus/full_block_to_block_record.py b/chia/consensus/full_block_to_block_record.py index f19bff3f8ab1..e0551321150a 100644 --- a/chia/consensus/full_block_to_block_record.py +++ b/chia/consensus/full_block_to_block_record.py @@ -3,6 +3,7 @@ from typing import Optional, Union from chia_rs import ConsensusConstants +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64 from chia.consensus.block_record import BlockRecord @@ -12,7 +13,6 @@ from chia.consensus.make_sub_epoch_summary import make_sub_epoch_summary from chia.consensus.pot_iterations import is_overflow_block 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.full_block import FullBlock diff --git a/chia/consensus/get_block_challenge.py b/chia/consensus/get_block_challenge.py index 19fae8a63ae1..899715010466 100644 --- a/chia/consensus/get_block_challenge.py +++ b/chia/consensus/get_block_challenge.py @@ -4,11 +4,11 @@ from typing import Union from chia_rs import ConsensusConstants +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from chia.consensus.block_record import BlockRecord from chia.consensus.blockchain_interface import BlockRecordsProtocol -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.unfinished_block import UnfinishedBlock diff --git a/chia/consensus/get_block_generator.py b/chia/consensus/get_block_generator.py index 22f85701c54a..0fe516cf2075 100644 --- a/chia/consensus/get_block_generator.py +++ b/chia/consensus/get_block_generator.py @@ -3,10 +3,10 @@ from collections.abc import Awaitable from typing import Callable, Optional +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32 from chia.types.block_protocol import BlockInfo -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.generator_types import BlockGenerator diff --git a/chia/consensus/multiprocess_validation.py b/chia/consensus/multiprocess_validation.py index 61547adc6bb7..671f5d8d8fe3 100644 --- a/chia/consensus/multiprocess_validation.py +++ b/chia/consensus/multiprocess_validation.py @@ -17,6 +17,7 @@ run_block_generator, run_block_generator2, ) +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint16, uint32, uint64 from chia.consensus.block_header_validation import validate_finished_header_block @@ -28,7 +29,6 @@ from chia.consensus.pot_iterations import calculate_iterations_quality, is_overflow_block from chia.types.blockchain_format.coin import Coin from chia.types.blockchain_format.proof_of_space import verify_and_get_quality_string -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.generator_types import BlockGenerator diff --git a/chia/consensus/pot_iterations.py b/chia/consensus/pot_iterations.py index 8c4263af5036..641f6fbfc7eb 100644 --- a/chia/consensus/pot_iterations.py +++ b/chia/consensus/pot_iterations.py @@ -1,10 +1,10 @@ from __future__ import annotations from chia_rs import ConsensusConstants +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint64, uint128 from chia.consensus.pos_quality import _expected_plot_size -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.hash import std_hash diff --git a/chia/consensus/vdf_info_computation.py b/chia/consensus/vdf_info_computation.py index 505d5a0969e5..c93df3c2771e 100644 --- a/chia/consensus/vdf_info_computation.py +++ b/chia/consensus/vdf_info_computation.py @@ -3,12 +3,12 @@ from typing import Optional from chia_rs import ConsensusConstants +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64, uint128 from chia.consensus.block_record import BlockRecord from chia.consensus.blockchain_interface import BlockRecordsProtocol from chia.types.blockchain_format.classgroup import ClassgroupElement -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.end_of_slot_bundle import EndOfSubSlotBundle diff --git a/chia/data_layer/data_layer.py b/chia/data_layer/data_layer.py index 415268aa0cbe..b400073a56a7 100644 --- a/chia/data_layer/data_layer.py +++ b/chia/data_layer/data_layer.py @@ -15,6 +15,7 @@ from typing import TYPE_CHECKING, Any, ClassVar, Optional, Union, cast, final import aiohttp +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from chia.data_layer.data_layer_errors import KeyNotFoundError @@ -61,7 +62,6 @@ from chia.server.outbound_message import NodeType from chia.server.server import ChiaServer from chia.server.ws_connection import WSChiaConnection -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.async_pool import Job, QueuedAsyncPool from chia.util.path import path_from_root from chia.util.task_referencer import create_referenced_task diff --git a/chia/data_layer/data_layer_errors.py b/chia/data_layer/data_layer_errors.py index 9f72121e2069..76416e948393 100644 --- a/chia/data_layer/data_layer_errors.py +++ b/chia/data_layer/data_layer_errors.py @@ -2,7 +2,7 @@ from collections.abc import Iterable -from chia.types.blockchain_format.sized_bytes import bytes32 +from chia_rs.sized_bytes import bytes32 class IntegrityError(Exception): diff --git a/chia/data_layer/data_layer_util.py b/chia/data_layer/data_layer_util.py index b40ec4bd2ebb..3f3a520371a0 100644 --- a/chia/data_layer/data_layer_util.py +++ b/chia/data_layer/data_layer_util.py @@ -7,13 +7,13 @@ from typing import TYPE_CHECKING, Any, Optional, Union import aiosqlite +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint64 from typing_extensions import final from chia.data_layer.data_layer_errors import ProofIntegrityError from chia.server.ws_connection import WSChiaConnection 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 from chia.util.streamable import Streamable, streamable diff --git a/chia/data_layer/data_layer_wallet.py b/chia/data_layer/data_layer_wallet.py index e7f7aac1320d..4c5f96b399d5 100644 --- a/chia/data_layer/data_layer_wallet.py +++ b/chia/data_layer/data_layer_wallet.py @@ -6,6 +6,7 @@ from typing import TYPE_CHECKING, Any, ClassVar, Optional, cast from chia_rs import G1Element, G2Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64, uint128 from clvm.EvalError import EvalError from typing_extensions import Unpack, final @@ -19,7 +20,6 @@ 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, compute_additions from chia.types.condition_opcodes import ConditionOpcode from chia.wallet.conditions import ( diff --git a/chia/data_layer/data_store.py b/chia/data_layer/data_store.py index 50a4449efc9d..039b68973693 100644 --- a/chia/data_layer/data_store.py +++ b/chia/data_layer/data_store.py @@ -10,6 +10,7 @@ from typing import Any, BinaryIO, Callable, Optional, Union import aiosqlite +from chia_rs.sized_bytes import bytes32 from chia.data_layer.data_layer_errors import KeyNotFoundError, NodeHashError, TreeGenerationIncrementingError from chia.data_layer.data_layer_util import ( @@ -41,7 +42,6 @@ unspecified, ) from chia.types.blockchain_format.program import Program -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.db_wrapper import SQLITE_MAX_VARIABLE_NUMBER, DBWrapper2 log = logging.getLogger(__name__) diff --git a/chia/data_layer/dl_wallet_store.py b/chia/data_layer/dl_wallet_store.py index 542fbd76bdc9..c10a1a4453b5 100644 --- a/chia/data_layer/dl_wallet_store.py +++ b/chia/data_layer/dl_wallet_store.py @@ -4,12 +4,12 @@ from typing import Optional, TypeVar, Union from aiosqlite import Row +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint16, uint32, uint64 from chia.data_layer.data_layer_wallet import Mirror from chia.data_layer.singleton_record import SingletonRecord from chia.types.blockchain_format.coin import Coin -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.db_wrapper import DBWrapper2, execute_fetchone from chia.wallet.lineage_proof import LineageProof diff --git a/chia/data_layer/download_data.py b/chia/data_layer/download_data.py index 9b210123995c..dfe1ec6c7357 100644 --- a/chia/data_layer/download_data.py +++ b/chia/data_layer/download_data.py @@ -8,11 +8,11 @@ from typing import Optional import aiohttp +from chia_rs.sized_bytes import bytes32 from typing_extensions import Literal from chia.data_layer.data_layer_util import NodeType, PluginRemote, Root, SerializedNode, ServerInfo, Status from chia.data_layer.data_store import DataStore -from chia.types.blockchain_format.sized_bytes import bytes32 def get_full_tree_filename(store_id: bytes32, node_hash: bytes32, generation: int, group_by_store: bool = False) -> str: diff --git a/chia/data_layer/s3_plugin_service.py b/chia/data_layer/s3_plugin_service.py index 33e254810b6a..95d0dbe0ab4f 100644 --- a/chia/data_layer/s3_plugin_service.py +++ b/chia/data_layer/s3_plugin_service.py @@ -18,9 +18,9 @@ import yaml from aiohttp import web from botocore.exceptions import ClientError +from chia_rs.sized_bytes import bytes32 from chia.data_layer.download_data import is_filename_valid -from chia.types.blockchain_format.sized_bytes import bytes32 log = logging.getLogger(__name__) plugin_name = "Chia S3 Datalayer plugin" diff --git a/chia/data_layer/singleton_record.py b/chia/data_layer/singleton_record.py index 79323b21c4e5..e5489ea956f4 100644 --- a/chia/data_layer/singleton_record.py +++ b/chia/data_layer/singleton_record.py @@ -2,9 +2,9 @@ import dataclasses +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.streamable import Streamable, streamable from chia.wallet.lineage_proof import LineageProof diff --git a/chia/data_layer/util/benchmark.py b/chia/data_layer/util/benchmark.py index 1c0169e1a0eb..e244df6370ea 100644 --- a/chia/data_layer/util/benchmark.py +++ b/chia/data_layer/util/benchmark.py @@ -8,9 +8,10 @@ from pathlib import Path from typing import Optional +from chia_rs.sized_bytes import bytes32 + from chia.data_layer.data_layer_util import Side, TerminalNode, leaf_hash from chia.data_layer.data_store import DataStore -from chia.types.blockchain_format.sized_bytes import bytes32 async def generate_datastore(num_nodes: int, slow_mode: bool) -> None: diff --git a/chia/farmer/farmer.py b/chia/farmer/farmer.py index 4a5c5f408582..7f7fb5df7ff7 100644 --- a/chia/farmer/farmer.py +++ b/chia/farmer/farmer.py @@ -15,6 +15,7 @@ import aiohttp from chia_rs import AugSchemeMPL, ConsensusConstants, G1Element, G2Element, PrivateKey +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint16, uint32, uint64 from chia.daemon.keychain_proxy import KeychainProxy, connect_to_keychain_and_validate, wrap_local_keychain @@ -40,7 +41,6 @@ from chia.server.ws_connection import WSChiaConnection from chia.ssl.create_ssl import get_mozilla_ca_crt from chia.types.blockchain_format.proof_of_space import ProofOfSpace -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.bech32m import decode_puzzle_hash, encode_puzzle_hash from chia.util.byte_types import hexstr_to_bytes from chia.util.config import config_path_for_filename, load_config, lock_and_load_config, save_config diff --git a/chia/farmer/farmer_api.py b/chia/farmer/farmer_api.py index 2087d5839af6..cea7700f8160 100644 --- a/chia/farmer/farmer_api.py +++ b/chia/farmer/farmer_api.py @@ -7,6 +7,7 @@ import aiohttp from chia_rs import AugSchemeMPL, G2Element, PrivateKey +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint16, uint32, uint64 from chia import __version__ @@ -44,7 +45,6 @@ get_plot_id, verify_and_get_quality_string, ) -from chia.types.blockchain_format.sized_bytes import bytes32 class FarmerAPI: diff --git a/chia/full_node/block_height_map.py b/chia/full_node/block_height_map.py index 7e215f94cfe2..7527a6ce90e5 100644 --- a/chia/full_node/block_height_map.py +++ b/chia/full_node/block_height_map.py @@ -6,9 +6,9 @@ from typing import Optional import aiofiles +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32 -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 diff --git a/chia/full_node/block_store.py b/chia/full_node/block_store.py index 68751c21b865..c5fc494415e8 100644 --- a/chia/full_node/block_store.py +++ b/chia/full_node/block_store.py @@ -8,10 +8,10 @@ import typing_extensions import zstd from chia_rs import SubEpochChallengeSegment, SubEpochSegments +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.types.full_block import FullBlock from chia.util.db_wrapper import DBWrapper2, execute_fetchone from chia.util.errors import Err diff --git a/chia/full_node/coin_store.py b/chia/full_node/coin_store.py index d44484b5bc3e..1af7fdabfdec 100644 --- a/chia/full_node/coin_store.py +++ b/chia/full_node/coin_store.py @@ -9,12 +9,12 @@ import typing_extensions from aiosqlite import Cursor +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from clvm.casts import int_from_bytes from chia.protocols.wallet_protocol import CoinState 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.util.batches import to_batches diff --git a/chia/full_node/full_node.py b/chia/full_node/full_node.py index c6415b288fea..68d6c2aefb8e 100644 --- a/chia/full_node/full_node.py +++ b/chia/full_node/full_node.py @@ -23,6 +23,7 @@ run_block_generator, run_block_generator2, ) +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64, uint128 from packaging.version import Version @@ -63,7 +64,6 @@ from chia.server.ws_connection import WSChiaConnection from chia.types.blockchain_format.classgroup import ClassgroupElement from chia.types.blockchain_format.pool_target import PoolTarget -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.blockchain_format.sub_epoch_summary import SubEpochSummary from chia.types.blockchain_format.vdf import CompressibleVDFField, VDFInfo, VDFProof, validate_vdf from chia.types.coin_record import CoinRecord diff --git a/chia/full_node/full_node_api.py b/chia/full_node/full_node_api.py index a8c0845c98bb..41901c9a314b 100644 --- a/chia/full_node/full_node_api.py +++ b/chia/full_node/full_node_api.py @@ -20,6 +20,7 @@ additions_and_removals, get_flags_for_height_and_constants, ) +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64, uint128 from chiabip158 import PyBIP158 @@ -57,7 +58,6 @@ from chia.types.blockchain_format.pool_target import PoolTarget from chia.types.blockchain_format.proof_of_space import verify_and_get_quality_string from chia.types.blockchain_format.reward_chain_block import RewardChainBlockUnfinished -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.blockchain_format.sub_epoch_summary import SubEpochSummary from chia.types.coin_record import CoinRecord from chia.types.end_of_slot_bundle import EndOfSubSlotBundle diff --git a/chia/full_node/full_node_store.py b/chia/full_node/full_node_store.py index 304bb8872ef2..6bc671c9334a 100644 --- a/chia/full_node/full_node_store.py +++ b/chia/full_node/full_node_store.py @@ -7,6 +7,7 @@ from typing import Optional from chia_rs import ConsensusConstants +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64, uint128 from chia.consensus.block_record import BlockRecord @@ -19,7 +20,6 @@ from chia.protocols import timelord_protocol from chia.server.outbound_message import Message 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, validate_vdf from chia.types.end_of_slot_bundle import EndOfSubSlotBundle from chia.types.full_block import FullBlock diff --git a/chia/full_node/hint_management.py b/chia/full_node/hint_management.py index 810847164fc5..f6427fc65154 100644 --- a/chia/full_node/hint_management.py +++ b/chia/full_node/hint_management.py @@ -2,8 +2,9 @@ from typing import Callable, Optional +from chia_rs.sized_bytes import bytes32 + from chia.consensus.blockchain import StateChangeSummary -from chia.types.blockchain_format.sized_bytes import bytes32 def get_hints_and_subscription_coin_ids( diff --git a/chia/full_node/hint_store.py b/chia/full_node/hint_store.py index 1802093ac081..e4f7be8e1f1d 100644 --- a/chia/full_node/hint_store.py +++ b/chia/full_node/hint_store.py @@ -4,8 +4,8 @@ import logging import typing_extensions +from chia_rs.sized_bytes import bytes32 -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.batches import to_batches from chia.util.db_wrapper import SQLITE_MAX_VARIABLE_NUMBER, DBWrapper2 diff --git a/chia/full_node/mempool.py b/chia/full_node/mempool.py index 60ce1bf8afb2..d94acb53513c 100644 --- a/chia/full_node/mempool.py +++ b/chia/full_node/mempool.py @@ -10,13 +10,13 @@ from typing import Callable, Optional from chia_rs import AugSchemeMPL, Coin, ConsensusConstants, G2Element, solution_generator_backrefs +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.fee_estimation import FeeMempoolInfo, MempoolInfo, MempoolItemInfo from chia.full_node.fee_estimator_interface import FeeEstimatorInterface from chia.types.blockchain_format.serialized_program import SerializedProgram -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.clvm_cost import CLVMCost from chia.types.coin_spend import CoinSpend from chia.types.eligible_coin_spends import EligibleCoinSpends, UnspentLineageInfo diff --git a/chia/full_node/mempool_check_conditions.py b/chia/full_node/mempool_check_conditions.py index df938075ed76..f0a16bad2da2 100644 --- a/chia/full_node/mempool_check_conditions.py +++ b/chia/full_node/mempool_check_conditions.py @@ -10,11 +10,11 @@ run_chia_program, ) from chia_rs import get_puzzle_and_solution_for_coin2 as get_puzzle_and_solution_for_coin_rust +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.program import Program -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.coin_record import CoinRecord from chia.types.coin_spend import CoinSpend, CoinSpendWithConditions, SpendInfo, make_spend from chia.types.generator_types import BlockGenerator diff --git a/chia/full_node/mempool_manager.py b/chia/full_node/mempool_manager.py index 34ed48d06800..da2ee4bbb0d5 100644 --- a/chia/full_node/mempool_manager.py +++ b/chia/full_node/mempool_manager.py @@ -17,6 +17,7 @@ supports_fast_forward, validate_clvm_and_signature, ) +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from chiabip158 import PyBIP158 @@ -29,7 +30,6 @@ from chia.full_node.mempool_check_conditions import mempool_check_time_locks from chia.full_node.pending_tx_cache import ConflictTxCache, PendingTxCache from chia.types.blockchain_format.coin import Coin -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.clvm_cost import CLVMCost from chia.types.coin_record import CoinRecord from chia.types.eligible_coin_spends import EligibilityAndAdditions, UnspentLineageInfo diff --git a/chia/full_node/pending_tx_cache.py b/chia/full_node/pending_tx_cache.py index ab8458220db7..3586ac9c96f4 100644 --- a/chia/full_node/pending_tx_cache.py +++ b/chia/full_node/pending_tx_cache.py @@ -3,10 +3,10 @@ from dataclasses import dataclass, field from typing import Optional +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32 from sortedcontainers import SortedDict -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.mempool_item import MempoolItem diff --git a/chia/full_node/subscriptions.py b/chia/full_node/subscriptions.py index b786f7c648fb..1151eb6661b4 100644 --- a/chia/full_node/subscriptions.py +++ b/chia/full_node/subscriptions.py @@ -4,9 +4,9 @@ from dataclasses import dataclass, field 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.types.spend_bundle_conditions import SpendBundleConditions log = logging.getLogger(__name__) diff --git a/chia/full_node/sync_store.py b/chia/full_node/sync_store.py index e39231f8817e..204fbad84265 100644 --- a/chia/full_node/sync_store.py +++ b/chia/full_node/sync_store.py @@ -9,10 +9,9 @@ from typing import Optional import typing_extensions +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint128 -from chia.types.blockchain_format.sized_bytes import bytes32 - log = logging.getLogger(__name__) diff --git a/chia/full_node/tx_processing_queue.py b/chia/full_node/tx_processing_queue.py index 6a3b2710515a..1341350f163f 100644 --- a/chia/full_node/tx_processing_queue.py +++ b/chia/full_node/tx_processing_queue.py @@ -6,7 +6,8 @@ from queue import SimpleQueue from typing import Optional -from chia.types.blockchain_format.sized_bytes import bytes32 +from chia_rs.sized_bytes import bytes32 + from chia.types.transaction_queue_entry import TransactionQueueEntry diff --git a/chia/full_node/weight_proof.py b/chia/full_node/weight_proof.py index e2f9cda4f101..dea1082278b7 100644 --- a/chia/full_node/weight_proof.py +++ b/chia/full_node/weight_proof.py @@ -11,6 +11,7 @@ from typing import IO, Optional from chia_rs import ConsensusConstants, SubEpochChallengeSegment, SubEpochData, SubEpochSegments, SubSlotData +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64, uint128 from chia.consensus.block_header_validation import validate_finished_header_block @@ -27,7 +28,6 @@ from chia.consensus.vdf_info_computation import get_signage_point_vdf_info from chia.types.blockchain_format.classgroup import ClassgroupElement from chia.types.blockchain_format.proof_of_space import verify_and_get_quality_string -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.blockchain_format.slots import ChallengeChainSubSlot, RewardChainSubSlot from chia.types.blockchain_format.sub_epoch_summary import SubEpochSummary from chia.types.blockchain_format.vdf import VDFInfo, VDFProof, validate_vdf diff --git a/chia/harvester/harvester_api.py b/chia/harvester/harvester_api.py index f632ec744796..1b9e1c6e3991 100644 --- a/chia/harvester/harvester_api.py +++ b/chia/harvester/harvester_api.py @@ -7,6 +7,7 @@ from typing import TYPE_CHECKING, ClassVar, Optional, cast from chia_rs import AugSchemeMPL, G1Element, G2Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64 from chia.consensus.pot_iterations import calculate_iterations_quality, calculate_sp_interval_iters @@ -25,7 +26,6 @@ generate_plot_public_key, passes_plot_filter, ) -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.wallet.derive_keys import master_sk_to_local_sk diff --git a/chia/plot_sync/receiver.py b/chia/plot_sync/receiver.py index 66cbfce70c45..45fa71e24ce4 100644 --- a/chia/plot_sync/receiver.py +++ b/chia/plot_sync/receiver.py @@ -6,6 +6,7 @@ from dataclasses import dataclass, field from typing import Any, Callable, Optional, Union +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import int16, uint32, uint64 from typing_extensions import Protocol @@ -34,7 +35,6 @@ from chia.protocols.protocol_message_types import ProtocolMessageTypes from chia.server.outbound_message import make_msg from chia.server.ws_connection import WSChiaConnection -from chia.types.blockchain_format.sized_bytes import bytes32 log = logging.getLogger(__name__) diff --git a/chia/plotting/cache.py b/chia/plotting/cache.py index 30e0bbbef5b7..c70504d4c31f 100644 --- a/chia/plotting/cache.py +++ b/chia/plotting/cache.py @@ -10,12 +10,12 @@ from typing import Optional from chia_rs import G1Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint16, uint64 from chiapos import DiskProver from chia.plotting.util import parse_plot_info from chia.types.blockchain_format.proof_of_space import generate_plot_public_key -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.streamable import Streamable, VersionedBlob, streamable from chia.wallet.derive_keys import master_sk_to_local_sk diff --git a/chia/plotting/create_plots.py b/chia/plotting/create_plots.py index 09208740da41..08369c9c2c54 100644 --- a/chia/plotting/create_plots.py +++ b/chia/plotting/create_plots.py @@ -6,6 +6,7 @@ from typing import Optional from chia_rs import AugSchemeMPL, G1Element, PrivateKey +from chia_rs.sized_bytes import bytes32 from chiapos import DiskPlotter from chia.daemon.keychain_proxy import KeychainProxy, connect_to_keychain_and_validate, wrap_local_keychain @@ -15,7 +16,6 @@ calculate_plot_id_pk, generate_plot_public_key, ) -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.bech32m import decode_puzzle_hash from chia.util.keychain import Keychain from chia.wallet.derive_keys import master_sk_to_farmer_sk, master_sk_to_local_sk, master_sk_to_pool_sk diff --git a/chia/plotting/util.py b/chia/plotting/util.py index 11bad628b1ca..c2ad2a136e05 100644 --- a/chia/plotting/util.py +++ b/chia/plotting/util.py @@ -7,11 +7,11 @@ from typing import Any, Optional, Union from chia_rs import G1Element, PrivateKey +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32 from chiapos import DiskProver from typing_extensions import final -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.config import load_config, lock_and_load_config, save_config from chia.util.streamable import Streamable, streamable diff --git a/chia/pools/pool_config.py b/chia/pools/pool_config.py index 68c0c52e4981..4fb1561177f6 100644 --- a/chia/pools/pool_config.py +++ b/chia/pools/pool_config.py @@ -6,8 +6,8 @@ from typing import Any, Callable from chia_rs import G1Element +from chia_rs.sized_bytes import bytes32 -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.byte_types import hexstr_to_bytes from chia.util.config import load_config, lock_and_load_config, save_config from chia.util.streamable import Streamable, streamable diff --git a/chia/pools/pool_puzzles.py b/chia/pools/pool_puzzles.py index e7098d4389a7..55ba12ed7c84 100644 --- a/chia/pools/pool_puzzles.py +++ b/chia/pools/pool_puzzles.py @@ -12,6 +12,7 @@ POOL_WAITINGROOM_INNERPUZ_HASH, ) from chia_rs import G1Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from clvm.casts import int_to_bytes @@ -21,7 +22,6 @@ 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, compute_additions from chia.wallet.puzzles.singleton_top_layer import ( SINGLETON_LAUNCHER_HASH, diff --git a/chia/pools/pool_wallet.py b/chia/pools/pool_wallet.py index f8ece77617ea..7a62483c02c6 100644 --- a/chia/pools/pool_wallet.py +++ b/chia/pools/pool_wallet.py @@ -6,6 +6,7 @@ from typing import TYPE_CHECKING, Any, ClassVar, Optional, cast from chia_rs import G1Element, G2Element, PrivateKey +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64, uint128 from typing_extensions import Unpack, final @@ -40,7 +41,6 @@ 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, compute_additions from chia.wallet.conditions import AssertCoinAnnouncement, Condition, ConditionValidTimes from chia.wallet.derive_keys import find_owner_sk diff --git a/chia/pools/pool_wallet_info.py b/chia/pools/pool_wallet_info.py index e6907daabbd6..c70dd528a871 100644 --- a/chia/pools/pool_wallet_info.py +++ b/chia/pools/pool_wallet_info.py @@ -5,11 +5,11 @@ from typing import Any, Optional from chia_rs import G1Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32 from chia.protocols.pool_protocol import POOL_PROTOCOL_VERSION from chia.types.blockchain_format.coin import Coin -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.streamable import Streamable, streamable diff --git a/chia/protocols/farmer_protocol.py b/chia/protocols/farmer_protocol.py index d3319da737a4..d8377df0d637 100644 --- a/chia/protocols/farmer_protocol.py +++ b/chia/protocols/farmer_protocol.py @@ -4,13 +4,13 @@ from typing import Optional from chia_rs import FoliageBlockData, FoliageTransactionBlock, G2Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64 from chia.types.blockchain_format.classgroup import ClassgroupElement from chia.types.blockchain_format.pool_target import PoolTarget from chia.types.blockchain_format.proof_of_space import ProofOfSpace from chia.types.blockchain_format.reward_chain_block import RewardChainBlockUnfinished -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.blockchain_format.slots import ChallengeChainSubSlot, RewardChainSubSlot from chia.util.streamable import Streamable, streamable diff --git a/chia/protocols/full_node_protocol.py b/chia/protocols/full_node_protocol.py index 99067c5fa88e..a78739e40eb9 100644 --- a/chia/protocols/full_node_protocol.py +++ b/chia/protocols/full_node_protocol.py @@ -3,9 +3,9 @@ from dataclasses import dataclass from typing import Optional +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64, uint128 -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.blockchain_format.vdf import VDFInfo, VDFProof from chia.types.end_of_slot_bundle import EndOfSubSlotBundle from chia.types.full_block import FullBlock diff --git a/chia/protocols/harvester_protocol.py b/chia/protocols/harvester_protocol.py index fc66f56e4c7d..a362ba76639a 100644 --- a/chia/protocols/harvester_protocol.py +++ b/chia/protocols/harvester_protocol.py @@ -5,11 +5,11 @@ from typing import Optional from chia_rs import G1Element, G2Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import int16, uint8, uint32, uint64 from chia.types.blockchain_format.proof_of_space import ProofOfSpace from chia.types.blockchain_format.reward_chain_block import RewardChainBlockUnfinished -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.streamable import Streamable, streamable """ diff --git a/chia/protocols/pool_protocol.py b/chia/protocols/pool_protocol.py index d20597919bc8..da45f349684f 100644 --- a/chia/protocols/pool_protocol.py +++ b/chia/protocols/pool_protocol.py @@ -6,10 +6,10 @@ from typing import Optional from chia_rs import G1Element, G2Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint16, uint32, uint64 from chia.types.blockchain_format.proof_of_space import ProofOfSpace -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.streamable import Streamable, streamable POOL_PROTOCOL_VERSION = uint8(1) diff --git a/chia/protocols/timelord_protocol.py b/chia/protocols/timelord_protocol.py index 32a3311151fd..d5e21d127b70 100644 --- a/chia/protocols/timelord_protocol.py +++ b/chia/protocols/timelord_protocol.py @@ -4,10 +4,10 @@ from typing import Optional from chia_rs import Foliage +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64, uint128 from chia.types.blockchain_format.reward_chain_block import RewardChainBlock, RewardChainBlockUnfinished -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.blockchain_format.sub_epoch_summary import SubEpochSummary from chia.types.blockchain_format.vdf import VDFInfo, VDFProof from chia.types.end_of_slot_bundle import EndOfSubSlotBundle diff --git a/chia/protocols/wallet_protocol.py b/chia/protocols/wallet_protocol.py index d96b4a8b921c..487e84acccf0 100644 --- a/chia/protocols/wallet_protocol.py +++ b/chia/protocols/wallet_protocol.py @@ -5,12 +5,12 @@ from typing import Optional import chia_rs +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64, uint128 from chia.full_node.fee_estimate import FeeEstimateGroup 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.header_block import HeaderBlock from chia.types.spend_bundle import SpendBundle from chia.util.streamable import Streamable, streamable diff --git a/chia/rpc/data_layer_rpc_api.py b/chia/rpc/data_layer_rpc_api.py index 9a5b784dddf0..d09f5bec4a3c 100644 --- a/chia/rpc/data_layer_rpc_api.py +++ b/chia/rpc/data_layer_rpc_api.py @@ -4,6 +4,7 @@ from pathlib import Path from typing import TYPE_CHECKING, Any, ClassVar, Optional, Union, cast +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint64 from chia.data_layer.data_layer_errors import OfferIntegrityError @@ -33,7 +34,6 @@ from chia.rpc.data_layer_rpc_util import marshal from chia.rpc.rpc_server import Endpoint, EndpointResult from chia.rpc.util import marshal as streamable_marshal -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.byte_types import hexstr_to_bytes from chia.util.streamable import recurse_jsonify from chia.util.ws_message import WsRpcMessage diff --git a/chia/rpc/data_layer_rpc_client.py b/chia/rpc/data_layer_rpc_client.py index 2edc9041a749..0dcf06bb3bf6 100644 --- a/chia/rpc/data_layer_rpc_client.py +++ b/chia/rpc/data_layer_rpc_client.py @@ -3,11 +3,11 @@ from pathlib import Path from typing import Any, Optional +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from chia.data_layer.data_layer_util import ClearPendingRootsRequest from chia.rpc.rpc_client import RpcClient -from chia.types.blockchain_format.sized_bytes import bytes32 class DataLayerRpcClient(RpcClient): diff --git a/chia/rpc/farmer_rpc_api.py b/chia/rpc/farmer_rpc_api.py index 10f8e8e033cd..d889c82f0655 100644 --- a/chia/rpc/farmer_rpc_api.py +++ b/chia/rpc/farmer_rpc_api.py @@ -4,6 +4,7 @@ import operator from typing import TYPE_CHECKING, Any, Callable, ClassVar, Optional, cast +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32 from typing_extensions import Protocol @@ -11,7 +12,6 @@ from chia.plot_sync.receiver import Receiver from chia.protocols.harvester_protocol import Plot from chia.rpc.rpc_server import Endpoint, EndpointResult -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.paginator import Paginator from chia.util.streamable import Streamable, streamable from chia.util.ws_message import WsRpcMessage, create_payload_dict diff --git a/chia/rpc/farmer_rpc_client.py b/chia/rpc/farmer_rpc_client.py index 8161a6031426..43b5c4b83cfc 100644 --- a/chia/rpc/farmer_rpc_client.py +++ b/chia/rpc/farmer_rpc_client.py @@ -2,9 +2,10 @@ from typing import Any, Optional, cast +from chia_rs.sized_bytes import bytes32 + from chia.rpc.farmer_rpc_api import PlotInfoRequestData, PlotPathRequestData from chia.rpc.rpc_client import RpcClient -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.streamable import recurse_jsonify diff --git a/chia/rpc/full_node_rpc_api.py b/chia/rpc/full_node_rpc_api.py index c83fa3e71871..6fc597e245cd 100644 --- a/chia/rpc/full_node_rpc_api.py +++ b/chia/rpc/full_node_rpc_api.py @@ -3,6 +3,7 @@ from datetime import datetime, timezone from typing import TYPE_CHECKING, Any, ClassVar, Optional, cast +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64, uint128 from chia.consensus.block_record import BlockRecord @@ -19,7 +20,6 @@ from chia.rpc.rpc_server import Endpoint, EndpointResult from chia.server.outbound_message import NodeType from chia.types.blockchain_format.proof_of_space import calculate_prefix_bits -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.coin_record import CoinRecord from chia.types.coin_spend import CoinSpend from chia.types.full_block import FullBlock diff --git a/chia/rpc/full_node_rpc_client.py b/chia/rpc/full_node_rpc_client.py index 42c7befc7799..4074dc0acd0d 100644 --- a/chia/rpc/full_node_rpc_client.py +++ b/chia/rpc/full_node_rpc_client.py @@ -2,12 +2,12 @@ from typing import Any, 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.full_node.signage_point import SignagePoint from chia.rpc.rpc_client import RpcClient -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.coin_record import CoinRecord from chia.types.coin_spend import CoinSpend, CoinSpendWithConditions from chia.types.end_of_slot_bundle import EndOfSubSlotBundle diff --git a/chia/rpc/rpc_client.py b/chia/rpc/rpc_client.py index b3fda2d1f331..6f45bb8a8c05 100644 --- a/chia/rpc/rpc_client.py +++ b/chia/rpc/rpc_client.py @@ -10,12 +10,12 @@ from typing import Any, Optional, TypeVar import aiohttp +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint16 from chia.server.outbound_message import NodeType from chia.server.server import ssl_context_for_client from chia.server.ssl_context import private_ssl_ca_paths -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.byte_types import hexstr_to_bytes from chia.util.task_referencer import create_referenced_task diff --git a/chia/rpc/wallet_request_types.py b/chia/rpc/wallet_request_types.py index 0b4afde88b0c..ba1f7262ee18 100644 --- a/chia/rpc/wallet_request_types.py +++ b/chia/rpc/wallet_request_types.py @@ -5,10 +5,10 @@ from typing import Any, Optional, TypeVar, final from chia_rs import G1Element, G2Element, PrivateKey +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint16, uint32, uint64 from typing_extensions import dataclass_transform -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.byte_types import hexstr_to_bytes from chia.util.streamable import Streamable, streamable from chia.wallet.conditions import Condition, ConditionValidTimes diff --git a/chia/rpc/wallet_rpc_api.py b/chia/rpc/wallet_rpc_api.py index 576f6d5e102e..6a884cc542d3 100644 --- a/chia/rpc/wallet_rpc_api.py +++ b/chia/rpc/wallet_rpc_api.py @@ -7,6 +7,7 @@ from typing import TYPE_CHECKING, Any, Callable, ClassVar, Optional, Union, cast from chia_rs import AugSchemeMPL, Coin, G1Element, G2Element, PrivateKey +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint16, uint32, uint64 from clvm_tools.binutils import assemble @@ -77,7 +78,6 @@ from chia.server.ws_connection import WSChiaConnection from chia.types.blockchain_format.coin import 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_record import CoinRecord from chia.types.coin_spend import CoinSpend from chia.types.signing_mode import CHIP_0002_SIGN_MESSAGE_PREFIX, SigningMode diff --git a/chia/rpc/wallet_rpc_client.py b/chia/rpc/wallet_rpc_client.py index 0ea8891370ff..f419b969376e 100644 --- a/chia/rpc/wallet_rpc_client.py +++ b/chia/rpc/wallet_rpc_client.py @@ -3,6 +3,7 @@ from collections.abc import Sequence from typing import Any, Optional, Union, cast +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint16, uint32, uint64 from chia.data_layer.data_layer_util import DLProof, VerifyProofResponse @@ -98,7 +99,6 @@ ) 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_record import CoinRecord from chia.wallet.conditions import Condition, ConditionValidTimes, conditions_to_json_dicts from chia.wallet.puzzles.clawback.metadata import AutoClaimSettings diff --git a/chia/server/server.py b/chia/server/server.py index 145cced4dd56..393bd097eadd 100644 --- a/chia/server/server.py +++ b/chia/server/server.py @@ -20,6 +20,7 @@ client_exceptions, web, ) +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 @@ -34,7 +35,6 @@ from chia.server.outbound_message import Message, NodeType from chia.server.ssl_context import private_ssl_paths, public_ssl_paths from chia.server.ws_connection import ConnectionCallback, WSChiaConnection -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.peer_info import PeerInfo from chia.util.errors import Err, ProtocolError from chia.util.network import WebServer, is_in_network, is_localhost, is_trusted_peer diff --git a/chia/server/ws_connection.py b/chia/server/ws_connection.py index b0d786889f2e..6daaaab41535 100644 --- a/chia/server/ws_connection.py +++ b/chia/server/ws_connection.py @@ -12,6 +12,7 @@ from aiohttp import ClientSession, WebSocketError, WSCloseCode, WSMessage, WSMsgType from aiohttp.client import ClientWebSocketResponse from aiohttp.web import WebSocketResponse +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import int16, uint8, uint16 from packaging.version import Version from typing_extensions import Protocol, final @@ -30,7 +31,6 @@ from chia.server.capabilities import known_active_capabilities from chia.server.outbound_message import Message, NodeType, make_msg from chia.server.rate_limits import RateLimiter -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.peer_info import PeerInfo from chia.util.errors import ApiError, ConsensusError, Err, ProtocolError, TimestampError from chia.util.log_exceptions import log_exceptions diff --git a/chia/simulator/block_tools.py b/chia/simulator/block_tools.py index e71919fcd894..4ac3b9cae859 100644 --- a/chia/simulator/block_tools.py +++ b/chia/simulator/block_tools.py @@ -19,6 +19,7 @@ import anyio from chia_puzzles_py.programs import CHIALISP_DESERIALISATION, ROM_BOOTSTRAP_GENERATOR from chia_rs import MEMPOOL_MODE, AugSchemeMPL, ConsensusConstants, G1Element, G2Element, 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 @@ -77,7 +78,6 @@ 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, diff --git a/chia/simulator/full_node_simulator.py b/chia/simulator/full_node_simulator.py index 00a05b41c2a3..6c0d768e6f6a 100644 --- a/chia/simulator/full_node_simulator.py +++ b/chia/simulator/full_node_simulator.py @@ -7,6 +7,7 @@ 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 @@ -22,7 +23,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.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 diff --git a/chia/simulator/setup_services.py b/chia/simulator/setup_services.py index d69297c07351..6eb828de3177 100644 --- a/chia/simulator/setup_services.py +++ b/chia/simulator/setup_services.py @@ -12,6 +12,7 @@ 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 @@ -43,7 +44,6 @@ 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 diff --git a/chia/simulator/simulator_full_node_rpc_api.py b/chia/simulator/simulator_full_node_rpc_api.py index 887ac543897a..16fa63231ebe 100644 --- a/chia/simulator/simulator_full_node_rpc_api.py +++ b/chia/simulator/simulator_full_node_rpc_api.py @@ -1,12 +1,12 @@ 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 diff --git a/chia/simulator/simulator_full_node_rpc_client.py b/chia/simulator/simulator_full_node_rpc_client.py index 3743b55c8292..453cc8cf236f 100644 --- a/chia/simulator/simulator_full_node_rpc_client.py +++ b/chia/simulator/simulator_full_node_rpc_client.py @@ -1,9 +1,9 @@ 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 diff --git a/chia/simulator/simulator_protocol.py b/chia/simulator/simulator_protocol.py index e5a64c794e0f..c5d5535690cf 100644 --- a/chia/simulator/simulator_protocol.py +++ b/chia/simulator/simulator_protocol.py @@ -3,9 +3,9 @@ from dataclasses import dataclass from typing import Optional +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32 -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.streamable import Streamable, streamable diff --git a/chia/simulator/simulator_test_tools.py b/chia/simulator/simulator_test_tools.py index cf6058e6cded..7da2af467b73 100644 --- a/chia/simulator/simulator_test_tools.py +++ b/chia/simulator/simulator_test_tools.py @@ -6,6 +6,7 @@ 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 @@ -22,7 +23,6 @@ ) 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 diff --git a/chia/simulator/start_simulator.py b/chia/simulator/start_simulator.py index 5d068cae41dc..15daa50300e3 100644 --- a/chia/simulator/start_simulator.py +++ b/chia/simulator/start_simulator.py @@ -7,6 +7,7 @@ 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 @@ -17,7 +18,6 @@ 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 diff --git a/chia/simulator/wallet_tools.py b/chia/simulator/wallet_tools.py index 62554ed4a8b7..e0ac89f0b1df 100644 --- a/chia/simulator/wallet_tools.py +++ b/chia/simulator/wallet_tools.py @@ -3,13 +3,13 @@ from typing import Any, Optional 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.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 diff --git a/chia/timelord/iters_from_block.py b/chia/timelord/iters_from_block.py index 47373e334e70..3102ed017793 100644 --- a/chia/timelord/iters_from_block.py +++ b/chia/timelord/iters_from_block.py @@ -3,12 +3,12 @@ from typing import Optional, Union from chia_rs import ConsensusConstants +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 def iters_from_block( diff --git a/chia/timelord/timelord.py b/chia/timelord/timelord.py index db0f506adf57..b5178c08d8dc 100644 --- a/chia/timelord/timelord.py +++ b/chia/timelord/timelord.py @@ -16,6 +16,7 @@ from typing import IO, TYPE_CHECKING, Any, ClassVar, Optional, cast from chia_rs import ConsensusConstants +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint16, uint32, uint64, uint128 from chiavdf import create_discriminant, prove @@ -31,7 +32,6 @@ 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, diff --git a/chia/timelord/timelord_state.py b/chia/timelord/timelord_state.py index 8731bdd957f0..51bb0a35f26e 100644 --- a/chia/timelord/timelord_state.py +++ b/chia/timelord/timelord_state.py @@ -4,13 +4,13 @@ from typing import Optional, Union 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 diff --git a/chia/types/block_protocol.py b/chia/types/block_protocol.py index b7d6ebc93316..5d20d4eeb8e5 100644 --- a/chia/types/block_protocol.py +++ b/chia/types/block_protocol.py @@ -2,11 +2,11 @@ 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 class BlockInfo(Protocol): diff --git a/chia/types/blockchain_format/coin.py b/chia/types/blockchain_format/coin.py index ea76a1abd892..bee38d14edde 100644 --- a/chia/types/blockchain_format/coin.py +++ b/chia/types/blockchain_format/coin.py @@ -3,9 +3,9 @@ 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 __all__ = ["Coin", "coin_as_list", "hash_coin_ids"] diff --git a/chia/types/blockchain_format/program.py b/chia/types/blockchain_format/program.py index a6766b480734..067597b7a6cd 100644 --- a/chia/types/blockchain_format/program.py +++ b/chia/types/blockchain_format/program.py @@ -4,13 +4,13 @@ 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 diff --git a/chia/types/blockchain_format/proof_of_space.py b/chia/types/blockchain_format/proof_of_space.py index c5cd6cbf7849..4f7be0bbecf5 100644 --- a/chia/types/blockchain_format/proof_of_space.py +++ b/chia/types/blockchain_format/proof_of_space.py @@ -6,10 +6,10 @@ import chia_rs from bitstring import BitArray 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.types.blockchain_format.sized_bytes import bytes32 from chia.util.hash import std_hash ProofOfSpace = chia_rs.ProofOfSpace diff --git a/chia/types/blockchain_format/sized_bytes.py b/chia/types/blockchain_format/sized_bytes.py deleted file mode 100644 index 53d0e960a804..000000000000 --- a/chia/types/blockchain_format/sized_bytes.py +++ /dev/null @@ -1,11 +0,0 @@ -from __future__ import annotations - -import chia_rs.sized_bytes - -bytes4 = chia_rs.sized_bytes.bytes4 -bytes8 = chia_rs.sized_bytes.bytes8 -bytes32 = chia_rs.sized_bytes.bytes32 -bytes48 = chia_rs.sized_bytes.bytes48 -bytes96 = chia_rs.sized_bytes.bytes96 -bytes100 = chia_rs.sized_bytes.bytes100 -bytes480 = chia_rs.sized_bytes.bytes480 diff --git a/chia/types/blockchain_format/tree_hash.py b/chia/types/blockchain_format/tree_hash.py index 60c57d7ac94a..414b0bbbba99 100644 --- a/chia/types/blockchain_format/tree_hash.py +++ b/chia/types/blockchain_format/tree_hash.py @@ -10,10 +10,10 @@ 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] diff --git a/chia/types/blockchain_format/vdf.py b/chia/types/blockchain_format/vdf.py index adc4a9b46558..f74e2654e20b 100644 --- a/chia/types/blockchain_format/vdf.py +++ b/chia/types/blockchain_format/vdf.py @@ -7,11 +7,11 @@ from typing import Optional 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.types.blockchain_format.classgroup import ClassgroupElement -from chia.types.blockchain_format.sized_bytes import bytes32, bytes100 log = logging.getLogger(__name__) diff --git a/chia/types/coin_record.py b/chia/types/coin_record.py index 49734ba8ea0e..7ecb91bd7fa0 100644 --- a/chia/types/coin_record.py +++ b/chia/types/coin_record.py @@ -4,10 +4,10 @@ from typing import Optional 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.streamable import Streamable, streamable diff --git a/chia/types/eligible_coin_spends.py b/chia/types/eligible_coin_spends.py index a9a2b04042fa..2e6a73539856 100644 --- a/chia/types/eligible_coin_spends.py +++ b/chia/types/eligible_coin_spends.py @@ -6,12 +6,12 @@ from typing import Callable, Optional 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.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 diff --git a/chia/types/internal_mempool_item.py b/chia/types/internal_mempool_item.py index f5eb0be5907a..54823c4d7298 100644 --- a/chia/types/internal_mempool_item.py +++ b/chia/types/internal_mempool_item.py @@ -2,9 +2,9 @@ from dataclasses import dataclass +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32 -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.mempool_item import BundleCoinSpend from chia.types.spend_bundle import SpendBundle from chia.types.spend_bundle_conditions import SpendBundleConditions diff --git a/chia/types/mempool_item.py b/chia/types/mempool_item.py index 99504ad036d7..288487b67ae6 100644 --- a/chia/types/mempool_item.py +++ b/chia/types/mempool_item.py @@ -3,10 +3,10 @@ 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 diff --git a/chia/types/transaction_queue_entry.py b/chia/types/transaction_queue_entry.py index 8ccf3ac6c74f..47052290c6a6 100644 --- a/chia/types/transaction_queue_entry.py +++ b/chia/types/transaction_queue_entry.py @@ -5,8 +5,9 @@ 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 diff --git a/chia/types/unfinished_header_block.py b/chia/types/unfinished_header_block.py index 6f8c9e01e500..cb9ff2188c05 100644 --- a/chia/types/unfinished_header_block.py +++ b/chia/types/unfinished_header_block.py @@ -4,10 +4,10 @@ from typing import Optional from chia_rs import Foliage, FoliageTransactionBlock +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint128 from chia.types.blockchain_format.reward_chain_block import RewardChainBlockUnfinished -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.blockchain_format.vdf import VDFProof from chia.types.end_of_slot_bundle import EndOfSubSlotBundle from chia.util.streamable import Streamable, streamable diff --git a/chia/util/augmented_chain.py b/chia/util/augmented_chain.py index fcd3a3a9de62..30b338c2622a 100644 --- a/chia/util/augmented_chain.py +++ b/chia/util/augmented_chain.py @@ -2,11 +2,11 @@ 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 diff --git a/chia/util/block_cache.py b/chia/util/block_cache.py index b37a438c76ae..271947c55514 100644 --- a/chia/util/block_cache.py +++ b/chia/util/block_cache.py @@ -2,10 +2,10 @@ 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 # implements BlockRecordsProtocol diff --git a/chia/util/condition_tools.py b/chia/util/condition_tools.py index f56c021d6aff..869c0d354169 100644 --- a/chia/util/condition_tools.py +++ b/chia/util/condition_tools.py @@ -4,13 +4,13 @@ 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 diff --git a/chia/util/full_block_utils.py b/chia/util/full_block_utils.py index 5b63c6f1e49d..97f52fd23202 100644 --- a/chia/util/full_block_utils.py +++ b/chia/util/full_block_utils.py @@ -4,12 +4,12 @@ from typing import Callable, Optional 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.serialized_program import SerializedProgram -from chia.types.blockchain_format.sized_bytes import bytes32 def skip_list(buf: memoryview, skip_item: Callable[[memoryview], memoryview]) -> memoryview: diff --git a/chia/util/generator_tools.py b/chia/util/generator_tools.py index 095941c78414..1e614c337bf9 100644 --- a/chia/util/generator_tools.py +++ b/chia/util/generator_tools.py @@ -3,11 +3,11 @@ 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 diff --git a/chia/util/network.py b/chia/util/network.py index 172c76aae740..054843f6863f 100644 --- a/chia/util/network.py +++ b/chia/util/network.py @@ -12,10 +12,10 @@ 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.ip_address import IPAddress from chia.util.task_referencer import create_referenced_task diff --git a/chia/util/vdf_prover.py b/chia/util/vdf_prover.py index 357bd30d1b78..4bdf76127add 100644 --- a/chia/util/vdf_prover.py +++ b/chia/util/vdf_prover.py @@ -1,11 +1,11 @@ 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.types.blockchain_format.classgroup import ClassgroupElement -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.blockchain_format.vdf import VDFInfo, VDFProof diff --git a/chia/util/ws_message.py b/chia/util/ws_message.py index 3d3186052abe..c7b6ce274f00 100644 --- a/chia/util/ws_message.py +++ b/chia/util/ws_message.py @@ -2,9 +2,9 @@ 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 diff --git a/chia/wallet/cat_wallet/cat_info.py b/chia/wallet/cat_wallet/cat_info.py index c4d8bceb16ae..763ba81e5c29 100644 --- a/chia/wallet/cat_wallet/cat_info.py +++ b/chia/wallet/cat_wallet/cat_info.py @@ -3,10 +3,10 @@ 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.streamable import Streamable, streamable from chia.wallet.lineage_proof import LineageProof from chia.wallet.vc_wallet.cr_cat_drivers import ProofsChecker diff --git a/chia/wallet/cat_wallet/cat_outer_puzzle.py b/chia/wallet/cat_wallet/cat_outer_puzzle.py index 4fa3ae2cf3af..0491af7a9647 100644 --- a/chia/wallet/cat_wallet/cat_outer_puzzle.py +++ b/chia/wallet/cat_wallet/cat_outer_puzzle.py @@ -3,11 +3,11 @@ 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.wallet.cat_wallet.cat_utils import ( CAT_MOD, diff --git a/chia/wallet/cat_wallet/cat_utils.py b/chia/wallet/cat_wallet/cat_utils.py index b582f96ae6d3..fcbb4e6afa7c 100644 --- a/chia/wallet/cat_wallet/cat_utils.py +++ b/chia/wallet/cat_wallet/cat_utils.py @@ -6,10 +6,10 @@ 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 diff --git a/chia/wallet/cat_wallet/cat_wallet.py b/chia/wallet/cat_wallet/cat_wallet.py index ff20b347708b..7d0ed842e186 100644 --- a/chia/wallet/cat_wallet/cat_wallet.py +++ b/chia/wallet/cat_wallet/cat_wallet.py @@ -7,6 +7,7 @@ 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 @@ -14,7 +15,6 @@ 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 diff --git a/chia/wallet/cat_wallet/lineage_store.py b/chia/wallet/cat_wallet/lineage_store.py index db99f18a9f41..43f018ccb0c3 100644 --- a/chia/wallet/cat_wallet/lineage_store.py +++ b/chia/wallet/cat_wallet/lineage_store.py @@ -3,7 +3,8 @@ 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 diff --git a/chia/wallet/coin_selection.py b/chia/wallet/coin_selection.py index e409dae1243d..4648fd57d429 100644 --- a/chia/wallet/coin_selection.py +++ b/chia/wallet/coin_selection.py @@ -4,10 +4,10 @@ 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.wallet.util.tx_config import CoinSelectionConfig from chia.wallet.wallet_coin_record import WalletCoinRecord diff --git a/chia/wallet/conditions.py b/chia/wallet/conditions.py index bd1bc42c0737..8c9d95931190 100644 --- a/chia/wallet/conditions.py +++ b/chia/wallet/conditions.py @@ -6,11 +6,11 @@ from typing import Any, ClassVar, Optional, TypeVar, Union, final, get_type_hints from chia_rs import Coin, G1Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64 from clvm.casts import int_from_bytes, int_to_bytes from chia.types.blockchain_format.program import Program -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.condition_opcodes import ConditionOpcode from chia.util.hash import std_hash from chia.util.streamable import Streamable, streamable diff --git a/chia/wallet/db_wallet/db_wallet_puzzles.py b/chia/wallet/db_wallet/db_wallet_puzzles.py index 5ca70098daf6..fd0017a628bf 100644 --- a/chia/wallet/db_wallet/db_wallet_puzzles.py +++ b/chia/wallet/db_wallet/db_wallet_puzzles.py @@ -5,11 +5,11 @@ from chia_puzzles_py.programs import GRAFTROOT_DL_OFFERS as GRAFTROOT_DL_OFFERS_BYTES from chia_puzzles_py.programs import P2_PARENT as P2_PARENT_BYTES +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from chia.types.blockchain_format.program import INFINITE_COST, 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.wallet.nft_wallet.nft_puzzle_utils import create_nft_layer_puzzle_with_curry_params from chia.wallet.nft_wallet.nft_puzzles import NFT_STATE_LAYER_MOD diff --git a/chia/wallet/derivation_record.py b/chia/wallet/derivation_record.py index 5667bc176553..dcf42ce986cd 100644 --- a/chia/wallet/derivation_record.py +++ b/chia/wallet/derivation_record.py @@ -4,9 +4,9 @@ from typing import Union from chia_rs import G1Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32 -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.wallet.util.wallet_types import WalletType diff --git a/chia/wallet/derive_keys.py b/chia/wallet/derive_keys.py index 60219460f815..ce20805b0257 100644 --- a/chia/wallet/derive_keys.py +++ b/chia/wallet/derive_keys.py @@ -3,10 +3,10 @@ from typing import Optional from chia_rs import AugSchemeMPL, G1Element, 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.types.blockchain_format.sized_bytes import bytes32 # EIP 2334 bls key derivation # https://eips.ethereum.org/EIPS/eip-2334 diff --git a/chia/wallet/did_wallet/did_info.py b/chia/wallet/did_wallet/did_info.py index 120903a8052d..8cd2b7a4924b 100644 --- a/chia/wallet/did_wallet/did_info.py +++ b/chia/wallet/did_wallet/did_info.py @@ -3,12 +3,12 @@ from dataclasses import dataclass from typing import Optional +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint16, uint64 from chia.protocols.wallet_protocol import CoinState 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.util.streamable import Streamable, streamable from chia.wallet.lineage_proof import LineageProof diff --git a/chia/wallet/did_wallet/did_wallet.py b/chia/wallet/did_wallet/did_wallet.py index 09da62b6b6d4..536c3ef1db94 100644 --- a/chia/wallet/did_wallet/did_wallet.py +++ b/chia/wallet/did_wallet/did_wallet.py @@ -8,6 +8,7 @@ from typing import TYPE_CHECKING, Any, ClassVar, Optional, cast from chia_rs import AugSchemeMPL, G1Element, G2Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint16, uint32, uint64, uint128 from typing_extensions import Unpack @@ -15,7 +16,6 @@ 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 CoinSpend, make_spend from chia.types.signing_mode import CHIP_0002_SIGN_MESSAGE_PREFIX, SigningMode from chia.wallet.conditions import ( diff --git a/chia/wallet/did_wallet/did_wallet_puzzles.py b/chia/wallet/did_wallet/did_wallet_puzzles.py index 51a4b3611d80..2788e3819037 100644 --- a/chia/wallet/did_wallet/did_wallet_puzzles.py +++ b/chia/wallet/did_wallet/did_wallet_puzzles.py @@ -5,11 +5,11 @@ from chia_puzzles_py.programs import DID_INNERPUZ, DID_INNERPUZ_HASH, NFT_INTERMEDIATE_LAUNCHER from chia_rs import G1Element +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.wallet.singleton import ( diff --git a/chia/wallet/driver_protocol.py b/chia/wallet/driver_protocol.py index 18e2ab3f4910..2369aafa0099 100644 --- a/chia/wallet/driver_protocol.py +++ b/chia/wallet/driver_protocol.py @@ -2,10 +2,10 @@ from typing import Optional +from chia_rs.sized_bytes import bytes32 from typing_extensions import Protocol from chia.types.blockchain_format.program import Program -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.wallet.puzzle_drivers import PuzzleInfo, Solver from chia.wallet.uncurried_puzzle import UncurriedPuzzle diff --git a/chia/wallet/lineage_proof.py b/chia/wallet/lineage_proof.py index 8276481d8510..93cfc4142473 100644 --- a/chia/wallet/lineage_proof.py +++ b/chia/wallet/lineage_proof.py @@ -4,10 +4,10 @@ from enum import Enum from typing import Any, 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.streamable import Streamable, streamable diff --git a/chia/wallet/nft_wallet/metadata_outer_puzzle.py b/chia/wallet/nft_wallet/metadata_outer_puzzle.py index ccab8ffcca06..ffae8874cd59 100644 --- a/chia/wallet/nft_wallet/metadata_outer_puzzle.py +++ b/chia/wallet/nft_wallet/metadata_outer_puzzle.py @@ -3,8 +3,9 @@ from dataclasses import dataclass from typing import Callable, Optional +from chia_rs.sized_bytes import bytes32 + from chia.types.blockchain_format.program import Program -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.wallet.nft_wallet.nft_puzzles import ( NFT_STATE_LAYER_MOD, NFT_STATE_LAYER_MOD_HASH, diff --git a/chia/wallet/nft_wallet/nft_info.py b/chia/wallet/nft_wallet/nft_info.py index 14856925c27a..3acca7bf86d5 100644 --- a/chia/wallet/nft_wallet/nft_info.py +++ b/chia/wallet/nft_wallet/nft_info.py @@ -3,11 +3,11 @@ from dataclasses import dataclass from typing import Optional +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint16, uint32, 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.util.streamable import Streamable, streamable from chia.wallet.lineage_proof import LineageProof from chia.wallet.singleton import SINGLETON_LAUNCHER_PUZZLE_HASH diff --git a/chia/wallet/nft_wallet/nft_puzzle_utils.py b/chia/wallet/nft_wallet/nft_puzzle_utils.py index 4ebfd945fbb9..2e234a4bc0aa 100644 --- a/chia/wallet/nft_wallet/nft_puzzle_utils.py +++ b/chia/wallet/nft_wallet/nft_puzzle_utils.py @@ -3,12 +3,12 @@ import logging from typing import Any, Literal, Optional, Union +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint16, uint64 from clvm_tools.binutils import disassemble 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.util.bech32m import encode_puzzle_hash from chia.wallet.nft_wallet.nft_info import NFTCoinInfo, NFTInfo from chia.wallet.nft_wallet.nft_puzzles import ( diff --git a/chia/wallet/nft_wallet/nft_puzzles.py b/chia/wallet/nft_wallet/nft_puzzles.py index 67de87c070c9..d2d9aaa1ac92 100644 --- a/chia/wallet/nft_wallet/nft_puzzles.py +++ b/chia/wallet/nft_wallet/nft_puzzles.py @@ -14,9 +14,9 @@ from chia_puzzles_py.programs import ( NFT_OWNERSHIP_LAYER_HASH as NFT_OWNERSHIP_LAYER_HASH_BYTES, ) +from chia_rs.sized_bytes import bytes32 from chia.types.blockchain_format.program import Program -from chia.types.blockchain_format.sized_bytes import bytes32 NFT_STATE_LAYER_MOD = Program.from_bytes(NFT_STATE_LAYER) NFT_STATE_LAYER_MOD_HASH = bytes32(NFT_STATE_LAYER_HASH) diff --git a/chia/wallet/nft_wallet/nft_wallet.py b/chia/wallet/nft_wallet/nft_wallet.py index 250f4fad28ce..4b7424ee6ee6 100644 --- a/chia/wallet/nft_wallet/nft_wallet.py +++ b/chia/wallet/nft_wallet/nft_wallet.py @@ -8,6 +8,7 @@ from typing import TYPE_CHECKING, Any, ClassVar, Optional, TypeVar, cast from chia_rs import AugSchemeMPL, G1Element, G2Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint16, uint32, uint64, uint128 from clvm.casts import int_from_bytes, int_to_bytes from typing_extensions import Unpack @@ -16,7 +17,6 @@ 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 CoinSpend, compute_additions, make_spend from chia.types.signing_mode import CHIP_0002_SIGN_MESSAGE_PREFIX, SigningMode from chia.util.hash import std_hash diff --git a/chia/wallet/nft_wallet/ownership_outer_puzzle.py b/chia/wallet/nft_wallet/ownership_outer_puzzle.py index f41fd8553fd2..a2064d5a3c0e 100644 --- a/chia/wallet/nft_wallet/ownership_outer_puzzle.py +++ b/chia/wallet/nft_wallet/ownership_outer_puzzle.py @@ -3,10 +3,10 @@ from dataclasses import dataclass from typing import Callable, Optional, Union +from chia_rs.sized_bytes import bytes32 from clvm_tools.binutils import disassemble from chia.types.blockchain_format.program import Program -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.wallet.nft_wallet.nft_puzzles import NFT_OWNERSHIP_LAYER from chia.wallet.puzzle_drivers import PuzzleInfo, Solver from chia.wallet.uncurried_puzzle import UncurriedPuzzle, uncurry_puzzle diff --git a/chia/wallet/nft_wallet/singleton_outer_puzzle.py b/chia/wallet/nft_wallet/singleton_outer_puzzle.py index 13ae11894f15..5a96fb3e315d 100644 --- a/chia/wallet/nft_wallet/singleton_outer_puzzle.py +++ b/chia/wallet/nft_wallet/singleton_outer_puzzle.py @@ -3,11 +3,11 @@ 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.wallet.lineage_proof import LineageProof from chia.wallet.puzzle_drivers import PuzzleInfo, Solver diff --git a/chia/wallet/nft_wallet/transfer_program_puzzle.py b/chia/wallet/nft_wallet/transfer_program_puzzle.py index cd930345e667..b337a37cabd2 100644 --- a/chia/wallet/nft_wallet/transfer_program_puzzle.py +++ b/chia/wallet/nft_wallet/transfer_program_puzzle.py @@ -3,10 +3,10 @@ from dataclasses import dataclass from typing import Callable, Optional +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint16 from chia.types.blockchain_format.program import Program -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.wallet.nft_wallet.nft_puzzles import NFT_TRANSFER_PROGRAM_DEFAULT from chia.wallet.puzzle_drivers import PuzzleInfo, Solver from chia.wallet.puzzles.singleton_top_layer_v1_1 import SINGLETON_LAUNCHER_HASH, SINGLETON_MOD_HASH diff --git a/chia/wallet/nft_wallet/uncurry_nft.py b/chia/wallet/nft_wallet/uncurry_nft.py index aa73d6bd8f3d..b33e912976db 100644 --- a/chia/wallet/nft_wallet/uncurry_nft.py +++ b/chia/wallet/nft_wallet/uncurry_nft.py @@ -4,11 +4,11 @@ from dataclasses import dataclass from typing import Optional, TypeVar +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint16 from chia.protocols.wallet_protocol import CoinState 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.streamable import Streamable, streamable from chia.wallet.nft_wallet.nft_puzzles import NFT_OWNERSHIP_LAYER diff --git a/chia/wallet/notification_manager.py b/chia/wallet/notification_manager.py index 3e424e089ff1..fc8e95684b2a 100644 --- a/chia/wallet/notification_manager.py +++ b/chia/wallet/notification_manager.py @@ -4,12 +4,12 @@ from typing import Any, Optional from chia_rs import G2Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from chia.protocols.wallet_protocol import CoinState 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.util.db_wrapper import DBWrapper2 from chia.wallet.conditions import AssertCoinAnnouncement, Condition diff --git a/chia/wallet/notification_store.py b/chia/wallet/notification_store.py index 225e979447ed..a3175839ae29 100644 --- a/chia/wallet/notification_store.py +++ b/chia/wallet/notification_store.py @@ -5,9 +5,9 @@ import sqlite3 from typing import Optional +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.db_wrapper import DBWrapper2 from chia.util.streamable import Streamable, streamable diff --git a/chia/wallet/outer_puzzles.py b/chia/wallet/outer_puzzles.py index bf94bd981a81..b34fa765137a 100644 --- a/chia/wallet/outer_puzzles.py +++ b/chia/wallet/outer_puzzles.py @@ -3,8 +3,9 @@ from enum import Enum from typing import Optional +from chia_rs.sized_bytes import bytes32 + from chia.types.blockchain_format.program import Program -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.wallet.cat_wallet.cat_outer_puzzle import CATOuterPuzzle from chia.wallet.driver_protocol import DriverProtocol from chia.wallet.nft_wallet.metadata_outer_puzzle import MetadataOuterPuzzle diff --git a/chia/wallet/puzzles/clawback/drivers.py b/chia/wallet/puzzles/clawback/drivers.py index 2b06c0595f3b..20254f017564 100644 --- a/chia/wallet/puzzles/clawback/drivers.py +++ b/chia/wallet/puzzles/clawback/drivers.py @@ -16,13 +16,13 @@ P2_PUZZLE_HASH, P2_PUZZLE_HASH_HASH, ) +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from chia.consensus.default_constants import DEFAULT_CONSTANTS 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, make_spend from chia.types.condition_opcodes import ConditionOpcode from chia.util.condition_tools import conditions_for_solution diff --git a/chia/wallet/puzzles/clawback/metadata.py b/chia/wallet/puzzles/clawback/metadata.py index 5dcae45ad40b..02a552e65ccf 100644 --- a/chia/wallet/puzzles/clawback/metadata.py +++ b/chia/wallet/puzzles/clawback/metadata.py @@ -3,9 +3,9 @@ from dataclasses import dataclass from enum import IntEnum +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint16, uint64 -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.streamable import Streamable, streamable from chia.wallet.wallet_puzzle_store import WalletPuzzleStore diff --git a/chia/wallet/puzzles/clawback/puzzle_decorator.py b/chia/wallet/puzzles/clawback/puzzle_decorator.py index ef9f01989820..ea38df1a4950 100644 --- a/chia/wallet/puzzles/clawback/puzzle_decorator.py +++ b/chia/wallet/puzzles/clawback/puzzle_decorator.py @@ -2,10 +2,10 @@ from typing import Any +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.types.condition_opcodes import ConditionOpcode from chia.util.streamable import VersionedBlob from chia.wallet.conditions import CreateCoin diff --git a/chia/wallet/puzzles/p2_delegated_puzzle_or_hidden_puzzle.py b/chia/wallet/puzzles/p2_delegated_puzzle_or_hidden_puzzle.py index b2ec3973377a..49ebd5d6cc93 100644 --- a/chia/wallet/puzzles/p2_delegated_puzzle_or_hidden_puzzle.py +++ b/chia/wallet/puzzles/p2_delegated_puzzle_or_hidden_puzzle.py @@ -64,10 +64,10 @@ from chia_puzzles_py.programs import P2_DELEGATED_PUZZLE_OR_HIDDEN_PUZZLE from chia_rs import G1Element, PrivateKey +from chia_rs.sized_bytes import bytes32 from clvm.casts import int_from_bytes from chia.types.blockchain_format.program import Program -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.wallet.puzzles.p2_conditions import puzzle_for_conditions from chia.wallet.util.curry_and_treehash import calculate_hash_of_quoted_mod_hash, curry_and_treehash, shatree_atom diff --git a/chia/wallet/puzzles/p2_puzzle_hash.py b/chia/wallet/puzzles/p2_puzzle_hash.py index 008a5e1c4052..430200d7b58f 100644 --- a/chia/wallet/puzzles/p2_puzzle_hash.py +++ b/chia/wallet/puzzles/p2_puzzle_hash.py @@ -8,9 +8,9 @@ from __future__ import annotations from chia_puzzles_py.programs import P2_PUZZLE_HASH +from chia_rs.sized_bytes import bytes32 from chia.types.blockchain_format.program import Program -from chia.types.blockchain_format.sized_bytes import bytes32 MOD = Program.from_bytes(P2_PUZZLE_HASH) diff --git a/chia/wallet/puzzles/puzzle_utils.py b/chia/wallet/puzzles/puzzle_utils.py index 7e45261ab8bc..87b2a1e11ae4 100644 --- a/chia/wallet/puzzles/puzzle_utils.py +++ b/chia/wallet/puzzles/puzzle_utils.py @@ -2,9 +2,9 @@ from typing import Any +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.types.condition_opcodes import ConditionOpcode diff --git a/chia/wallet/puzzles/singleton_top_layer.py b/chia/wallet/puzzles/singleton_top_layer.py index 082db0bcbe34..609cb5dd55fc 100644 --- a/chia/wallet/puzzles/singleton_top_layer.py +++ b/chia/wallet/puzzles/singleton_top_layer.py @@ -17,11 +17,11 @@ from chia_puzzles_py.programs import ( SINGLETON_LAUNCHER_HASH as SINGLETON_LAUNCHER_HASH_BYTES, ) +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.util.hash import std_hash diff --git a/chia/wallet/puzzles/singleton_top_layer_v1_1.py b/chia/wallet/puzzles/singleton_top_layer_v1_1.py index 5b224eb1fd33..a6262cce195f 100644 --- a/chia/wallet/puzzles/singleton_top_layer_v1_1.py +++ b/chia/wallet/puzzles/singleton_top_layer_v1_1.py @@ -15,11 +15,11 @@ from chia_puzzles_py.programs import ( SINGLETON_LAUNCHER_HASH as SINGLETON_LAUNCHER_HASH_BYTES, ) +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.util.hash import std_hash diff --git a/chia/wallet/puzzles/tails.py b/chia/wallet/puzzles/tails.py index e0db21b0ec65..a8494e4db6b6 100644 --- a/chia/wallet/puzzles/tails.py +++ b/chia/wallet/puzzles/tails.py @@ -9,10 +9,10 @@ GENESIS_BY_COIN_ID_OR_SINGLETON, GENESIS_BY_PUZZLE_HASH, ) +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.byte_types import hexstr_to_bytes from chia.wallet.cat_wallet.cat_info import CATInfo from chia.wallet.cat_wallet.cat_utils import ( diff --git a/chia/wallet/signer_protocol.py b/chia/wallet/signer_protocol.py index 38cfc317b1f1..d2567342250d 100644 --- a/chia/wallet/signer_protocol.py +++ b/chia/wallet/signer_protocol.py @@ -2,12 +2,12 @@ from dataclasses import dataclass +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from chia.types.blockchain_format.coin import Coin as _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.util.streamable import Streamable from chia.wallet.util.clvm_streamable import clvm_streamable diff --git a/chia/wallet/singleton.py b/chia/wallet/singleton.py index a353039ea2df..5d6536b18875 100644 --- a/chia/wallet/singleton.py +++ b/chia/wallet/singleton.py @@ -8,11 +8,11 @@ SINGLETON_TOP_LAYER_V1_1, SINGLETON_TOP_LAYER_V1_1_HASH, ) +from chia_rs.sized_bytes import bytes32 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, compute_additions from chia.wallet.util.curry_and_treehash import ( calculate_hash_of_quoted_mod_hash, diff --git a/chia/wallet/singleton_record.py b/chia/wallet/singleton_record.py index 5148b0af46ea..9d595f445984 100644 --- a/chia/wallet/singleton_record.py +++ b/chia/wallet/singleton_record.py @@ -3,10 +3,10 @@ from dataclasses import dataclass from typing import Any, Optional +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32 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.wallet.lineage_proof import LineageProof diff --git a/chia/wallet/trade_manager.py b/chia/wallet/trade_manager.py index 9ad0fba99ac7..575a095d76c9 100644 --- a/chia/wallet/trade_manager.py +++ b/chia/wallet/trade_manager.py @@ -6,6 +6,7 @@ from collections import deque from typing import TYPE_CHECKING, Any, Optional, Union +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from typing_extensions import Literal @@ -14,7 +15,6 @@ from chia.server.ws_connection import WSChiaConnection from chia.types.blockchain_format.coin import Coin, coin_as_list from chia.types.blockchain_format.program import Program -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.spend_bundle import estimate_fees from chia.util.db_wrapper import DBWrapper2 from chia.util.hash import std_hash diff --git a/chia/wallet/trade_record.py b/chia/wallet/trade_record.py index a8c87b48588e..04343e983731 100644 --- a/chia/wallet/trade_record.py +++ b/chia/wallet/trade_record.py @@ -3,10 +3,10 @@ from dataclasses import dataclass from typing import Any, Optional, TypeVar +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64 from chia.types.blockchain_format.coin import Coin -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.streamable import Streamable, streamable from chia.wallet.conditions import ConditionValidTimes from chia.wallet.trading.offer import Offer diff --git a/chia/wallet/trading/offer.py b/chia/wallet/trading/offer.py index 99eadc7ed48e..e9b54e86758b 100644 --- a/chia/wallet/trading/offer.py +++ b/chia/wallet/trading/offer.py @@ -5,13 +5,13 @@ from chia_puzzles_py.programs import SETTLEMENT_PAYMENT, SETTLEMENT_PAYMENT_HASH from chia_rs import G2Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from clvm_tools.binutils import disassemble from chia.consensus.default_constants import DEFAULT_CONSTANTS 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 CoinSpend, make_spend from chia.util.bech32m import bech32_decode, bech32_encode, convertbits from chia.util.errors import Err, ValidationError diff --git a/chia/wallet/trading/trade_store.py b/chia/wallet/trading/trade_store.py index 1e8af1b802e6..5403629d0a45 100644 --- a/chia/wallet/trading/trade_store.py +++ b/chia/wallet/trading/trade_store.py @@ -5,9 +5,9 @@ from typing import Optional import aiosqlite +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32 -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.mempool_inclusion_status import MempoolInclusionStatus from chia.util.db_wrapper import DBWrapper2 from chia.util.errors import Err diff --git a/chia/wallet/transaction_record.py b/chia/wallet/transaction_record.py index ac4aba4be34d..a795b851afbc 100644 --- a/chia/wallet/transaction_record.py +++ b/chia/wallet/transaction_record.py @@ -5,11 +5,11 @@ from typing import Any, Generic, Optional, TypeVar from chia_rs import SpendBundle +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64 from chia.consensus.coinbase import farmer_parent_id, pool_parent_id from chia.types.blockchain_format.coin import Coin -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.mempool_inclusion_status import MempoolInclusionStatus from chia.util.bech32m import decode_puzzle_hash, encode_puzzle_hash from chia.util.errors import Err diff --git a/chia/wallet/util/blind_signer_tl.py b/chia/wallet/util/blind_signer_tl.py index 75dc79910c25..0a14b2133ea5 100644 --- a/chia/wallet/util/blind_signer_tl.py +++ b/chia/wallet/util/blind_signer_tl.py @@ -2,9 +2,9 @@ from dataclasses import dataclass, field +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.streamable import Streamable from chia.wallet.signer_protocol import ( KeyHints, diff --git a/chia/wallet/util/compute_hints.py b/chia/wallet/util/compute_hints.py index 731102b8526f..b2223a5afd66 100644 --- a/chia/wallet/util/compute_hints.py +++ b/chia/wallet/util/compute_hints.py @@ -3,13 +3,13 @@ from dataclasses import dataclass from typing import Optional +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 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.program import Program -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.util.errors import Err, ValidationError diff --git a/chia/wallet/util/compute_memos.py b/chia/wallet/util/compute_memos.py index 7261e6e1b3c3..a015371a7a32 100644 --- a/chia/wallet/util/compute_memos.py +++ b/chia/wallet/util/compute_memos.py @@ -1,11 +1,11 @@ from __future__ import annotations +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from clvm.casts import int_from_bytes from chia.types.blockchain_format.coin import Coin from chia.types.blockchain_format.program import INFINITE_COST -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.wallet.wallet_spend_bundle import WalletSpendBundle diff --git a/chia/wallet/util/curry_and_treehash.py b/chia/wallet/util/curry_and_treehash.py index 82045d09aa30..a9ae0cd91a35 100644 --- a/chia/wallet/util/curry_and_treehash.py +++ b/chia/wallet/util/curry_and_treehash.py @@ -4,10 +4,9 @@ from hashlib import sha256 from typing import Callable +from chia_rs.sized_bytes import bytes32 from clvm.casts import int_to_bytes -from chia.types.blockchain_format.sized_bytes import bytes32 - CurryHashFunction = Callable[..., bytes32] diff --git a/chia/wallet/util/merkle_tree.py b/chia/wallet/util/merkle_tree.py index 545593eb4787..1a538cd39764 100644 --- a/chia/wallet/util/merkle_tree.py +++ b/chia/wallet/util/merkle_tree.py @@ -4,9 +4,9 @@ from enum import Enum from typing import Optional +from chia_rs.sized_bytes import bytes32 from clvm.casts import int_to_bytes -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.hash import std_hash ONE = int_to_bytes(1) diff --git a/chia/wallet/util/merkle_utils.py b/chia/wallet/util/merkle_utils.py index 3df8c4767429..9a8df4adc711 100644 --- a/chia/wallet/util/merkle_utils.py +++ b/chia/wallet/util/merkle_utils.py @@ -3,7 +3,7 @@ import hashlib from typing import Any -from chia.types.blockchain_format.sized_bytes import bytes32 +from chia_rs.sized_bytes import bytes32 TupleTree = Any # Union[bytes32, tuple["TupleTree", "TupleTree"]] Proof_Tree_Type = Any # Union[bytes32, tuple[bytes32, "Proof_Tree_Type"]] diff --git a/chia/wallet/util/new_peak_queue.py b/chia/wallet/util/new_peak_queue.py index 7d3df970e41c..7e31d80b4da1 100644 --- a/chia/wallet/util/new_peak_queue.py +++ b/chia/wallet/util/new_peak_queue.py @@ -5,9 +5,10 @@ from enum import IntEnum from typing import Any +from chia_rs.sized_bytes import bytes32 + from chia.protocols.wallet_protocol import CoinStateUpdate, NewPeakWallet from chia.server.ws_connection import WSChiaConnection -from chia.types.blockchain_format.sized_bytes import bytes32 class NewPeakQueueTypes(IntEnum): diff --git a/chia/wallet/util/notifications.py b/chia/wallet/util/notifications.py index c640aaf8d88a..0fd136801cb0 100644 --- a/chia/wallet/util/notifications.py +++ b/chia/wallet/util/notifications.py @@ -1,10 +1,10 @@ from __future__ import annotations from chia_puzzles_py.programs import NOTIFICATION +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 NOTIFICATION_MOD = Program.from_bytes(NOTIFICATION) diff --git a/chia/wallet/util/peer_request_cache.py b/chia/wallet/util/peer_request_cache.py index 38844d822825..28347e44a4e7 100644 --- a/chia/wallet/util/peer_request_cache.py +++ b/chia/wallet/util/peer_request_cache.py @@ -3,10 +3,10 @@ import asyncio from typing import Any, Optional +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from chia.protocols.wallet_protocol import CoinState -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.header_block import HeaderBlock from chia.util.hash import std_hash from chia.util.lru_cache import LRUCache diff --git a/chia/wallet/util/puzzle_decorator.py b/chia/wallet/util/puzzle_decorator.py index 9a698e5a4f04..59afec663101 100644 --- a/chia/wallet/util/puzzle_decorator.py +++ b/chia/wallet/util/puzzle_decorator.py @@ -3,10 +3,10 @@ import logging from typing import Any +from chia_rs.sized_bytes import bytes32 from typing_extensions import Protocol from chia.types.blockchain_format.program import Program -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.wallet.conditions import CreateCoin from chia.wallet.puzzles.clawback.puzzle_decorator import ClawbackPuzzleDecorator from chia.wallet.util.puzzle_decorator_type import PuzzleDecoratorType diff --git a/chia/wallet/util/query_filter.py b/chia/wallet/util/query_filter.py index 90ade08a6f3a..07f88e931ce8 100644 --- a/chia/wallet/util/query_filter.py +++ b/chia/wallet/util/query_filter.py @@ -3,9 +3,9 @@ from dataclasses import dataclass from enum import IntEnum +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint64 -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.streamable import Streamable, streamable from chia.wallet.util.transaction_type import TransactionType diff --git a/chia/wallet/util/tx_config.py b/chia/wallet/util/tx_config.py index f923f6d715d9..7220606c4284 100644 --- a/chia/wallet/util/tx_config.py +++ b/chia/wallet/util/tx_config.py @@ -4,12 +4,12 @@ from typing import Any, Optional, TypeVar from chia_rs import ConsensusConstants +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint64 from typing_extensions import NotRequired, TypedDict, Unpack 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.streamable import Streamable, streamable diff --git a/chia/wallet/util/wallet_sync_utils.py b/chia/wallet/util/wallet_sync_utils.py index bfebb197c55f..7e0cde6e1556 100644 --- a/chia/wallet/util/wallet_sync_utils.py +++ b/chia/wallet/util/wallet_sync_utils.py @@ -6,6 +6,7 @@ from typing import Any, Optional, Union from chia_rs import compute_merkle_set_root, confirm_included_already_hashed, confirm_not_included_already_hashed +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32 from chia.full_node.full_node_api import FullNodeAPI @@ -33,7 +34,6 @@ ) from chia.server.ws_connection import WSChiaConnection from chia.types.blockchain_format.coin import Coin, hash_coin_ids -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.coin_spend import CoinSpend, make_spend from chia.types.header_block import HeaderBlock from chia.util.task_referencer import create_referenced_task diff --git a/chia/wallet/vc_wallet/cr_cat_drivers.py b/chia/wallet/vc_wallet/cr_cat_drivers.py index 321bf32ee6af..7c5e38ede647 100644 --- a/chia/wallet/vc_wallet/cr_cat_drivers.py +++ b/chia/wallet/vc_wallet/cr_cat_drivers.py @@ -16,12 +16,12 @@ from chia_puzzles_py.programs import ( CREDENTIAL_RESTRICTION_HASH as CREDENTIAL_RESTRICTION_HASH_BYTES, ) +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint16, uint64 from clvm.casts import int_to_bytes from chia.types.blockchain_format.coin import Coin, coin_as_list 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.util.hash import std_hash from chia.util.streamable import Streamable, streamable diff --git a/chia/wallet/vc_wallet/cr_cat_wallet.py b/chia/wallet/vc_wallet/cr_cat_wallet.py index 05cc7770eccb..5604e98d26e7 100644 --- a/chia/wallet/vc_wallet/cr_cat_wallet.py +++ b/chia/wallet/vc_wallet/cr_cat_wallet.py @@ -6,13 +6,13 @@ from typing import TYPE_CHECKING, Any, Optional from chia_rs import G1Element, G2Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64, uint128 from typing_extensions import Unpack from chia.server.ws_connection import WSChiaConnection from chia.types.blockchain_format.coin import Coin, coin_as_list 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.byte_types import hexstr_to_bytes from chia.util.hash import std_hash diff --git a/chia/wallet/vc_wallet/cr_outer_puzzle.py b/chia/wallet/vc_wallet/cr_outer_puzzle.py index 3897c4dc006a..1d22df7ea348 100644 --- a/chia/wallet/vc_wallet/cr_outer_puzzle.py +++ b/chia/wallet/vc_wallet/cr_outer_puzzle.py @@ -3,12 +3,12 @@ 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 clvm_tools.binutils import disassemble 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.wallet.puzzle_drivers import PuzzleInfo, Solver from chia.wallet.uncurried_puzzle import UncurriedPuzzle, uncurry_puzzle from chia.wallet.vc_wallet.cr_cat_drivers import PROOF_FLAGS_CHECKER, construct_cr_layer, match_cr_layer, solve_cr_layer diff --git a/chia/wallet/vc_wallet/vc_drivers.py b/chia/wallet/vc_wallet/vc_drivers.py index 94b9550497e8..0ec815f00d0c 100644 --- a/chia/wallet/vc_wallet/vc_drivers.py +++ b/chia/wallet/vc_wallet/vc_drivers.py @@ -20,11 +20,11 @@ from chia_puzzles_py.programs import STANDARD_VC_REVOCATION_PUZZLE as STANDARD_VC_REVOCATION_PUZZLE_BYTES from chia_puzzles_py.programs import STD_PARENT_MORPHER as STD_PARENT_MORPHER_BYTES from chia_puzzles_py.programs import STD_PARENT_MORPHER_HASH as STD_PARENT_MORPHER_HASH_BYTES +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, compute_additions, make_spend from chia.util.hash import std_hash from chia.util.streamable import Streamable, streamable diff --git a/chia/wallet/vc_wallet/vc_store.py b/chia/wallet/vc_wallet/vc_store.py index 454cd599c7c0..135f7699353d 100644 --- a/chia/wallet/vc_wallet/vc_store.py +++ b/chia/wallet/vc_wallet/vc_store.py @@ -5,11 +5,11 @@ from typing import Optional, TypeVar from aiosqlite import Row +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.program import Program -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.db_wrapper import DBWrapper2 from chia.util.streamable import Streamable, streamable from chia.wallet.lineage_proof import LineageProof diff --git a/chia/wallet/vc_wallet/vc_wallet.py b/chia/wallet/vc_wallet/vc_wallet.py index dbe84c4b839f..2a379cafaace 100644 --- a/chia/wallet/vc_wallet/vc_wallet.py +++ b/chia/wallet/vc_wallet/vc_wallet.py @@ -6,6 +6,7 @@ from typing import TYPE_CHECKING, Optional, TypeVar, Union from chia_rs import G1Element, G2Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64, uint128 from clvm.casts import int_to_bytes from typing_extensions import Unpack @@ -15,7 +16,6 @@ from chia.types.blockchain_format.coin import Coin, coin_as_list 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, make_spend from chia.util.hash import std_hash from chia.util.streamable import Streamable diff --git a/chia/wallet/wallet.py b/chia/wallet/wallet.py index a13b4d6300ef..2642539543cb 100644 --- a/chia/wallet/wallet.py +++ b/chia/wallet/wallet.py @@ -5,13 +5,13 @@ from typing import TYPE_CHECKING, Any, ClassVar, Optional, cast from chia_rs import AugSchemeMPL, G1Element, G2Element, PrivateKey +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64, uint128 from typing_extensions import Unpack 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, make_spend from chia.types.signing_mode import CHIP_0002_SIGN_MESSAGE_PREFIX, SigningMode from chia.util.hash import std_hash diff --git a/chia/wallet/wallet_blockchain.py b/chia/wallet/wallet_blockchain.py index 979541d56cc3..cee16f27a0af 100644 --- a/chia/wallet/wallet_blockchain.py +++ b/chia/wallet/wallet_blockchain.py @@ -4,6 +4,7 @@ from typing import TYPE_CHECKING, ClassVar, Optional, cast from chia_rs import ConsensusConstants +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from chia.consensus.block_header_validation import validate_finished_header_block @@ -11,7 +12,6 @@ from chia.consensus.blockchain import AddBlockResult from chia.consensus.find_fork_point import find_fork_point_in_chain from chia.consensus.full_block_to_block_record import block_to_block_record -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.header_block import HeaderBlock from chia.types.validation_state import ValidationState from chia.types.weight_proof import WeightProof diff --git a/chia/wallet/wallet_coin_record.py b/chia/wallet/wallet_coin_record.py index 35c99c0ab8c9..9252e0849fe2 100644 --- a/chia/wallet/wallet_coin_record.py +++ b/chia/wallet/wallet_coin_record.py @@ -3,10 +3,10 @@ from dataclasses import dataclass, field from typing import Any, Optional, Union +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64 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.util.streamable import VersionedBlob from chia.wallet.puzzles.clawback.metadata import ClawbackMetadata, ClawbackVersion diff --git a/chia/wallet/wallet_coin_store.py b/chia/wallet/wallet_coin_store.py index c79039ffebd6..a2877269364c 100644 --- a/chia/wallet/wallet_coin_store.py +++ b/chia/wallet/wallet_coin_store.py @@ -5,10 +5,10 @@ from enum import IntEnum from typing import Optional +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32, uint64 from chia.types.blockchain_format.coin import Coin -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.db_wrapper import DBWrapper2, execute_fetchone from chia.util.hash import std_hash from chia.util.lru_cache import LRUCache diff --git a/chia/wallet/wallet_interested_store.py b/chia/wallet/wallet_interested_store.py index 1c78465a6c38..a10c07eb4486 100644 --- a/chia/wallet/wallet_interested_store.py +++ b/chia/wallet/wallet_interested_store.py @@ -2,10 +2,10 @@ from typing import Optional +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32 from chia.protocols.wallet_protocol import CoinState -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.db_wrapper import DBWrapper2 diff --git a/chia/wallet/wallet_nft_store.py b/chia/wallet/wallet_nft_store.py index fc379868b0dd..3ed29c0f2887 100644 --- a/chia/wallet/wallet_nft_store.py +++ b/chia/wallet/wallet_nft_store.py @@ -5,11 +5,11 @@ from sqlite3 import Row from typing import Optional, TypeVar, Union +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32 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.util.db_wrapper import DBWrapper2, execute_fetchone from chia.wallet.lineage_proof import LineageProof from chia.wallet.nft_wallet.nft_info import DEFAULT_STATUS, IN_TRANSACTION_STATUS, NFTCoinInfo diff --git a/chia/wallet/wallet_node.py b/chia/wallet/wallet_node.py index d7c0c0d91574..c2aa8e00eb55 100644 --- a/chia/wallet/wallet_node.py +++ b/chia/wallet/wallet_node.py @@ -15,6 +15,7 @@ import aiosqlite from chia_rs import AugSchemeMPL, ConsensusConstants, G1Element, G2Element, PrivateKey +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint16, uint32, uint64, uint128 from packaging.version import Version @@ -41,7 +42,6 @@ from chia.server.server import ChiaServer from chia.server.ws_connection import WSChiaConnection from chia.types.blockchain_format.coin import Coin -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.header_block import HeaderBlock from chia.types.mempool_inclusion_status import MempoolInclusionStatus from chia.types.weight_proof import WeightProof diff --git a/chia/wallet/wallet_protocol.py b/chia/wallet/wallet_protocol.py index 4c95c2141c18..5dfaf2dc6aa7 100644 --- a/chia/wallet/wallet_protocol.py +++ b/chia/wallet/wallet_protocol.py @@ -3,13 +3,13 @@ from typing import TYPE_CHECKING, Any, Optional, TypeVar 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 NotRequired, Protocol, TypedDict, Unpack 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.wallet.conditions import Condition from chia.wallet.nft_wallet.nft_info import NFTCoinInfo from chia.wallet.util.wallet_types import WalletType diff --git a/chia/wallet/wallet_puzzle_store.py b/chia/wallet/wallet_puzzle_store.py index 499d1de69390..371f6112bf66 100644 --- a/chia/wallet/wallet_puzzle_store.py +++ b/chia/wallet/wallet_puzzle_store.py @@ -5,9 +5,9 @@ from typing import Optional from chia_rs import G1Element +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32 -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.db_wrapper import DBWrapper2, execute_fetchone from chia.util.lru_cache import LRUCache from chia.wallet.derivation_record import DerivationRecord diff --git a/chia/wallet/wallet_retry_store.py b/chia/wallet/wallet_retry_store.py index 17829e2fdf67..3bdf864d5b9e 100644 --- a/chia/wallet/wallet_retry_store.py +++ b/chia/wallet/wallet_retry_store.py @@ -3,9 +3,9 @@ from typing import Optional from chia_rs import CoinState +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32 -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.util.db_wrapper import DBWrapper2 diff --git a/chia/wallet/wallet_singleton_store.py b/chia/wallet/wallet_singleton_store.py index 6d237f086c0c..9d764184ddb4 100644 --- a/chia/wallet/wallet_singleton_store.py +++ b/chia/wallet/wallet_singleton_store.py @@ -5,12 +5,12 @@ from sqlite3 import Row from typing import Optional, TypeVar, Union +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint32, uint64 from clvm.casts import int_from_bytes 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.types.coin_spend import CoinSpend from chia.types.condition_opcodes import ConditionOpcode from chia.util.condition_tools import conditions_dict_for_solution diff --git a/chia/wallet/wallet_state_manager.py b/chia/wallet/wallet_state_manager.py index 2506ba317ab9..2068cce03063 100644 --- a/chia/wallet/wallet_state_manager.py +++ b/chia/wallet/wallet_state_manager.py @@ -14,6 +14,7 @@ import aiosqlite from chia_rs import AugSchemeMPL, ConsensusConstants, G1Element, G2Element, PrivateKey +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint16, uint32, uint64, uint128 from chia.consensus.block_rewards import calculate_base_farmer_reward, calculate_pool_reward @@ -33,7 +34,6 @@ 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_record import CoinRecord from chia.types.coin_spend import CoinSpend, compute_additions from chia.types.mempool_inclusion_status import MempoolInclusionStatus diff --git a/chia/wallet/wallet_transaction_store.py b/chia/wallet/wallet_transaction_store.py index 81a085e8d9ed..040c42340c6a 100644 --- a/chia/wallet/wallet_transaction_store.py +++ b/chia/wallet/wallet_transaction_store.py @@ -6,9 +6,9 @@ from typing import Optional import aiosqlite +from chia_rs.sized_bytes import bytes32 from chia_rs.sized_ints import uint8, uint32 -from chia.types.blockchain_format.sized_bytes import bytes32 from chia.types.mempool_inclusion_status import MempoolInclusionStatus from chia.util.db_wrapper import DBWrapper2 from chia.util.errors import Err diff --git a/tools/analyze-chain.py b/tools/analyze-chain.py index e72cda55fd67..9c413a352726 100755 --- a/tools/analyze-chain.py +++ b/tools/analyze-chain.py @@ -20,11 +20,11 @@ SpendBundleConditions, run_block_generator, ) +from chia_rs.sized_bytes import bytes32 from chia.consensus.default_constants import DEFAULT_CONSTANTS from chia.types.block_protocol import BlockInfo 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.condition_tools import pkm_pairs from chia.util.full_block_utils import block_info_from_block, generator_from_block diff --git a/tools/manage_clvm.py b/tools/manage_clvm.py index 88acc5de9c1f..4ac6023c319a 100644 --- a/tools/manage_clvm.py +++ b/tools/manage_clvm.py @@ -12,8 +12,7 @@ import click import typing_extensions - -from chia.types.blockchain_format.sized_bytes import bytes32 +from chia_rs.sized_bytes import bytes32 here = pathlib.Path(__file__).parent.resolve() root = here.parent