chia-blockchain 2.5.7rc3__py3-none-any.whl → 2.5.8rc1__py3-none-any.whl

chia/pools/pool_wallet_info.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 from enum import IntEnum
-from typing import Any, Optional
 
 from chia_rs import G1Element
 from chia_rs.sized_bytes import bytes32
@@ -57,26 +56,56 @@ class PoolState(Streamable):
     target_puzzle_hash: bytes32  # TODO: rename target_puzzle_hash -> pay_to_address
     # owner_pubkey is set by the wallet, once
     owner_pubkey: G1Element
-    pool_url: Optional[str]
+    pool_url: str | None
     relative_lock_height: uint32
 
 
+@streamable
+@dataclass(frozen=True)
+class NewPoolWalletInitialTargetState(Streamable):
+    state: str  # must map to name of PoolSingletonState Enum
+    # only when state == "FARMING_TO_POOL"
+    target_puzzle_hash: bytes32 | None = None
+    pool_url: str | None = None
+    relative_lock_height: uint32 | None = None
+
+    def __post_init__(self) -> None:
+        if self.state not in {member.name for member in PoolSingletonState}:
+            raise ValueError(f"Invalid pool wallet initial state: {self.state}")
+        if PoolSingletonState[self.state] == PoolSingletonState.FARMING_TO_POOL:
+            if self.target_puzzle_hash is None:
+                raise ValueError("target_puzzle_hash must be set when state is FARMING_TO_POOL")
+            if self.pool_url is None:
+                raise ValueError("pool_url must be set when state is FARMING_TO_POOL")
+            if self.relative_lock_height is None:
+                raise ValueError("relative_lock_height must be set when state is FARMING_TO_POOL")
+        else:
+            if self.target_puzzle_hash is not None:
+                raise ValueError("target_puzzle_hash is only valid for FARMING_TO_POOL")
+            if self.pool_url is not None:
+                raise ValueError("pool_url is only valid for FARMING_TO_POOL")
+            if self.relative_lock_height is not None:
+                raise ValueError("relative_lock_height is only valid for FARMING_TO_POOL")
+
+        super().__post_init__()
+
+
 def initial_pool_state_from_dict(
-    state_dict: dict[str, Any],
+    initial_state: NewPoolWalletInitialTargetState,
     owner_pubkey: G1Element,
     owner_puzzle_hash: bytes32,
 ) -> PoolState:
-    state_str = state_dict["state"]
-    singleton_state: PoolSingletonState = PoolSingletonState[state_str]
+    singleton_state: PoolSingletonState = PoolSingletonState[initial_state.state]
 
     if singleton_state == SELF_POOLING:
         target_puzzle_hash = owner_puzzle_hash
         pool_url: str = ""
         relative_lock_height = uint32(0)
     elif singleton_state == FARMING_TO_POOL:
-        target_puzzle_hash = bytes32.from_hexstr(state_dict["target_puzzle_hash"])
-        pool_url = state_dict["pool_url"]
-        relative_lock_height = uint32(state_dict["relative_lock_height"])
+        # mypy doesn't know about our __post_init__
+        target_puzzle_hash = initial_state.target_puzzle_hash  # type: ignore[assignment]
+        pool_url = initial_state.pool_url  # type: ignore[assignment]
+        relative_lock_height = initial_state.relative_lock_height  # type: ignore[assignment]
     else:
         raise ValueError("Initial state must be SELF_POOLING or FARMING_TO_POOL")
 
@@ -89,7 +118,7 @@ def create_pool_state(
     state: PoolSingletonState,
     target_puzzle_hash: bytes32,
     owner_pubkey: G1Element,
-    pool_url: Optional[str],
+    pool_url: str | None,
     relative_lock_height: uint32,
 ) -> PoolState:
     if state not in {s.value for s in PoolSingletonState}:
@@ -110,7 +139,7 @@ class PoolWalletInfo(Streamable):
     """
 
     current: PoolState
-    target: Optional[PoolState]
+    target: PoolState | None
     launcher_coin: Coin
     launcher_id: bytes32
     p2_singleton_puzzle_hash: bytes32

chia/protocols/farmer_protocol.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Optional
 
 from chia_rs import (
     ChallengeChainSubSlot,
@@ -42,8 +41,8 @@ class SPVDFSourceData(Streamable):
 @streamable
 @dataclass(frozen=True)
 class SignagePointSourceData(Streamable):
-    sub_slot_data: Optional[SPSubSlotSourceData] = None
-    vdf_data: Optional[SPVDFSourceData] = None
+    sub_slot_data: SPSubSlotSourceData | None = None
+    vdf_data: SPVDFSourceData | None = None
 
 
 @streamable
@@ -57,7 +56,7 @@ class NewSignagePoint(Streamable):
     signage_point_index: uint8
     peak_height: uint32
     last_tx_height: uint32
-    sp_source_data: Optional[SignagePointSourceData] = None
+    sp_source_data: SignagePointSourceData | None = None
 
 
 @streamable
@@ -71,8 +70,8 @@ class DeclareProofOfSpace(Streamable):
     challenge_chain_sp_signature: G2Element
     reward_chain_sp_signature: G2Element
     farmer_puzzle_hash: bytes32
-    pool_target: Optional[PoolTarget]
-    pool_signature: Optional[G2Element]
+    pool_target: PoolTarget | None
+    pool_signature: G2Element | None
     include_signature_source_data: bool = False
 
 
@@ -82,9 +81,9 @@ class RequestSignedValues(Streamable):
     quality_string: bytes32
     foliage_block_data_hash: bytes32
     foliage_transaction_block_hash: bytes32
-    foliage_block_data: Optional[FoliageBlockData] = None
-    foliage_transaction_block_data: Optional[FoliageTransactionBlock] = None
-    rc_block_unfinished: Optional[RewardChainBlockUnfinished] = None
+    foliage_block_data: FoliageBlockData | None = None
+    foliage_transaction_block_data: FoliageTransactionBlock | None = None
+    rc_block_unfinished: RewardChainBlockUnfinished | None = None
 
 
 @streamable

chia/protocols/fee_estimate.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import math
 from dataclasses import dataclass
-from typing import Optional
 
 from chia_rs.sized_ints import uint64
 
@@ -23,14 +22,14 @@ class FeeEstimate(Streamable):
     estimated_fee_rate: expressed in mojo per 1 clvm_cost. `estimated_fee` can be zero.
     """
 
-    error: Optional[str]
+    error: str | None
     time_target: uint64  # unix time stamp in seconds
     estimated_fee_rate: FeeRate  # Mojos per clvm cost
 
 
 @dataclass(frozen=True)
 class FeeEstimateV2:
-    error: Optional[str]
+    error: str | None
     time_target: uint64  # unix time stamp in seconds
     estimated_fee_rate: FeeRateV2  # Mojos per clvm cost
 
@@ -51,5 +50,5 @@ class FeeEstimateGroup(Streamable):
     Estimates are expressed in mojos / 1 clvm_cost.
     """
 
-    error: Optional[str]
+    error: str | None
     estimates: list[FeeEstimate]

chia/protocols/full_node_protocol.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Optional
 
 from chia_rs import EndOfSubSlotBundle, FullBlock, SpendBundle, UnfinishedBlock
 from chia_rs.sized_bytes import bytes32
@@ -120,14 +119,14 @@ class RequestUnfinishedBlock(Streamable):
 @dataclass(frozen=True)
 class NewUnfinishedBlock2(Streamable):
     unfinished_reward_hash: bytes32
-    foliage_hash: Optional[bytes32]
+    foliage_hash: bytes32 | None
 
 
 @streamable
 @dataclass(frozen=True)
 class RequestUnfinishedBlock2(Streamable):
     unfinished_reward_hash: bytes32
-    foliage_hash: Optional[bytes32]
+    foliage_hash: bytes32 | None
 
 
 @streamable
@@ -139,7 +138,7 @@ class RespondUnfinishedBlock(Streamable):
 @streamable
 @dataclass(frozen=True)
 class NewSignagePointOrEndOfSubSlot(Streamable):
-    prev_challenge_hash: Optional[bytes32]
+    prev_challenge_hash: bytes32 | None
     challenge_hash: bytes32
     index_from_challenge: uint8
     last_rc_infusion: bytes32

chia/protocols/harvester_protocol.py

@@ -2,9 +2,8 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 from enum import IntEnum
-from typing import Optional
 
-from chia_rs import G1Element, G2Element, ProofOfSpace, RewardChainBlockUnfinished
+from chia_rs import G1Element, G2Element, PartialProof, PlotParam, ProofOfSpace, RewardChainBlockUnfinished
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import int16, uint8, uint32, uint64
 
@@ -73,8 +72,8 @@ class NewProofOfSpace(Streamable):
     proof: ProofOfSpace
     signage_point_index: uint8
     include_source_signature_data: bool
-    farmer_reward_address_override: Optional[bytes32]
-    fee_info: Optional[ProofOfSpaceFeeInfo]
+    farmer_reward_address_override: bytes32 | None
+    fee_info: ProofOfSpaceFeeInfo | None
 
 
 @streamable
@@ -83,11 +82,13 @@ class PartialProofsData(Streamable):
     challenge_hash: bytes32
     sp_hash: bytes32
     plot_identifier: str
-    partial_proofs: list[bytes]  # 16 * k bits blobs instead of 32-byte quality strings
+    partial_proofs: list[PartialProof]  # 16 * k bits blobs instead of 32-byte quality strings
     signage_point_index: uint8
     plot_size: uint8
-    pool_public_key: Optional[G1Element]
-    pool_contract_puzzle_hash: Optional[bytes32]
+    strength: uint8
+    plot_id: bytes32
+    pool_public_key: G1Element | None
+    pool_contract_puzzle_hash: bytes32 | None
     plot_public_key: G1Element
 
 
@@ -119,8 +120,8 @@ class RequestSignatures(Streamable):
     sp_hash: bytes32
     messages: list[bytes32]
     # This, and rc_block_unfinished are only set when using a third-party harvester (see CHIP-22)
-    message_data: Optional[list[Optional[SignatureRequestSourceData]]]
-    rc_block_unfinished: Optional[RewardChainBlockUnfinished]
+    message_data: list[SignatureRequestSourceData | None] | None
+    rc_block_unfinished: RewardChainBlockUnfinished | None
 
 
 @streamable
@@ -133,21 +134,32 @@ class RespondSignatures(Streamable):
     farmer_pk: G1Element
     message_signatures: list[tuple[bytes32, G2Element]]
     include_source_signature_data: bool
-    farmer_reward_address_override: Optional[bytes32]
+    farmer_reward_address_override: bytes32 | None
 
 
 @streamable
 @dataclass(frozen=True)
 class Plot(Streamable):
     filename: str
+    # for backwards compatibility with previous harvester (e.g. DrPlotter)
+    # this field is either k-size (for v1 plots) or strength (for v2 plots).
+    # the most significant bit is set for v2 plots
+    # TODO: after the phase-out, v1 harvester won't be relevant anymore and we
+    # can clean this up with a new protocol version
     size: uint8
     plot_id: bytes32
-    pool_public_key: Optional[G1Element]
-    pool_contract_puzzle_hash: Optional[bytes32]
+    pool_public_key: G1Element | None
+    pool_contract_puzzle_hash: bytes32 | None
     plot_public_key: G1Element
     file_size: uint64
     time_modified: uint64
-    compression_level: Optional[uint8]
+    compression_level: uint8 | None
+
+    def param(self) -> PlotParam:
+        if (self.size & 0x80) != 0:
+            return PlotParam.make_v2(self.size & 0x7F)
+        else:
+            return PlotParam.make_v1(self.size)
 
 
 @streamable
@@ -226,7 +238,7 @@ class PlotSyncDone(Streamable):
 class PlotSyncError(Streamable):
     code: int16
     message: str
-    expected_identifier: Optional[PlotSyncIdentifier]
+    expected_identifier: PlotSyncIdentifier | None
 
     def __str__(self) -> str:
         return f"PlotSyncError: code {self.code}, count {self.message}, expected_identifier {self.expected_identifier}"
@@ -237,7 +249,7 @@ class PlotSyncError(Streamable):
 class PlotSyncResponse(Streamable):
     identifier: PlotSyncIdentifier
     message_type: int16
-    error: Optional[PlotSyncError]
+    error: PlotSyncError | None
 
     def __str__(self) -> str:
         return f"PlotSyncResponse: identifier {self.identifier}, message_type {self.message_type}, error {self.error}"

chia/protocols/outbound_message.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 from enum import IntEnum
-from typing import Optional, SupportsBytes, Union
+from typing import SupportsBytes
 
 from chia_rs.sized_ints import uint8, uint16
 
@@ -26,10 +26,10 @@ class NodeType(IntEnum):
 class Message(Streamable):
     type: uint8  # one of ProtocolMessageTypes
     # message id
-    id: Optional[uint16]
+    id: uint16 | None
     # Message data for that type
     data: bytes
 
 
-def make_msg(msg_type: ProtocolMessageTypes, data: Union[bytes, SupportsBytes]) -> Message:
+def make_msg(msg_type: ProtocolMessageTypes, data: bytes | SupportsBytes) -> Message:
     return Message(uint8(msg_type.value), None, bytes(data))

chia/protocols/pool_protocol.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 import time
 from dataclasses import dataclass
 from enum import Enum
-from typing import Optional
 
 from chia_rs import G1Element, G2Element, ProofOfSpace
 from chia_rs.sized_bytes import bytes32
@@ -109,7 +108,7 @@ class PostFarmerPayload(Streamable):
     authentication_token: uint64
     authentication_public_key: G1Element
     payout_instructions: str
-    suggested_difficulty: Optional[uint64]
+    suggested_difficulty: uint64 | None
 
 
 @streamable
@@ -134,9 +133,9 @@ class PostFarmerResponse(Streamable):
 class PutFarmerPayload(Streamable):
     launcher_id: bytes32
     authentication_token: uint64
-    authentication_public_key: Optional[G1Element]
-    payout_instructions: Optional[str]
-    suggested_difficulty: Optional[uint64]
+    authentication_public_key: G1Element | None
+    payout_instructions: str | None
+    suggested_difficulty: uint64 | None
 
 
 @streamable
@@ -150,9 +149,9 @@ class PutFarmerRequest(Streamable):
 @streamable
 @dataclass(frozen=True)
 class PutFarmerResponse(Streamable):
-    authentication_public_key: Optional[bool]
-    payout_instructions: Optional[bool]
-    suggested_difficulty: Optional[bool]
+    authentication_public_key: bool | None
+    payout_instructions: bool | None
+    suggested_difficulty: bool | None
 
 
 # Misc
@@ -163,7 +162,7 @@ class PutFarmerResponse(Streamable):
 @dataclass(frozen=True)
 class ErrorResponse(Streamable):
     error_code: uint16
-    error_message: Optional[str]
+    error_message: str | None
 
 
 # Get the current authentication token according to "Farmer authentication" in SPECIFICATION.md

chia/protocols/shared_protocol.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 from enum import IntEnum
-from typing import Optional
 
 from chia_rs.sized_ints import int16, uint8, uint16
 
@@ -86,4 +85,4 @@ class Handshake(Streamable):
 class Error(Streamable):
     code: int16  # Err
     message: str
-    data: Optional[bytes] = None
+    data: bytes | None = None

chia/protocols/solver_protocol.py

@@ -2,17 +2,24 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 
+from chia_rs import PartialProof
+from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8
+
 from chia.util.streamable import Streamable, streamable
 
 
 @streamable
 @dataclass(frozen=True)
 class SolverInfo(Streamable):
-    partial_proof: bytes  # 16 * k bits blob, k (plot size) can be derived from this
+    partial_proof: PartialProof
+    plot_id: bytes32
+    strength: uint8
+    size: uint8  # k-size
 
 
 @streamable
 @dataclass(frozen=True)
 class SolverResponse(Streamable):
-    partial_proof: bytes
+    partial_proof: PartialProof
     proof: bytes

chia/protocols/timelord_protocol.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Optional
 
 from chia_rs import EndOfSubSlotBundle, Foliage, RewardChainBlock, RewardChainBlockUnfinished, SubEpochSummary
 from chia_rs.sized_bytes import bytes32
@@ -23,9 +22,7 @@ class NewPeakTimelord(Streamable):
     difficulty: uint64
     deficit: uint8
     sub_slot_iters: uint64  # SSi in the slot where NewPeak has been infused
-    sub_epoch_summary: Optional[
-        SubEpochSummary
-    ]  # If NewPeak is the last slot in epoch, the next slot should include this
+    sub_epoch_summary: SubEpochSummary | None  # If NewPeak is the last slot in epoch, the next slot should include this
     previous_reward_challenges: list[tuple[bytes32, uint128]]
     last_challenge_sb_or_eos_total_iters: uint128
     passes_ses_height_but_not_yet_included: bool
@@ -38,7 +35,7 @@ class NewUnfinishedBlockTimelord(Streamable):
     difficulty: uint64
     sub_slot_iters: uint64  # SSi in the slot where block is infused
     foliage: Foliage  # Reward chain foliage data
-    sub_epoch_summary: Optional[SubEpochSummary]  # If this is the last slot in epoch, the next slot should include this
+    sub_epoch_summary: SubEpochSummary | None  # If this is the last slot in epoch, the next slot should include this
     # This is the last thing infused in the reward chain before this signage point.
     # The challenge that the SP reward chain VDF is based off of, or in the case of sp index 0, the previous infusion
     rc_prev: bytes32
@@ -52,8 +49,8 @@ class NewInfusionPointVDF(Streamable):
     challenge_chain_ip_proof: VDFProof
     reward_chain_ip_vdf: VDFInfo
     reward_chain_ip_proof: VDFProof
-    infused_challenge_chain_ip_vdf: Optional[VDFInfo]
-    infused_challenge_chain_ip_proof: Optional[VDFProof]
+    infused_challenge_chain_ip_vdf: VDFInfo | None
+    infused_challenge_chain_ip_proof: VDFProof | None
 
 
 @streamable

chia/protocols/wallet_protocol.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 from enum import IntEnum
-from typing import Optional
 
 import chia_rs
 from chia_rs import HeaderBlock, SpendBundle
@@ -65,7 +64,7 @@ class SendTransaction(Streamable):
 class TransactionAck(Streamable):
     txid: bytes32
     status: uint8  # MempoolInclusionStatus
-    error: Optional[str]
+    error: str | None
 
 
 @streamable
@@ -100,7 +99,7 @@ class RejectHeaderRequest(Streamable):
 class RequestRemovals(Streamable):
     height: uint32
     header_hash: bytes32
-    coin_names: Optional[list[bytes32]]
+    coin_names: list[bytes32] | None
 
 
 @streamable
@@ -108,8 +107,8 @@ class RequestRemovals(Streamable):
 class RespondRemovals(Streamable):
     height: uint32
     header_hash: bytes32
-    coins: list[tuple[bytes32, Optional[Coin]]]
-    proofs: Optional[list[tuple[bytes32, bytes]]]
+    coins: list[tuple[bytes32, Coin | None]]
+    proofs: list[tuple[bytes32, bytes]] | None
 
 
 @streamable
@@ -123,8 +122,8 @@ class RejectRemovalsRequest(Streamable):
 @dataclass(frozen=True)
 class RequestAdditions(Streamable):
     height: uint32
-    header_hash: Optional[bytes32]
-    puzzle_hashes: Optional[list[bytes32]]
+    header_hash: bytes32 | None
+    puzzle_hashes: list[bytes32] | None
 
 
 @streamable
@@ -133,7 +132,7 @@ class RespondAdditions(Streamable):
     height: uint32
     header_hash: bytes32
     coins: list[tuple[bytes32, list[Coin]]]
-    proofs: Optional[list[tuple[bytes32, bytes, Optional[bytes]]]]
+    proofs: list[tuple[bytes32, bytes, bytes | None]] | None
 
 
 @streamable
@@ -282,7 +281,7 @@ class RespondFeeEstimates(Streamable):
 @streamable
 @dataclass(frozen=True)
 class RequestRemovePuzzleSubscriptions(Streamable):
-    puzzle_hashes: Optional[list[bytes32]]
+    puzzle_hashes: list[bytes32] | None
 
 
 @streamable
@@ -294,7 +293,7 @@ class RespondRemovePuzzleSubscriptions(Streamable):
 @streamable
 @dataclass(frozen=True)
 class RequestRemoveCoinSubscriptions(Streamable):
-    coin_ids: Optional[list[bytes32]]
+    coin_ids: list[bytes32] | None
 
 
 @streamable
@@ -316,7 +315,7 @@ class CoinStateFilters(Streamable):
 @dataclass(frozen=True)
 class RequestPuzzleState(Streamable):
     puzzle_hashes: list[bytes32]
-    previous_height: Optional[uint32]
+    previous_height: uint32 | None
     header_hash: bytes32
     filters: CoinStateFilters
     subscribe_when_finished: bool
@@ -342,7 +341,7 @@ class RejectPuzzleState(Streamable):
 @dataclass(frozen=True)
 class RequestCoinState(Streamable):
     coin_ids: list[bytes32]
-    previous_height: Optional[uint32]
+    previous_height: uint32 | None
     header_hash: bytes32
     subscribe: bool
 

chia/rpc/rpc_client.py

@@ -7,7 +7,7 @@ from contextlib import asynccontextmanager
 from dataclasses import dataclass
 from pathlib import Path
 from ssl import SSLContext
-from typing import Any, Optional
+from typing import Any
 
 import aiohttp
 from chia_rs.sized_bytes import bytes32
@@ -42,23 +42,23 @@ class RpcClient:
 
     url: str
     session: aiohttp.ClientSession
-    ssl_context: Optional[SSLContext]
+    ssl_context: SSLContext | None
     hostname: str
     port: uint16
-    closing_task: Optional[asyncio.Task] = None
+    closing_task: asyncio.Task | None = None
 
     @classmethod
     async def create(
         cls,
         self_hostname: str,
         port: uint16,
-        root_path: Optional[Path],
-        net_config: Optional[dict[str, Any]],
+        root_path: Path | None,
+        net_config: dict[str, Any] | None,
     ) -> Self:
         if (root_path is not None) != (net_config is not None):
             raise ValueError("Either both or neither of root_path and net_config must be provided")
 
-        ssl_context: Optional[SSLContext]
+        ssl_context: SSLContext | None
         if root_path is None:
             scheme = "http"
             ssl_context = None
@@ -91,8 +91,8 @@ class RpcClient:
         cls,
         self_hostname: str,
         port: uint16,
-        root_path: Optional[Path] = None,
-        net_config: Optional[dict[str, Any]] = None,
+        root_path: Path | None = None,
+        net_config: dict[str, Any] | None = None,
     ) -> AsyncIterator[Self]:
         self = await cls.create(
             self_hostname=self_hostname,
@@ -116,7 +116,7 @@ class RpcClient:
                 raise ResponseFailureError(res_json)
             return res_json
 
-    async def get_connections(self, node_type: Optional[NodeType] = None) -> list[dict]:
+    async def get_connections(self, node_type: NodeType | None = None) -> list[dict]:
         request = {}
         if node_type is not None:
             request["node_type"] = node_type.value