chia-blockchain 2.5.6rc2__py3-none-any.whl → 2.5.7__py3-none-any.whl

chia/_tests/util/test_network_protocol_json.py

@@ -18,6 +18,8 @@ def test_protocol_json() -> None:
     assert type(farming_info).from_json_dict(farming_info_json) == farming_info
     assert str(signed_values_json) == str(signed_values.to_json_dict())
     assert type(signed_values).from_json_dict(signed_values_json) == signed_values
+    assert str(partial_proof_json) == str(partial_proof.to_json_dict())
+    assert type(partial_proof).from_json_dict(partial_proof_json) == partial_proof
     assert str(new_peak_json) == str(new_peak.to_json_dict())
     assert type(new_peak).from_json_dict(new_peak_json) == new_peak
     assert str(new_transaction_json) == str(new_transaction.to_json_dict())
@@ -270,3 +272,7 @@ def test_protocol_json() -> None:
     assert type(error_without_data).from_json_dict(error_without_data_json) == error_without_data
     assert str(error_with_data_json) == str(error_with_data.to_json_dict())
     assert type(error_with_data).from_json_dict(error_with_data_json) == error_with_data
+    assert str(solver_info_json) == str(solver_info.to_json_dict())
+    assert type(solver_info).from_json_dict(solver_info_json) == solver_info
+    assert str(solver_response_json) == str(solver_response.to_json_dict())
+    assert type(solver_response).from_json_dict(solver_response_json) == solver_response

chia/_tests/util/test_network_protocol_test.py

@@ -4,6 +4,8 @@ import ast
 import inspect
 from typing import Any, cast
 
+import pytest
+
 from chia.protocols import (
     farmer_protocol,
     full_node_protocol,
@@ -12,6 +14,7 @@ from chia.protocols import (
     pool_protocol,
     protocol_message_types,
     shared_protocol,
+    solver_protocol,
     timelord_protocol,
     wallet_protocol,
 )
@@ -58,6 +61,7 @@ def test_message_ids() -> None:
             assert isinstance(entry.value, ast.Constant)
             assert isinstance(entry.targets[0], ast.Name)
             message_id = entry.value.value
+            assert isinstance(message_id, int), f"message ID must be an int, got {type(message_id).__name__}"
             message_name = entry.targets[0].id
             if message_id in message_ids:  # pragma: no cover
                 raise AssertionError(
@@ -188,6 +192,7 @@ def test_missing_messages() -> None:
         "RequestSignatures",
         "RespondPlots",
         "RespondSignatures",
+        "PartialProofsData",
     }
 
     introducer_msgs = {"RequestPeersIntroducer", "RespondPeersIntroducer"}
@@ -219,6 +224,8 @@ def test_missing_messages() -> None:
         "RespondCompactProofOfTime",
     }
 
+    solver_msgs = {"SolverInfo", "SolverResponse"}
+
     shared_msgs = {"Handshake", "Capability", "Error"}
 
     # if these asserts fail, make sure to add the new network protocol messages
@@ -252,6 +259,26 @@ def test_missing_messages() -> None:
         f"message types were added or removed from timelord_protocol. {STANDARD_ADVICE}"
     )
 
+    assert types_in_module(solver_protocol) == solver_msgs, (
+        f"message types were added or removed from shared_protocol. {STANDARD_ADVICE}"
+    )
+
     assert types_in_module(shared_protocol) == shared_msgs, (
         f"message types were added or removed from shared_protocol. {STANDARD_ADVICE}"
     )
+
+
+@pytest.mark.parametrize("version", [1, 2])
+def test_rate_limits_complete(version: int) -> None:
+    from chia.protocols.protocol_message_types import ProtocolMessageTypes
+    from chia.server.rate_limit_numbers import rate_limits
+
+    if version == 1:
+        composed = rate_limits[1]
+    elif version == 2:
+        composed = {
+            **rate_limits[1],
+            **rate_limits[2],
+        }
+
+    assert set(composed.keys()) == set(ProtocolMessageTypes)

chia/_tests/util/test_priority_mutex.py

@@ -381,7 +381,7 @@ def sane(requests: list[Request]) -> bool:
         return False
 
     ordered = sorted(requests)
-    return all(a.before(b) for a, b in zip(ordered, ordered[1:]))
+    return all(a.before(b) for a, b in itertools.pairwise(ordered))
 
 
 @dataclass

chia/_tests/util/test_replace_str_to_bytes.py

@@ -65,12 +65,12 @@ test_constants = ConsensusConstants(
     PLOT_FILTER_128_HEIGHT=uint32(10542000),
     PLOT_FILTER_64_HEIGHT=uint32(15592000),
     PLOT_FILTER_32_HEIGHT=uint32(20643000),
-    PLOT_DIFFICULTY_INITIAL=uint8(2),
-    PLOT_DIFFICULTY_4_HEIGHT=uint32(0xFFFFFFFF),
-    PLOT_DIFFICULTY_5_HEIGHT=uint32(0xFFFFFFFF),
-    PLOT_DIFFICULTY_6_HEIGHT=uint32(0xFFFFFFFF),
-    PLOT_DIFFICULTY_7_HEIGHT=uint32(0xFFFFFFFF),
-    PLOT_DIFFICULTY_8_HEIGHT=uint32(0xFFFFFFFF),
+    PLOT_STRENGTH_INITIAL=uint8(2),
+    PLOT_STRENGTH_4_HEIGHT=uint32(0xFFFFFFFF),
+    PLOT_STRENGTH_5_HEIGHT=uint32(0xFFFFFFFF),
+    PLOT_STRENGTH_6_HEIGHT=uint32(0xFFFFFFFF),
+    PLOT_STRENGTH_7_HEIGHT=uint32(0xFFFFFFFF),
+    PLOT_STRENGTH_8_HEIGHT=uint32(0xFFFFFFFF),
 )
 
 

chia/_tests/wallet/cat_wallet/test_cat_wallet.py

@@ -44,7 +44,7 @@ from chia.wallet.vc_wallet.vc_drivers import create_revocation_layer
 from chia.wallet.wallet_info import WalletInfo
 from chia.wallet.wallet_interested_store import WalletInterestedStore
 from chia.wallet.wallet_node import WalletNode
-from chia.wallet.wallet_request_types import GetTransactionMemo, PushTX
+from chia.wallet.wallet_request_types import GetTransactionMemo, PushTX, SendTransaction
 from chia.wallet.wallet_state_manager import WalletStateManager
 
 
@@ -377,9 +377,9 @@ async def test_cat_spend(wallet_environments: WalletTestFramework, wallet_type:
         if tx_record.spend_bundle is not None:
             tx_id = tx_record.name
     assert tx_id is not None
-    memos = await env_1.rpc_client.get_transaction_memo(GetTransactionMemo(transaction_id=tx_id))
-    assert len(memos.coins_with_memos) == 2
-    assert cat_2_hash in {coin_w_memos.memos[0] for coin_w_memos in memos.coins_with_memos}
+    memo_response = await env_1.rpc_client.get_transaction_memo(GetTransactionMemo(transaction_id=tx_id))
+    assert len(memo_response.memo_dict) == 2
+    assert cat_2_hash in {memos[0] for memos in memo_response.memo_dict.values()}
 
     await wallet_environments.process_pending_states(
         [
@@ -454,9 +454,9 @@ async def test_cat_spend(wallet_environments: WalletTestFramework, wallet_type:
     assert len(coins) == 1
     coin = coins.pop()
     tx_id = coin.name()
-    memos = await env_2.rpc_client.get_transaction_memo(GetTransactionMemo(transaction_id=tx_id))
-    assert len(memos.coins_with_memos) == 2
-    assert cat_2_hash in {coin_w_memos.memos[0] for coin_w_memos in memos.coins_with_memos}
+    memo_response = await env_2.rpc_client.get_transaction_memo(GetTransactionMemo(transaction_id=tx_id))
+    assert len(memo_response.memo_dict) == 2
+    assert cat_2_hash in {memos[0] for memos in memo_response.memo_dict.values()}
     async with cat_wallet.wallet_state_manager.new_action_scope(
         wallet_environments.tx_config, push=True
     ) as action_scope:
@@ -1043,11 +1043,10 @@ async def test_cat_spend_multiple(wallet_environments: WalletTestFramework, wall
     txs = await wallet_1.wallet_state_manager.tx_store.get_transactions_between(cat_wallet_1.id(), 0, 100000)
     for tx in txs:
         if tx.amount == 30:
-            memos = tx.get_memos()
-            assert len(memos) == 2  # One for tx, one for change
-            assert b"Markus Walburg" in [v for v_list in memos.values() for v in v_list]
+            assert len(tx.memos) == 2  # One for tx, one for change
+            assert b"Markus Walburg" in [v for v_list in tx.memos.values() for v in v_list]
             assert tx.spend_bundle is not None
-            assert next(iter(memos.keys())) in [a.name() for a in tx.spend_bundle.additions()]
+            assert next(iter(tx.memos.keys())) in [a.name() for a in tx.spend_bundle.additions()]
 
 
 @pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN], reason="irrelevant")
@@ -1154,7 +1153,7 @@ async def test_cat_max_amount_send(wallet_environments: WalletTestFramework, wal
     assert action_scope.side_effects.transactions[0].amount == uint64(max_sent_amount)
 
     # 3) Generate transaction that is greater than limit
-    with pytest.raises(ValueError, match="Can't select amount higher than our spendable balance."):
+    with pytest.raises(ValueError, match="Can't select amount higher than our spendable balance"):
         async with cat_wallet.wallet_state_manager.new_action_scope(
             wallet_environments.tx_config, push=False
         ) as action_scope:
@@ -1430,7 +1429,12 @@ async def test_cat_change_detection(wallet_environments: WalletTestFramework, wa
     cat_amount_0 = uint64(100)
     cat_amount_1 = uint64(5)
 
-    tx = (await env.rpc_client.send_transaction(1, cat_amount_0, addr, wallet_environments.tx_config)).transaction
+    tx = (
+        await env.rpc_client.send_transaction(
+            SendTransaction(wallet_id=uint32(1), amount=cat_amount_0, address=addr, push=True),
+            wallet_environments.tx_config,
+        )
+    ).transaction
     spend_bundle = tx.spend_bundle
     assert spend_bundle is not None
 

chia/_tests/wallet/cat_wallet/test_trades.py

@@ -1629,8 +1629,9 @@ async def test_cat_trades(
     indirect=True,
 )
 @pytest.mark.limit_consensus_modes(reason="irrelevant")
+@pytest.mark.parametrize("wallet_type", [CATWallet, RCATWallet])
 @pytest.mark.anyio
-async def test_trade_cancellation(wallet_environments: WalletTestFramework) -> None:
+async def test_trade_cancellation(wallet_environments: WalletTestFramework, wallet_type: type[CATWallet]) -> None:
     env_maker = wallet_environments.environments[0]
     env_taker = wallet_environments.environments[1]
 
@@ -1645,16 +1646,15 @@ async def test_trade_cancellation(wallet_environments: WalletTestFramework) -> N
 
     xch_to_cat_amount = uint64(100)
 
-    async with env_maker.wallet_state_manager.new_action_scope(
-        wallet_environments.tx_config, push=True
-    ) as action_scope:
-        cat_wallet_maker = await CATWallet.create_new_cat_wallet(
-            env_maker.wallet_state_manager,
-            env_maker.xch_wallet,
-            {"identifier": "genesis_by_id"},
-            xch_to_cat_amount,
-            action_scope,
-        )
+    cat_wallet_maker = await mint_cat(
+        wallet_environments,
+        env_maker,
+        "xch",
+        "cat",
+        xch_to_cat_amount,
+        wallet_type,
+        "cat",
+    )
 
     await wallet_environments.process_pending_states(
         [
@@ -1941,8 +1941,9 @@ async def test_trade_cancellation(wallet_environments: WalletTestFramework) -> N
     indirect=True,
 )
 @pytest.mark.limit_consensus_modes(reason="irrelevant")
+@pytest.mark.parametrize("wallet_type", [CATWallet, RCATWallet])
 @pytest.mark.anyio
-async def test_trade_conflict(wallet_environments: WalletTestFramework) -> None:
+async def test_trade_conflict(wallet_environments: WalletTestFramework, wallet_type: type[CATWallet]) -> None:
     env_maker = wallet_environments.environments[0]
     env_taker = wallet_environments.environments[1]
     env_trader = wallet_environments.environments[2]
@@ -1963,16 +1964,15 @@ async def test_trade_conflict(wallet_environments: WalletTestFramework) -> None:
     xch_to_cat_amount = uint64(100)
     fee = uint64(10)
 
-    async with env_maker.wallet_state_manager.new_action_scope(
-        wallet_environments.tx_config, push=True
-    ) as action_scope:
-        await CATWallet.create_new_cat_wallet(
-            env_maker.wallet_state_manager,
-            env_maker.xch_wallet,
-            {"identifier": "genesis_by_id"},
-            xch_to_cat_amount,
-            action_scope,
-        )
+    await mint_cat(
+        wallet_environments,
+        env_maker,
+        "xch",
+        "cat",
+        xch_to_cat_amount,
+        wallet_type,
+        "cat",
+    )
 
     await wallet_environments.process_pending_states(
         [
@@ -2138,8 +2138,9 @@ async def test_trade_conflict(wallet_environments: WalletTestFramework) -> None:
     indirect=True,
 )
 @pytest.mark.limit_consensus_modes(reason="irrelevant")
+@pytest.mark.parametrize("wallet_type", [CATWallet, RCATWallet])
 @pytest.mark.anyio
-async def test_trade_bad_spend(wallet_environments: WalletTestFramework) -> None:
+async def test_trade_bad_spend(wallet_environments: WalletTestFramework, wallet_type: type[CATWallet]) -> None:
     env_maker = wallet_environments.environments[0]
     env_taker = wallet_environments.environments[1]
 
@@ -2154,16 +2155,15 @@ async def test_trade_bad_spend(wallet_environments: WalletTestFramework) -> None
 
     xch_to_cat_amount = uint64(100)
 
-    async with env_maker.wallet_state_manager.new_action_scope(
-        wallet_environments.tx_config, push=True
-    ) as action_scope:
-        await CATWallet.create_new_cat_wallet(
-            env_maker.wallet_state_manager,
-            env_maker.xch_wallet,
-            {"identifier": "genesis_by_id"},
-            xch_to_cat_amount,
-            action_scope,
-        )
+    await mint_cat(
+        wallet_environments,
+        env_maker,
+        "xch",
+        "cat",
+        xch_to_cat_amount,
+        wallet_type,
+        "cat",
+    )
 
     await wallet_environments.process_pending_states(
         [
@@ -2260,8 +2260,9 @@ async def test_trade_bad_spend(wallet_environments: WalletTestFramework) -> None
     indirect=True,
 )
 @pytest.mark.limit_consensus_modes(reason="irrelevant")
+@pytest.mark.parametrize("wallet_type", [CATWallet, RCATWallet])
 @pytest.mark.anyio
-async def test_trade_high_fee(wallet_environments: WalletTestFramework) -> None:
+async def test_trade_high_fee(wallet_environments: WalletTestFramework, wallet_type: type[CATWallet]) -> None:
     env_maker = wallet_environments.environments[0]
     env_taker = wallet_environments.environments[1]
 
@@ -2276,16 +2277,15 @@ async def test_trade_high_fee(wallet_environments: WalletTestFramework) -> None:
 
     xch_to_cat_amount = uint64(100)
 
-    async with env_maker.wallet_state_manager.new_action_scope(
-        wallet_environments.tx_config, push=True
-    ) as action_scope:
-        await CATWallet.create_new_cat_wallet(
-            env_maker.wallet_state_manager,
-            env_maker.xch_wallet,
-            {"identifier": "genesis_by_id"},
-            xch_to_cat_amount,
-            action_scope,
-        )
+    await mint_cat(
+        wallet_environments,
+        env_maker,
+        "xch",
+        "cat",
+        xch_to_cat_amount,
+        wallet_type,
+        "cat",
+    )
 
     await wallet_environments.process_pending_states(
         [
@@ -2405,8 +2405,9 @@ async def test_trade_high_fee(wallet_environments: WalletTestFramework) -> None:
     indirect=True,
 )
 @pytest.mark.limit_consensus_modes(reason="irrelevant")
+@pytest.mark.parametrize("wallet_type", [CATWallet, RCATWallet])
 @pytest.mark.anyio
-async def test_aggregated_trade_state(wallet_environments: WalletTestFramework) -> None:
+async def test_aggregated_trade_state(wallet_environments: WalletTestFramework, wallet_type: type[CATWallet]) -> None:
     env_maker = wallet_environments.environments[0]
     env_taker = wallet_environments.environments[1]
 
@@ -2421,16 +2422,15 @@ async def test_aggregated_trade_state(wallet_environments: WalletTestFramework)
 
     xch_to_cat_amount = uint64(100)
 
-    async with env_maker.wallet_state_manager.new_action_scope(
-        wallet_environments.tx_config, push=True
-    ) as action_scope:
-        await CATWallet.create_new_cat_wallet(
-            env_maker.wallet_state_manager,
-            env_maker.xch_wallet,
-            {"identifier": "genesis_by_id"},
-            xch_to_cat_amount,
-            action_scope,
-        )
+    await mint_cat(
+        wallet_environments,
+        env_maker,
+        "xch",
+        "cat",
+        xch_to_cat_amount,
+        wallet_type,
+        "cat",
+    )
 
     await wallet_environments.process_pending_states(
         [