From ecc3fd50d6cc63c60a1e9882ef60b0f6758c784d Mon Sep 17 00:00:00 2001
From: Etan Kissling <etan@status.im>
Date: Sat, 23 Dec 2023 07:34:04 +0100
Subject: [PATCH] load Goerli metadata from `goerli` repo

The `eth2-networks` repo often receives metadata updates with a delay.
Switch to `goerli` repo to obtain the latest config (Dencun scheduling)
when it is updated. This is in line with how Sepolia / Holesky work.

- https://github.com/eth-clients/goerli/pull/178
---
 .gitmodules                                        | 5 +++++
 beacon_chain/networking/network_metadata.nim       | 4 ++--
 beacon_chain/networking/network_metadata_mainnet.S | 2 +-
 vendor/goerli                                      | 1 +
 4 files changed, 9 insertions(+), 3 deletions(-)
 create mode 160000 vendor/goerli

diff --git a/.gitmodules b/.gitmodules
index 10dc5a0955..179a7bd28b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -220,6 +220,11 @@
 	url = https://github.com/arnetheduck/nim-results.git
 	ignore = untracked
 	branch = master
+[submodule "vendor/goerli"]
+	path = vendor/goerli
+	url = https://github.com/eth-clients/goerli
+	ignore = untracked
+	branch = main
 [submodule "vendor/holesky"]
 	path = vendor/holesky
 	url = https://github.com/eth-clients/holesky
diff --git a/beacon_chain/networking/network_metadata.nim b/beacon_chain/networking/network_metadata.nim
index fcdfbcdb87..e3adfa491e 100644
--- a/beacon_chain/networking/network_metadata.nim
+++ b/beacon_chain/networking/network_metadata.nim
@@ -302,7 +302,7 @@ elif const_preset == "mainnet":
         vendorDir & "/eth2-networks/shared/mainnet/genesis.ssz")
 
       praterGenesis* = slurp(
-        vendorDir & "/eth2-networks/shared/prater/genesis.ssz")
+        vendorDir & "/goerli/prater/genesis.ssz")
 
       sepoliaGenesis* = slurp(
         vendorDir & "/sepolia/bepolia/genesis.ssz")
@@ -314,7 +314,7 @@ elif const_preset == "mainnet":
       useBakedInGenesis = some "mainnet")
 
     praterMetadata = loadCompileTimeNetworkMetadata(
-      vendorDir & "/eth2-networks/shared/prater",
+      vendorDir & "/goerli/prater",
       some goerli,
       useBakedInGenesis = some "prater")
 
diff --git a/beacon_chain/networking/network_metadata_mainnet.S b/beacon_chain/networking/network_metadata_mainnet.S
index 8fb15b8632..39d603d728 100644
--- a/beacon_chain/networking/network_metadata_mainnet.S
+++ b/beacon_chain/networking/network_metadata_mainnet.S
@@ -36,7 +36,7 @@ cdecl(eth2_mainnet_genesis_size):
     .quad    eth2_mainnet_genesis_end - eth2_mainnet_genesis_data
 
 eth2_goerli_genesis_data:
-    .incbin "eth2-networks/shared/prater/genesis.ssz"
+    .incbin "goerli/prater/genesis.ssz"
 eth2_goerli_genesis_end:
     .global cdecl(eth2_goerli_genesis_size)
     .p2align 3
diff --git a/vendor/goerli b/vendor/goerli
new file mode 160000
index 0000000000..ab09c7a4a1
--- /dev/null
+++ b/vendor/goerli
@@ -0,0 +1 @@
+Subproject commit ab09c7a4a1074f3fd11541ba0fe9b13f96d66c46