diff --git a/.gitmodules b/.gitmodules index a42ebf3cc..08326638a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,6 +5,11 @@ # * 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. +[submodule "vendor/mainnet"] + path = vendor/mainnet + url = https://github.com/eth-clients/mainnet.git + ignore = untracked + branch = main [submodule "vendor/nim-eth2-scenarios"] path = vendor/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 ignore = untracked 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"] path = vendor/nim-taskpools url = https://github.com/status-im/nim-taskpools diff --git a/Makefile b/Makefile index 6607d92cf..06a2d6974 100644 --- a/Makefile +++ b/Makefile @@ -593,7 +593,7 @@ define MAKE_DEPOSIT build/deposit_contract sendDeposits \ $(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 \ --min-delay=$(DEPOSITS_DELAY) \ --max-delay=$(DEPOSITS_DELAY) \ diff --git a/beacon_chain/libnimbus_lc/test_files/config.yaml b/beacon_chain/libnimbus_lc/test_files/config.yaml index cef4fd337..15d89fdc5 120000 --- a/beacon_chain/libnimbus_lc/test_files/config.yaml +++ b/beacon_chain/libnimbus_lc/test_files/config.yaml @@ -1 +1 @@ -../../../vendor/eth2-networks/shared/mainnet/config.yaml \ No newline at end of file +../../../vendor/mainnet/metadata/config.yaml \ No newline at end of file diff --git a/beacon_chain/libnimbus_lc/test_files/genesis.ssz b/beacon_chain/libnimbus_lc/test_files/genesis.ssz index 20f89e4e6..00c0fa1a6 120000 --- a/beacon_chain/libnimbus_lc/test_files/genesis.ssz +++ b/beacon_chain/libnimbus_lc/test_files/genesis.ssz @@ -1 +1 @@ -../../../vendor/eth2-networks/shared/mainnet/genesis.ssz \ No newline at end of file +../../../vendor/mainnet/metadata/genesis.ssz \ No newline at end of file diff --git a/beacon_chain/networking/eth2_discovery.nim b/beacon_chain/networking/eth2_discovery.nim index a8887aaf0..55ac6a28e 100644 --- a/beacon_chain/networking/eth2_discovery.nim +++ b/beacon_chain/networking/eth2_discovery.nim @@ -53,7 +53,7 @@ proc addBootstrapNode*(bootstrapAddr: string, return # 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]) if enrRes.isOk: bootstrapEnrs.add enrRes.value diff --git a/beacon_chain/networking/network_metadata.nim b/beacon_chain/networking/network_metadata.nim index 7c2160db0..7d7d8c954 100644 --- a/beacon_chain/networking/network_metadata.nim +++ b/beacon_chain/networking/network_metadata.nim @@ -117,8 +117,8 @@ proc loadEth2NetworkMetadata*( downloadGenesisFrom = none(DownloadInfo), useBakedInGenesis = none(string) ): Result[Eth2NetworkMetadata, string] {.raises: [IOError, PresetFileError].} = - # Load data in eth2-networks format - # https://github.com/eth-clients/eth2-networks + # Load data in mainnet format + # https://github.com/eth-clients/mainnet try: let @@ -292,14 +292,14 @@ elif const_preset == "mainnet": else: const mainnetGenesis* = slurp( - vendorDir & "/eth2-networks/shared/mainnet/genesis.ssz") + vendorDir & "/mainnet/metadata/genesis.ssz") sepoliaGenesis* = slurp( vendorDir & "/sepolia/bepolia/genesis.ssz") const mainnetMetadata = loadCompileTimeNetworkMetadata( - vendorDir & "/eth2-networks/shared/mainnet", + vendorDir & "/mainnet/metadata", some mainnet, useBakedInGenesis = some "mainnet") diff --git a/beacon_chain/networking/network_metadata_mainnet.S b/beacon_chain/networking/network_metadata_mainnet.S index 85e0f6153..aafa1dd8c 100644 --- a/beacon_chain/networking/network_metadata_mainnet.S +++ b/beacon_chain/networking/network_metadata_mainnet.S @@ -28,7 +28,7 @@ # name_size = 64-bit length in bytes eth2_mainnet_genesis_data: - .incbin "eth2-networks/shared/mainnet/genesis.ssz" + .incbin "mainnet/metadata/genesis.ssz" eth2_mainnet_genesis_end: .global cdecl(eth2_mainnet_genesis_size) .p2align 3 diff --git a/tests/test_deposit_snapshots.nim b/tests/test_deposit_snapshots.nim index c131c91e5..259727e36 100644 --- a/tests/test_deposit_snapshots.nim +++ b/tests/test_deposit_snapshots.nim @@ -39,7 +39,7 @@ proc ifNecessaryMigrateDCS(db: BeaconChainDB, db.putDepositContractSnapshot upgradeProc(oldSnapshot.get) # Hexlified copy of -# eth2-networks/shared/mainnet/genesis_deposit_contract_snapshot.ssz +# mainnet/metadata/genesis_deposit_contract_snapshot.ssz let ds1: seq[byte] = hexToSeqByte( """ eeea1373d4aa9e099d7c9deddb694db9aeb4577755ef83f9b6345ce4357d9abfca3bfce2c diff --git a/vendor/eth2-networks b/vendor/eth2-networks deleted file mode 160000 index ab581251b..000000000 --- a/vendor/eth2-networks +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ab581251bcda11e3cc120cc9e9ad1ad679340949 diff --git a/vendor/mainnet b/vendor/mainnet new file mode 160000 index 000000000..f6b788261 --- /dev/null +++ b/vendor/mainnet @@ -0,0 +1 @@ +Subproject commit f6b7882618a5ad2c1d2731ae35e5d16a660d5bb7