From 1394ef37fbaabe43d560a552a7b7dccf40f29ac5 Mon Sep 17 00:00:00 2001
From: Zahary Karadjov <zahary@gmail.com>
Date: Thu, 4 Feb 2021 17:01:47 +0200
Subject: [PATCH] Tentative fix for the freezing Eth1 monitor activity

---
 beacon_chain/eth1_monitor.nim | 4 +++-
 vendor/nim-eth                | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/beacon_chain/eth1_monitor.nim b/beacon_chain/eth1_monitor.nim
index f0b07f8a7..070e758c2 100644
--- a/beacon_chain/eth1_monitor.nim
+++ b/beacon_chain/eth1_monitor.nim
@@ -1062,7 +1062,9 @@ proc startEth1Syncing(m: Eth1Monitor, delayBeforeStart: Duration) {.async.} =
     if m.eth1Chain.hasConsensusViolation:
       raise newException(CorruptDataProvider, "Eth1 chain contradicts Eth2 consensus")
 
-    await m.eth1Progress.wait()
+    awaitWithTimeout(m.eth1Progress.wait(), 5.minutes):
+      raise newException(CorruptDataProvider, "No eth1 chain progress for too long")
+
     m.eth1Progress.clear()
 
     if m.latestEth1BlockNumber <= m.preset.ETH1_FOLLOW_DISTANCE:
diff --git a/vendor/nim-eth b/vendor/nim-eth
index 4e58eb48c..e8c9691b3 160000
--- a/vendor/nim-eth
+++ b/vendor/nim-eth
@@ -1 +1 @@
-Subproject commit 4e58eb48ce1b1a06d28802ad22215de9ff92a916
+Subproject commit e8c9691b35f4875d9a97193cb965fbf1a956dd7e