From 75d75de1903db318f79f76ec4ccb81b3e2a837a6 Mon Sep 17 00:00:00 2001
From: Mariano Sorgente <3069354+mariano54@users.noreply.github.com>
Date: Sat, 1 May 2021 05:11:05 +0900
Subject: [PATCH] SES could corrupt DB. Also don't cancel a task which could
 lead to corrupt memory. (#3237)

---
 chia/consensus/blockchain.py | 18 +++---------------
 chia/server/server.py        |  7 +++++--
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/chia/consensus/blockchain.py b/chia/consensus/blockchain.py
index b555cab0523d..80c3fe0bda15 100644
--- a/chia/consensus/blockchain.py
+++ b/chia/consensus/blockchain.py
@@ -255,29 +255,19 @@ async def receive_block(
         # Always add the block to the database
         async with self.block_store.db_wrapper.lock:
             try:
+                # Perform the DB operations to update the state, and rollback if something goes wrong
                 await self.block_store.db_wrapper.begin_transaction()
                 await self.block_store.add_full_block(block, block_record)
                 fork_height, peak_height, records = await self._reconsider_peak(
                     block_record, genesis, fork_point_with_peak, npc_result
                 )
                 await self.block_store.db_wrapper.commit_transaction()
+
+                # Then update the memory cache. It is important that this task is not cancelled and does not throw
                 self.add_block_record(block_record)
                 for fetched_block_record in records:
                     self.__height_to_hash[fetched_block_record.height] = fetched_block_record.header_hash
                     if fetched_block_record.sub_epoch_summary_included is not None:
-                        if summaries_to_check is not None:
-                            # make sure this matches the summary list we got
-                            ses_n = len(self.get_ses_heights())
-                            if (
-                                fetched_block_record.sub_epoch_summary_included.get_hash()
-                                != summaries_to_check[ses_n].get_hash()
-                            ):
-                                log.error(
-                                    f"block ses does not match list, "
-                                    f"got {fetched_block_record.sub_epoch_summary_included} "
-                                    f"expected {summaries_to_check[ses_n]}"
-                                )
-                                return ReceiveBlockResult.INVALID_BLOCK, Err.INVALID_SUB_EPOCH_SUMMARY, None
                         self.__sub_epoch_summaries[
                             fetched_block_record.height
                         ] = fetched_block_record.sub_epoch_summary_included
@@ -311,8 +301,6 @@ async def _reconsider_peak(
                 block: Optional[FullBlock] = await self.block_store.get_full_block(block_record.header_hash)
                 assert block is not None
 
-                # Begins a transaction, because we want to ensure that the coin store and block store are only updated
-                # in sync.
                 if npc_result is not None:
                     tx_removals, tx_additions = tx_removals_and_additions(npc_result.npc_list)
                 else:
diff --git a/chia/server/server.py b/chia/server/server.py
index 2f05e1fcdaf2..31b329d1cbef 100644
--- a/chia/server/server.py
+++ b/chia/server/server.py
@@ -147,7 +147,7 @@ def __init__(
         self.api_exception_ban_seconds = 10
 
     def my_id(self) -> bytes32:
-        """ If node has public cert use that one for id, if not use private."""
+        """If node has public cert use that one for id, if not use private."""
         if self.p2p_crt_path is not None:
             pem_cert = x509.load_pem_x509_certificate(self.p2p_crt_path.read_bytes(), default_backend())
         else:
@@ -505,8 +505,11 @@ async def api_call(full_message: Message, connection: WSChiaConnection, task_id)
                         if self.api.api_ready is False:
                             return None
 
+                    timeout: Optional[int] = 600
                     if hasattr(f, "execute_task"):
+                        # Don't timeout on methods with execute_task decorator, these need to run fully
                         self.execute_tasks.add(task_id)
+                        timeout = None
 
                     if hasattr(f, "peer_required"):
                         coroutine = f(full_message.data, connection)
@@ -525,7 +528,7 @@ async def wrapped_coroutine() -> Optional[Message]:
                             raise e
                         return None
 
-                    response: Optional[Message] = await asyncio.wait_for(wrapped_coroutine(), timeout=600)
+                    response: Optional[Message] = await asyncio.wait_for(wrapped_coroutine(), timeout=timeout)
                     connection.log.debug(
                         f"Time taken to process {message_type} from {connection.peer_node_id} is "
                         f"{time.time() - start_time} seconds"