Simplified comute_attesters_for_epoch and removed slot from duties

Author: rodrigo-o

lib/lambda_ethereum_consensus/validator/duties.ex

@@ -16,7 +16,6 @@ defmodule LambdaEthereumConsensus.Validator.Duties do
           selection_proof: Bls.signature(),
           signing_domain: Types.domain(),
           subnet_id: Types.uint64(),
-          slot: Types.slot(),
           validator_index: Types.validator_index(),
           committee_index: Types.uint64(),
           committee_length: Types.uint64(),
@@ -51,16 +50,13 @@ defmodule LambdaEthereumConsensus.Validator.Duties do
          {start_slot, end_slot} <- boundary_slots(epoch) do
       committee_count_per_slot = Accessors.get_committee_count_per_slot(state, epoch)
 
-      start_slot..end_slot
-      |> Enum.flat_map(fn slot ->
-        0..(committee_count_per_slot - 1)
-        |> Enum.flat_map(&compute_duties_per_committee(state, epoch, slot, validators, &1))
-        |> case do
-          [] -> []
-          duties -> [{slot, duties}]
-        end
-      end)
-      |> Map.new()
+      for slot <- start_slot..end_slot,
+          committee_i <- 0..(committee_count_per_slot - 1),
+          reduce: %{} do
+        acc ->
+          new_duties = compute_duties_per_committee(state, epoch, slot, validators, committee_i)
+          Map.update(acc, slot, new_duties, &(new_duties ++ &1))
+      end
     end
   end
 
@@ -71,15 +67,14 @@ defmodule LambdaEthereumConsensus.Validator.Duties do
             validator = Map.get(validators, validator_index),
             duty =
               %{
-                slot: slot,
                 validator_index: validator_index,
                 index_in_committee: index_in_committee,
                 committee_length: length(committee),
                 committee_index: committee_index,
                 attested?: false
               }
-              |> update_with_aggregation_duty(state, validator.keystore.privkey)
-              |> update_with_subnet_id(state, epoch) do
+              |> update_with_aggregation_duty(state, slot, validator.keystore.privkey)
+              |> update_with_subnet_id(state, epoch, slot) do
           duty
         end
 
@@ -88,11 +83,11 @@ defmodule LambdaEthereumConsensus.Validator.Duties do
     end
   end
 
-  defp update_with_aggregation_duty(duty, beacon_state, privkey) do
-    proof = Utils.get_slot_signature(beacon_state, duty.slot, privkey)
+  defp update_with_aggregation_duty(duty, beacon_state, slot, privkey) do
+    proof = Utils.get_slot_signature(beacon_state, slot, privkey)
 
     if Utils.aggregator?(proof, duty.committee_length) do
-      epoch = Misc.compute_epoch_at_slot(duty.slot)
+      epoch = Misc.compute_epoch_at_slot(slot)
       domain = Accessors.get_domain(beacon_state, Constants.domain_aggregate_and_proof(), epoch)
 
       Map.put(duty, :should_aggregate?, true)
@@ -103,11 +98,11 @@ defmodule LambdaEthereumConsensus.Validator.Duties do
     end
   end
 
-  defp update_with_subnet_id(duty, beacon_state, epoch) do
+  defp update_with_subnet_id(duty, beacon_state, epoch, slot) do
     committees_per_slot = Accessors.get_committee_count_per_slot(beacon_state, epoch)
 
     subnet_id =
-      Utils.compute_subnet_for_attestation(committees_per_slot, duty.slot, duty.committee_index)
+      Utils.compute_subnet_for_attestation(committees_per_slot, slot, duty.committee_index)
 
     Map.put(duty, :subnet_id, subnet_id)
   end

lib/lambda_ethereum_consensus/validator/validator.ex

@@ -90,14 +90,14 @@ defmodule LambdaEthereumConsensus.Validator do
   ##########################
   # Attestations
 
-  @spec attest(t(), Duties.attester_duty(), Types.root()) :: :ok
-  def attest(%{index: validator_index, keystore: keystore}, current_duty, head_root) do
+  @spec attest(t(), Duties.attester_duty(), Types.slot(), Types.root()) :: :ok
+  def attest(%{index: validator_index, keystore: keystore}, current_duty, slot, head_root) do
     subnet_id = current_duty.subnet_id
-    log_debug(validator_index, "attesting", slot: current_duty.slot, subnet_id: subnet_id)
+    log_debug(validator_index, "attesting", slot: slot, subnet_id: subnet_id)
 
-    attestation = produce_attestation(current_duty, head_root, keystore.privkey)
+    attestation = produce_attestation(current_duty, slot, head_root, keystore.privkey)
 
-    log_md = [slot: attestation.data.slot, attestation: attestation, subnet_id: subnet_id]
+    log_md = [slot: slot, attestation: attestation, subnet_id: subnet_id]
 
     debug_log_msg =
       "publishing attestation on committee index: #{current_duty.committee_index} | as #{current_duty.index_in_committee}/#{current_duty.committee_length - 1} and pubkey: #{LambdaEthereumConsensus.Utils.format_shorten_binary(keystore.pubkey)}"
@@ -115,11 +115,12 @@ defmodule LambdaEthereumConsensus.Validator do
     end
   end
 
-  @spec publish_aggregate(Duties.attester_duty(), non_neg_integer(), Keystore.t()) :: :ok
-  def publish_aggregate(duty, validator_index, keystore) do
+  @spec publish_aggregate(Duties.attester_duty(), Types.slot(), non_neg_integer(), Keystore.t()) ::
+          :ok
+  def publish_aggregate(duty, slot, validator_index, keystore) do
     case Gossip.Attestation.stop_collecting(duty.subnet_id) do
       {:ok, attestations} ->
-        log_md = [slot: duty.slot, attestations: attestations]
+        log_md = [slot: slot, attestations: attestations]
         log_debug(validator_index, "publishing aggregate", log_md)
 
         aggregate_attestations(attestations)
@@ -163,12 +164,11 @@ defmodule LambdaEthereumConsensus.Validator do
     %Types.SignedAggregateAndProof{message: aggregate_and_proof, signature: signature}
   end
 
-  defp produce_attestation(duty, head_root, privkey) do
+  defp produce_attestation(duty, slot, head_root, privkey) do
     %{
       index_in_committee: index_in_committee,
       committee_length: committee_length,
-      committee_index: committee_index,
-      slot: slot
+      committee_index: committee_index
     } = duty
 
     head_state = BlockStates.get_state_info!(head_root).beacon_state |> go_to_slot(slot)

lib/lambda_ethereum_consensus/validator/validator_set.ex

@@ -170,7 +170,7 @@ defmodule LambdaEthereumConsensus.ValidatorSet do
 
       attesters ->
         Enum.map(attesters, fn {validator, duty} ->
-          Validator.attest(validator, duty, head_root)
+          Validator.attest(validator, duty, slot, head_root)
 
           # Duty.attested(duty)
           %{duty | attested?: true}
@@ -186,7 +186,7 @@ defmodule LambdaEthereumConsensus.ValidatorSet do
 
       aggregators ->
         Enum.map(aggregators, fn {validator, duty} ->
-          Validator.publish_aggregate(duty, validator.index, validator.keystore)
+          Validator.publish_aggregate(duty, slot, validator.index, validator.keystore)
 
           # Duty.aggregated(duty)
           %{duty | should_aggregate?: false}