Improved logging related to bootstrap nodes

beacon_chain/beacon_node.nim

@@ -132,10 +132,8 @@ proc loadBootstrapFile(bootstrapFile: string): seq[BootstrapAddr] =
       result.addBootstrapAddr(line)
 
 proc addEnrBootstrapNode(node: BeaconNode, enrBase64: string) =
-  info "Adding bootsrap node", enr = enrBase64
   var enrRec: enr.Record
-  if enrRec.fromBase64(enrBase64):
-    info "Parsed ENR record", value = enrRec
+  if enrRec.fromURI(enrBase64):
     try:
       let
         ip = IpAddress(family: IpAddressFamily.IPv4,
@@ -146,6 +144,8 @@ proc addEnrBootstrapNode(node: BeaconNode, enrBase64: string) =
       node.bootstrapEnrs.add enrRec
     except CatchableError as err:
       warn "Invalid ENR record", enrRec
+  else:
+    warn "Failed to parse ENR record", value = enrRec
 
 proc useEnrBootstrapFile(node: BeaconNode, bootstrapFile: string) =
   let ext = splitFile(bootstrapFile).ext

scripts/connect_to_testnet.nims

@@ -35,9 +35,6 @@ cli do (testnetName {.argument.}: string):
   rmDir(allTestnetsDir)
   cd buildDir
 
-  # TODO
-  # The branch below is temporarily changed until the following issue is addressed:
-  # https://github.com/eth2-clients/eth2-testnets/pull/3
   exec &"git clone --quiet --depth=1 {testnetsGitUrl}"
 
   var