Skip to content

Commit

Permalink
load Goerli metadata from goerli repo (#5680)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
etan-status authored and zah committed Jan 3, 2024
1 parent 29b29e1 commit 8759466
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
7 changes: 6 additions & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# beacon_chain
# Copyright (c) 2019-2023 Status Research & Development GmbH
# Copyright (c) 2019-2024 Status Research & Development GmbH
# Licensed and distributed under either of
# * MIT license (license terms in the root directory or at http://opensource.org/licenses/MIT).
# * Apache v2 license (license terms in the root directory or at http://www.apache.org/licenses/LICENSE-2.0).
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions beacon_chain/networking/network_metadata.nim
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# beacon_chain
# Copyright (c) 2018-2023 Status Research & Development GmbH
# Copyright (c) 2018-2024 Status Research & Development GmbH
# Licensed and distributed under either of
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
Expand Down Expand Up @@ -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")
Expand All @@ -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")

Expand Down
4 changes: 2 additions & 2 deletions beacon_chain/networking/network_metadata_mainnet.S
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# beacon_chain
# Copyright (c) 2023 Status Research & Development GmbH
# Copyright (c) 2023-2024 Status Research & Development GmbH
# Licensed and distributed under either of
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions vendor/goerli
Submodule goerli added at 247ed0

0 comments on commit 8759466

Please sign in to comment.