chia-blockchain 2.5.0rc2__py3-none-any.whl → 2.5.1rc2__py3-none-any.whl

chia/util/default_root.py

@@ -1,10 +1,27 @@
+# Package: utils
+
 from __future__ import annotations
 
 import os
 from pathlib import Path
+from typing import Optional
 
 DEFAULT_ROOT_PATH = Path(os.path.expanduser(os.getenv("CHIA_ROOT", "~/.chia/mainnet"))).resolve()
 
 DEFAULT_KEYS_ROOT_PATH = Path(os.path.expanduser(os.getenv("CHIA_KEYS_ROOT", "~/.chia_keys"))).resolve()
 
 SIMULATOR_ROOT_PATH = Path(os.path.expanduser(os.getenv("CHIA_SIMULATOR_ROOT", "~/.chia/simulator"))).resolve()
+
+
+def resolve_root_path(*, override: Optional[Path]) -> Path:
+    candidates = [
+        override,
+        os.environ.get("CHIA_ROOT"),
+        "~/.chia/mainnet",
+    ]
+
+    for candidate in candidates:
+        if candidate is not None:
+            return Path(candidate).expanduser().resolve()
+
+    raise RuntimeError("unreachable: last candidate is hardcoded to be found")

chia/util/dump_keyring.py

@@ -5,17 +5,17 @@ from __future__ import annotations
 import os
 from io import TextIOWrapper
 from pathlib import Path
-from typing import Any, Dict, Optional, cast
+from typing import Any, Optional, cast
 
 import click
 import colorama
 import yaml
 from cryptography.exceptions import InvalidTag
 
-from chia.cmds.passphrase_funcs import prompt_for_passphrase, read_passphrase_from_file
+from chia.cmds.passphrase_funcs import read_passphrase_from_file
 from chia.util.default_root import DEFAULT_KEYS_ROOT_PATH
 from chia.util.file_keyring import FileKeyringContent
-from chia.util.keyring_wrapper import DEFAULT_PASSPHRASE_IF_NO_MASTER_PASSPHRASE, KeyringWrapper
+from chia.util.keyring_wrapper import DEFAULT_PASSPHRASE_IF_NO_MASTER_PASSPHRASE, KeyringWrapper, prompt_for_passphrase
 
 DEFAULT_KEYRING_YAML = DEFAULT_KEYS_ROOT_PATH / "keyring.yaml"
 
@@ -36,7 +36,7 @@ def get_passphrase_prompt(keyring_file: str) -> str:
             + ")"
             + colorama.Style.RESET_ALL
             + " Passphrase: "
-        ),  # noqa: E501
+        ),
     )
     return prompt
 
@@ -66,7 +66,7 @@ def dump(keyring_file: str, full_payload: bool, passphrase_file: Optional[TextIO
         try:
             data_dict = file_content.get_decrypted_data_dict(passphrase)
             if full_payload:
-                dump_content: Dict[str, Any] = file_content_dict
+                dump_content: dict[str, Any] = file_content_dict
                 dump_content["data"] = data_dict
             else:
                 dump_content = data_dict
@@ -86,7 +86,7 @@ def dump(keyring_file: str, full_payload: bool, passphrase_file: Optional[TextIO
 
 def main() -> None:
     colorama.init()
-    dump()  # pylint: disable=no-value-for-parameter
+    dump()
 
 
 if __name__ == "__main__":

chia/util/errors.py

@@ -1,8 +1,10 @@
+# Package: utils
+
 from __future__ import annotations
 
 from enum import Enum
 from pathlib import Path
-from typing import Any, List, Optional
+from typing import Any, Optional
 
 from click import ClickException
 
@@ -208,14 +210,14 @@ class TimestampError(Exception):
 
 
 class ConsensusError(Exception):
-    def __init__(self, code: Err, errors: List[Any] = []):
+    def __init__(self, code: Err, errors: list[Any] = []):
         super().__init__(f"Error code: {code.name} {errors}")
         self.code = code
         self.errors = errors
 
 
 class ProtocolError(Exception):
-    def __init__(self, code: Err, errors: List[Any] = []):
+    def __init__(self, code: Err, errors: list[Any] = []):
         super().__init__(f"Error code: {code.name} {errors}")
         self.code = code
         self.errors = errors

chia/util/file_keyring.py

@@ -1,16 +1,18 @@
+# Package: utils
+
 from __future__ import annotations
 
 import base64
 import contextlib
 import os
 import shutil
-import sys
 import threading
+from collections.abc import Iterator
 from dataclasses import asdict, dataclass, field
 from hashlib import pbkdf2_hmac
 from pathlib import Path
 from secrets import token_bytes
-from typing import Any, Dict, Iterator, Optional, Union, cast
+from typing import Any, Optional, Union, cast
 
 import yaml
 from cryptography.hazmat.primitives.ciphers.aead import ChaCha20Poly1305  # pyright: reportMissingModuleSource=false
@@ -52,18 +54,6 @@ def symmetric_key_from_passphrase(passphrase: str, salt: bytes) -> bytes:
     return pbkdf2_hmac("sha256", passphrase.encode(), salt, HASH_ITERS)
 
 
-def get_symmetric_key(salt: bytes) -> bytes:
-    from chia.cmds.passphrase_funcs import obtain_current_passphrase
-
-    try:
-        passphrase = obtain_current_passphrase(use_passphrase_cache=True)
-    except Exception as e:
-        print(f"Unable to unlock the keyring: {e}")
-        sys.exit(1)
-
-    return symmetric_key_from_passphrase(passphrase, salt)
-
-
 def encrypt_data(input_data: bytes, key: bytes, nonce: bytes) -> bytes:
     encryptor = ChaCha20Poly1305(key)
     data = encryptor.encrypt(nonce, CHECKBYTES_VALUE + input_data, None)
@@ -144,7 +134,7 @@ class FileKeyringContent:
         except PermissionError:
             shutil.move(str(temp_path), str(path))
 
-    def get_decrypted_data_dict(self, passphrase: str) -> Dict[str, Any]:
+    def get_decrypted_data_dict(self, passphrase: str) -> dict[str, Any]:
         if self.empty():
             return {}
         key = symmetric_key_from_passphrase(passphrase, self.salt)
@@ -165,7 +155,7 @@ class FileKeyringContent:
     def empty(self) -> bool:
         return self.data is None or len(self.data) == 0
 
-    def to_dict(self) -> Dict[str, Any]:
+    def to_dict(self) -> dict[str, Any]:
         result = asdict(self)
         result["salt"] = result["salt"].hex()
         result["nonce"] = result["nonce"].hex()
@@ -175,30 +165,30 @@ class FileKeyringContent:
 @dataclass(frozen=True)
 class Key:
     secret: bytes
-    metadata: Optional[Dict[str, Any]] = None
+    metadata: Optional[dict[str, Any]] = None
 
     @classmethod
-    def parse(cls, data: str, metadata: Optional[Dict[str, Any]]) -> Key:
+    def parse(cls, data: str, metadata: Optional[dict[str, Any]]) -> Key:
         return cls(
             bytes.fromhex(data),
             metadata,
         )
 
-    def to_data(self) -> Union[str, Dict[str, Any]]:
+    def to_data(self) -> Union[str, dict[str, Any]]:
         return self.secret.hex()
 
 
-Users = Dict[str, Key]
-Services = Dict[str, Users]
+Users = dict[str, Key]
+Services = dict[str, Users]
 
 
 @dataclass
 class DecryptedKeyringData:
     services: Services
-    labels: Dict[int, str]  # {fingerprint: label}
+    labels: dict[int, str]  # {fingerprint: label}
 
     @classmethod
-    def from_dict(cls, data_dict: Dict[str, Any]) -> DecryptedKeyringData:
+    def from_dict(cls, data_dict: dict[str, Any]) -> DecryptedKeyringData:
         return cls(
             {
                 service: {
@@ -210,7 +200,7 @@ class DecryptedKeyringData:
             data_dict.get("labels", {}),
         )
 
-    def to_dict(self) -> Dict[str, Any]:
+    def to_dict(self) -> dict[str, Any]:
         return {
             "keys": {
                 service: {user: key.to_data() for user, key in users.items()}
@@ -243,7 +233,7 @@ class FileKeyring(FileSystemEventHandler):
     cached_data_dict: DecryptedKeyringData = field(default_factory=default_file_keyring_data)
     keyring_last_mod_time: Optional[float] = None
     # Key/value pairs to set on the outer payload on the next write
-    file_content_properties_for_next_write: Dict[str, Any] = field(default_factory=dict)
+    file_content_properties_for_next_write: dict[str, Any] = field(default_factory=dict)
 
     @classmethod
     def create(cls, keys_root_path: Path = DEFAULT_KEYS_ROOT_PATH) -> FileKeyring:
@@ -282,16 +272,16 @@ class FileKeyring(FileSystemEventHandler):
     def setup_keyring_file_watcher(self) -> None:
         # recursive=True necessary for macOS support
         if not self.keyring_observer.is_alive():
-            self.keyring_observer.schedule(  # type: ignore[no-untyped-call]
+            self.keyring_observer.schedule(
                 self,
-                self.keyring_path.parent,
+                str(self.keyring_path.parent),
                 recursive=True,
             )
-            self.keyring_observer.start()  # type: ignore[no-untyped-call]
+            self.keyring_observer.start()
 
     def cleanup_keyring_file_watcher(self) -> None:
         if self.keyring_observer.is_alive():
-            self.keyring_observer.stop()  # type: ignore[no-untyped-call]
+            self.keyring_observer.stop()
             self.keyring_observer.join()
 
     def on_modified(self, event: Union[FileSystemEvent, DirModifiedEvent]) -> None:
@@ -320,7 +310,7 @@ class FileKeyring(FileSystemEventHandler):
         """
         return self.cached_data_dict.services
 
-    def cached_labels(self) -> Dict[int, str]:
+    def cached_labels(self) -> dict[int, str]:
         """
         Returns keyring.data.labels
         """
@@ -416,7 +406,7 @@ class FileKeyring(FileSystemEventHandler):
             return False
 
     def load_keyring(self, passphrase: Optional[str] = None) -> None:
-        from chia.cmds.passphrase_funcs import obtain_current_passphrase
+        from chia.util.keyring_wrapper import obtain_current_passphrase
 
         with self.load_keyring_lock:
             self.needs_load_keyring = False
@@ -435,8 +425,7 @@ class FileKeyring(FileSystemEventHandler):
         )
 
     def write_keyring(self, fresh_salt: bool = False) -> None:
-        from chia.cmds.passphrase_funcs import obtain_current_passphrase
-        from chia.util.keyring_wrapper import KeyringWrapper
+        from chia.util.keyring_wrapper import KeyringWrapper, obtain_current_passphrase
 
         # Merge in other properties like "passphrase_hint"
         if "passphrase_hint" in self.file_content_properties_for_next_write:

chia/util/files.py

@@ -1,3 +1,5 @@
+# Package: utils
+
 from __future__ import annotations
 
 import asyncio

chia/util/full_block_utils.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Callable, List, Optional, Tuple
+from typing import Callable, Optional
 
 from chia_rs import G1Element, G2Element, serialized_length
 from chiabip158 import PyBIP158
@@ -56,7 +56,7 @@ def skip_uint8(buf: memoryview) -> memoryview:
 
 
 def skip_bool(buf: memoryview) -> memoryview:
-    assert buf[0] in [0, 1]
+    assert buf[0] in {0, 1}
     return buf[1:]
 
 
@@ -167,7 +167,7 @@ def skip_foliage(buf: memoryview) -> memoryview:
     return skip_optional(buf, skip_g2_element)  # foliage_transaction_block_signature
 
 
-def prev_hash_from_foliage(buf: memoryview) -> Tuple[memoryview, bytes32]:
+def prev_hash_from_foliage(buf: memoryview) -> tuple[memoryview, bytes32]:
     prev_hash = buf[:32]  # prev_block_hash
     buf = skip_bytes32(buf)  # prev_block_hash
     buf = skip_bytes32(buf)  # reward_block_hash
@@ -230,7 +230,7 @@ def generator_from_block(buf: memoryview) -> Optional[bytes]:
 class GeneratorBlockInfo:
     prev_header_hash: bytes32
     transactions_generator: Optional[SerializedProgram]
-    transactions_generator_ref_list: List[uint32]
+    transactions_generator_ref_list: list[uint32]
 
 
 def block_info_from_block(buf: memoryview) -> GeneratorBlockInfo:
@@ -267,7 +267,7 @@ def block_info_from_block(buf: memoryview) -> GeneratorBlockInfo:
 
 
 def header_block_from_block(
-    buf: memoryview, request_filter: bool = True, tx_addition_coins: List[Coin] = [], removal_names: List[bytes32] = []
+    buf: memoryview, request_filter: bool = True, tx_addition_coins: list[Coin] = [], removal_names: list[bytes32] = []
 ) -> bytes:
     buf2 = buf[:]
     buf2 = skip_list(buf2, skip_end_of_sub_slot_bundle)  # finished_sub_slots
@@ -297,8 +297,8 @@ def header_block_from_block(
             transactions_info_optional = bytes([0])
         else:
             transactions_info_optional = bytes([1])
-            transactions_info, advance = TransactionsInfo.parse_rust(buf2[1:])
-        byte_array_tx: List[bytearray] = []
+            transactions_info, _advance = TransactionsInfo.parse_rust(buf2[1:])
+        byte_array_tx: list[bytearray] = []
         if is_transaction_block and transactions_info:
             addition_coins = tx_addition_coins + list(transactions_info.reward_claims_incorporated)
             for coin in addition_coins:
@@ -319,3 +319,27 @@ def header_block_from_block(
         header_block += bytes(transactions_info)
 
     return header_block
+
+
+def get_height_and_tx_status_from_block(buf: memoryview) -> tuple[uint32, bool]:
+    """
+    Returns the height of the block and whether it's a transaction block or not.
+    We're considering the block as a transaction block if transactions_info is not None.
+    """
+    reward_chain_block_buf = skip_list(buf, skip_end_of_sub_slot_bundle)  # finished_sub_slots
+    # Get the block height from reward_chain_block_buf
+    height_buf = skip_uint128(reward_chain_block_buf)  # weight
+    height = uint32.from_bytes(height_buf[:4])
+    # Let's continue down to transactions_info
+    buf = skip_reward_chain_block(reward_chain_block_buf)  # reward_chain_block
+    buf = skip_optional(buf, skip_vdf_proof)  # challenge_chain_sp_proof
+    buf = skip_vdf_proof(buf)  # challenge_chain_ip_proof
+    buf = skip_optional(buf, skip_vdf_proof)  # reward_chain_sp_proof
+    buf = skip_vdf_proof(buf)  # reward_chain_ip_proof
+    buf = skip_optional(buf, skip_vdf_proof)  # infused_challenge_chain_ip_proof
+    buf = skip_foliage(buf)  # foliage
+    buf = skip_optional(buf, skip_foliage_transaction_block)  # foliage_transaction_block
+    # We're at the transactions_info optional.
+    # If it's not None, consider this a transaction block.
+    is_tx_block = buf[0] != 0
+    return height, is_tx_block

chia/util/generator_tools.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
-from typing import Collection, List, Optional, Tuple
+from collections.abc import Collection
+from typing import Optional
 
 from chiabip158 import PyBIP158
 
@@ -13,11 +14,20 @@ from chia.util.ints import uint64
 
 
 def get_block_header(
-    block: FullBlock, tx_addition_coins: Collection[Coin], removals_names: Collection[bytes32]
+    block: FullBlock, removals_and_additions: Optional[tuple[Collection[bytes32], Collection[Coin]]] = None
 ) -> HeaderBlock:
-    # Create filter
-    byte_array_tx: List[bytearray] = []
-    if block.is_transaction_block():
+    """
+    Returns a HeaderBlock from a FullBlock.
+    If `removals_and_additions` is not None, account for them, as well as
+    reward coins, in the creation of the transactions filter, otherwise create
+    an empty one.
+    """
+    # Guard against passing removals and additions for a non-transaction block.
+    assert removals_and_additions is None or block.is_transaction_block()
+    # Create an empty filter to begin with
+    byte_array_tx: list[bytearray] = []
+    if removals_and_additions is not None and block.is_transaction_block():
+        removals_names, tx_addition_coins = removals_and_additions
         for coin in tx_addition_coins:
             byte_array_tx.append(bytearray(coin.puzzle_hash))
         for coin in block.get_included_reward_coins():
@@ -43,13 +53,13 @@ def get_block_header(
     )
 
 
-def tx_removals_and_additions(results: Optional[SpendBundleConditions]) -> Tuple[List[bytes32], List[Coin]]:
+def tx_removals_and_additions(results: Optional[SpendBundleConditions]) -> tuple[list[bytes32], list[Coin]]:
     """
     Doesn't return farmer and pool reward.
     """
 
-    removals: List[bytes32] = []
-    additions: List[Coin] = []
+    removals: list[bytes32] = []
+    additions: list[Coin] = []
 
     # build removals list
     if results is None:

chia/util/hash.py

@@ -1,9 +1,11 @@
+# Package: utils
+
 from __future__ import annotations
 
 from hashlib import sha256
 from typing import Literal, SupportsBytes, Union, cast, overload
 
-from chia.types.blockchain_format.sized_bytes import bytes32
+from chia_rs.sized_bytes import bytes32
 
 
 @overload

chia/util/initial-config.yaml

@@ -86,6 +86,7 @@ daemon_ssl:
 # Controls logging of all servers (harvester, farmer, etc..). Each one can be overridden.
 logging: &logging
   log_stdout: False # If True, outputs to stdout instead of a file
+  log_backcompat: False
   log_filename: "log/debug.log"
   log_level: "WARNING" # Can be CRITICAL, ERROR, WARNING, INFO, DEBUG, NOTSET
   log_maxfilesrotation: 7 #  Max files in rotation. Default value 7 if the key is not set
@@ -109,6 +110,9 @@ seeder:
   # Peers used for the initial run.
   bootstrap_peers:
     - "node.chia.net"
+  # Peers to respond with regardless of what the crawler finds
+  # Can be IPs or Hostnames. Hostnames will be resolved to IPs
+  static_peers: []
   # Only consider nodes synced at least to this height.
   minimum_height: 240000
   # How many of a particular version we need to see before reporting it in the logs
@@ -160,6 +164,7 @@ harvester:
   # Plots are searched for in the following directories
   plot_directories: []
   recursive_plot_scan: False # If True the harvester scans plots recursively in the provided directories.
+  recursive_follow_links: False # If True the harvester follows symlinks when scanning for plots recursively
 
   ssl:
     private_crt: "config/ssl/harvester/private_harvester.crt"
@@ -356,6 +361,10 @@ full_node:
   # profiled.
   single_threaded: False
 
+  # when enabled, logs coins additions, removals and reorgs at INFO level.
+  # Requires the log level to be INFO or DEBUG as well.
+  log_coins: False
+
   # How often to initiate outbound connections to other full nodes.
   peer_connect_interval: 30
   # How long to wait for a peer connection
@@ -401,6 +410,10 @@ full_node:
 
   enable_memory_profiler: False
 
+  # this is a debug/auditing facility that saves all spend bundles added to the
+  # mempool, organized by peak height at the time
+  log_mempool: false
+
   # this is a debug and profiling facility that logs all SQLite commands to a
   # separate log file (under logging/sql.log).
   log_sqlite_cmds: False
@@ -427,6 +440,7 @@ full_node:
     - "seeder.dexie.space"
     - "chia.hoffmang.com"
     - "seeder.xchpool.org"
+    - "seeder.xchseeder.com"
   introducer_peer:
     host: introducer.chia.net # Chia AWS introducer IPv4/IPv6
     port: 8444
@@ -480,6 +494,8 @@ introducer:
     public_key: "config/ssl/full_node/public_full_node.key"
 
 wallet:
+  # If True, starts an RPC server at the following port
+  start_rpc_server: True
   rpc_port: 9256
 
   # when enabled, the wallet will print a pstats profile to the
@@ -564,6 +580,9 @@ wallet:
   # the user accepts the risk/responsibility of verifying the authenticity and origin of unknown CATs
   automatically_add_unknown_cats: False
 
+  # if an unknown DID is sent to us, a wallet will be automatically created
+  did_auto_add_limit: 10
+
   # Interval to resend unconfirmed transactions, even if previously accepted into Mempool
   tx_resend_timeout_secs: 1800
 

chia/util/inline_executor.py

@@ -1,3 +1,5 @@
+# Package: utils
+
 from __future__ import annotations
 
 from concurrent.futures import Executor, Future

chia/util/ip_address.py

@@ -0,0 +1,39 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from ipaddress import IPv4Address, IPv6Address, ip_address
+from typing import Union
+
+
+@dataclass(frozen=True)
+class IPAddress:
+    _inner: Union[IPv4Address, IPv6Address]
+
+    @classmethod
+    def create(cls, ip: str) -> IPAddress:
+        return cls(ip_address(ip))
+
+    def __int__(self) -> int:
+        return int(self._inner)
+
+    def __str__(self) -> str:
+        return str(self._inner)
+
+    def __repr__(self) -> str:
+        return repr(self._inner)
+
+    @property
+    def packed(self) -> bytes:
+        return self._inner.packed
+
+    @property
+    def is_private(self) -> bool:
+        return self._inner.is_private
+
+    @property
+    def is_v4(self) -> bool:
+        return self._inner.version == 4
+
+    @property
+    def is_v6(self) -> bool:
+        return self._inner.version == 6

chia/util/json_util.py

@@ -5,8 +5,6 @@ from typing import Any
 
 from aiohttp import web
 
-from chia.wallet.util.wallet_types import WalletType
-
 
 class EnhancedJSONEncoder(json.JSONEncoder):
     """
@@ -16,8 +14,6 @@ class EnhancedJSONEncoder(json.JSONEncoder):
     def default(self, o: Any) -> Any:
         if hasattr(type(o), "to_json_dict"):
             return o.to_json_dict()
-        elif isinstance(o, WalletType):
-            return o.name
         elif hasattr(type(o), "__bytes__"):
             return f"0x{bytes(o).hex()}"
         elif isinstance(o, bytes):