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

use canonical, standalone sepolia network definition repository (#4762)

This commit is contained in:
tersec 2023-03-29 08:37:14 +00:00 committed by GitHub
parent 865d95bcbb
commit aa04d45335
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitmodules vendored
View File

@ -193,16 +193,15 @@
url = https://github.com/status-im/nim-toml-serialization.git url = https://github.com/status-im/nim-toml-serialization.git
ignore = untracked ignore = untracked
branch = master branch = master
[submodule "vendor/merge-testnets"]
path = vendor/merge-testnets
url = https://github.com/eth-clients/merge-testnets.git
branch = main
[submodule "vendor/gnosis-chain-configs"] [submodule "vendor/gnosis-chain-configs"]
path = vendor/gnosis-chain-configs path = vendor/gnosis-chain-configs
url = https://github.com/gnosischain/configs.git url = https://github.com/gnosischain/configs.git
[submodule "vendor/withdrawals-testnets"] [submodule "vendor/withdrawals-testnets"]
path = vendor/withdrawals-testnets path = vendor/withdrawals-testnets
url = https://github.com/ethpandaops/withdrawals-testnet.git url = https://github.com/ethpandaops/withdrawals-testnet.git
[submodule "vendor/sepolia"]
path = vendor/sepolia
url = https://github.com/eth-clients/sepolia.git
[submodule "vendor/nim-kzg4844"] [submodule "vendor/nim-kzg4844"]
path = vendor/nim-kzg4844 path = vendor/nim-kzg4844
url = https://github.com/status-im/nim-kzg4844/ url = https://github.com/status-im/nim-kzg4844/

11
beacon_chain/networking/network_metadata.nim
View File

@ -77,7 +77,7 @@ type
const const
eth2NetworksDir = currentSourcePath.parentDir.replace('\\', '/') & "/../../vendor/eth2-networks" eth2NetworksDir = currentSourcePath.parentDir.replace('\\', '/') & "/../../vendor/eth2-networks"
mergeTestnetsDir = currentSourcePath.parentDir.replace('\\', '/') & "/../../vendor/merge-testnets" sepoliaDir = currentSourcePath.parentDir.replace('\\', '/') & "/../../vendor/sepolia"
proc readBootstrapNodes*(path: string): seq[string] {.raises: [IOError, Defect].} = proc readBootstrapNodes*(path: string): seq[string] {.raises: [IOError, Defect].} =
# Read a list of ENR values from a YAML file containing a flat list of entries # Read a list of ENR values from a YAML file containing a flat list of entries
@ -205,10 +205,6 @@ template eth2Network(path: string, eth1Network: Eth1Network): Eth2NetworkMetadat
loadCompileTimeNetworkMetadata(eth2NetworksDir & "/" & path, loadCompileTimeNetworkMetadata(eth2NetworksDir & "/" & path,
some eth1Network) some eth1Network)
template mergeTestnet(path: string, eth1Network: Eth1Network): Eth2NetworkMetadata =
loadCompileTimeNetworkMetadata(mergeTestnetsDir & "/" & path,
some eth1Network)
when const_preset == "gnosis": when const_preset == "gnosis":
const const
gnosisMetadata* = loadCompileTimeNetworkMetadata( gnosisMetadata* = loadCompileTimeNetworkMetadata(
@ -223,12 +219,13 @@ elif const_preset == "mainnet":
const const
mainnetMetadata* = eth2Network("shared/mainnet", mainnet) mainnetMetadata* = eth2Network("shared/mainnet", mainnet)
praterMetadata* = eth2Network("shared/prater", goerli) praterMetadata* = eth2Network("shared/prater", goerli)
sepoliaMetadata* = mergeTestnet("sepolia", sepolia) sepoliaMetadata* =
loadCompileTimeNetworkMetadata(sepoliaDir & "/bepolia", some sepolia)
static: static:
for network in [mainnetMetadata, praterMetadata, sepoliaMetadata]: for network in [mainnetMetadata, praterMetadata, sepoliaMetadata]:
checkForkConsistency(network.cfg) checkForkConsistency(network.cfg)
for network in [mainnetMetadata, praterMetadata]: for network in [mainnetMetadata, praterMetadata, sepoliaMetaData]:
doAssert network.cfg.DENEB_FORK_EPOCH == FAR_FUTURE_EPOCH doAssert network.cfg.DENEB_FORK_EPOCH == FAR_FUTURE_EPOCH
proc getMetadataForNetwork*( proc getMetadataForNetwork*(

1
vendor/merge-testnets vendored

@ -1 +0,0 @@
Subproject commit baebfaba3c0dcb8b6e4d5113e52fd6981253a152

1
vendor/sepolia vendored Submodule

@ -0,0 +1 @@
Subproject commit 23dbdd7077fa0abdd7c8f29862a2f8883151d144