Skip to content

Commit 8759466

Browse files
etan-statuszah
authored andcommitted
load Goerli metadata from goerli repo (#5680)
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. - eth-clients/goerli#178
1 parent 29b29e1 commit 8759466

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

.gitmodules

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2019-2023 Status Research & Development GmbH
2+
# Copyright (c) 2019-2024 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at http://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at http://www.apache.org/licenses/LICENSE-2.0).
@@ -220,6 +220,11 @@
220220
url = https://github.com/arnetheduck/nim-results.git
221221
ignore = untracked
222222
branch = master
223+
[submodule "vendor/goerli"]
224+
path = vendor/goerli
225+
url = https://github.com/eth-clients/goerli
226+
ignore = untracked
227+
branch = main
223228
[submodule "vendor/holesky"]
224229
path = vendor/holesky
225230
url = https://github.com/eth-clients/holesky

beacon_chain/networking/network_metadata.nim

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2018-2023 Status Research & Development GmbH
2+
# Copyright (c) 2018-2024 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
@@ -302,7 +302,7 @@ elif const_preset == "mainnet":
302302
vendorDir & "/eth2-networks/shared/mainnet/genesis.ssz")
303303

304304
praterGenesis* = slurp(
305-
vendorDir & "/eth2-networks/shared/prater/genesis.ssz")
305+
vendorDir & "/goerli/prater/genesis.ssz")
306306

307307
sepoliaGenesis* = slurp(
308308
vendorDir & "/sepolia/bepolia/genesis.ssz")
@@ -314,7 +314,7 @@ elif const_preset == "mainnet":
314314
useBakedInGenesis = some "mainnet")
315315

316316
praterMetadata = loadCompileTimeNetworkMetadata(
317-
vendorDir & "/eth2-networks/shared/prater",
317+
vendorDir & "/goerli/prater",
318318
some goerli,
319319
useBakedInGenesis = some "prater")
320320

beacon_chain/networking/network_metadata_mainnet.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2023 Status Research & Development GmbH
2+
# Copyright (c) 2023-2024 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
@@ -36,7 +36,7 @@ cdecl(eth2_mainnet_genesis_size):
3636
.quad eth2_mainnet_genesis_end - eth2_mainnet_genesis_data
3737

3838
eth2_goerli_genesis_data:
39-
.incbin "eth2-networks/shared/prater/genesis.ssz"
39+
.incbin "goerli/prater/genesis.ssz"
4040
eth2_goerli_genesis_end:
4141
.global cdecl(eth2_goerli_genesis_size)
4242
.p2align 3

vendor/goerli

Submodule goerli added at 247ed07

0 commit comments

Comments
 (0)