Merge branch 'unstable' into column-syncer

Author: agnxsh

AllTests-mainnet.md

@@ -792,6 +792,7 @@ AllTests-mainnet
 + Access peers by key test                                                                   OK
 + Acquire from empty pool                                                                    OK
 + Acquire/Sorting and consistency test                                                       OK
++ Custom filters test                                                                        OK
 + Delete peer on release text                                                                OK
 + Iterators test                                                                             OK
 + Peer lifetime test                                                                         OK

ConsensusSpecPreset-mainnet.md

@@ -132,7 +132,7 @@ type
     current_sync_committee*: SyncCommittee     # [New in Altair]
     next_sync_committee*: SyncCommittee        # [New in Altair]
 
-  # https://github.com/ethereum/consensus-specs/blob/v1.5.0-beta.3/specs/bellatrix/beacon-chain.md#beaconstate
+  # https://github.com/ethereum/consensus-specs/blob/v1.5.0-beta.4/specs/bellatrix/beacon-chain.md#beaconstate
   # Memory-representation-equivalent to a Bellatrix BeaconState for in-place SSZ
   # reading and writing
   BellatrixBeaconStateNoImmutableValidators* = object

ConsensusSpecPreset-minimal.md

@@ -507,7 +507,8 @@ proc addAttestation*(
 
   template addAttToPool(_: electra.Attestation) {.used.} =
     let
-      committee_index = get_committee_index_one(attestation.committee_bits).expect("TODO")
+      committee_index = get_committee_index_one(
+        attestation.committee_bits).expect("Gossip validation requires this")
       data = AttestationData(
         slot: attestation.data.slot,
         index: uint64 committee_index,
@@ -557,11 +558,10 @@ func covers*(
   ## the existing aggregates, making it redundant
   ## the `var` attestation pool is needed to use `withValue`, else Table becomes
   ## unusably inefficient
-  let candidateIdx = pool.candidateIdx(data.slot, CandidateIdxType.phase0Idx)
-  if candidateIdx.isNone:
+  let candidateIdx = pool.candidateIdx(data.slot, CandidateIdxType.phase0Idx).valueOr:
     return false
 
-  pool.phase0Candidates[candidateIdx.get()].withValue(
+  pool.phase0Candidates[candidateIdx].withValue(
       getAttestationCandidateKey(data, Opt.none CommitteeIndex), entry):
     if entry[].covers(bits):
       return true
@@ -570,21 +570,21 @@ func covers*(
 
 func covers*(
     pool: var AttestationPool, data: AttestationData,
-    bits: ElectraCommitteeValidatorsBits): bool =
+    aggregation_bits: ElectraCommitteeValidatorsBits,
+    committee_bits: AttestationCommitteeBits): bool =
   ## Return true iff the given attestation already is fully covered by one of
   ## the existing aggregates, making it redundant
   ## the `var` attestation pool is needed to use `withValue`, else Table becomes
   ## unusably inefficient
-  let candidateIdx = pool.candidateIdx(data.slot, CandidateIdxType.electraIdx)
-  if candidateIdx.isNone:
+  let candidateIdx = pool.candidateIdx(data.slot, CandidateIdxType.electraIdx).valueOr:
     return false
 
-  debugComment "foo"
-  # needs to know more than attestationdata now
-  #let attestation_data_root = hash_tree_root(data)
-  #pool.electraCandidates[candidateIdx.get()].withValue(attestation_data_root, entry):
-  #  if entry[].covers(bits):
-  #    return true
+  pool.electraCandidates[candidateIdx].withValue(
+      getAttestationCandidateKey(
+        data, Opt.some get_committee_index_one(
+          committee_bits).expect("Gossip validation requires this")), entry):
+    if entry[].covers(aggregation_bits):
+      return true
 
   false
 

beacon_chain/beacon_chain_db_immutable.nim

@@ -333,7 +333,7 @@ proc getBlockProposalData*(chain: var Eth1Chain,
         totalDepositsInNewBlock =
           withState(state):
             when consensusFork >= ConsensusFork.Electra:
-              # https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.10/specs/electra/validator.md#deposits
+              # https://github.com/ethereum/consensus-specs/blob/v1.5.0-beta.4/specs/electra/validator.md#deposits
               let eth1_deposit_index_limit = min(
                 forkyState.data.eth1_data.deposit_count,
                 forkyState.data.deposit_requests_start_index)

beacon_chain/consensus_object_pools/attestation_pool.nim

@@ -7,7 +7,7 @@
 
 {.push raises: [].}
 
-# https://github.com/ethereum/consensus-specs/blob/v1.5.0-beta.3/tests/core/pyspec/eth2spec/utils/merkle_minimal.py
+# https://github.com/ethereum/consensus-specs/blob/v1.5.0-beta.4/tests/core/pyspec/eth2spec/utils/merkle_minimal.py
 
 # Merkle tree helpers
 # ---------------------------------------------------------------

beacon_chain/el/eth1_chain.nim

@@ -11,9 +11,9 @@ Gossip validation is different from consensus verification in particular for blo
 
 - Blocks: https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.8/specs/phase0/p2p-interface.md#beacon_block
 - Attestations (aggregated): https://github.com/ethereum/consensus-specs/blob/v1.5.0-beta.0/specs/phase0/p2p-interface.md#beacon_aggregate_and_proof
-- Attestations (unaggregated): https://github.com/ethereum/consensus-specs/blob/v1.4.0/specs/phase0/p2p-interface.md#attestation-subnets
+- Attestations (unaggregated): https://github.com/ethereum/consensus-specs/blob/v1.5.0-beta.4/specs/phase0/p2p-interface.md#attestation-subnets
 - Voluntary exits: https://github.com/ethereum/consensus-specs/blob/v1.4.0-beta.4/specs/phase0/p2p-interface.md#voluntary_exit
-- Proposer slashings: https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.10/specs/phase0/p2p-interface.md#proposer_slashing
+- Proposer slashings: https://github.com/ethereum/consensus-specs/blob/v1.5.0-beta.4/specs/phase0/p2p-interface.md#proposer_slashing
 - Attester slashing: https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.8/specs/phase0/p2p-interface.md#attester_slashing
 
 There are multiple consumers of validated consensus objects:

beacon_chain/el/merkle_minimal.nim

@@ -95,7 +95,7 @@ func check_propagation_slot_range(
     return ok(msgSlot)
 
   if consensusFork < ConsensusFork.Deneb:
-    # https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.8/specs/phase0/p2p-interface.md#configuration
+    # https://github.com/ethereum/consensus-specs/blob/v1.5.0-beta.4/specs/phase0/p2p-interface.md#configuration
     # The spec value of ATTESTATION_PROPAGATION_SLOT_RANGE is 32, but it can
     # retransmit attestations on the cusp of being out of spec, and which by
     # the time they reach their destination might be out of spec.
@@ -1191,6 +1191,7 @@ proc validateAttestation*(
 
 # https://github.com/ethereum/consensus-specs/blob/v1.4.0-beta.1/specs/phase0/p2p-interface.md#beacon_aggregate_and_proof
 # https://github.com/ethereum/consensus-specs/blob/v1.4.0-beta.5/specs/deneb/p2p-interface.md#beacon_aggregate_and_proof
+# https://github.com/ethereum/consensus-specs/blob/v1.5.0-beta.4/specs/electra/p2p-interface.md#beacon_aggregate_and_proof
 proc validateAggregate*(
     pool: ref AttestationPool, batchCrypto: ref BatchCrypto,
     signedAggregateAndProof:
@@ -1215,6 +1216,11 @@ proc validateAggregate*(
       return pool.checkedReject(v.error)
     v.get()
 
+  # [REJECT] aggregate.data.index == 0
+  when signedAggregateAndProof is electra.SignedAggregateAndProof:
+    if not(aggregate.data.index == 0):
+      return pool.checkedReject("Aggregate: Electra aggregate.data.index != 0")
+
   # [IGNORE] aggregate.data.slot is within the last
   # ATTESTATION_PROPAGATION_SLOT_RANGE slots (with a
   # MAXIMUM_GOSSIP_CLOCK_DISPARITY allowance) -- i.e. aggregate.data.slot +
@@ -1279,11 +1285,13 @@ proc validateAggregate*(
   # [REJECT] The committee index is within the expected range -- i.e.
   # data.index < get_committee_count_per_slot(state, data.target.epoch).
   let committee_index = block:
-    when signedAggregateAndProof is electra.SignedAggregateAndProof:
+    when kind(typeof(signedAggregateAndProof)) == ConsensusFork.Electra:
+      # [REJECT] len(committee_indices) == 1, where committee_indices =
+      # get_committee_indices(aggregate)
       let agg_idx = get_committee_index_one(aggregate.committee_bits).valueOr:
         return pool.checkedReject("Aggregate: got multiple committee bits")
       let idx = shufflingRef.get_committee_index(agg_idx.uint64)
-    elif signedAggregateAndProof is phase0.SignedAggregateAndProof:
+    elif kind(typeof(signedAggregateAndProof)) == ConsensusFork.Phase0:
       let idx = shufflingRef.get_committee_index(aggregate.data.index)
     else:
       static: doAssert false
@@ -1296,13 +1304,19 @@ proc validateAggregate*(
     return pool.checkedReject(
       "Aggregate: number of aggregation bits and committee size mismatch")
 
-  if checkCover and
-      pool[].covers(aggregate.data, aggregate.aggregation_bits):
-    # [IGNORE] A valid aggregate attestation defined by
-    # `hash_tree_root(aggregate.data)` whose `aggregation_bits` is a non-strict
-    # superset has _not_ already been seen.
-    # https://github.com/ethereum/consensus-specs/pull/2847
-    return errIgnore("Aggregate: already covered")
+  # [IGNORE] A valid aggregate attestation defined by
+  # `hash_tree_root(aggregate.data)` whose `aggregation_bits` is a non-strict
+  # superset has _not_ already been seen.
+  # https://github.com/ethereum/consensus-specs/pull/2847
+  when kind(typeof(signedAggregateAndProof)) == ConsensusFork.Electra:
+    if checkCover and
+        pool[].covers(aggregate.data, aggregate.aggregation_bits,
+        aggregate.committee_bits):
+      return errIgnore("Aggregate: already covered")
+  else:
+    if checkCover and
+        pool[].covers(aggregate.data, aggregate.aggregation_bits):
+      return errIgnore("Aggregate: already covered")
 
   # [REJECT] aggregate_and_proof.selection_proof selects the validator as an
   # aggregator for the slot -- i.e. is_aggregator(state, aggregate.data.slot,

beacon_chain/gossip_processing/README.md

@@ -94,7 +94,7 @@ typedef struct ETHConsensusConfig ETHConsensusConfig;
  *         based on the given `config.yaml` file content - If successful.
  * @return `NULL` - If the given `config.yaml` is malformed or incompatible.
  *
- * @see https://github.com/ethereum/consensus-specs/blob/v1.5.0-beta.3/configs/README.md
+ * @see https://github.com/ethereum/consensus-specs/blob/v1.5.0-beta.4/configs/README.md
  */
 ETH_RESULT_USE_CHECK
 ETHConsensusConfig *_Nullable ETHConsensusConfigCreateFromYaml(const char *configFileContent);
@@ -150,7 +150,7 @@ typedef struct ETHBeaconState ETHBeaconState;
  * @return `NULL` - If the given `sszBytes` is malformed.
  *
  * @see https://github.com/ethereum/consensus-specs/blob/v1.5.0-beta.0/specs/phase0/beacon-chain.md#beaconstate
- * @see https://github.com/ethereum/consensus-specs/blob/v1.5.0-beta.3/specs/altair/beacon-chain.md#beaconstate
+ * @see https://github.com/ethereum/consensus-specs/blob/v1.5.0-beta.4/specs/altair/beacon-chain.md#beaconstate
  * @see https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.8/specs/bellatrix/beacon-chain.md#beaconstate
  * @see https://github.com/ethereum/consensus-specs/blob/v1.5.0-beta.2/specs/capella/beacon-chain.md#beaconstate
  * @see https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.9/configs/README.md
@@ -326,7 +326,7 @@ typedef struct ETHLightClientStore ETHLightClientStore;
  * @see https://ethereum.github.io/beacon-APIs/?urls.primaryName=v2.4.1#/Beacon/getLightClientBootstrap
  * @see https://ethereum.github.io/beacon-APIs/?urls.primaryName=v2.4.1#/Events/eventstream
  * @see https://github.com/ethereum/consensus-specs/blob/v1.5.0-beta.0/specs/altair/light-client/light-client.md
- * @see https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.9/specs/phase0/weak-subjectivity.md#weak-subjectivity-period
+ * @see https://github.com/ethereum/consensus-specs/blob/v1.5.0-beta.4/specs/phase0/weak-subjectivity.md#weak-subjectivity-period
  */
 ETH_RESULT_USE_CHECK
 ETHLightClientStore *_Nullable ETHLightClientStoreCreateFromBootstrap(