fix: remove genserver behavior from pending blocks (#1200)

Author: Arkenan

lib/lambda_ethereum_consensus/beacon/pending_blocks.ex

@@ -34,10 +34,9 @@ defmodule LambdaEthereumConsensus.Beacon.PendingBlocks do
   @spec add_block(SignedBeaconBlock.t()) :: :ok
   def add_block(signed_block) do
     block_info = BlockInfo.from_block(signed_block)
-
-    # If the block is new or was to be downloaded, we store it.
     loaded_block = Blocks.get_block_info(block_info.root)
 
+    # If the block is new or was to be downloaded, we store it.
     if is_nil(loaded_block) or loaded_block.status == :download do
       missing_blobs = missing_blobs(block_info)
 
@@ -130,10 +129,8 @@ defmodule LambdaEthereumConsensus.Beacon.PendingBlocks do
   # To be used when a series of blobs are downloaded. Stores each blob.
   # If there are blocks that can be processed, does so immediately.
   defp add_blobs(blobs) do
-    Enum.map(blobs, fn blob ->
-      BlobDb.store_blob(blob)
-      Ssz.hash_tree_root!(blob.signed_block_header.message)
-    end)
+    blobs
+    |> Enum.map(&BlobDb.store_blob/1)
     |> Enum.uniq()
     |> Enum.each(fn root ->
       with %BlockInfo{} = block_info <- Blocks.get_block_info(root) do

lib/lambda_ethereum_consensus/store/blob_db.ex

@@ -13,7 +13,10 @@ defmodule LambdaEthereumConsensus.Store.BlobDb do
   @blobdata_prefix "blobdata"
   @block_root_prefix "block_root"
 
-  @spec store_blob(BlobSidecar.t()) :: :ok
+  @doc """
+  Stores a blob sidecar for a certain block. Returns the block root.
+  """
+  @spec store_blob(BlobSidecar.t()) :: Types.root()
   def store_blob(%BlobSidecar{signed_block_header: %{message: block_header}} = blob) do
     block_root = Ssz.hash_tree_root!(block_header)
     {:ok, encoded_blob} = Ssz.to_ssz(blob)
@@ -29,6 +32,7 @@ defmodule LambdaEthereumConsensus.Store.BlobDb do
 
     block_root_key = block_root_key(block_header.slot, blob.index)
     Db.put(block_root_key, block_root)
+    block_root
   end
 
   # TODO: this is only used for tests

lib/lambda_ethereum_consensus/store/blocks.ex

@@ -77,7 +77,11 @@ defmodule LambdaEthereumConsensus.Store.Blocks do
   @spec new_block_info(BlockInfo.t()) :: :ok
   def new_block_info(block_info) do
     store_block_info(block_info)
-    BlockDb.add_root_to_status(block_info.root, block_info.status)
+
+    # We add the root to the status list, but we also make sure we remove it from the downloads
+    # list. If it's not in the list, the operation is equivalent to only adding it in the correct
+    # one.
+    BlockDb.change_root_status(block_info.root, :download, block_info.status)
   end
 
   @doc """

test/unit/p2p/requests_test.exs

@@ -10,7 +10,7 @@ defmodule Unit.P2p.RequestsTest do
              Requests.handle_response(requests, "some response", "fake id")
   end
 
-  test "A requests object should handle a request only once" do
+  test "A requests object should handler a request only once" do
     requests = Requests.new()
     pid = self()