Skip to content

Commit

Permalink
use chia_rs directly for pool target
Browse files Browse the repository at this point in the history
  • Loading branch information
altendky committed Feb 28, 2025
1 parent d50b6e0 commit adb17a3
Show file tree
Hide file tree
Showing 12 changed files with 28 additions and 21 deletions.
3 changes: 1 addition & 2 deletions benchmarks/block_store.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from pathlib import Path
from time import monotonic

from chia_rs import Foliage, FoliageBlockData, FoliageTransactionBlock, TransactionsInfo
from chia_rs import Foliage, FoliageBlockData, FoliageTransactionBlock, PoolTarget, TransactionsInfo
from chia_rs.sized_bytes import bytes32
from chia_rs.sized_ints import uint8, uint32, uint64, uint128

Expand All @@ -25,7 +25,6 @@
)
from chia.consensus.block_record import BlockRecord
from chia.full_node.block_store import BlockStore
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
from chia.types.blockchain_format.serialized_program import SerializedProgram
Expand Down
2 changes: 1 addition & 1 deletion chia/_tests/util/benchmarks.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
FoliageTransactionBlock,
G1Element,
G2Element,
PoolTarget,
TransactionsInfo,
VDFInfo,
VDFProof,
Expand All @@ -21,7 +22,6 @@

from chia.consensus.coinbase import create_farmer_coin, create_pool_coin
from chia.consensus.default_constants import DEFAULT_CONSTANTS
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
from chia.types.blockchain_format.serialized_program import SerializedProgram
Expand Down
2 changes: 1 addition & 1 deletion chia/_tests/util/network_protocol_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
FoliageTransactionBlock,
G1Element,
G2Element,
PoolTarget,
RewardChainBlockUnfinished,
SubEpochChallengeSegment,
SubEpochData,
Expand All @@ -27,7 +28,6 @@
from chia.protocols.shared_protocol import Error
from chia.types.blockchain_format.classgroup import ClassgroupElement
from chia.types.blockchain_format.coin import Coin
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
from chia.types.blockchain_format.serialized_program import SerializedProgram
Expand Down
11 changes: 9 additions & 2 deletions chia/_tests/util/test_full_block_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,19 @@
from typing import Optional

import pytest
from chia_rs import Foliage, FoliageBlockData, FoliageTransactionBlock, G1Element, G2Element, TransactionsInfo
from chia_rs import (
Foliage,
FoliageBlockData,
FoliageTransactionBlock,
G1Element,
G2Element,
PoolTarget,
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
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
from chia.types.blockchain_format.serialized_program import SerializedProgram
Expand Down
2 changes: 1 addition & 1 deletion chia/_tests/wallet/wallet_block_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
FoliageTransactionBlock,
G1Element,
G2Element,
PoolTarget,
TransactionsInfo,
compute_merkle_set_root,
)
Expand All @@ -25,7 +26,6 @@
from chia.simulator.block_tools import BlockTools, compute_additions_unchecked
from chia.types.blockchain_format.classgroup import ClassgroupElement
from chia.types.blockchain_format.coin import Coin, hash_coin_ids
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.vdf import VDFInfo, VDFProof
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 @@ -15,6 +15,7 @@
FoliageTransactionBlock,
G1Element,
G2Element,
PoolTarget,
TransactionsInfo,
compute_merkle_set_root,
get_flags_for_height_and_constants,
Expand All @@ -31,7 +32,6 @@
from chia.consensus.coinbase import create_farmer_coin, create_pool_coin
from chia.full_node.signage_point import SignagePoint
from chia.types.blockchain_format.coin import Coin, hash_coin_ids
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.vdf import VDFInfo, VDFProof
Expand Down
3 changes: 1 addition & 2 deletions chia/farmer/farmer_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from typing import TYPE_CHECKING, Any, ClassVar, Optional, Union, cast

import aiohttp
from chia_rs import AugSchemeMPL, G2Element, PrivateKey
from chia_rs import AugSchemeMPL, G2Element, PoolTarget, PrivateKey
from chia_rs.sized_bytes import bytes32
from chia_rs.sized_ints import uint8, uint16, uint32, uint64

Expand Down Expand Up @@ -37,7 +37,6 @@
from chia.server.server import ssl_context_for_root
from chia.server.ws_connection import WSChiaConnection
from chia.ssl.create_ssl import get_mozilla_ca_crt
from chia.types.blockchain_format.pool_target import PoolTarget
from chia.types.blockchain_format.proof_of_space import (
calculate_prefix_bits,
generate_plot_public_key,
Expand Down
2 changes: 1 addition & 1 deletion chia/full_node/full_node.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
AugSchemeMPL,
BLSCache,
ConsensusConstants,
PoolTarget,
get_flags_for_height_and_constants,
run_block_generator,
run_block_generator2,
Expand Down Expand Up @@ -63,7 +64,6 @@
from chia.server.server import ChiaServer
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.sub_epoch_summary import SubEpochSummary
from chia.types.blockchain_format.vdf import CompressibleVDFField, VDFInfo, VDFProof, validate_vdf
from chia.types.coin_record import CoinRecord
Expand Down
2 changes: 1 addition & 1 deletion chia/full_node/full_node_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
G1Element,
G2Element,
MerkleSet,
PoolTarget,
additions_and_removals,
get_flags_for_height_and_constants,
)
Expand Down Expand Up @@ -55,7 +56,6 @@
from chia.server.ws_connection import WSChiaConnection
from chia.types.block_protocol import BlockInfo
from chia.types.blockchain_format.coin import Coin, hash_coin_ids
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.sub_epoch_summary import SubEpochSummary
Expand Down
3 changes: 1 addition & 2 deletions chia/protocols/farmer_protocol.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@
from dataclasses import dataclass
from typing import Optional

from chia_rs import FoliageBlockData, FoliageTransactionBlock, G2Element
from chia_rs import FoliageBlockData, FoliageTransactionBlock, G2Element, PoolTarget
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.slots import ChallengeChainSubSlot, RewardChainSubSlot
Expand Down
12 changes: 10 additions & 2 deletions chia/simulator/block_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,16 @@

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 import (
MEMPOOL_MODE,
AugSchemeMPL,
ConsensusConstants,
G1Element,
G2Element,
PoolTarget,
PrivateKey,
solution_generator,
)
from chia_rs.sized_bytes import bytes32
from chia_rs.sized_ints import uint8, uint16, uint32, uint64, uint128

Expand Down Expand Up @@ -66,7 +75,6 @@
from chia.ssl.create_ssl import create_all_ssl
from chia.types.blockchain_format.classgroup import ClassgroupElement
from chia.types.blockchain_format.coin import Coin
from chia.types.blockchain_format.pool_target import PoolTarget
from chia.types.blockchain_format.program import INFINITE_COST, Program
from chia.types.blockchain_format.proof_of_space import (
ProofOfSpace,
Expand Down
5 changes: 0 additions & 5 deletions chia/types/blockchain_format/pool_target.py

This file was deleted.

0 comments on commit adb17a3

Please sign in to comment.