Skip to content

Commit

Permalink
use chia_rs directly for consensus constants (#19301)
Browse files Browse the repository at this point in the history
  • Loading branch information
altendky authored Feb 21, 2025
1 parent f28b1a1 commit 30c4ef2
Show file tree
Hide file tree
Showing 64 changed files with 118 additions and 85 deletions.
3 changes: 1 addition & 2 deletions chia/_tests/blockchain/test_blockchain.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from typing import Optional

import pytest
from chia_rs import AugSchemeMPL, G2Element, MerkleSet
from chia_rs import AugSchemeMPL, ConsensusConstants, G2Element, MerkleSet
from clvm.casts import int_to_bytes

from chia._tests.blockchain.blockchain_test_utils import (
Expand All @@ -29,7 +29,6 @@
from chia.consensus.block_rewards import calculate_base_farmer_reward
from chia.consensus.blockchain import AddBlockResult, Blockchain
from chia.consensus.coinbase import create_farmer_coin
from chia.consensus.constants import ConsensusConstants
from chia.consensus.find_fork_point import lookup_fork_chain
from chia.consensus.full_block_to_block_record import block_to_block_record
from chia.consensus.get_block_generator import get_block_generator
Expand Down
3 changes: 2 additions & 1 deletion chia/_tests/clvm/coin_store.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
from dataclasses import dataclass, replace
from typing import Optional

from chia_rs import ConsensusConstants

from chia._tests.util.get_name_puzzle_conditions import get_name_puzzle_conditions
from chia.consensus.constants import ConsensusConstants
from chia.consensus.cost_calculator import NPCResult
from chia.full_node.bundle_tools import simple_solution_generator
from chia.full_node.mempool_check_conditions import mempool_check_time_locks
Expand Down
2 changes: 1 addition & 1 deletion chia/_tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

# TODO: update after resolution in https://github.com/pytest-dev/pytest/issues/7469
from _pytest.fixtures import SubRequest
from chia_rs import ConsensusConstants
from pytest import MonkeyPatch

from chia._tests import ether
Expand All @@ -47,7 +48,6 @@
)
from chia._tests.util.spend_sim import CostLogger
from chia._tests.util.time_out_assert import time_out_assert
from chia.consensus.constants import ConsensusConstants
from chia.full_node.full_node_api import FullNodeAPI
from chia.rpc.farmer_rpc_client import FarmerRpcClient
from chia.rpc.harvester_rpc_client import HarvesterRpcClient
Expand Down
3 changes: 2 additions & 1 deletion chia/_tests/core/full_node/ram_db.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
from collections.abc import AsyncIterator
from pathlib import Path

from chia_rs import ConsensusConstants

from chia.consensus.blockchain import Blockchain
from chia.consensus.constants import ConsensusConstants
from chia.full_node.block_store import BlockStore
from chia.full_node.coin_store import CoinStore
from chia.util.db_wrapper import DBWrapper2
Expand Down
2 changes: 1 addition & 1 deletion chia/_tests/core/full_node/stores/test_full_node_store.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
from typing import Optional

import pytest
from chia_rs import ConsensusConstants

from chia._tests.blockchain.blockchain_test_utils import _validate_and_add_block, _validate_and_add_block_no_error
from chia._tests.util.blockchain import create_blockchain
from chia._tests.util.blockchain_mock import BlockchainMock
from chia.consensus.block_body_validation import ForkInfo
from chia.consensus.blockchain import AddBlockResult, Blockchain
from chia.consensus.constants import ConsensusConstants
from chia.consensus.default_constants import DEFAULT_CONSTANTS
from chia.consensus.difficulty_adjustment import get_next_sub_slot_iters_and_difficulty
from chia.consensus.find_fork_point import find_fork_point_in_chain
Expand Down
10 changes: 8 additions & 2 deletions chia/_tests/core/mempool/test_mempool_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,20 @@
from typing import Any, Callable, ClassVar, Optional

import pytest
from chia_rs import ELIGIBLE_FOR_DEDUP, ELIGIBLE_FOR_FF, AugSchemeMPL, G2Element, get_conditions_from_spendbundle
from chia_rs import (
ELIGIBLE_FOR_DEDUP,
ELIGIBLE_FOR_FF,
AugSchemeMPL,
ConsensusConstants,
G2Element,
get_conditions_from_spendbundle,
)
from chiabip158 import PyBIP158

from chia._tests.conftest import ConsensusMode
from chia._tests.util.misc import invariant_check_mempool
from chia._tests.util.setup_nodes import OldSimulatorsAndWallets, setup_simulators_and_wallets
from chia.consensus.condition_costs import ConditionCost
from chia.consensus.constants import ConsensusConstants
from chia.consensus.default_constants import DEFAULT_CONSTANTS
from chia.full_node.mempool import MAX_SKIPPED_ITEMS, PRIORITY_TX_THRESHOLD
from chia.full_node.mempool_check_conditions import mempool_check_time_locks
Expand Down
3 changes: 1 addition & 2 deletions chia/_tests/fee_estimation/test_mempoolitem_height_added.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@
from typing import Callable, Optional

import pytest
from chia_rs import Coin, G2Element
from chia_rs import Coin, ConsensusConstants, G2Element

from chia._tests.util.spend_sim import SimClient, SpendSim, sim_and_client
from chia.consensus.constants import ConsensusConstants
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
Expand Down
3 changes: 1 addition & 2 deletions chia/_tests/pools/test_pool_rpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,11 @@

# TODO: update after resolution in https://github.com/pytest-dev/pytest/issues/7469
from _pytest.fixtures import SubRequest
from chia_rs import G1Element
from chia_rs import ConsensusConstants, G1Element

from chia._tests.environments.wallet import WalletStateTransition, WalletTestFramework
from chia._tests.util.setup_nodes import setup_simulators_and_wallets_service
from chia._tests.util.time_out_assert import time_out_assert
from chia.consensus.constants import ConsensusConstants
from chia.pools.pool_wallet_info import PoolSingletonState, PoolWalletInfo
from chia.rpc.wallet_rpc_client import WalletRpcClient
from chia.simulator.add_blocks_in_batches import add_blocks_in_batches
Expand Down
3 changes: 2 additions & 1 deletion chia/_tests/util/blockchain.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
from pathlib import Path
from typing import Optional

from chia_rs import ConsensusConstants

from chia.consensus.blockchain import Blockchain
from chia.consensus.constants import ConsensusConstants
from chia.full_node.block_store import BlockStore
from chia.full_node.coin_store import CoinStore
from chia.simulator.block_tools import BlockTools
Expand Down
3 changes: 2 additions & 1 deletion chia/_tests/util/generator_tools_testing.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
from __future__ import annotations

from chia_rs import ConsensusConstants

from chia._tests.util.get_name_puzzle_conditions import get_name_puzzle_conditions
from chia.consensus.constants import ConsensusConstants
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
Expand Down
2 changes: 1 addition & 1 deletion chia/_tests/util/get_name_puzzle_conditions.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
from chia_rs import (
DONT_VALIDATE_SIGNATURE,
MEMPOOL_MODE,
ConsensusConstants,
G2Element,
get_flags_for_height_and_constants,
run_block_generator,
run_block_generator2,
)

from chia.consensus.constants import ConsensusConstants
from chia.consensus.cost_calculator import NPCResult
from chia.types.generator_types import BlockGenerator
from chia.util.errors import Err
Expand Down
3 changes: 1 addition & 2 deletions chia/_tests/util/run_block.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
from typing import Any

from chia_puzzles_py.programs import CHIALISP_DESERIALISATION
from chia_rs import Coin
from chia_rs import Coin, ConsensusConstants

from chia.consensus.constants import ConsensusConstants
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
Expand Down
2 changes: 1 addition & 1 deletion chia/_tests/util/setup_nodes.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
from typing import Optional, Union

import anyio
from chia_rs import ConsensusConstants

from chia._tests.environments.full_node import FullNodeEnvironment
from chia._tests.environments.wallet import WalletEnvironment
from chia.consensus.constants import ConsensusConstants
from chia.daemon.server import WebSocketServer
from chia.farmer.farmer import Farmer
from chia.full_node.full_node_api import FullNodeAPI
Expand Down
9 changes: 7 additions & 2 deletions chia/_tests/util/spend_sim.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,16 @@
from typing import Any, Callable, Optional, TypeVar

import anyio
from chia_rs import DONT_VALIDATE_SIGNATURE, G2Element, get_flags_for_height_and_constants, run_block_generator2
from chia_rs import (
DONT_VALIDATE_SIGNATURE,
ConsensusConstants,
G2Element,
get_flags_for_height_and_constants,
run_block_generator2,
)

from chia.consensus.block_rewards import calculate_base_farmer_reward, calculate_pool_reward
from chia.consensus.coinbase import create_farmer_coin, create_pool_coin
from chia.consensus.constants import ConsensusConstants
from chia.consensus.default_constants import DEFAULT_CONSTANTS
from chia.full_node.bundle_tools import simple_solution_generator
from chia.full_node.coin_store import CoinStore
Expand Down
2 changes: 1 addition & 1 deletion chia/_tests/wallet/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import pytest
from chia_rs import (
DONT_VALIDATE_SIGNATURE,
ConsensusConstants,
SpendBundleConditions,
get_flags_for_height_and_constants,
run_block_generator,
Expand All @@ -19,7 +20,6 @@
from chia._tests.environments.wallet import NewPuzzleHashError, WalletEnvironment, WalletState, WalletTestFramework
from chia._tests.util.setup_nodes import setup_simulators_and_wallets_service
from chia._tests.wallet.wallet_block_tools import WalletBlockTools
from chia.consensus.constants import ConsensusConstants
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
Expand Down
3 changes: 1 addition & 2 deletions chia/_tests/wallet/sync/test_wallet_sync.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

import pytest
from aiosqlite import Error as AIOSqliteError
from chia_rs import G2Element, confirm_not_included_already_hashed
from chia_rs import ConsensusConstants, G2Element, confirm_not_included_already_hashed
from chiabip158 import PyBIP158
from colorlog import getLogger

Expand All @@ -24,7 +24,6 @@
from chia.consensus.block_body_validation import ForkInfo
from chia.consensus.block_record import BlockRecord
from chia.consensus.block_rewards import calculate_base_farmer_reward, calculate_pool_reward
from chia.consensus.constants import ConsensusConstants
from chia.consensus.difficulty_adjustment import get_next_sub_slot_iters_and_difficulty
from chia.full_node.full_node_api import FullNodeAPI
from chia.full_node.weight_proof import WeightProofHandler
Expand Down
3 changes: 1 addition & 2 deletions chia/_tests/wallet/wallet_block_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@
import time
from typing import Any, Optional

from chia_rs import G1Element, G2Element, compute_merkle_set_root
from chia_rs import ConsensusConstants, G1Element, G2Element, compute_merkle_set_root
from chiabip158 import PyBIP158

from chia.consensus.block_record import BlockRecord
from chia.consensus.block_rewards import calculate_base_farmer_reward, calculate_pool_reward
from chia.consensus.coinbase import create_farmer_coin, create_pool_coin
from chia.consensus.constants import ConsensusConstants
from chia.consensus.full_block_to_block_record import block_to_block_record
from chia.full_node.bundle_tools import simple_solution_generator
from chia.simulator.block_tools import BlockTools, compute_additions_unchecked
Expand Down
2 changes: 1 addition & 1 deletion chia/_tests/weight_proof/test_weight_proof.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
from typing import Optional

import pytest
from chia_rs import ConsensusConstants

from chia._tests.util.blockchain_mock import BlockchainMock
from chia.consensus.block_record import BlockRecord
from chia.consensus.constants import ConsensusConstants
from chia.consensus.default_constants import DEFAULT_CONSTANTS
from chia.consensus.full_block_to_block_record import block_to_block_record
from chia.consensus.pot_iterations import calculate_iterations_quality
Expand Down
3 changes: 1 addition & 2 deletions chia/consensus/block_body_validation.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,13 @@
from dataclasses import dataclass, field
from typing import Callable, Optional, Union

from chia_rs import SpendBundleConditions, compute_merkle_set_root
from chia_rs import ConsensusConstants, SpendBundleConditions, compute_merkle_set_root
from chiabip158 import PyBIP158

from chia.consensus.block_record import BlockRecord
from chia.consensus.block_rewards import calculate_base_farmer_reward, calculate_pool_reward
from chia.consensus.blockchain_interface import BlockRecordsProtocol
from chia.consensus.coinbase import create_farmer_coin, create_pool_coin
from chia.consensus.constants import ConsensusConstants
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
Expand Down
2 changes: 1 addition & 1 deletion chia/consensus/block_creation.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from chia_rs import (
DONT_VALIDATE_SIGNATURE,
MEMPOOL_MODE,
ConsensusConstants,
G1Element,
G2Element,
compute_merkle_set_root,
Expand All @@ -22,7 +23,6 @@
from chia.consensus.block_rewards import calculate_base_farmer_reward, calculate_pool_reward
from chia.consensus.blockchain_interface import BlockRecordsProtocol
from chia.consensus.coinbase import create_farmer_coin, create_pool_coin
from chia.consensus.constants import ConsensusConstants
from chia.full_node.signage_point import SignagePoint
from chia.types.blockchain_format.coin import Coin, hash_coin_ids
from chia.types.blockchain_format.foliage import Foliage, FoliageBlockData, FoliageTransactionBlock, TransactionsInfo
Expand Down
3 changes: 1 addition & 2 deletions chia/consensus/block_header_validation.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@
import time
from typing import Optional

from chia_rs import AugSchemeMPL
from chia_rs import AugSchemeMPL, ConsensusConstants

from chia.consensus.block_record import BlockRecord
from chia.consensus.blockchain_interface import BlockRecordsProtocol
from chia.consensus.constants import ConsensusConstants
from chia.consensus.deficit import calculate_deficit
from chia.consensus.difficulty_adjustment import can_finish_sub_and_full_epoch
from chia.consensus.get_block_challenge import final_eos_is_already_included, get_block_challenge
Expand Down
3 changes: 1 addition & 2 deletions chia/consensus/blockchain.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@
from pathlib import Path
from typing import TYPE_CHECKING, ClassVar, Optional, cast

from chia_rs import additions_and_removals, get_flags_for_height_and_constants
from chia_rs import ConsensusConstants, additions_and_removals, get_flags_for_height_and_constants

from chia.consensus.block_body_validation import ForkInfo, validate_block_body
from chia.consensus.block_header_validation import validate_unfinished_header_block
from chia.consensus.block_record import BlockRecord
from chia.consensus.constants import ConsensusConstants
from chia.consensus.cost_calculator import NPCResult
from chia.consensus.difficulty_adjustment import get_next_sub_slot_iters_and_difficulty
from chia.consensus.find_fork_point import lookup_fork_chain
Expand Down
2 changes: 1 addition & 1 deletion chia/consensus/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import logging
from typing import Any

from chia_rs import ConsensusConstants as ConsensusConstants # noqa: PLC0414
from chia_rs import ConsensusConstants

from chia.util.byte_types import hexstr_to_bytes
from chia.util.hash import std_hash
Expand Down
3 changes: 2 additions & 1 deletion chia/consensus/default_constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

from typing import Any

from chia.consensus.constants import ConsensusConstants
from chia_rs import ConsensusConstants

from chia.types.blockchain_format.sized_bytes import bytes32
from chia.util.hash import std_hash
from chia.util.ints import uint8, uint16, uint32, uint64, uint128
Expand Down
3 changes: 2 additions & 1 deletion chia/consensus/deficit.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

from typing import Optional

from chia_rs import ConsensusConstants

from chia.consensus.block_record import BlockRecord
from chia.consensus.constants import ConsensusConstants
from chia.util.ints import uint8, uint32


Expand Down
3 changes: 2 additions & 1 deletion chia/consensus/difficulty_adjustment.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

from typing import Optional

from chia_rs import ConsensusConstants

from chia.consensus.block_record import BlockRecord
from chia.consensus.blockchain_interface import BlockRecordsProtocol
from chia.consensus.constants import ConsensusConstants
from chia.types.blockchain_format.sized_bytes import bytes32
from chia.util.ints import uint8, uint32, uint64, uint128
from chia.util.significant_bits import count_significant_bits, truncate_to_significant_bits
Expand Down
3 changes: 2 additions & 1 deletion chia/consensus/find_fork_point.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

from typing import Union

from chia_rs import ConsensusConstants

from chia.consensus.block_record import BlockRecord
from chia.consensus.blockchain_interface import BlockRecordsProtocol
from chia.consensus.constants import ConsensusConstants
from chia.types.blockchain_format.sized_bytes import bytes32
from chia.types.header_block import HeaderBlock
from chia.util.ints import uint32
Expand Down
3 changes: 2 additions & 1 deletion chia/consensus/full_block_to_block_record.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

from typing import Optional, Union

from chia_rs import ConsensusConstants

from chia.consensus.block_record import BlockRecord
from chia.consensus.blockchain_interface import BlockRecordsProtocol
from chia.consensus.constants import ConsensusConstants
from chia.consensus.deficit import calculate_deficit
from chia.consensus.difficulty_adjustment import get_next_sub_slot_iters_and_difficulty
from chia.consensus.make_sub_epoch_summary import make_sub_epoch_summary
Expand Down
3 changes: 2 additions & 1 deletion chia/consensus/get_block_challenge.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
import logging
from typing import Union

from chia_rs import ConsensusConstants

from chia.consensus.block_record import BlockRecord
from chia.consensus.blockchain_interface import BlockRecordsProtocol
from chia.consensus.constants import ConsensusConstants
from chia.types.blockchain_format.sized_bytes import bytes32
from chia.types.full_block import FullBlock
from chia.types.header_block import HeaderBlock
Expand Down
Loading

0 comments on commit 30c4ef2

Please sign in to comment.