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

chia/simulator/ssl_certs.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import itertools
 from dataclasses import dataclass, field
-from typing import Dict, Generic, List, Tuple, TypeVar
+from typing import Generic, TypeVar
 
 from chia.simulator.ssl_certs_1 import SSL_TEST_NODE_CERTS_AND_KEYS_1, SSL_TEST_PRIVATE_CA_CERT_AND_KEY_1
 from chia.simulator.ssl_certs_2 import SSL_TEST_NODE_CERTS_AND_KEYS_2, SSL_TEST_PRIVATE_CA_CERT_AND_KEY_2
@@ -39,12 +39,12 @@ class SSLTestCollateralTracker:
 
 @dataclass
 class SSLTestCACertAndPrivateKey(SSLTestCollateralTracker):
-    cert_and_key: Tuple[bytes, bytes]
+    cert_and_key: tuple[bytes, bytes]
 
 
 @dataclass
 class SSLTestNodeCertsAndKeys(SSLTestCollateralTracker):
-    certs_and_keys: Dict[str, Dict[str, Dict[str, bytes]]]
+    certs_and_keys: dict[str, dict[str, dict[str, bytes]]]
 
 
 @dataclass
@@ -64,7 +64,7 @@ class SSLTestCollateralWrapper(Generic[_T_SSLTestCollateral]):
 # Private CA certs/keys
 # ---------------------------------------------------------------------------
 
-SSL_TEST_PRIVATE_CA_CERTS_AND_KEYS: List[SSLTestCACertAndPrivateKey] = [
+SSL_TEST_PRIVATE_CA_CERTS_AND_KEYS: list[SSLTestCACertAndPrivateKey] = [
     SSLTestCACertAndPrivateKey(SSL_TEST_PRIVATE_CA_CERT_AND_KEY_1),
     SSLTestCACertAndPrivateKey(SSL_TEST_PRIVATE_CA_CERT_AND_KEY_2),
     SSLTestCACertAndPrivateKey(SSL_TEST_PRIVATE_CA_CERT_AND_KEY_3),
@@ -81,7 +81,7 @@ SSL_TEST_PRIVATE_CA_CERTS_AND_KEYS: List[SSLTestCACertAndPrivateKey] = [
 # Node -> cert/key mappings
 # ---------------------------------------------------------------------------
 
-SSL_TEST_NODE_CERTS_AND_KEYS: List[SSLTestNodeCertsAndKeys] = [
+SSL_TEST_NODE_CERTS_AND_KEYS: list[SSLTestNodeCertsAndKeys] = [
     SSLTestNodeCertsAndKeys(SSL_TEST_NODE_CERTS_AND_KEYS_1),
     SSLTestNodeCertsAndKeys(SSL_TEST_NODE_CERTS_AND_KEYS_2),
     SSLTestNodeCertsAndKeys(SSL_TEST_NODE_CERTS_AND_KEYS_3),

chia/simulator/ssl_certs_1.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Dict, Tuple
-
 SSL_TEST_PRIVATE_CA_CRT = b"""-----BEGIN CERTIFICATE-----
 MIIDKTCCAhGgAwIBAgIUZnoqyaLGQMl08azdwpafGGfEGR0wDQYJKoZIhvcNAQEL
 BQAwRDENMAsGA1UECgwEQ2hpYTEQMA4GA1UEAwwHQ2hpYSBDQTEhMB8GA1UECwwY
@@ -665,9 +663,9 @@ NR6RKo206k2HeqrAQC0L0A==
 -----END PRIVATE KEY-----
 """
 
-SSL_TEST_PRIVATE_CA_CERT_AND_KEY_1: Tuple[bytes, bytes] = (SSL_TEST_PRIVATE_CA_CRT, SSL_TEST_PRIVATE_CA_KEY)
+SSL_TEST_PRIVATE_CA_CERT_AND_KEY_1: tuple[bytes, bytes] = (SSL_TEST_PRIVATE_CA_CRT, SSL_TEST_PRIVATE_CA_KEY)
 
-SSL_TEST_NODE_CERTS_AND_KEYS_1: Dict[str, Dict[str, Dict[str, bytes]]] = {
+SSL_TEST_NODE_CERTS_AND_KEYS_1: dict[str, dict[str, dict[str, bytes]]] = {
     "full_node": {
         "private": {"crt": SSL_TEST_FULLNODE_PRIVATE_CRT, "key": SSL_TEST_FULLNODE_PRIVATE_KEY},
         "public": {"crt": SSL_TEST_FULLNODE_PUBLIC_CRT, "key": SSL_TEST_FULLNODE_PUBLIC_KEY},

chia/simulator/ssl_certs_10.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Dict, Tuple
-
 SSL_TEST_PRIVATE_CA_CRT = b"""-----BEGIN CERTIFICATE-----
 MIIDKTCCAhGgAwIBAgIUWzGLmUq3RgS/u2oYomRSyKsXWwcwDQYJKoZIhvcNAQEL
 BQAwRDENMAsGA1UECgwEQ2hpYTEQMA4GA1UEAwwHQ2hpYSBDQTEhMB8GA1UECwwY
@@ -665,9 +663,9 @@ EMu0jkyvnFmDWG65WRzbD5c=
 -----END PRIVATE KEY-----
 """
 
-SSL_TEST_PRIVATE_CA_CERT_AND_KEY_10: Tuple[bytes, bytes] = (SSL_TEST_PRIVATE_CA_CRT, SSL_TEST_PRIVATE_CA_KEY)
+SSL_TEST_PRIVATE_CA_CERT_AND_KEY_10: tuple[bytes, bytes] = (SSL_TEST_PRIVATE_CA_CRT, SSL_TEST_PRIVATE_CA_KEY)
 
-SSL_TEST_NODE_CERTS_AND_KEYS_10: Dict[str, Dict[str, Dict[str, bytes]]] = {
+SSL_TEST_NODE_CERTS_AND_KEYS_10: dict[str, dict[str, dict[str, bytes]]] = {
     "full_node": {
         "private": {"crt": SSL_TEST_FULLNODE_PRIVATE_CRT, "key": SSL_TEST_FULLNODE_PRIVATE_KEY},
         "public": {"crt": SSL_TEST_FULLNODE_PUBLIC_CRT, "key": SSL_TEST_FULLNODE_PUBLIC_KEY},

chia/simulator/ssl_certs_2.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Dict, Tuple
-
 SSL_TEST_PRIVATE_CA_CRT = b"""-----BEGIN CERTIFICATE-----
 MIIDKTCCAhGgAwIBAgIUbFhRlgpIM3M+ZYuTigQ1Vbmi6P4wDQYJKoZIhvcNAQEL
 BQAwRDENMAsGA1UECgwEQ2hpYTEQMA4GA1UEAwwHQ2hpYSBDQTEhMB8GA1UECwwY
@@ -665,9 +663,9 @@ y5AZoW69GqwC41YzBDIO0w==
 -----END PRIVATE KEY-----
 """
 
-SSL_TEST_PRIVATE_CA_CERT_AND_KEY_2: Tuple[bytes, bytes] = (SSL_TEST_PRIVATE_CA_CRT, SSL_TEST_PRIVATE_CA_KEY)
+SSL_TEST_PRIVATE_CA_CERT_AND_KEY_2: tuple[bytes, bytes] = (SSL_TEST_PRIVATE_CA_CRT, SSL_TEST_PRIVATE_CA_KEY)
 
-SSL_TEST_NODE_CERTS_AND_KEYS_2: Dict[str, Dict[str, Dict[str, bytes]]] = {
+SSL_TEST_NODE_CERTS_AND_KEYS_2: dict[str, dict[str, dict[str, bytes]]] = {
     "full_node": {
         "private": {"crt": SSL_TEST_FULLNODE_PRIVATE_CRT, "key": SSL_TEST_FULLNODE_PRIVATE_KEY},
         "public": {"crt": SSL_TEST_FULLNODE_PUBLIC_CRT, "key": SSL_TEST_FULLNODE_PUBLIC_KEY},

chia/simulator/ssl_certs_3.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Dict, Tuple
-
 SSL_TEST_PRIVATE_CA_CRT = b"""-----BEGIN CERTIFICATE-----
 MIIDKTCCAhGgAwIBAgIUeLxDdxR+RmiMMvvCxRfsQJAL7vUwDQYJKoZIhvcNAQEL
 BQAwRDENMAsGA1UECgwEQ2hpYTEQMA4GA1UEAwwHQ2hpYSBDQTEhMB8GA1UECwwY
@@ -665,9 +663,9 @@ p0weDMN6dQd5dKE+pUZYYpM=
 -----END PRIVATE KEY-----
 """
 
-SSL_TEST_PRIVATE_CA_CERT_AND_KEY_3: Tuple[bytes, bytes] = (SSL_TEST_PRIVATE_CA_CRT, SSL_TEST_PRIVATE_CA_KEY)
+SSL_TEST_PRIVATE_CA_CERT_AND_KEY_3: tuple[bytes, bytes] = (SSL_TEST_PRIVATE_CA_CRT, SSL_TEST_PRIVATE_CA_KEY)
 
-SSL_TEST_NODE_CERTS_AND_KEYS_3: Dict[str, Dict[str, Dict[str, bytes]]] = {
+SSL_TEST_NODE_CERTS_AND_KEYS_3: dict[str, dict[str, dict[str, bytes]]] = {
     "full_node": {
         "private": {"crt": SSL_TEST_FULLNODE_PRIVATE_CRT, "key": SSL_TEST_FULLNODE_PRIVATE_KEY},
         "public": {"crt": SSL_TEST_FULLNODE_PUBLIC_CRT, "key": SSL_TEST_FULLNODE_PUBLIC_KEY},

chia/simulator/ssl_certs_4.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Dict, Tuple
-
 SSL_TEST_PRIVATE_CA_CRT = b"""-----BEGIN CERTIFICATE-----
 MIIDKTCCAhGgAwIBAgIUS+xy2kGNomsBGfU0DEELWiHoSa4wDQYJKoZIhvcNAQEL
 BQAwRDENMAsGA1UECgwEQ2hpYTEQMA4GA1UEAwwHQ2hpYSBDQTEhMB8GA1UECwwY
@@ -665,9 +663,9 @@ d8a1rEOCndTj7T9DNTBfYl0=
 -----END PRIVATE KEY-----
 """
 
-SSL_TEST_PRIVATE_CA_CERT_AND_KEY_4: Tuple[bytes, bytes] = (SSL_TEST_PRIVATE_CA_CRT, SSL_TEST_PRIVATE_CA_KEY)
+SSL_TEST_PRIVATE_CA_CERT_AND_KEY_4: tuple[bytes, bytes] = (SSL_TEST_PRIVATE_CA_CRT, SSL_TEST_PRIVATE_CA_KEY)
 
-SSL_TEST_NODE_CERTS_AND_KEYS_4: Dict[str, Dict[str, Dict[str, bytes]]] = {
+SSL_TEST_NODE_CERTS_AND_KEYS_4: dict[str, dict[str, dict[str, bytes]]] = {
     "full_node": {
         "private": {"crt": SSL_TEST_FULLNODE_PRIVATE_CRT, "key": SSL_TEST_FULLNODE_PRIVATE_KEY},
         "public": {"crt": SSL_TEST_FULLNODE_PUBLIC_CRT, "key": SSL_TEST_FULLNODE_PUBLIC_KEY},

chia/simulator/ssl_certs_5.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Dict, Tuple
-
 SSL_TEST_PRIVATE_CA_CRT = b"""-----BEGIN CERTIFICATE-----
 MIIDKTCCAhGgAwIBAgIUXU/nGxb+rZck2qIMztmDWKDZCBcwDQYJKoZIhvcNAQEL
 BQAwRDENMAsGA1UECgwEQ2hpYTEQMA4GA1UEAwwHQ2hpYSBDQTEhMB8GA1UECwwY
@@ -665,9 +663,9 @@ gqCQGe9wW+ZeGMo5qplhtJURjus=
 -----END PRIVATE KEY-----
 """
 
-SSL_TEST_PRIVATE_CA_CERT_AND_KEY_5: Tuple[bytes, bytes] = (SSL_TEST_PRIVATE_CA_CRT, SSL_TEST_PRIVATE_CA_KEY)
+SSL_TEST_PRIVATE_CA_CERT_AND_KEY_5: tuple[bytes, bytes] = (SSL_TEST_PRIVATE_CA_CRT, SSL_TEST_PRIVATE_CA_KEY)
 
-SSL_TEST_NODE_CERTS_AND_KEYS_5: Dict[str, Dict[str, Dict[str, bytes]]] = {
+SSL_TEST_NODE_CERTS_AND_KEYS_5: dict[str, dict[str, dict[str, bytes]]] = {
     "full_node": {
         "private": {"crt": SSL_TEST_FULLNODE_PRIVATE_CRT, "key": SSL_TEST_FULLNODE_PRIVATE_KEY},
         "public": {"crt": SSL_TEST_FULLNODE_PUBLIC_CRT, "key": SSL_TEST_FULLNODE_PUBLIC_KEY},

chia/simulator/ssl_certs_6.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Dict, Tuple
-
 SSL_TEST_PRIVATE_CA_CRT = b"""-----BEGIN CERTIFICATE-----
 MIIDKTCCAhGgAwIBAgIUD5VUdvJQlRhGJg2WJ+/K8I2sYZcwDQYJKoZIhvcNAQEL
 BQAwRDENMAsGA1UECgwEQ2hpYTEQMA4GA1UEAwwHQ2hpYSBDQTEhMB8GA1UECwwY
@@ -665,9 +663,9 @@ NCqsxWTlPvhxmdJj/TVownPJrzA=
 -----END PRIVATE KEY-----
 """
 
-SSL_TEST_PRIVATE_CA_CERT_AND_KEY_6: Tuple[bytes, bytes] = (SSL_TEST_PRIVATE_CA_CRT, SSL_TEST_PRIVATE_CA_KEY)
+SSL_TEST_PRIVATE_CA_CERT_AND_KEY_6: tuple[bytes, bytes] = (SSL_TEST_PRIVATE_CA_CRT, SSL_TEST_PRIVATE_CA_KEY)
 
-SSL_TEST_NODE_CERTS_AND_KEYS_6: Dict[str, Dict[str, Dict[str, bytes]]] = {
+SSL_TEST_NODE_CERTS_AND_KEYS_6: dict[str, dict[str, dict[str, bytes]]] = {
     "full_node": {
         "private": {"crt": SSL_TEST_FULLNODE_PRIVATE_CRT, "key": SSL_TEST_FULLNODE_PRIVATE_KEY},
         "public": {"crt": SSL_TEST_FULLNODE_PUBLIC_CRT, "key": SSL_TEST_FULLNODE_PUBLIC_KEY},

chia/simulator/ssl_certs_7.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Dict, Tuple
-
 SSL_TEST_PRIVATE_CA_CRT = b"""-----BEGIN CERTIFICATE-----
 MIIDKTCCAhGgAwIBAgIUHoeobLQu3yMmraIDXDF+F6M4j9IwDQYJKoZIhvcNAQEL
 BQAwRDENMAsGA1UECgwEQ2hpYTEQMA4GA1UEAwwHQ2hpYSBDQTEhMB8GA1UECwwY
@@ -665,9 +663,9 @@ QSJ3WfEjOC9Xe5CR6qPEmR99
 -----END PRIVATE KEY-----
 """
 
-SSL_TEST_PRIVATE_CA_CERT_AND_KEY_7: Tuple[bytes, bytes] = (SSL_TEST_PRIVATE_CA_CRT, SSL_TEST_PRIVATE_CA_KEY)
+SSL_TEST_PRIVATE_CA_CERT_AND_KEY_7: tuple[bytes, bytes] = (SSL_TEST_PRIVATE_CA_CRT, SSL_TEST_PRIVATE_CA_KEY)
 
-SSL_TEST_NODE_CERTS_AND_KEYS_7: Dict[str, Dict[str, Dict[str, bytes]]] = {
+SSL_TEST_NODE_CERTS_AND_KEYS_7: dict[str, dict[str, dict[str, bytes]]] = {
     "full_node": {
         "private": {"crt": SSL_TEST_FULLNODE_PRIVATE_CRT, "key": SSL_TEST_FULLNODE_PRIVATE_KEY},
         "public": {"crt": SSL_TEST_FULLNODE_PUBLIC_CRT, "key": SSL_TEST_FULLNODE_PUBLIC_KEY},

chia/simulator/ssl_certs_8.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Dict, Tuple
-
 SSL_TEST_PRIVATE_CA_CRT = b"""-----BEGIN CERTIFICATE-----
 MIIDKTCCAhGgAwIBAgIUaAgNa9r45P7lGSz9yjEAMmSYuA4wDQYJKoZIhvcNAQEL
 BQAwRDENMAsGA1UECgwEQ2hpYTEQMA4GA1UEAwwHQ2hpYSBDQTEhMB8GA1UECwwY
@@ -665,9 +663,9 @@ axack/6KTJBo6FRskxPoH4U=
 -----END PRIVATE KEY-----
 """
 
-SSL_TEST_PRIVATE_CA_CERT_AND_KEY_8: Tuple[bytes, bytes] = (SSL_TEST_PRIVATE_CA_CRT, SSL_TEST_PRIVATE_CA_KEY)
+SSL_TEST_PRIVATE_CA_CERT_AND_KEY_8: tuple[bytes, bytes] = (SSL_TEST_PRIVATE_CA_CRT, SSL_TEST_PRIVATE_CA_KEY)
 
-SSL_TEST_NODE_CERTS_AND_KEYS_8: Dict[str, Dict[str, Dict[str, bytes]]] = {
+SSL_TEST_NODE_CERTS_AND_KEYS_8: dict[str, dict[str, dict[str, bytes]]] = {
     "full_node": {
         "private": {"crt": SSL_TEST_FULLNODE_PRIVATE_CRT, "key": SSL_TEST_FULLNODE_PRIVATE_KEY},
         "public": {"crt": SSL_TEST_FULLNODE_PUBLIC_CRT, "key": SSL_TEST_FULLNODE_PUBLIC_KEY},

chia/simulator/ssl_certs_9.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Dict, Tuple
-
 SSL_TEST_PRIVATE_CA_CRT = b"""-----BEGIN CERTIFICATE-----
 MIIDKTCCAhGgAwIBAgIUX9kvHEjir5fniTg3GRQ8wO7zOvAwDQYJKoZIhvcNAQEL
 BQAwRDENMAsGA1UECgwEQ2hpYTEQMA4GA1UEAwwHQ2hpYSBDQTEhMB8GA1UECwwY
@@ -665,9 +663,9 @@ P3vN0OIo1UZaNRW6CpZLa8sOyg==
 -----END PRIVATE KEY-----
 """
 
-SSL_TEST_PRIVATE_CA_CERT_AND_KEY_9: Tuple[bytes, bytes] = (SSL_TEST_PRIVATE_CA_CRT, SSL_TEST_PRIVATE_CA_KEY)
+SSL_TEST_PRIVATE_CA_CERT_AND_KEY_9: tuple[bytes, bytes] = (SSL_TEST_PRIVATE_CA_CRT, SSL_TEST_PRIVATE_CA_KEY)
 
-SSL_TEST_NODE_CERTS_AND_KEYS_9: Dict[str, Dict[str, Dict[str, bytes]]] = {
+SSL_TEST_NODE_CERTS_AND_KEYS_9: dict[str, dict[str, dict[str, bytes]]] = {
     "full_node": {
         "private": {"crt": SSL_TEST_FULLNODE_PRIVATE_CRT, "key": SSL_TEST_FULLNODE_PRIVATE_KEY},
         "public": {"crt": SSL_TEST_FULLNODE_PUBLIC_CRT, "key": SSL_TEST_FULLNODE_PUBLIC_KEY},

chia/simulator/start_simulator.py

@@ -5,8 +5,9 @@ import sys
 from dataclasses import dataclass
 from multiprocessing import freeze_support
 from pathlib import Path
-from typing import Any, Dict, List, Optional, Tuple
+from typing import Any, Optional
 
+from chia.apis import ApiProtocolRegistry
 from chia.full_node.full_node import FullNode
 from chia.server.outbound_message import NodeType
 from chia.server.signal_handlers import SignalHandlers
@@ -18,7 +19,7 @@ from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.bech32m import decode_puzzle_hash
 from chia.util.chia_logging import initialize_logging
 from chia.util.config import load_config, load_config_cli, override_config
-from chia.util.default_root import DEFAULT_ROOT_PATH
+from chia.util.default_root import resolve_root_path
 from chia.util.ints import uint16
 
 SimulatorFullNodeService = Service[FullNode, FullNodeSimulator, SimulatorFullNodeRpcApi]
@@ -34,10 +35,10 @@ PLOT_SIZE = 19  # anything under k19 is a bit buggy
 
 async def create_full_node_simulator_service(
     root_path: Path,
-    config: Dict[str, Any],
+    config: dict[str, Any],
     bt: BlockTools,
     connect_to_daemon: bool = True,
-    override_capabilities: Optional[List[Tuple[uint16, str]]] = None,
+    override_capabilities: Optional[list[tuple[uint16, str]]] = None,
 ) -> SimulatorFullNodeService:
     service_config = config[SERVICE_NAME]
     constants = bt.constants
@@ -63,6 +64,7 @@ async def create_full_node_simulator_service(
         rpc_info=(SimulatorFullNodeRpcApi, service_config["rpc_port"]),
         connect_to_daemon=connect_to_daemon,
         override_capabilities=override_capabilities,
+        class_for_type=ApiProtocolRegistry,
     )
 
 
@@ -75,8 +77,12 @@ class StartedSimulator:
 async def async_main(
     test_mode: bool = False,
     automated_testing: bool = False,
-    root_path: Path = DEFAULT_ROOT_PATH,
+    root_path: Optional[Path] = None,
 ) -> StartedSimulator:
+    root_path = resolve_root_path(override=root_path)
+    # helping mypy out for now
+    assert root_path is not None
+
     # Same as full node, but the root_path is defined above
     config = load_config(root_path, "config.yaml")
     service_config = load_config_cli(root_path, "config.yaml", SERVICE_NAME)
@@ -128,7 +134,9 @@ async def async_main(
 
 def main() -> int:
     freeze_support()
-    return async_run(async_main()).exit_code
+    root_path = resolve_root_path(override=None)
+
+    return async_run(async_main(root_path=root_path)).exit_code
 
 
 if __name__ == "__main__":

chia/simulator/wallet_tools.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any, Dict, List, Optional, Tuple
+from typing import Any, Optional
 
 from chia_rs import AugSchemeMPL, G1Element, G2Element, PrivateKey
 from clvm.casts import int_from_bytes, int_to_bytes
@@ -32,8 +32,9 @@ assert len(DEFAULT_SEED) == 32
 
 class WalletTool:
     next_address = 0
-    pubkey_num_lookup: Dict[bytes, uint32] = {}
-    puzzle_pk_cache: Dict[bytes32, PrivateKey] = {}
+    # TODO: make this a dataclass to make these instance attributes instead of mutable class attributes
+    pubkey_num_lookup: dict[bytes, uint32] = {}  # noqa: RUF012
+    puzzle_pk_cache: dict[bytes32, PrivateKey] = {}  # noqa: RUF012
 
     def __init__(self, constants: ConsensusConstants, sk: Optional[PrivateKey] = None):
         self.constants = constants
@@ -43,8 +44,8 @@ class WalletTool:
             self.private_key = sk
         else:
             self.private_key = AugSchemeMPL.key_gen(DEFAULT_SEED)
-        self.generator_lookups: Dict = {}
-        self.puzzle_pk_cache: Dict = {}
+        self.generator_lookups: dict = {}
+        self.puzzle_pk_cache: dict = {}
         self.get_new_puzzle()
 
     def get_next_address_index(self) -> uint32:
@@ -83,31 +84,31 @@ class WalletTool:
         privatekey: PrivateKey = master_sk_to_wallet_sk(self.private_key, self.pubkey_num_lookup[pubkey])
         return AugSchemeMPL.sign(privatekey, value)
 
-    def make_solution(self, condition_dic: Dict[ConditionOpcode, List[ConditionWithArgs]]) -> Program:
+    def make_solution(self, condition_dic: dict[ConditionOpcode, list[ConditionWithArgs]]) -> Program:
         ret = []
 
         for con_list in condition_dic.values():
             for cvp in con_list:
                 if cvp.opcode == ConditionOpcode.CREATE_COIN and len(cvp.vars) > 2:
-                    formatted: List[Any] = []
+                    formatted: list[Any] = []
                     formatted.extend(cvp.vars)
                     formatted[2] = cvp.vars[2:]
-                    ret.append([cvp.opcode.value] + formatted)
+                    ret.append([cvp.opcode.value, *formatted])
                 else:
-                    ret.append([cvp.opcode.value] + cvp.vars)
+                    ret.append([cvp.opcode.value, *cvp.vars])
         return solution_for_conditions(Program.to(ret))
 
     def generate_unsigned_transaction(
         self,
         amount: uint64,
         new_puzzle_hash: bytes32,
-        coins: List[Coin],
-        condition_dic: Dict[ConditionOpcode, List[ConditionWithArgs]],
+        coins: list[Coin],
+        condition_dic: dict[ConditionOpcode, list[ConditionWithArgs]],
         fee: int = 0,
         secret_key: Optional[PrivateKey] = None,
-        additional_outputs: Optional[List[Tuple[bytes32, int]]] = None,
+        additional_outputs: Optional[list[tuple[bytes32, int]]] = None,
         memo: Optional[bytes32] = None,
-    ) -> List[CoinSpend]:
+    ) -> list[CoinSpend]:
         spends = []
 
         spend_value = sum(c.amount for c in coins)
@@ -134,7 +135,7 @@ class WalletTool:
             change_output = ConditionWithArgs(ConditionOpcode.CREATE_COIN, [change_puzzle_hash, int_to_bytes(change)])
             condition_dic[output.opcode].append(change_output)
 
-        secondary_coins_cond_dic: Dict[ConditionOpcode, List[ConditionWithArgs]] = dict()
+        secondary_coins_cond_dic: dict[ConditionOpcode, list[ConditionWithArgs]] = dict()
         secondary_coins_cond_dic[ConditionOpcode.ASSERT_COIN_ANNOUNCEMENT] = []
         for n, coin in enumerate(coins):
             puzzle_hash = coin.puzzle_hash
@@ -175,7 +176,7 @@ class WalletTool:
                 )
         return spends
 
-    def sign_transaction(self, coin_spends: List[CoinSpend]) -> SpendBundle:
+    def sign_transaction(self, coin_spends: list[CoinSpend]) -> SpendBundle:
         signatures = []
         data = agg_sig_additional_data(self.constants.AGG_SIG_ME_ADDITIONAL_DATA)
         agg_sig_opcodes = [
@@ -214,9 +215,9 @@ class WalletTool:
         amount: uint64,
         new_puzzle_hash: bytes32,
         coin: Coin,
-        condition_dic: Dict[ConditionOpcode, List[ConditionWithArgs]] = None,
+        condition_dic: Optional[dict[ConditionOpcode, list[ConditionWithArgs]]] = None,
         fee: int = 0,
-        additional_outputs: Optional[List[Tuple[bytes32, int]]] = None,
+        additional_outputs: Optional[list[tuple[bytes32, int]]] = None,
         memo: Optional[bytes32] = None,
     ) -> SpendBundle:
         if condition_dic is None:
@@ -231,10 +232,10 @@ class WalletTool:
         self,
         amount: uint64,
         new_puzzle_hash: bytes32,
-        coins: List[Coin],
-        condition_dic: Dict[ConditionOpcode, List[ConditionWithArgs]] = None,
+        coins: list[Coin],
+        condition_dic: Optional[dict[ConditionOpcode, list[ConditionWithArgs]]] = None,
         fee: int = 0,
-        additional_outputs: Optional[List[Tuple[bytes32, int]]] = None,
+        additional_outputs: Optional[list[tuple[bytes32, int]]] = None,
     ) -> SpendBundle:
         if condition_dic is None:
             condition_dic = {}

chia/ssl/create_ssl.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import datetime
 import os
 from pathlib import Path
-from typing import Any, Dict, List, Optional, Tuple
+from typing import Any, Optional
 
 import importlib_resources
 from cryptography import x509
@@ -15,7 +15,7 @@ from cryptography.x509.oid import NameOID
 
 from chia.util.ssl_check import DEFAULT_PERMISSIONS_CERT_FILE, DEFAULT_PERMISSIONS_KEY_FILE
 
-_all_private_node_names: List[str] = [
+_all_private_node_names: list[str] = [
     "full_node",
     "wallet",
     "farmer",
@@ -25,10 +25,10 @@ _all_private_node_names: List[str] = [
     "data_layer",
     "daemon",
 ]
-_all_public_node_names: List[str] = ["full_node", "wallet", "farmer", "introducer", "timelord", "data_layer"]
+_all_public_node_names: list[str] = ["full_node", "wallet", "farmer", "introducer", "timelord", "data_layer"]
 
 
-def get_chia_ca_crt_key() -> Tuple[Any, Any]:
+def get_chia_ca_crt_key() -> tuple[Any, Any]:
     here = importlib_resources.files(__name__.rpartition(".")[0])
     crt = here.joinpath("chia_ca.crt").read_bytes()
     key = here.joinpath("chia_ca.key").read_bytes()
@@ -57,7 +57,7 @@ def write_ssl_cert_and_key(cert_path: Path, cert_data: bytes, key_path: Path, ke
             f.write(data)  # lgtm [py/clear-text-storage-sensitive-data]
 
 
-def ensure_ssl_dirs(dirs: List[Path]):
+def ensure_ssl_dirs(dirs: list[Path]):
     """Create SSL dirs with a default 755 mode if necessary"""
     for dir in dirs:
         if not dir.exists():
@@ -137,10 +137,10 @@ def make_ca_cert(cert_path: Path, key_path: Path):
 def create_all_ssl(
     root_path: Path,
     *,
-    private_ca_crt_and_key: Optional[Tuple[bytes, bytes]] = None,
-    node_certs_and_keys: Optional[Dict[str, Dict]] = None,
-    private_node_names: List[str] = _all_private_node_names,
-    public_node_names: List[str] = _all_public_node_names,
+    private_ca_crt_and_key: Optional[tuple[bytes, bytes]] = None,
+    node_certs_and_keys: Optional[dict[str, dict]] = None,
+    private_node_names: list[str] = _all_private_node_names,
+    public_node_names: list[str] = _all_public_node_names,
     overwrite: bool = True,
 ):
     # remove old key and crt
@@ -219,9 +219,9 @@ def generate_ssl_for_nodes(
     ca_key: bytes,
     *,
     prefix: str,
-    nodes: List[str],
+    nodes: list[str],
     overwrite: bool = True,
-    node_certs_and_keys: Optional[Dict[str, Dict]] = None,
+    node_certs_and_keys: Optional[dict[str, dict]] = None,
 ):
     for node_name in nodes:
         node_dir = ssl_dir / node_name

chia/timelord/iters_from_block.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Optional, Tuple, Union
+from typing import Optional, Union
 
 from chia.consensus.constants import ConsensusConstants
 from chia.consensus.pot_iterations import calculate_ip_iters, calculate_iterations_quality, calculate_sp_iters
@@ -16,7 +16,7 @@ def iters_from_block(
     sub_slot_iters: uint64,
     difficulty: uint64,
     height: uint32,
-) -> Tuple[uint64, uint64]:
+) -> tuple[uint64, uint64]:
     if reward_chain_block.challenge_chain_sp_vdf is None:
         assert reward_chain_block.signage_point_index == 0
         cc_sp: bytes32 = reward_chain_block.pos_ss_cc_challenge_hash