diff --git a/ConsensusSpecPreset-mainnet.md b/ConsensusSpecPreset-mainnet.md index 8635a4816e..76e376ac61 100644 --- a/ConsensusSpecPreset-mainnet.md +++ b/ConsensusSpecPreset-mainnet.md @@ -92,7 +92,7 @@ ConsensusSpecPreset-mainnet + Rewards and penalties - full_attestation_participation [Preset: mainnet] OK + Rewards and penalties - full_attestation_participation_with_leak [Preset: mainnet] OK + Rewards and penalties - full_attestations_misc_balances [Preset: mainnet] OK -+ Rewards and penalties - full_attestations_one_validaor_one_gwei [Preset: mainnet] OK ++ Rewards and penalties - full_attestations_one_validator_one_gwei [Preset: mainnet] OK + Rewards and penalties - genesis_epoch_full_attestations_no_rewards [Preset: mainnet] OK + Rewards and penalties - genesis_epoch_no_attestations_no_penalties [Preset: mainnet] OK + Rewards and penalties - no_attestations_all_penalties [Preset: mainnet] OK @@ -584,7 +584,7 @@ ConsensusSpecPreset-mainnet + Rewards and penalties - full_attestation_participation [Preset: mainnet] OK + Rewards and penalties - full_attestation_participation_with_leak [Preset: mainnet] OK + Rewards and penalties - full_attestations_misc_balances [Preset: mainnet] OK -+ Rewards and penalties - full_attestations_one_validaor_one_gwei [Preset: mainnet] OK ++ Rewards and penalties - full_attestations_one_validator_one_gwei [Preset: mainnet] OK + Rewards and penalties - genesis_epoch_full_attestations_no_rewards [Preset: mainnet] OK + Rewards and penalties - genesis_epoch_no_attestations_no_penalties [Preset: mainnet] OK + Rewards and penalties - no_attestations_all_penalties [Preset: mainnet] OK @@ -1109,7 +1109,7 @@ ConsensusSpecPreset-mainnet + Rewards and penalties - full_attestation_participation [Preset: mainnet] OK + Rewards and penalties - full_attestation_participation_with_leak [Preset: mainnet] OK + Rewards and penalties - full_attestations_misc_balances [Preset: mainnet] OK -+ Rewards and penalties - full_attestations_one_validaor_one_gwei [Preset: mainnet] OK ++ Rewards and penalties - full_attestations_one_validator_one_gwei [Preset: mainnet] OK + Rewards and penalties - genesis_epoch_full_attestations_no_rewards [Preset: mainnet] OK + Rewards and penalties - genesis_epoch_no_attestations_no_penalties [Preset: mainnet] OK + Rewards and penalties - no_attestations_all_penalties [Preset: mainnet] OK @@ -1732,7 +1732,7 @@ ConsensusSpecPreset-mainnet + Rewards and penalties - full_attestation_participation [Preset: mainnet] OK + Rewards and penalties - full_attestation_participation_with_leak [Preset: mainnet] OK + Rewards and penalties - full_attestations_misc_balances [Preset: mainnet] OK -+ Rewards and penalties - full_attestations_one_validaor_one_gwei [Preset: mainnet] OK ++ Rewards and penalties - full_attestations_one_validator_one_gwei [Preset: mainnet] OK + Rewards and penalties - genesis_epoch_full_attestations_no_rewards [Preset: mainnet] OK + Rewards and penalties - genesis_epoch_no_attestations_no_penalties [Preset: mainnet] OK + Rewards and penalties - no_attestations_all_penalties [Preset: mainnet] OK @@ -2451,7 +2451,7 @@ ConsensusSpecPreset-mainnet + Rewards and penalties - full_attestation_participation [Preset: mainnet] OK + Rewards and penalties - full_attestation_participation_with_leak [Preset: mainnet] OK + Rewards and penalties - full_attestations_misc_balances [Preset: mainnet] OK -+ Rewards and penalties - full_attestations_one_validaor_one_gwei [Preset: mainnet] OK ++ Rewards and penalties - full_attestations_one_validator_one_gwei [Preset: mainnet] OK + Rewards and penalties - genesis_epoch_full_attestations_no_rewards [Preset: mainnet] OK + Rewards and penalties - genesis_epoch_no_attestations_no_penalties [Preset: mainnet] OK + Rewards and penalties - no_attestations_all_penalties [Preset: mainnet] OK @@ -3288,7 +3288,7 @@ ConsensusSpecPreset-mainnet + Rewards and penalties - full_attestation_participation [Preset: mainnet] OK + Rewards and penalties - full_attestation_participation_with_leak [Preset: mainnet] OK + Rewards and penalties - full_attestations_misc_balances [Preset: mainnet] OK -+ Rewards and penalties - full_attestations_one_validaor_one_gwei [Preset: mainnet] OK ++ Rewards and penalties - full_attestations_one_validator_one_gwei [Preset: mainnet] OK + Rewards and penalties - genesis_epoch_full_attestations_no_rewards [Preset: mainnet] OK + Rewards and penalties - genesis_epoch_no_attestations_no_penalties [Preset: mainnet] OK + Rewards and penalties - no_attestations_all_penalties [Preset: mainnet] OK @@ -4011,7 +4011,7 @@ ConsensusSpecPreset-mainnet + Rewards and penalties - full_attestation_participation [Preset: mainnet] OK + Rewards and penalties - full_attestation_participation_with_leak [Preset: mainnet] OK + Rewards and penalties - full_attestations_misc_balances [Preset: mainnet] OK -+ Rewards and penalties - full_attestations_one_validaor_one_gwei [Preset: mainnet] OK ++ Rewards and penalties - full_attestations_one_validator_one_gwei [Preset: mainnet] OK + Rewards and penalties - full_attestations_random_incorrect_fields [Preset: mainnet] OK + Rewards and penalties - genesis_epoch_full_attestations_no_rewards [Preset: mainnet] OK + Rewards and penalties - genesis_epoch_no_attestations_no_penalties [Preset: mainnet] OK diff --git a/ConsensusSpecPreset-minimal.md b/ConsensusSpecPreset-minimal.md index c34a73d103..3ad8119b52 100644 --- a/ConsensusSpecPreset-minimal.md +++ b/ConsensusSpecPreset-minimal.md @@ -98,7 +98,7 @@ ConsensusSpecPreset-minimal + Rewards and penalties - full_attestation_participation [Preset: minimal] OK + Rewards and penalties - full_attestation_participation_with_leak [Preset: minimal] OK + Rewards and penalties - full_attestations_misc_balances [Preset: minimal] OK -+ Rewards and penalties - full_attestations_one_validaor_one_gwei [Preset: minimal] OK ++ Rewards and penalties - full_attestations_one_validator_one_gwei [Preset: minimal] OK + Rewards and penalties - genesis_epoch_full_attestations_no_rewards [Preset: minimal] OK + Rewards and penalties - genesis_epoch_no_attestations_no_penalties [Preset: minimal] OK + Rewards and penalties - no_attestations_all_penalties [Preset: minimal] OK @@ -614,7 +614,7 @@ ConsensusSpecPreset-minimal + Rewards and penalties - full_attestation_participation [Preset: minimal] OK + Rewards and penalties - full_attestation_participation_with_leak [Preset: minimal] OK + Rewards and penalties - full_attestations_misc_balances [Preset: minimal] OK -+ Rewards and penalties - full_attestations_one_validaor_one_gwei [Preset: minimal] OK ++ Rewards and penalties - full_attestations_one_validator_one_gwei [Preset: minimal] OK + Rewards and penalties - genesis_epoch_full_attestations_no_rewards [Preset: minimal] OK + Rewards and penalties - genesis_epoch_no_attestations_no_penalties [Preset: minimal] OK + Rewards and penalties - no_attestations_all_penalties [Preset: minimal] OK @@ -1163,7 +1163,7 @@ ConsensusSpecPreset-minimal + Rewards and penalties - full_attestation_participation [Preset: minimal] OK + Rewards and penalties - full_attestation_participation_with_leak [Preset: minimal] OK + Rewards and penalties - full_attestations_misc_balances [Preset: minimal] OK -+ Rewards and penalties - full_attestations_one_validaor_one_gwei [Preset: minimal] OK ++ Rewards and penalties - full_attestations_one_validator_one_gwei [Preset: minimal] OK + Rewards and penalties - genesis_epoch_full_attestations_no_rewards [Preset: minimal] OK + Rewards and penalties - genesis_epoch_no_attestations_no_penalties [Preset: minimal] OK + Rewards and penalties - no_attestations_all_penalties [Preset: minimal] OK @@ -1815,7 +1815,7 @@ ConsensusSpecPreset-minimal + Rewards and penalties - full_attestation_participation [Preset: minimal] OK + Rewards and penalties - full_attestation_participation_with_leak [Preset: minimal] OK + Rewards and penalties - full_attestations_misc_balances [Preset: minimal] OK -+ Rewards and penalties - full_attestations_one_validaor_one_gwei [Preset: minimal] OK ++ Rewards and penalties - full_attestations_one_validator_one_gwei [Preset: minimal] OK + Rewards and penalties - genesis_epoch_full_attestations_no_rewards [Preset: minimal] OK + Rewards and penalties - genesis_epoch_no_attestations_no_penalties [Preset: minimal] OK + Rewards and penalties - no_attestations_all_penalties [Preset: minimal] OK @@ -2566,7 +2566,7 @@ ConsensusSpecPreset-minimal + Rewards and penalties - full_attestation_participation [Preset: minimal] OK + Rewards and penalties - full_attestation_participation_with_leak [Preset: minimal] OK + Rewards and penalties - full_attestations_misc_balances [Preset: minimal] OK -+ Rewards and penalties - full_attestations_one_validaor_one_gwei [Preset: minimal] OK ++ Rewards and penalties - full_attestations_one_validator_one_gwei [Preset: minimal] OK + Rewards and penalties - genesis_epoch_full_attestations_no_rewards [Preset: minimal] OK + Rewards and penalties - genesis_epoch_no_attestations_no_penalties [Preset: minimal] OK + Rewards and penalties - no_attestations_all_penalties [Preset: minimal] OK @@ -2754,11 +2754,12 @@ ConsensusSpecPreset-minimal + [Valid] EF - Electra - Operations - Consolidation Request - incorrect_exited_target OK + [Valid] EF - Electra - Operations - Consolidation Request - incorrect_inactive_source OK + [Valid] EF - Electra - Operations - Consolidation Request - incorrect_inactive_target OK -+ [Valid] EF - Electra - Operations - Consolidation Request - incorrect_incorrect_source_a OK + [Valid] EF - Electra - Operations - Consolidation Request - incorrect_no_source_executio OK + [Valid] EF - Electra - Operations - Consolidation Request - incorrect_not_enough_consoli OK ++ [Valid] EF - Electra - Operations - Consolidation Request - incorrect_source_address OK + [Valid] EF - Electra - Operations - Consolidation Request - incorrect_source_has_pending OK + [Valid] EF - Electra - Operations - Consolidation Request - incorrect_source_not_active_ OK ++ [Valid] EF - Electra - Operations - Consolidation Request - incorrect_source_with_bls_cr OK + [Valid] EF - Electra - Operations - Consolidation Request - incorrect_target_with_bls_cr OK + [Valid] EF - Electra - Operations - Consolidation Request - incorrect_target_with_eth1_c OK + [Valid] EF - Electra - Operations - Consolidation Request - incorrect_unknown_source_pub OK @@ -3468,7 +3469,7 @@ ConsensusSpecPreset-minimal + Rewards and penalties - full_attestation_participation [Preset: minimal] OK + Rewards and penalties - full_attestation_participation_with_leak [Preset: minimal] OK + Rewards and penalties - full_attestations_misc_balances [Preset: minimal] OK -+ Rewards and penalties - full_attestations_one_validaor_one_gwei [Preset: minimal] OK ++ Rewards and penalties - full_attestations_one_validator_one_gwei [Preset: minimal] OK + Rewards and penalties - genesis_epoch_full_attestations_no_rewards [Preset: minimal] OK + Rewards and penalties - genesis_epoch_no_attestations_no_penalties [Preset: minimal] OK + Rewards and penalties - no_attestations_all_penalties [Preset: minimal] OK @@ -3649,11 +3650,12 @@ ConsensusSpecPreset-minimal + [Valid] EF - Fulu - Operations - Consolidation Request - incorrect_exited_target OK + [Valid] EF - Fulu - Operations - Consolidation Request - incorrect_inactive_source OK + [Valid] EF - Fulu - Operations - Consolidation Request - incorrect_inactive_target OK -+ [Valid] EF - Fulu - Operations - Consolidation Request - incorrect_incorrect_source_addr OK + [Valid] EF - Fulu - Operations - Consolidation Request - incorrect_no_source_execution_w OK + [Valid] EF - Fulu - Operations - Consolidation Request - incorrect_not_enough_consolidat OK ++ [Valid] EF - Fulu - Operations - Consolidation Request - incorrect_source_address OK + [Valid] EF - Fulu - Operations - Consolidation Request - incorrect_source_has_pending_wi OK + [Valid] EF - Fulu - Operations - Consolidation Request - incorrect_source_not_active_lon OK ++ [Valid] EF - Fulu - Operations - Consolidation Request - incorrect_source_with_bls_crede OK + [Valid] EF - Fulu - Operations - Consolidation Request - incorrect_target_with_bls_crede OK + [Valid] EF - Fulu - Operations - Consolidation Request - incorrect_target_with_eth1_cred OK + [Valid] EF - Fulu - Operations - Consolidation Request - incorrect_unknown_source_pubkey OK @@ -4180,6 +4182,7 @@ ConsensusSpecPreset-minimal + Light client - Sync - minimal/altair/light_client/sync/pyspec_tests/deneb_store_with_legac OK + Light client - Sync - minimal/altair/light_client/sync/pyspec_tests/electra_store_with_leg OK + Light client - Sync - minimal/altair/light_client/sync/pyspec_tests/light_client_sync OK ++ Light client - Sync - minimal/altair/light_client/sync/pyspec_tests/light_client_sync_no_f OK + Light client - Sync - minimal/altair/light_client/sync/pyspec_tests/supply_sync_committee_ OK + Light client - Sync - minimal/bellatrix/light_client/sync/pyspec_tests/advance_finality_wi OK + Light client - Sync - minimal/bellatrix/light_client/sync/pyspec_tests/capella_deneb_fork OK @@ -4189,6 +4192,7 @@ ConsensusSpecPreset-minimal + Light client - Sync - minimal/bellatrix/light_client/sync/pyspec_tests/deneb_store_with_le OK + Light client - Sync - minimal/bellatrix/light_client/sync/pyspec_tests/electra_store_with_ OK + Light client - Sync - minimal/bellatrix/light_client/sync/pyspec_tests/light_client_sync OK ++ Light client - Sync - minimal/bellatrix/light_client/sync/pyspec_tests/light_client_sync_n OK + Light client - Sync - minimal/bellatrix/light_client/sync/pyspec_tests/supply_sync_committ OK + Light client - Sync - minimal/capella/light_client/sync/pyspec_tests/advance_finality_with OK + Light client - Sync - minimal/capella/light_client/sync/pyspec_tests/deneb_electra_fork OK @@ -4196,14 +4200,17 @@ ConsensusSpecPreset-minimal + Light client - Sync - minimal/capella/light_client/sync/pyspec_tests/deneb_store_with_lega OK + Light client - Sync - minimal/capella/light_client/sync/pyspec_tests/electra_store_with_le OK + Light client - Sync - minimal/capella/light_client/sync/pyspec_tests/light_client_sync OK ++ Light client - Sync - minimal/capella/light_client/sync/pyspec_tests/light_client_sync_no_ OK + Light client - Sync - minimal/capella/light_client/sync/pyspec_tests/supply_sync_committee OK + Light client - Sync - minimal/deneb/light_client/sync/pyspec_tests/advance_finality_withou OK + Light client - Sync - minimal/deneb/light_client/sync/pyspec_tests/electra_fork OK + Light client - Sync - minimal/deneb/light_client/sync/pyspec_tests/electra_store_with_lega OK + Light client - Sync - minimal/deneb/light_client/sync/pyspec_tests/light_client_sync OK ++ Light client - Sync - minimal/deneb/light_client/sync/pyspec_tests/light_client_sync_no_fo OK + Light client - Sync - minimal/deneb/light_client/sync/pyspec_tests/supply_sync_committee_f OK + Light client - Sync - minimal/electra/light_client/sync/pyspec_tests/advance_finality_with OK + Light client - Sync - minimal/electra/light_client/sync/pyspec_tests/light_client_sync OK ++ Light client - Sync - minimal/electra/light_client/sync/pyspec_tests/light_client_sync_no_ OK + Light client - Sync - minimal/electra/light_client/sync/pyspec_tests/supply_sync_committee OK ``` ## EF - Light client - Update ranking [Preset: minimal] @@ -4297,7 +4304,7 @@ ConsensusSpecPreset-minimal + Rewards and penalties - full_attestation_participation [Preset: minimal] OK + Rewards and penalties - full_attestation_participation_with_leak [Preset: minimal] OK + Rewards and penalties - full_attestations_misc_balances [Preset: minimal] OK -+ Rewards and penalties - full_attestations_one_validaor_one_gwei [Preset: minimal] OK ++ Rewards and penalties - full_attestations_one_validator_one_gwei [Preset: minimal] OK + Rewards and penalties - full_attestations_random_incorrect_fields [Preset: minimal] OK + Rewards and penalties - genesis_epoch_full_attestations_no_rewards [Preset: minimal] OK + Rewards and penalties - genesis_epoch_no_attestations_no_penalties [Preset: minimal] OK diff --git a/beacon_chain/spec/datatypes/base.nim b/beacon_chain/spec/datatypes/base.nim index a75f4127b7..b6251f23a8 100644 --- a/beacon_chain/spec/datatypes/base.nim +++ b/beacon_chain/spec/datatypes/base.nim @@ -74,7 +74,7 @@ export tables, results, endians2, json_serialization, sszTypes, beacon_time, crypto, digest, presets -const SPEC_VERSION* = "1.5.0-beta.2" +const SPEC_VERSION* = "1.5.0-beta.3" ## Spec version we're aiming to be compatible with, right now const diff --git a/tests/consensus_spec/test_fixture_kzg.nim b/tests/consensus_spec/test_fixture_kzg.nim index 58b3dd31cd..3ce52cf9b5 100644 --- a/tests/consensus_spec/test_fixture_kzg.nim +++ b/tests/consensus_spec/test_fixture_kzg.nim @@ -12,12 +12,12 @@ import std/json, yaml/tojson, kzg4844/[kzg, kzg_abi], - stew/byteutils, ../testutil, ./fixtures_utils, ./os_ops from std/sequtils import anyIt, mapIt, toSeq from std/strutils import rsplit +from stew/byteutils import fromHex func toUInt64(s: int): Opt[uint64] = if s < 0: @@ -337,8 +337,8 @@ suite suiteName: # TODO also check that the only direct subdirectory of each is kzg-mainnet doAssert sorted(mapIt( toSeq(walkDir(suitePath, relative = true, checkDir = true)), it.path)) == - ["compute_cells_and_kzg_proofs", "recover_cells_and_kzg_proofs", - "verify_cell_kzg_proof_batch"] + ["compute_cells", "compute_cells_and_kzg_proofs", + "recover_cells_and_kzg_proofs", "verify_cell_kzg_proof_batch"] block: let testsDir = suitePath/"compute_cells_and_kzg_proofs"/"kzg-mainnet" diff --git a/vendor/nim-eth2-scenarios b/vendor/nim-eth2-scenarios index 217a1776ad..e650925329 160000 --- a/vendor/nim-eth2-scenarios +++ b/vendor/nim-eth2-scenarios @@ -1 +1 @@ -Subproject commit 217a1776adb5120bc44f870e407747902089f343 +Subproject commit e650925329d96550fc35437daa5f69f5d50fe2b6