From 8102d5dc4d7811badee15c7cf415572e2cf9236d Mon Sep 17 00:00:00 2001 From: Kim De Mey Date: Tue, 27 Oct 2020 08:44:46 +0100 Subject: [PATCH] Bump eth2-testnets for more discv5.1 bootstrap nodes on medalla (#1911) And improve logging UX a bit by ignoring comments or newlines --- beacon_chain/eth2_discovery.nim | 7 ++++--- vendor/eth2-testnets | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/beacon_chain/eth2_discovery.nim b/beacon_chain/eth2_discovery.nim index 0592b1507..3d1c92573 100644 --- a/beacon_chain/eth2_discovery.nim +++ b/beacon_chain/eth2_discovery.nim @@ -16,9 +16,6 @@ export proc parseBootstrapAddress*(address: TaintedString): Result[enr.Record, cstring] = - if address.len == 0: - return err "an empty string is not a valid bootstrap node" - logScope: address = string(address) @@ -38,6 +35,10 @@ proc parseBootstrapAddress*(address: TaintedString): proc addBootstrapNode*(bootstrapAddr: string, bootstrapEnrs: var seq[enr.Record]) = + # Ignore empty lines or lines starting with # + if bootstrapAddr.len == 0 or bootstrapAddr[0] == '#': + return + let enrRes = parseBootstrapAddress(bootstrapAddr) if enrRes.isOk: bootstrapEnrs.add enrRes.value diff --git a/vendor/eth2-testnets b/vendor/eth2-testnets index d03f7e62f..2a5cc08a5 160000 --- a/vendor/eth2-testnets +++ b/vendor/eth2-testnets @@ -1 +1 @@ -Subproject commit d03f7e62f52252497c521bf597667d90210d46a2 +Subproject commit 2a5cc08a557051947c4076674e01a93bcefed46a