CHIA-194: CHIP-0026 Mempool Updates

benchmarks/mempool.py

@@ -177,9 +177,9 @@ async def add_spend_bundles(spend_bundles: List[SpendBundle]) -> None:
                 spend_bundle_id = tx.name()
                 npc = await mempool.pre_validate_spendbundle(tx, None, spend_bundle_id)
                 assert npc is not None
-                _, status, error = await mempool.add_spend_bundle(tx, npc, spend_bundle_id, height)
-                assert status == MempoolInclusionStatus.SUCCESS
-                assert error is None
+                info = await mempool.add_spend_bundle(tx, npc, spend_bundle_id, height)
+                assert info.status == MempoolInclusionStatus.SUCCESS
+                assert info.error is None
 
         suffix = "st" if single_threaded else "mt"
 

chia/_tests/connection_utils.py

@@ -3,7 +3,7 @@
 import asyncio
 import logging
 from pathlib import Path
-from typing import Set, Tuple
+from typing import List, Set, Tuple
 
 import aiohttp
 from cryptography import x509
@@ -39,15 +39,26 @@ async def disconnect_all_and_reconnect(server: ChiaServer, reconnect_to: ChiaSer
 
 
 async def add_dummy_connection(
-    server: ChiaServer, self_hostname: str, dummy_port: int, type: NodeType = NodeType.FULL_NODE
+    server: ChiaServer,
+    self_hostname: str,
+    dummy_port: int,
+    type: NodeType = NodeType.FULL_NODE,
+    *,
+    additional_capabilities: List[Tuple[uint16, str]] = [],
 ) -> Tuple[asyncio.Queue, bytes32]:
-    wsc, peer_id = await add_dummy_connection_wsc(server, self_hostname, dummy_port, type)
+    wsc, peer_id = await add_dummy_connection_wsc(
+        server, self_hostname, dummy_port, type, additional_capabilities=additional_capabilities
+    )
 
     return wsc.incoming_queue, peer_id
 
 
 async def add_dummy_connection_wsc(
-    server: ChiaServer, self_hostname: str, dummy_port: int, type: NodeType = NodeType.FULL_NODE
+    server: ChiaServer,
+    self_hostname: str,
+    dummy_port: int,
+    type: NodeType = NodeType.FULL_NODE,
+    additional_capabilities: List[Tuple[uint16, str]] = [],
 ) -> Tuple[WSChiaConnection, bytes32]:
     timeout = aiohttp.ClientTimeout(total=10)
     session = aiohttp.ClientSession(timeout=timeout)
@@ -86,7 +97,7 @@ async def add_dummy_connection_wsc(
         peer_id,
         100,
         30,
-        local_capabilities_for_handshake=default_capabilities[type],
+        local_capabilities_for_handshake=default_capabilities[type] + additional_capabilities,
     )
     await wsc.perform_handshake(server._network_id, dummy_port, type)
     if wsc.incoming_message_task is not None:

chia/_tests/core/mempool/test_mempool.py

@@ -2863,7 +2863,7 @@ def test_limit_expiring_transactions(height: bool, items: List[int], expected: L
         invariant_check_mempool(mempool)
         if increase_fee:
             fee_rate += 0.1
-            assert ret is None
+            assert ret.error is None
         else:
             fee_rate -= 0.1
 

chia/_tests/core/mempool/test_mempool_manager.py

@@ -388,7 +388,7 @@ async def add_spendbundle(
     npc_result = await mempool_manager.pre_validate_spendbundle(sb, None, sb_name)
     ret = await mempool_manager.add_spend_bundle(sb, npc_result, sb_name, TEST_HEIGHT)
     invariant_check_mempool(mempool_manager.mempool)
-    return ret
+    return ret.cost, ret.status, ret.error
 
 
 async def generate_and_add_spendbundle(

chia/_tests/util/build_network_protocol_files.py

@@ -107,6 +107,8 @@ def visit_wallet_protocol(visitor: Callable[[Any, str], None]) -> None:
     visitor(request_coin_state, "request_coin_state")
     visitor(respond_coin_state, "respond_coin_state")
     visitor(reject_coin_state, "reject_coin_state")
+    visitor(request_cost_info, "request_cost_info")
+    visitor(respond_cost_info, "respond_cost_info")
 
 
 def visit_harvester_protocol(visitor: Callable[[Any, str], None]) -> None:

chia/_tests/util/network_protocol_data.py

@@ -733,6 +733,27 @@
     uint8(wallet_protocol.RejectStateReason.EXCEEDED_SUBSCRIPTION_LIMIT)
 )
 
+removed_mempool_item = wallet_protocol.RemovedMempoolItem(
+    bytes32(bytes.fromhex("59710628755b6d7f7d0b5d84d5c980e7a1c52e55f5a43b531312402bd9045da7")), uint8(1)
+)
+
+mempool_items_added = wallet_protocol.MempoolItemsAdded(
+    [bytes32(bytes.fromhex("59710628755b6d7f7d0b5d84d5c980e7a1c52e55f5a43b531312402bd9045da7"))]
+)
+
+mempool_items_removed = wallet_protocol.MempoolItemsRemoved([removed_mempool_item])
+
+request_cost_info = wallet_protocol.RequestCostInfo()
+
+respond_cost_info = wallet_protocol.RespondCostInfo(
+    max_transaction_cost=uint64(100000),
+    max_block_cost=uint64(1000000),
+    max_mempool_cost=uint64(10000000),
+    mempool_cost=uint64(50000),
+    mempool_fee=uint64(500000),
+    bump_fee_per_cost=uint8(10),
+)
+
 
 ### HARVESTER PROTOCOL
 pool_difficulty = harvester_protocol.PoolDifficulty(

chia/_tests/util/protocol_messages_json.py

@@ -2119,6 +2119,17 @@
 
 reject_coin_state_json: Dict[str, Any] = {"reason": 1}
 
+request_cost_info_json: Dict[str, Any] = {}
+
+respond_cost_info_json: Dict[str, Any] = {
+    "max_transaction_cost": 100000,
+    "max_block_cost": 1000000,
+    "max_mempool_cost": 10000000,
+    "mempool_cost": 50000,
+    "mempool_fee": 500000,
+    "bump_fee_per_cost": 10,
+}
+
 pool_difficulty_json: Dict[str, Any] = {
     "difficulty": 14819251421858580996,
     "sub_slot_iters": 12852879676624401630,