Moved notify_tick to libp2p to be sure the issues is just with new blocks and not with libp2p calling the ValidatorManager

Author: rodrigo-o

lib/lambda_ethereum_consensus/beacon/clock.ex

@@ -42,15 +42,12 @@ defmodule LambdaEthereumConsensus.Beacon.Clock do
     new_state = %{state | time: time}
 
     if time >= state.genesis_time do
-      Libp2pPort.on_tick(time)
+
       # TODO: reduce time between ticks to account for gnosis' 5s slot time.
       old_logical_time = compute_logical_time(state)
       new_logical_time = compute_logical_time(new_state)
 
-      if old_logical_time != new_logical_time do
-        log_new_slot(new_logical_time)
-        ValidatorManager.notify_tick(new_logical_time)
-      end
+      Libp2pPort.on_tick({time, new_logical_time, new_logical_time != old_logical_time})
     end
 
     {:noreply, new_state}

lib/lambda_ethereum_consensus/fork_choice/fork_choice.ex

@@ -5,7 +5,7 @@ defmodule LambdaEthereumConsensus.ForkChoice do
 
   require Logger
 
-  alias LambdaEthereumConsensus.Beacon.Clock
+  # alias LambdaEthereumConsensus.Beacon.Clock
   alias LambdaEthereumConsensus.Execution.ExecutionChain
   alias LambdaEthereumConsensus.ForkChoice.Handlers
   alias LambdaEthereumConsensus.ForkChoice.Head
@@ -232,7 +232,7 @@ defmodule LambdaEthereumConsensus.ForkChoice do
     %{slot: slot, body: body} = head_block
 
     OperationsCollector.notify_new_block(head_block)
-    ValidatorManager.notify_new_block(slot, head_root)
+
     ExecutionChain.notify_new_block(slot, body.eth1_data, body.execution_payload)
 
     update_fork_choice_data(
@@ -242,7 +242,9 @@ defmodule LambdaEthereumConsensus.ForkChoice do
       store.finalized_checkpoint
     )
 
-    Logger.debug("[Fork choice] Updated fork choice cache", slot: slot)
+    ValidatorManager.notify_new_block(slot, head_root)
+
+    Logger.info("[Fork choice] Updated fork choice cache", slot: slot)
 
     :ok
   end

lib/lambda_ethereum_consensus/validator/validator_manager.ex

@@ -49,11 +49,15 @@ defmodule LambdaEthereumConsensus.Validator.ValidatorManager do
 
   @spec notify_new_block(Types.slot(), Types.root()) :: :ok
   def notify_new_block(slot, head_root) do
-    notify_validators({:new_block, slot, head_root})
+    # Making this alone a cast solves the issue
+    GenServer.cast(__MODULE__, {:notify_all, {:new_block, slot, head_root}})
+    # notify_validators({:new_block, slot, head_root})
   end
 
   @spec notify_tick(Clock.logical_time()) :: :ok
   def notify_tick(logical_time) do
+    # Making this a cast alone doesn't solve the issue
+    # GenServer.cast(__MODULE__, {:notify_all, {:on_tick, logical_time}})
     notify_validators({:on_tick, logical_time})
   end
 

lib/libp2p_port.ex

@@ -9,6 +9,7 @@ defmodule LambdaEthereumConsensus.Libp2pPort do
 
   use GenServer
 
+  alias LambdaEthereumConsensus.Validator.ValidatorManager
   alias LambdaEthereumConsensus.Beacon.PendingBlocks
   alias LambdaEthereumConsensus.Beacon.SyncBlocks
   alias LambdaEthereumConsensus.ForkChoice
@@ -392,10 +393,17 @@ defmodule LambdaEthereumConsensus.Libp2pPort do
   end
 
   @impl GenServer
-  def handle_cast({:on_tick, time}, state) do
+  def handle_cast({:on_tick, {time, slot_data, changed_slot_data}}, state) do
     # TODO: we probably want to remove this from here, but we keep it here to have this serialized
     # with respect to the other fork choice store modifications.
     ForkChoice.on_tick(time)
+
+    # For testing that calling it from the libp2p works, and its just a matter of the notify new block,
+    # not the clock being the one who calls the notify tick.
+    if changed_slot_data do
+      ValidatorManager.notify_tick(slot_data)
+    end
+
     {:noreply, state}
   end
 

network_params.yaml

@@ -8,5 +8,5 @@ participants:
     cl_image: lambda_ethereum_consensus:latest
     use_separate_vc: false
     count: 1
-    validator_count: 10
+    validator_count: 20
     cl_max_mem: 4096