bump `mainnet` to `f6b7882618a5ad2c1d2731ae35e5d16a660d5bb7` (#6310)

* bump `mainnet` to `f6b7882618a5ad2c1d2731ae35e5d16a660d5bb7`

- Initial commit

* fix soft links
This commit is contained in:
Etan Kissling 2024-05-30 11:28:16 +02:00 committed by GitHub
parent d033ae0a34
commit ab892c1a04
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 16 additions and 16 deletions

10
.gitmodules vendored
View File

@ -5,6 +5,11 @@
# * 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).
# at your option. This file may not be copied, modified, or distributed except according to those terms. # at your option. This file may not be copied, modified, or distributed except according to those terms.
[submodule "vendor/mainnet"]
path = vendor/mainnet
url = https://github.com/eth-clients/mainnet.git
ignore = untracked
branch = main
[submodule "vendor/nim-eth2-scenarios"] [submodule "vendor/nim-eth2-scenarios"]
path = vendor/nim-eth2-scenarios path = vendor/nim-eth2-scenarios
url = https://github.com/status-im/nim-eth2-scenarios url = https://github.com/status-im/nim-eth2-scenarios
@ -170,11 +175,6 @@
url = https://github.com/status-im/nim-presto.git url = https://github.com/status-im/nim-presto.git
ignore = untracked ignore = untracked
branch = master branch = master
[submodule "vendor/eth2-networks"]
path = vendor/eth2-networks
url = https://github.com/eth-clients/eth2-networks.git
ignore = untracked
branch = master
[submodule "vendor/nim-taskpools"] [submodule "vendor/nim-taskpools"]
path = vendor/nim-taskpools path = vendor/nim-taskpools
url = https://github.com/status-im/nim-taskpools url = https://github.com/status-im/nim-taskpools

View File

@ -593,7 +593,7 @@ define MAKE_DEPOSIT
build/deposit_contract sendDeposits \ build/deposit_contract sendDeposits \
$(2) \ $(2) \
--deposit-contract=$$(cat vendor/eth2-networks/shared/$(1)/deposit_contract.txt) \ --deposit-contract=$$(cat vendor/$(1)/metadata/deposit_contract.txt) \
--deposits-file=nbc-$(1)-deposits.json \ --deposits-file=nbc-$(1)-deposits.json \
--min-delay=$(DEPOSITS_DELAY) \ --min-delay=$(DEPOSITS_DELAY) \
--max-delay=$(DEPOSITS_DELAY) \ --max-delay=$(DEPOSITS_DELAY) \

View File

@ -1 +1 @@
../../../vendor/eth2-networks/shared/mainnet/config.yaml ../../../vendor/mainnet/metadata/config.yaml

View File

@ -1 +1 @@
../../../vendor/eth2-networks/shared/mainnet/genesis.ssz ../../../vendor/mainnet/metadata/genesis.ssz

View File

@ -53,7 +53,7 @@ proc addBootstrapNode*(bootstrapAddr: string,
return return
# Ignore comments in # Ignore comments in
# https://github.com/eth-clients/eth2-networks/blob/063f826a03676c33c95a66306916f18b690d35eb/shared/mainnet/bootstrap_nodes.txt # https://github.com/eth-clients/mainnet/blob/main/metadata/bootstrap_nodes.txt
let enrRes = parseBootstrapAddress(bootstrapAddr.split(" # ")[0]) let enrRes = parseBootstrapAddress(bootstrapAddr.split(" # ")[0])
if enrRes.isOk: if enrRes.isOk:
bootstrapEnrs.add enrRes.value bootstrapEnrs.add enrRes.value

View File

@ -117,8 +117,8 @@ proc loadEth2NetworkMetadata*(
downloadGenesisFrom = none(DownloadInfo), downloadGenesisFrom = none(DownloadInfo),
useBakedInGenesis = none(string) useBakedInGenesis = none(string)
): Result[Eth2NetworkMetadata, string] {.raises: [IOError, PresetFileError].} = ): Result[Eth2NetworkMetadata, string] {.raises: [IOError, PresetFileError].} =
# Load data in eth2-networks format # Load data in mainnet format
# https://github.com/eth-clients/eth2-networks # https://github.com/eth-clients/mainnet
try: try:
let let
@ -292,14 +292,14 @@ elif const_preset == "mainnet":
else: else:
const const
mainnetGenesis* = slurp( mainnetGenesis* = slurp(
vendorDir & "/eth2-networks/shared/mainnet/genesis.ssz") vendorDir & "/mainnet/metadata/genesis.ssz")
sepoliaGenesis* = slurp( sepoliaGenesis* = slurp(
vendorDir & "/sepolia/bepolia/genesis.ssz") vendorDir & "/sepolia/bepolia/genesis.ssz")
const const
mainnetMetadata = loadCompileTimeNetworkMetadata( mainnetMetadata = loadCompileTimeNetworkMetadata(
vendorDir & "/eth2-networks/shared/mainnet", vendorDir & "/mainnet/metadata",
some mainnet, some mainnet,
useBakedInGenesis = some "mainnet") useBakedInGenesis = some "mainnet")

View File

@ -28,7 +28,7 @@
# name_size = 64-bit length in bytes # name_size = 64-bit length in bytes
eth2_mainnet_genesis_data: eth2_mainnet_genesis_data:
.incbin "eth2-networks/shared/mainnet/genesis.ssz" .incbin "mainnet/metadata/genesis.ssz"
eth2_mainnet_genesis_end: eth2_mainnet_genesis_end:
.global cdecl(eth2_mainnet_genesis_size) .global cdecl(eth2_mainnet_genesis_size)
.p2align 3 .p2align 3

View File

@ -39,7 +39,7 @@ proc ifNecessaryMigrateDCS(db: BeaconChainDB,
db.putDepositContractSnapshot upgradeProc(oldSnapshot.get) db.putDepositContractSnapshot upgradeProc(oldSnapshot.get)
# Hexlified copy of # Hexlified copy of
# eth2-networks/shared/mainnet/genesis_deposit_contract_snapshot.ssz # mainnet/metadata/genesis_deposit_contract_snapshot.ssz
let ds1: seq[byte] = hexToSeqByte( let ds1: seq[byte] = hexToSeqByte(
""" """
eeea1373d4aa9e099d7c9deddb694db9aeb4577755ef83f9b6345ce4357d9abfca3bfce2c eeea1373d4aa9e099d7c9deddb694db9aeb4577755ef83f9b6345ce4357d9abfca3bfce2c

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

1
vendor/mainnet vendored Submodule

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