Add Disc v5.1 bootstrap nodes for Zinken

Also prepares the Makefiles for supporting Medalla
through a separate binary

Makefile

@@ -33,6 +33,7 @@ endif
 # unconditionally built by the default Make target
 # TODO re-enable ncli_query if/when it works again
 TOOLS := \
+	medalla_beacon_node \
 	beacon_node \
 	block_sim \
 	deposit_contract \
@@ -192,9 +193,9 @@ define CONNECT_TO_NETWORK
 		--base-metrics-port $$(($(BASE_METRICS_PORT) + $(NODE_ID))) \
 		--config-file "build/data/shared_$(1)_$(NODE_ID)/prometheus.yml"
 
-	[ "$(2)" == "FastSync" ] && { export CHECKPOINT_PARAMS="--finalized-checkpoint-state=vendor/eth2-testnets/shared/$(1)/recent-finalized-state.ssz \
+	[ "$(3)" == "FastSync" ] && { export CHECKPOINT_PARAMS="--finalized-checkpoint-state=vendor/eth2-testnets/shared/$(1)/recent-finalized-state.ssz \
 																													--finalized-checkpoint-block=vendor/eth2-testnets/shared/$(1)/recent-finalized-block.ssz" ; }; \
-	$(CPU_LIMIT_CMD) build/beacon_node \
+	$(CPU_LIMIT_CMD) build/$(2) \
 		--network=$(1) \
 		--log-level="$(LOG_LEVEL)" \
 		--log-file=build/data/shared_$(1)_$(NODE_ID)/nbc_bn_$$(date +"%Y%m%d%H%M%S").log \
@@ -210,7 +211,7 @@ define CONNECT_TO_NETWORK_IN_DEV_MODE
 		--base-metrics-port $$(($(BASE_METRICS_PORT) + $(NODE_ID))) \
 		--config-file "build/data/shared_$(1)_$(NODE_ID)/prometheus.yml"
 
-	$(CPU_LIMIT_CMD) build/beacon_node \
+	$(CPU_LIMIT_CMD) build/$(2) \
 		--network=$(1) \
 		--log-level="DEBUG; TRACE:discv5,networking; REQUIRED:none; DISABLED:none" \
 		--data-dir=build/data/shared_$(1)_$(NODE_ID) \
@@ -227,7 +228,7 @@ define CONNECT_TO_NETWORK_WITH_VALIDATOR_CLIENT
 		--base-metrics-port $$(($(BASE_METRICS_PORT) + $(NODE_ID))) \
 		--config-file "build/data/shared_$(1)_$(NODE_ID)/prometheus.yml"
 
-	$(CPU_LIMIT_CMD) build/beacon_node \
+	$(CPU_LIMIT_CMD) build/$(2) \
 		--network=$(1) \
 		--log-level="$(LOG_LEVEL)" \
 		--log-file=build/data/shared_$(1)_$(NODE_ID)/nbc_bn_$$(date +"%Y%m%d%H%M%S").log \
@@ -282,27 +283,27 @@ endef
 ### medalla
 ###
 # https://www.gnu.org/software/make/manual/html_node/Call-Function.html#Call-Function
-medalla: | beacon_node signing_process
-	$(call CONNECT_TO_NETWORK,medalla)
+medalla: | medalla_beacon_node signing_process
+	$(call CONNECT_TO_NETWORK,medalla,medalla_beacon_node)
 
-medalla-vc: | beacon_node signing_process validator_client
-	$(call CONNECT_TO_NETWORK_WITH_VALIDATOR_CLIENT,medalla)
+medalla-vc: | medalla_beacon_node signing_process validator_client
+	$(call CONNECT_TO_NETWORK_WITH_VALIDATOR_CLIENT,medalla,medalla_beacon_node)
 
-medalla-fast-sync: | beacon_node signing_process
-	$(call CONNECT_TO_NETWORK,medalla,FastSync)
+medalla-fast-sync: | medalla_beacon_node signing_process
+	$(call CONNECT_TO_NETWORK,medalla,medalla_beacon_node,FastSync)
 
 ifneq ($(LOG_LEVEL), TRACE)
 medalla-dev:
 	+ "$(MAKE)" LOG_LEVEL=TRACE $@
 else
-medalla-dev: | beacon_node signing_process
-	$(call CONNECT_TO_NETWORK_IN_DEV_MODE,medalla)
+medalla-dev: | medalla_beacon_node signing_process
+	$(call CONNECT_TO_NETWORK_IN_DEV_MODE,medalla,medalla_beacon_node)
 endif
 
-medalla-deposit-data: | beacon_node signing_process deposit_contract
+medalla-deposit-data: | medalla_beacon_node signing_process deposit_contract
 	$(call MAKE_DEPOSIT_DATA,medalla)
 
-medalla-deposit: | beacon_node signing_process deposit_contract
+medalla-deposit: | medalla_beacon_node signing_process deposit_contract
 	$(call MAKE_DEPOSIT,medalla)
 
 clean-medalla:
@@ -312,17 +313,17 @@ clean-medalla:
 ### zinken
 ###
 zinken: | beacon_node signing_process
-	$(call CONNECT_TO_NETWORK,zinken)
+	$(call CONNECT_TO_NETWORK,zinken,beacon_node)
 
 zinken-vc: | beacon_node signing_process validator_client
-	$(call CONNECT_TO_NETWORK_WITH_VALIDATOR_CLIENT,zinken)
+	$(call CONNECT_TO_NETWORK_WITH_VALIDATOR_CLIENT,zinken,beacon_node)
 
 ifneq ($(LOG_LEVEL), TRACE)
 zinken-dev:
 	+ "$(MAKE)" LOG_LEVEL=TRACE $@
 else
 zinken-dev: | beacon_node signing_process
-	$(call CONNECT_TO_NETWORK_IN_DEV_MODE,zinken)
+	$(call CONNECT_TO_NETWORK_IN_DEV_MODE,zinken,beacon_node)
 endif
 
 zinken-deposit-data: | beacon_node signing_process deposit_contract
@@ -345,17 +346,17 @@ clean-spadina:
 ### attacknet-beta1-mc-0
 ###
 attacknet-beta1-mc-0: | beacon_node signing_process
-	$(call CONNECT_TO_NETWORK,attacknet-beta1-mc-0)
+	$(call CONNECT_TO_NETWORK,attacknet-beta1-mc-0,beacon_node)
 
 attacknet-beta1-mc-0-vc: | beacon_node signing_process validator_client
-	$(call CONNECT_TO_NETWORK_WITH_VALIDATOR_CLIENT,attacknet-beta1-mc-0)
+	$(call CONNECT_TO_NETWORK_WITH_VALIDATOR_CLIENT,attacknet-beta1-mc-0,beacon_node)
 
 ifneq ($(LOG_LEVEL), TRACE)
 attacknet-beta1-mc-0-dev:
 	+ "$(MAKE)" LOG_LEVEL=TRACE $@
 else
 attacknet-beta1-mc-0-dev: | beacon_node signing_process
-	$(call CONNECT_TO_NETWORK_IN_DEV_MODE,attacknet-beta1-mc-0)
+	$(call CONNECT_TO_NETWORK_IN_DEV_MODE,attacknet-beta1-mc-0,beacon_node)
 endif
 
 attacknet-beta1-mc-0-deposit-data: | beacon_node signing_process deposit_contract

beacon_chain/beacon_node.nim.cfg

@@ -4,6 +4,7 @@
 
 # Use only `secp256k1` public key cryptography as an identity in LibP2P.
 -d:"libp2p_pki_schemes=secp256k1"
+-d:"UseDiscv51=true"
 
 @if testnet_servers_image:
   -d:"chronicles_sinks=json"

beacon_chain/medalla_beacon_node.nim

@@ -0,0 +1,2 @@
+import beacon_node
+

beacon_chain/medalla_beacon_node.nim.cfg

@@ -0,0 +1,15 @@
+-d:"chronicles_sinks=textlines,json[file]"
+-d:"chronicles_runtime_filtering=on"
+-d:"chronicles_default_output_device=dynamic"
+
+# Use only `secp256k1` public key cryptography as an identity in LibP2P.
+-d:"libp2p_pki_schemes=secp256k1"
+
+-d:"ETH2_SPEC=v0.12.3"
+-d:"UseDiscv51=false"
+
+@if testnet_servers_image:
+  -d:"chronicles_sinks=json"
+  -d:"withoutPrompt"
+@end
+

vendor/eth2-testnets

@@ -1 +1 @@
-Subproject commit 86259e4ce28bc86d93e194c3ce46d210bcd5556d
+Subproject commit 7d046da0aa581f799fcccd3b71e4299dae19f080

vendor/nim-eth

@@ -1 +1 @@
-Subproject commit cc0d15ccacaac220695943d28c04f2d82be9b979
+Subproject commit 345dac702b4e77e61d0d47b60c7aecb99b17926d