From 9cd8a6c7302c264a28022da998b4124e8a0bd960 Mon Sep 17 00:00:00 2001
From: Zahary Karadjov <zahary@gmail.com>
Date: Sun, 28 Jun 2020 23:47:04 +0300
Subject: [PATCH] Working local sim (without waiting genesis)

---
 beacon_chain/mainchain_monitor.nim | 5 +++--
 tests/simulation/start.sh          | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/beacon_chain/mainchain_monitor.nim b/beacon_chain/mainchain_monitor.nim
index 7330d989d..05e0bf03c 100644
--- a/beacon_chain/mainchain_monitor.nim
+++ b/beacon_chain/mainchain_monitor.nim
@@ -675,7 +675,8 @@ proc processDeposits(m: MainchainMonitor,
     let eth1Blocks = await dataProvider.fetchDepositData(latestKnownBlock + 1,
                                                          Eth1BlockNumber blk.number)
     if eth1Blocks.len == 0:
-      if m.eth1Chain.maxValidDeposits > totalDepositsNeededForGenesis:
+      if m.eth1Chain.maxValidDeposits > totalDepositsNeededForGenesis and
+         m.eth1Chain.knownStart.deposit_count == 0:
         let latestEth1Data = m.eth1Chain.latestEth1Data
 
         for missingBlockNum in latestKnownBlock + 1 ..< Eth1BlockNumber(blk.number):
@@ -757,7 +758,7 @@ proc run(m: MainchainMonitor, delayBeforeStart: Duration) {.async.} =
     await close(dataProvider)
 
 proc safeCancel(fut: var Future[void]) =
-  if not fut.isNil:
+  if not fut.isNil and not fut.finished:
     fut.cancel()
     fut = nil
 
diff --git a/tests/simulation/start.sh b/tests/simulation/start.sh
index 13d3f7ff6..30fd32256 100755
--- a/tests/simulation/start.sh
+++ b/tests/simulation/start.sh
@@ -125,6 +125,7 @@ if [ ! -f "${SNAPSHOT_FILE}" ]; then
     $BEACON_NODE_BIN \
       --data-dir="${SIMULATION_DIR}/node-$BOOTSTRAP_NODE" \
       createTestnet \
+      $WEB3_ARG \
       --validators-dir="${VALIDATORS_DIR}" \
       --total-validators="${NUM_VALIDATORS}" \
       --output-genesis="${SNAPSHOT_FILE}" \