status-im
/
nimbus-eth2
mirror of https://github.com/status-im/nimbus-eth2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.

- https://github.com/eth-clients/goerli/pull/178
This commit is contained in:
Etan Kissling 2024-01-02 16:15:44 +01:00 committed by GitHub
parent a90e1308b5
commit af63291df4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitmodules vendored
View File

@ -1,5 +1,5 @@
# beacon_chain # beacon_chain
# Copyright (c) 2019-2023 Status Research & Development GmbH # Copyright (c) 2019-2024 Status Research & Development GmbH
# Licensed and distributed under either of # Licensed and distributed under either of
# * MIT license (license terms in the root directory or at http://opensource.org/licenses/MIT). # * 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). # * Apache v2 license (license terms in the root directory or at http://www.apache.org/licenses/LICENSE-2.0).
@ -220,6 +220,11 @@
url = https://github.com/arnetheduck/nim-results.git url = https://github.com/arnetheduck/nim-results.git
ignore = untracked ignore = untracked
branch = master branch = master
[submodule "vendor/goerli"]
path = vendor/goerli
url = https://github.com/eth-clients/goerli
ignore = untracked
branch = main
[submodule "vendor/holesky"] [submodule "vendor/holesky"]
path = vendor/holesky path = vendor/holesky
url = https://github.com/eth-clients/holesky url = https://github.com/eth-clients/holesky

6
beacon_chain/networking/network_metadata.nim
View File

@ -1,5 +1,5 @@
# beacon_chain # beacon_chain
# Copyright (c) 2018-2023 Status Research & Development GmbH # Copyright (c) 2018-2024 Status Research & Development GmbH
# Licensed and distributed under either of # Licensed and distributed under either of
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT). # * 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). # * 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":
vendorDir & "/eth2-networks/shared/mainnet/genesis.ssz") vendorDir & "/eth2-networks/shared/mainnet/genesis.ssz")
praterGenesis* = slurp( praterGenesis* = slurp(
vendorDir & "/eth2-networks/shared/prater/genesis.ssz") vendorDir & "/goerli/prater/genesis.ssz")
sepoliaGenesis* = slurp( sepoliaGenesis* = slurp(
vendorDir & "/sepolia/bepolia/genesis.ssz") vendorDir & "/sepolia/bepolia/genesis.ssz")
@ -314,7 +314,7 @@ elif const_preset == "mainnet":
useBakedInGenesis = some "mainnet") useBakedInGenesis = some "mainnet")
praterMetadata = loadCompileTimeNetworkMetadata( praterMetadata = loadCompileTimeNetworkMetadata(
vendorDir & "/eth2-networks/shared/prater", vendorDir & "/goerli/prater",
some goerli, some goerli,
useBakedInGenesis = some "prater") useBakedInGenesis = some "prater")

4
beacon_chain/networking/network_metadata_mainnet.S
View File

@ -1,5 +1,5 @@
# beacon_chain # beacon_chain
# Copyright (c) 2023 Status Research & Development GmbH # Copyright (c) 2023-2024 Status Research & Development GmbH
# Licensed and distributed under either of # Licensed and distributed under either of
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT). # * 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). # * 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):
.quad eth2_mainnet_genesis_end - eth2_mainnet_genesis_data .quad eth2_mainnet_genesis_end - eth2_mainnet_genesis_data
eth2_goerli_genesis_data: eth2_goerli_genesis_data:
.incbin "eth2-networks/shared/prater/genesis.ssz" .incbin "goerli/prater/genesis.ssz"
eth2_goerli_genesis_end: eth2_goerli_genesis_end:
.global cdecl(eth2_goerli_genesis_size) .global cdecl(eth2_goerli_genesis_size)
.p2align 3 .p2align 3

1
vendor/goerli vendored Submodule

@ -0,0 +1 @@
Subproject commit 247ed0735d88190f79c1b7371ee55bc74f463f9b