Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions ConsensusSpecPreset-mainnet.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
25 changes: 16 additions & 9 deletions ConsensusSpecPreset-minimal.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -4189,21 +4192,25 @@ 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
+ Light client - Sync - minimal/capella/light_client/sync/pyspec_tests/deneb_fork OK
+ 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]
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion beacon_chain/spec/datatypes/base.nim
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions tests/consensus_spec/test_fixture_kzg.nim
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion vendor/nim-eth2-scenarios