diff --git a/AllTests-mainnet.md b/AllTests-mainnet.md index f7c533f7f..247c19d2f 100644 --- a/AllTests-mainnet.md +++ b/AllTests-mainnet.md @@ -116,7 +116,7 @@ OK: 3/3 Fail: 0/3 Skip: 0/3 + DOMAIN_VOLUNTARY_EXIT "0x04000000" [Preset: mainnet] OK + EFFECTIVE_BALANCE_INCREMENT 1000000000 [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_RANDOM_SUBNET_SUBSCRIPTION 256 [Preset: mainnet] OK + EPOCHS_PER_SLASHINGS_VECTOR 8192 [Preset: mainnet] OK diff --git a/Makefile b/Makefile index ee780f50d..4f3290776 100644 --- a/Makefile +++ b/Makefile @@ -309,6 +309,27 @@ medalla-deposit: | nimbus_beacon_node_spec_0_12_3 nimbus_signing_process deposit clean-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 mkdir -p vendor/.nimble/bin/ $(ENV_SCRIPT) nim -d:danger -o:vendor/.nimble/bin/ctail c vendor/nim-chronicles-tail/ctail.nim diff --git a/beacon_chain/network_metadata.nim b/beacon_chain/network_metadata.nim index e5e65b23f..a467b5ddb 100644 --- a/beacon_chain/network_metadata.nim +++ b/beacon_chain/network_metadata.nim @@ -167,6 +167,7 @@ template eth2testnet(path: string): Eth2NetworkMetadata = const medallaMetadata* = eth2testnet "shared/medalla" + toledoMetadata* = eth2testnet "shared/toledo" testnet0Metadata* = eth2testnet "nimbus/testnet0" testnet1Metadata* = eth2testnet "nimbus/testnet1" @@ -179,6 +180,8 @@ proc getMetadataForNetwork*(networkName: string): Eth2NetworkMetadata = mainnetMetadata of "medalla": medallaMetadata + of "toledo": + toledoMetadata of "testnet0": testnet0Metadata of "testnet1": diff --git a/beacon_chain/spec/presets.nim b/beacon_chain/spec/presets.nim index 6d8021f6e..010c3b9e9 100644 --- a/beacon_chain/spec/presets.nim +++ b/beacon_chain/spec/presets.nim @@ -122,7 +122,7 @@ proc readPresetFile*(path: string): PresetFile 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" when ETH2_SPEC == "v0.12.3": diff --git a/vendor/eth2-testnets b/vendor/eth2-testnets index 7f63f72e4..290f68b36 160000 --- a/vendor/eth2-testnets +++ b/vendor/eth2-testnets @@ -1 +1 @@ -Subproject commit 7f63f72e46a8c5932c802931cefbe2683bb5e5e6 +Subproject commit 290f68b3601d0cb66529376243b30a90bae318e2