rm holesky support

Author: tersec

.gitmodules

@@ -220,11 +220,6 @@
 	url = https://github.com/arnetheduck/nim-results.git
 	ignore = untracked
 	branch = master
-[submodule "vendor/holesky"]
-	path = vendor/holesky
-	url = https://github.com/eth-clients/holesky
-	ignore = untracked
-	branch = main
 [submodule "vendor/nim-minilru"]
 	path = vendor/nim-minilru
 	url = https://github.com/status-im/nim-minilru.git

Makefile

@@ -111,7 +111,7 @@ ifneq ($(OS), Windows_NT)
 PLATFORM_SPECIFIC_TARGETS += gnosis-build
 endif
 
-# We don't need these `vendor/holesky` and `vendor/hoodi` files but
+# We don't need these `vendor/hoodi` files but
 # fetching them may trigger 'This repository is over its data quota' from GitHub
 #
 # MSYS_NO_PATHCONV=1: On Windows MSYS2, 1st path gets mangled without this flag!
@@ -125,7 +125,7 @@ ifeq ($(NIM_PARAMS),)
 # with Ctrl+C after deleting the working copy and before getting a chance to
 # restore it in $(BUILD_SYSTEM_DIR).
 
-# `vendor/holesky` and `vendor/hoodi` require Git LFS
+# `vendor/hoodi` requires Git LFS
 ifeq (, $(shell which git-lfs))
 ifeq ($(shell uname), Darwin)
 $(error Git LFS not installed. Run 'brew install git-lfs' to set up)

beacon_chain/conf.nim

@@ -1176,7 +1176,7 @@ proc shortNetworkName*(eth2Network: Option[string]): string =
   # network that can be used for directories etc.
   if eth2Network.isSome() and
       eth2Network.get() in
-      ["mainnet", "minimal", "gnosis", "chiado", "hoodi", "holesky", "sepolia"]:
+      ["mainnet", "minimal", "gnosis", "chiado", "hoodi", "sepolia"]:
     eth2Network.get()
   else:
     eth2Network.loadEth2Network().cfg.name()

beacon_chain/el/el_manager.nim

@@ -1144,7 +1144,6 @@ proc checkChainIdWithSingleEL(
         expectedChain = case m.eth1Network.get
           of mainnet: 1.u256
           of sepolia: 11155111.u256
-          of holesky: 17000.u256
           of hoodi: 560048.u256
       if expectedChain != providerChain:
         warn "The specified EL client is connected to a different chain",

beacon_chain/networking/network_metadata.nim

@@ -43,7 +43,6 @@ type
   Eth1Network* = enum
     mainnet
     sepolia
-    holesky
     hoodi
 
   GenesisMetadataKind* = enum
@@ -289,13 +288,6 @@ elif IsMainnetSupported:
       Opt.some sepolia,
       useBakedInGenesis = Opt.some "sepolia")
 
-    holeskyMetadata = loadCompileTimeNetworkMetadata(
-      vendorDir & "/holesky/metadata",
-      Opt.some holesky,
-      downloadGenesisFrom = Opt.some DownloadInfo(
-        url: "https://github.com/status-im/nimbus-eth2/releases/download/v23.9.1/holesky-genesis.ssz.sz",
-        digest: Eth2Digest.fromHex "0x0ea3f6f9515823b59c863454675fefcd1d8b4f2dbe454db166206a41fda060a0"))
-
     # File can be reproduced by `cd vendor/hoodi`, then `git lfs install` and
     # `git lfs pull`, and then from repo root:
     #
@@ -325,15 +317,15 @@ elif IsMainnetSupported:
 
   static:
     for network in [
-        mainnetMetadata, sepoliaMetadata, holeskyMetadata, hoodiMetadata]:
+        mainnetMetadata, sepoliaMetadata, hoodiMetadata]:
       checkForkConsistency(network.cfg)
       doAssert network.cfg.GLOAS_FORK_EPOCH == FAR_FUTURE_EPOCH
       doAssert ConsensusFork.high == ConsensusFork.Gloas
 
     doAssert mainnetMetadata.cfg.FULU_FORK_EPOCH == FAR_FUTURE_EPOCH
     doAssert mainnetMetadata.cfg.BLOB_SCHEDULE.len == 0
 
-    for network in [sepoliaMetadata, holeskyMetadata, hoodiMetadata]:
+    for network in [sepoliaMetadata, hoodiMetadata]:
       doAssert network.cfg.FULU_FORK_EPOCH < FAR_FUTURE_EPOCH
       doAssert network.cfg.BLOB_SCHEDULE.len == 2
 
@@ -379,8 +371,6 @@ proc getMetadataForNetwork*(networkName: string): Eth2NetworkMetadata =
         mainnetMetadata
       of "hoodi":
         hoodiMetadata
-      of "holesky":
-        holeskyMetadata
       of "sepolia":
         sepoliaMetadata
       else:

beacon_chain/networking/network_metadata_downloads.nim

@@ -5,7 +5,7 @@
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
-{.push raises: [].}
+{.push raises: [], gcsafe.}
 
 import
   std/uri,
@@ -77,12 +77,6 @@ proc sourceDesc*(metadata: GenesisMetadata): string =
     metadata.path
 
 when isMainModule:
-  let holeskyMetadata = getMetadataForNetwork("holesky")
-  io2.writeFile(
-    "holesky-genesis.ssz",
-    waitFor holeskyMetadata.fetchGenesisBytes()
-  ).expect("success")
-
   let hoodiMetadata = getMetadataForNetwork("hoodi")
   io2.writeFile(
     "hoodi-genesis.ssz",

beacon_chain/validators/block_payloads.nim

@@ -493,7 +493,7 @@ proc makeBuilderBlock*(
 func isExcludedTestnet(cfg: RuntimeConfig): bool =
   ## Ensure that builder API testing can still occur in certain circumstances.
   cfg.DEPOSIT_CHAIN_ID == cfg.DEPOSIT_NETWORK_ID and
-    cfg.DEPOSIT_CHAIN_ID in [17000'u64, 560048] # Holesky and Hoodi, respectively
+    cfg.DEPOSIT_CHAIN_ID == 560048'u64  # Hoodi
 
 proc collectBids*(
     node: BeaconNode,

docs/the_nimbus_book/src/rest-api.md

@@ -36,11 +36,6 @@ You can make requests as follows (here we are requesting the version the Nimbus
     curl -X GET  http://unstable.hoodi.beacon-api.nimbus.team/eth/v1/node/version
     ```
 
-=== "Holesky unstable branch"
-    ```
-    curl -X GET  http://unstable.holesky.beacon-api.nimbus.team/eth/v1/node/version
-    ```
-
 === "Sepolia unstable branch"
     ```
     curl -X GET  http://unstable.sepolia.beacon-api.nimbus.team/eth/v1/node/version