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

Add metadata for the toledo network

This commit is contained in:
Zahary Karadjov 2020-11-09 11:32:51 +02:00 committed by zah
parent 4b603d7f5a
commit 94e9ce3c1f
5 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AllTests-mainnet.md
View File

@ -116,7 +116,7 @@ OK: 3/3 Fail: 0/3 Skip: 0/3
+ DOMAIN_VOLUNTARY_EXIT "0x04000000" [Preset: mainnet] OK + DOMAIN_VOLUNTARY_EXIT "0x04000000" [Preset: mainnet] OK
+ EFFECTIVE_BALANCE_INCREMENT 1000000000 [Preset: mainnet] OK + EFFECTIVE_BALANCE_INCREMENT 1000000000 [Preset: mainnet] OK
+ EJECTION_BALANCE 16000000000 [Preset: mainnet] OK + EJECTION_BALANCE 16000000000 [Preset: mainnet] OK
+ EPOCHS_PER_ETH1_VOTING_PERIOD 32 [Preset: mainnet] OK + EPOCHS_PER_ETH1_VOTING_PERIOD 64 [Preset: mainnet] OK
+ EPOCHS_PER_HISTORICAL_VECTOR 65536 [Preset: mainnet] OK + EPOCHS_PER_HISTORICAL_VECTOR 65536 [Preset: mainnet] OK
+ EPOCHS_PER_RANDOM_SUBNET_SUBSCRIPTION 256 [Preset: mainnet] OK + EPOCHS_PER_RANDOM_SUBNET_SUBSCRIPTION 256 [Preset: mainnet] OK
+ EPOCHS_PER_SLASHINGS_VECTOR 8192 [Preset: mainnet] OK + EPOCHS_PER_SLASHINGS_VECTOR 8192 [Preset: mainnet] OK

21
Makefile
View File

@ -309,6 +309,27 @@ medalla-deposit: | nimbus_beacon_node_spec_0_12_3 nimbus_signing_process deposit
clean-medalla: clean-medalla:
$(call CLEAN_NETWORK,medalla) $(call CLEAN_NETWORK,medalla)
###
### toledo
###
# https://www.gnu.org/software/make/manual/html_node/Call-Function.html#Call-Function
toledo: | nimbus_beacon_node nimbus_signing_process
$(call CONNECT_TO_NETWORK,toledo,nimbus_beacon_node)
toledo-vc: | nimbus_beacon_node nimbus_signing_process nimbus_validator_client
$(call CONNECT_TO_NETWORK_WITH_VALIDATOR_CLIENT,toledo,nimbus_beacon_node)
ifneq ($(LOG_LEVEL), TRACE)
toledo-dev:
+ "$(MAKE)" LOG_LEVEL=TRACE $@
else
toledo-dev: | nimbus_beacon_node nimbus_signing_process
$(call CONNECT_TO_NETWORK_IN_DEV_MODE,toledo,nimbus_beacon_node)
endif
clean-toledo:
$(call CLEAN_NETWORK,toledo)
ctail: | build deps ctail: | build deps
mkdir -p vendor/.nimble/bin/ mkdir -p vendor/.nimble/bin/
$(ENV_SCRIPT) nim -d:danger -o:vendor/.nimble/bin/ctail c vendor/nim-chronicles-tail/ctail.nim $(ENV_SCRIPT) nim -d:danger -o:vendor/.nimble/bin/ctail c vendor/nim-chronicles-tail/ctail.nim

3
beacon_chain/network_metadata.nim
View File

@ -167,6 +167,7 @@ template eth2testnet(path: string): Eth2NetworkMetadata =
const const
medallaMetadata* = eth2testnet "shared/medalla" medallaMetadata* = eth2testnet "shared/medalla"
toledoMetadata* = eth2testnet "shared/toledo"
testnet0Metadata* = eth2testnet "nimbus/testnet0" testnet0Metadata* = eth2testnet "nimbus/testnet0"
testnet1Metadata* = eth2testnet "nimbus/testnet1" testnet1Metadata* = eth2testnet "nimbus/testnet1"
@ -179,6 +180,8 @@ proc getMetadataForNetwork*(networkName: string): Eth2NetworkMetadata =
mainnetMetadata mainnetMetadata
of "medalla": of "medalla":
medallaMetadata medallaMetadata
of "toledo":
toledoMetadata
of "testnet0": of "testnet0":
testnet0Metadata testnet0Metadata
of "testnet1": of "testnet1":

2
beacon_chain/spec/presets.nim
View File

@ -122,7 +122,7 @@ proc readPresetFile*(path: string): PresetFile
result.missingValues = PresetValue.entireSet - presetValues result.missingValues = PresetValue.entireSet - presetValues
const ETH2_SPEC* {.strdefine.} = "v0.12.3" const ETH2_SPEC* {.strdefine.} = "v1.0.0"
static: doAssert: ETH2_SPEC == "v0.12.3" or ETH2_SPEC == "v1.0.0" static: doAssert: ETH2_SPEC == "v0.12.3" or ETH2_SPEC == "v1.0.0"
when ETH2_SPEC == "v0.12.3": when ETH2_SPEC == "v0.12.3":

2
vendor/eth2-testnets vendored

@ -1 +1 @@
Subproject commit 7f63f72e46a8c5932c802931cefbe2683bb5e5e6 Subproject commit 290f68b3601d0cb66529376243b30a90bae318e2