chia-blockchain 2.5.4rc1__py3-none-any.whl → 2.5.5__py3-none-any.whl

chia/data_layer/dl_wallet_store.py

@@ -1,11 +1,12 @@
 from __future__ import annotations
 
 import dataclasses
-from typing import Optional, TypeVar, Union
+from typing import Optional, Union
 
 from aiosqlite import Row
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint16, uint32, uint64
+from typing_extensions import Self
 
 from chia.data_layer.data_layer_wallet import Mirror
 from chia.data_layer.singleton_record import SingletonRecord
@@ -13,8 +14,6 @@ from chia.types.blockchain_format.coin import Coin
 from chia.util.db_wrapper import DBWrapper2, execute_fetchone
 from chia.wallet.lineage_proof import LineageProof
 
-_T_DataLayerStore = TypeVar("_T_DataLayerStore", bound="DataLayerStore")
-
 
 def _row_to_singleton_record(row: Row) -> SingletonRecord:
     return SingletonRecord(
@@ -38,7 +37,14 @@ def _row_to_mirror(row: Row, confirmed_at_height: Optional[uint32]) -> Mirror:
         url = byte_list[2 : length + 2]
         byte_list = byte_list[length + 2 :]
         urls.append(url)
-    return Mirror(bytes32(row[0]), bytes32(row[1]), uint64.from_bytes(row[2]), urls, bool(row[4]), confirmed_at_height)
+    return Mirror(
+        bytes32(row[0]),
+        bytes32(row[1]),
+        uint64.from_bytes(row[2]),
+        Mirror.decode_urls(urls),
+        bool(row[4]),
+        confirmed_at_height,
+    )
 
 
 class DataLayerStore:
@@ -49,7 +55,7 @@ class DataLayerStore:
     db_wrapper: DBWrapper2
 
     @classmethod
-    async def create(cls: type[_T_DataLayerStore], db_wrapper: DBWrapper2) -> _T_DataLayerStore:
+    async def create(cls, db_wrapper: DBWrapper2) -> Self:
         self = cls()
 
         self.db_wrapper = db_wrapper
@@ -315,7 +321,7 @@ class DataLayerStore:
                     mirror.launcher_id,
                     mirror.amount.stream_to_bytes(),
                     b"".join(
-                        [uint16(len(url)).stream_to_bytes() + url for url in mirror.urls]
+                        [uint16(len(url)).stream_to_bytes() + url for url in Mirror.encode_urls(mirror.urls)]
                     ),  # prefix each item with a length
                     1 if mirror.ours else 0,
                 ),

chia/data_layer/download_data.py

@@ -187,7 +187,7 @@ async def download_file(
     root_hash: bytes32,
     generation: int,
     server_info: ServerInfo,
-    proxy_url: str,
+    proxy_url: Optional[str],
     downloader: Optional[PluginRemote],
     timeout: aiohttp.ClientTimeout,
     client_foldername: Path,
@@ -242,7 +242,7 @@ async def insert_from_delta_file(
     client_foldername: Path,
     timeout: aiohttp.ClientTimeout,
     log: logging.Logger,
-    proxy_url: str,
+    proxy_url: Optional[str],
     downloader: Optional[PluginRemote],
     group_files_by_store: bool = False,
     maximum_full_file_count: int = 1,
@@ -357,7 +357,7 @@ def delete_full_file_if_exists(foldername: Path, store_id: bytes32, root: Root)
 async def http_download(
     target_filename_path: Path,
     filename: str,
-    proxy_url: str,
+    proxy_url: Optional[str],
     server_info: ServerInfo,
     timeout: aiohttp.ClientTimeout,
     log: logging.Logger,

chia/data_layer/s3_plugin_service.py

@@ -384,7 +384,6 @@ def read_store_ids_from_config(config: dict[str, Any]) -> list[StoreConfig]:
             else:
                 bad_store_id = "<missing>"
             log.info(f"Ignoring invalid store id: {bad_store_id}: {type(e).__name__} {e}")
-            pass
 
     return stores
 

chia/farmer/farmer.py

@@ -14,7 +14,7 @@ from pathlib import Path
 from typing import TYPE_CHECKING, Any, ClassVar, Optional, Union, cast
 
 import aiohttp
-from chia_rs import AugSchemeMPL, ConsensusConstants, G1Element, G2Element, PrivateKey
+from chia_rs import AugSchemeMPL, ConsensusConstants, G1Element, G2Element, PrivateKey, ProofOfSpace
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint8, uint16, uint32, uint64
 
@@ -23,6 +23,7 @@ from chia.plot_sync.delta import Delta
 from chia.plot_sync.receiver import Receiver
 from chia.pools.pool_config import PoolWalletConfig, load_pool_config, update_pool_url
 from chia.protocols import farmer_protocol, harvester_protocol
+from chia.protocols.outbound_message import NodeType, make_msg
 from chia.protocols.pool_protocol import (
     AuthenticationPayload,
     ErrorResponse,
@@ -36,11 +37,9 @@ from chia.protocols.pool_protocol import (
 )
 from chia.protocols.protocol_message_types import ProtocolMessageTypes
 from chia.rpc.rpc_server import StateChangedProtocol, default_get_connections
-from chia.server.outbound_message import NodeType, make_msg
 from chia.server.server import ChiaServer, 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.proof_of_space import ProofOfSpace
 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
@@ -227,7 +226,7 @@ class Farmer:
             else:
                 self.keychain_proxy = await connect_to_keychain_and_validate(self._root_path, self.log)
                 if not self.keychain_proxy:
-                    raise KeychainProxyConnectionFailure()
+                    raise KeychainProxyConnectionFailure
         return self.keychain_proxy
 
     async def get_all_private_keys(self) -> list[tuple[PrivateKey, bytes]]:

chia/farmer/farmer_api.py

@@ -25,6 +25,7 @@ from chia.protocols.harvester_protocol import (
     SignatureRequestSourceData,
     SigningDataKind,
 )
+from chia.protocols.outbound_message import Message, NodeType, make_msg
 from chia.protocols.pool_protocol import (
     PoolErrorCode,
     PostPartialPayload,
@@ -33,12 +34,10 @@ from chia.protocols.pool_protocol import (
 )
 from chia.protocols.protocol_message_types import ProtocolMessageTypes
 from chia.server.api_protocol import ApiMetadata
-from chia.server.outbound_message import Message, NodeType, make_msg
 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.proof_of_space import (
-    calculate_prefix_bits,
     generate_plot_public_key,
     generate_taproot_sk,
     get_plot_id,
@@ -110,11 +109,13 @@ class FarmerAPI:
             self.farmer.number_of_responses[new_proof_of_space.sp_hash] += 1
 
             required_iters: uint64 = calculate_iterations_quality(
-                self.farmer.constants.DIFFICULTY_CONSTANT_FACTOR,
+                self.farmer.constants,
                 computed_quality_string,
-                new_proof_of_space.proof.size,
+                new_proof_of_space.proof.size(),
                 sp.difficulty,
                 new_proof_of_space.sp_hash,
+                sp.sub_slot_iters,
+                sp.last_tx_height,
             )
 
             # If the iters are good enough to make a block, proceed with the block making flow
@@ -217,11 +218,13 @@ class FarmerAPI:
                     return
 
                 required_iters = calculate_iterations_quality(
-                    self.farmer.constants.DIFFICULTY_CONSTANT_FACTOR,
+                    self.farmer.constants,
                     computed_quality_string,
-                    new_proof_of_space.proof.size,
+                    new_proof_of_space.proof.size(),
                     pool_state_dict["current_difficulty"],
                     new_proof_of_space.sp_hash,
+                    sp.sub_slot_iters,
+                    sp.last_tx_height,
                 )
                 if required_iters >= calculate_sp_interval_iters(
                     self.farmer.constants, self.farmer.constants.POOL_SUB_SLOT_ITERS
@@ -532,7 +535,8 @@ class FarmerAPI:
                 new_signage_point.signage_point_index,
                 new_signage_point.challenge_chain_sp,
                 pool_difficulties,
-                uint8(calculate_prefix_bits(self.farmer.constants, new_signage_point.peak_height)),
+                new_signage_point.peak_height,
+                new_signage_point.last_tx_height,
             )
 
             msg = make_msg(ProtocolMessageTypes.new_signage_point_harvester, message)

chia/{rpc → farmer}/farmer_rpc_client.py

@@ -4,7 +4,7 @@ from typing import Any, Optional, cast
 
 from chia_rs.sized_bytes import bytes32
 
-from chia.rpc.farmer_rpc_api import PlotInfoRequestData, PlotPathRequestData
+from chia.farmer.farmer_rpc_api import PlotInfoRequestData, PlotPathRequestData
 from chia.rpc.rpc_client import RpcClient
 from chia.util.streamable import recurse_jsonify
 

chia/full_node/block_height_map.py

@@ -6,10 +6,10 @@ from pathlib import Path
 from typing import Optional
 
 import aiofiles
+from chia_rs import SubEpochSummary
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint32
 
-from chia.types.blockchain_format.sub_epoch_summary import SubEpochSummary
 from chia.util.db_wrapper import DBWrapper2
 from chia.util.files import write_file_async
 from chia.util.streamable import Streamable, streamable
@@ -56,7 +56,9 @@ class BlockHeightMap:
     __ses_filename: Path
 
     @classmethod
-    async def create(cls, blockchain_dir: Path, db: DBWrapper2) -> BlockHeightMap:
+    async def create(
+        cls, blockchain_dir: Path, db: DBWrapper2, selected_network: Optional[str] = None
+    ) -> BlockHeightMap:
         if db.db_version != 2:
             raise RuntimeError(f"BlockHeightMap does not support database schema v{db.db_version}")
         self = BlockHeightMap()
@@ -66,8 +68,9 @@ class BlockHeightMap:
         self.__first_dirty = 0
         self.__height_to_hash = bytearray()
         self.__sub_epoch_summaries = {}
-        self.__height_to_hash_filename = blockchain_dir / "height-to-hash"
-        self.__ses_filename = blockchain_dir / "sub-epoch-summaries"
+        suffix = "" if (selected_network is None or selected_network == "mainnet") else f"-{selected_network}"
+        self.__height_to_hash_filename = blockchain_dir / f"height-to-hash{suffix}"
+        self.__ses_filename = blockchain_dir / f"sub-epoch-summaries{suffix}"
 
         async with self.db.reader_no_transaction() as conn:
             async with conn.execute("SELECT hash FROM current_peak WHERE key = 0") as cursor:
@@ -91,7 +94,6 @@ class BlockHeightMap:
         except Exception as e:
             # it's OK if this file doesn't exist, we can rebuild it
             log.info(f"Failed to load height-to-hash: {e}")
-            pass
 
         try:
             async with aiofiles.open(self.__ses_filename, "rb") as f:
@@ -99,7 +101,6 @@ class BlockHeightMap:
         except Exception as e:
             # it's OK if this file doesn't exist, we can rebuild it
             log.info(f"Failed to load sub-epoch-summaries: {e}")
-            pass
 
         peak: bytes32 = row[0]
         prev_hash: bytes32 = row[1]

chia/full_node/block_store.py

@@ -7,15 +7,13 @@ from typing import Optional
 
 import typing_extensions
 import zstd
-from chia_rs import SubEpochChallengeSegment, SubEpochSegments
+from chia_rs import BlockRecord, FullBlock, 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.full_block import FullBlock
+from chia.full_node.full_block_utils import GeneratorBlockInfo, block_info_from_block, generator_from_block
 from chia.util.db_wrapper import DBWrapper2, execute_fetchone
 from chia.util.errors import Err
-from chia.util.full_block_utils import GeneratorBlockInfo, block_info_from_block, generator_from_block
 from chia.util.lru_cache import LRUCache
 
 log = logging.getLogger(__name__)
@@ -252,7 +250,7 @@ class BlockStore:
             row = await execute_fetchone(conn, formatted_str, (header_hash,))
             if row is None:
                 return None
-            block_bytes = zstd.decompress(row[0])
+            block_bytes = memoryview(zstd.decompress(row[0]))
 
             try:
                 return block_info_from_block(block_bytes)
@@ -276,7 +274,7 @@ class BlockStore:
             row = await execute_fetchone(conn, formatted_str, (header_hash,))
             if row is None:
                 return None
-            block_bytes = zstd.decompress(row[0])
+            block_bytes = memoryview(zstd.decompress(row[0]))
 
             try:
                 return generator_from_block(block_bytes)
@@ -299,7 +297,7 @@ class BlockStore:
         async with self.db_wrapper.reader_no_transaction() as conn:
             async with conn.execute(formatted_str, list(heights)) as cursor:
                 async for row in cursor:
-                    block_bytes = zstd.decompress(row[0])
+                    block_bytes = memoryview(zstd.decompress(row[0]))
 
                     try:
                         gen = generator_from_block(block_bytes)

chia/full_node/bundle_tools.py

@@ -1,10 +1,9 @@
 from __future__ import annotations
 
-from chia_rs import solution_generator, solution_generator_backrefs
+from chia_rs import SpendBundle, solution_generator, solution_generator_backrefs
 
 from chia.types.blockchain_format.serialized_program import SerializedProgram
 from chia.types.generator_types import BlockGenerator
-from chia.types.spend_bundle import SpendBundle
 
 
 def simple_solution_generator(bundle: SpendBundle) -> BlockGenerator: