deprecate --terminal-total-difficulty-override; remove launch script for deprecated ropsten (#4241)

* deprecate --terminal-total-difficulty-override; remove launch script for deprecated ropsten

* remove Makefile support for Ropsten

Makefile

@@ -28,7 +28,6 @@ BASE_METRICS_PORT := 8008
 # WARNING: Use lazy assignment to allow CI to override.
 EXECUTOR_NUMBER ?= 0
 
-ROPSTEN_WEB3_URL := "--web3-url=wss://ropsten.infura.io/ws/v3/809a18497dd74102b5f37d25aae3c85a"
 SEPOLIA_WEB3_URL := "--web3-url=https://rpc.sepolia.dev --web3-url=https://www.sepoliarpc.space"
 GOERLI_WEB3_URL := "--web3-url=wss://goerli.infura.io/ws/v3/809a18497dd74102b5f37d25aae3c85a"
 GNOSIS_WEB3_URLS := "--web3-url=wss://rpc.gnosischain.com/wss --web3-url=wss://xdai.poanetwork.dev/wss"
@@ -531,35 +530,6 @@ clean-goerli:
 	$(call CLEAN_NETWORK,goerli)
 
 
-###
-### Ropsten
-###
-ropsten-build: | nimbus_beacon_node nimbus_signing_node
-
-# https://www.gnu.org/software/make/manual/html_node/Call-Function.html#Call-Function
-ropsten: | ropsten-build
-	$(call CONNECT_TO_NETWORK,ropsten,nimbus_beacon_node,$(ROPSTEN_WEB3_URL))
-
-ropsten-vc: | ropsten-build nimbus_validator_client
-	$(call CONNECT_TO_NETWORK_WITH_VALIDATOR_CLIENT,ropsten,nimbus_beacon_node,$(ROPSTEN_WEB3_URL))
-
-ropsten-lc: | nimbus_light_client
-	$(call CONNECT_TO_NETWORK_WITH_LIGHT_CLIENT,ropsten)
-
-ifneq ($(LOG_LEVEL), TRACE)
-ropsten-dev:
-	+ "$(MAKE)" LOG_LEVEL=TRACE $@
-else
-ropsten-dev: | ropsten-build
-	$(call CONNECT_TO_NETWORK_IN_DEV_MODE,ropsten,nimbus_beacon_node,$(ROPSTEN_WEB3_URL))
-endif
-
-ropsten-dev-deposit: | ropsten-build deposit_contract
-	$(call MAKE_DEPOSIT,ropsten,$(ROPSTEN_WEB3_URL))
-
-clean-ropsten:
-	$(call CLEAN_NETWORK,ropsten)
-
 ###
 ### Sepolia
 ###

beacon_chain/conf.nim

@@ -528,12 +528,9 @@ type
         defaultValueDesc: $DeploymentPhase.Mainnet
         name: "deployment-phase" .}: DeploymentPhase
 
-      # TODO nim-confutils on 32-bit platforms overflows decoding integers
-      # requiring 64-bit representations and doesn't build when specifying
-      # UInt256 directly, so pass this through for decoding elsewhere.
       terminalTotalDifficultyOverride* {.
         hidden
-        desc: "Override pre-configured TERMINAL_TOTAL_DIFFICULTY parameter"
+        desc: "Deprecated for removal"
         name: "terminal-total-difficulty-override" .}: Option[string]
 
       validatorMonitorAuto* {.

beacon_chain/nimbus_beacon_node.nim

@@ -1812,6 +1812,7 @@ proc doRunBeaconNode(config: var BeaconNodeConf, rng: ref HmacDrbgContext) {.rai
         option = config.option.get
   ignoreDeprecatedOption requireEngineAPI
   ignoreDeprecatedOption safeSlotsToImportOptimistically
+  ignoreDeprecatedOption terminalTotalDifficultyOverride
 
   createPidFile(config.dataDir.string / "beacon_node.pid")
 
@@ -1837,10 +1838,6 @@ proc doRunBeaconNode(config: var BeaconNodeConf, rng: ref HmacDrbgContext) {.rai
   # the db.
   var metadata = config.loadEth2Network()
 
-  if config.terminalTotalDifficultyOverride.isSome:
-    metadata.cfg.TERMINAL_TOTAL_DIFFICULTY =
-      parse(config.terminalTotalDifficultyOverride.get, UInt256, 10)
-
   # Updating the config based on the metadata certainly is not beautiful but it
   # works
   for node in metadata.bootstrapNodes:

beacon_chain/rpc/rest_key_management_api.nim

@@ -8,7 +8,7 @@
 # please keep imports clear of `rest_utils` or any other module which imports
 # beacon node's specific networking code.
 
-import std/[tables, os, strutils, uri]
+import std/[tables, strutils, uri]
 import chronos, chronicles, confutils,
        stew/[base10, results, io2], blscurve, presto
 import ".."/spec/[keystore, crypto]

beacon_chain/spec/eth2_apis/rest_common.nim

@@ -10,7 +10,7 @@ else:
   {.push raises: [].}
 
 import
-  chronos, presto/client, chronicles,
+  chronos, presto/client,
   "."/[rest_types, eth2_rest_serialization]
 
 export chronos, client, rest_types, eth2_rest_serialization

beacon_chain/spec/eth2_apis/rest_remote_signer_calls.nim

@@ -10,7 +10,7 @@ else:
   {.push raises: [].}
 
 import
-  std/strutils, chronicles, metrics,
+  chronicles, metrics,
   chronos, chronos/apps/http/httpclient, presto, presto/client,
   serialization, json_serialization,
   json_serialization/std/[options, net, sets],

run-ropsten-beacon-node.sh

@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2020-2021 Status Research & Development GmbH. Licensed under
-# either of:
-# - Apache License, version 2.0
-# - MIT license
-# at your option. This file may not be copied, modified, or distributed except
-# according to those terms.
-
-cd "$(dirname $0)"
-# Allow the binary to receive signals directly.
-exec scripts/run-beacon-node.sh nimbus_beacon_node ropsten "$@"

tests/consensus_spec/test_fixture_fork_choice.nim

@@ -11,7 +11,7 @@ import
   # Standard library
   std/[json, os, sequtils, strutils, tables],
   # Status libraries
-  stew/[results, endians2], chronicles,
+  stew/results, chronicles,
   eth/keys, taskpools,
   # Internals
   ../../beacon_chain/spec/[helpers, forks, state_transition_block],

tests/consensus_spec/test_fixture_light_client_sync.nim

@@ -10,8 +10,6 @@
 import
   # Standard library
   std/[json, os, streams],
-  # Status libraries
-  stew/bitops2,
   # Third-party
   yaml,
   # Beacon chain internals