W35 upstream merge

CHANGELOG.md

@@ -8,6 +8,7 @@
 - [#4452](https://github.com/blockscout/blockscout/pull/4452) - Add names for smart-conrtact's function response
 
 ### Fixes
+- [#4553](https://github.com/blockscout/blockscout/pull/4553) - Indexer performance update: skip genesis block in requesting of trace_block API endpoint
 - [#4542](https://github.com/blockscout/blockscout/pull/4542) - Indexer performance update: Deduplicate tokens in the indexer token transfers transformer
 - [#4535](https://github.com/blockscout/blockscout/pull/4535) - Indexer performance update:: Eliminate multiple updates of the same token while parsing mint/burn token transfers batch
 - [#4527](https://github.com/blockscout/blockscout/pull/4527) - Indexer performance update: refactor coin balance daily fetcher

apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/parity/fetched_beneficiaries.ex

@@ -83,9 +83,11 @@ defmodule EthereumJSONRPC.Parity.FetchedBeneficiaries do
   `trace_block` requests for `id_to_params`.
   """
   def requests(id_to_params) when is_map(id_to_params) do
-    Enum.map(id_to_params, fn {id, %{block_quantity: block_quantity}} ->
+    id_to_params
+    |> Enum.map(fn {id, %{block_quantity: block_quantity}} ->
       request(%{id: id, block_quantity: block_quantity})
     end)
+    |> Enum.filter(&(!is_nil(&1)))
   end
 
   @spec response_to_params_set(%{id: id, result: nil}, %{id => %{block_quantity: block_quantity}}) ::
@@ -121,7 +123,11 @@ defmodule EthereumJSONRPC.Parity.FetchedBeneficiaries do
   end
 
   defp request(%{id: id, block_quantity: block_quantity}) when is_integer(id) and is_binary(block_quantity) do
-    EthereumJSONRPC.request(%{id: id, method: "trace_block", params: [block_quantity]})
+    if block_quantity == "0x0" do
+      nil
+    else
+      EthereumJSONRPC.request(%{id: id, method: "trace_block", params: [block_quantity]})
+    end
   end
 
   defp traces_to_params_set(traces, block_number) when is_list(traces) and is_integer(block_number) do

apps/ethereum_jsonrpc/test/ethereum_jsonrpc/parity/fetched_beneficiaries_test.exs

@@ -231,13 +231,26 @@ defmodule EthereumJSONRPC.Parity.FetchedBeneficiariesTest do
 
   describe "requests/1" do
     test "maps multiple ids to request params map" do
+      input = %{
+        0 => %{block_quantity: EthereumJSONRPC.integer_to_quantity(1)},
+        1 => %{block_quantity: EthereumJSONRPC.integer_to_quantity(2)}
+      }
+
+      expected_output = [
+        %{id: 0, jsonrpc: "2.0", method: "trace_block", params: [EthereumJSONRPC.integer_to_quantity(1)]},
+        %{id: 1, jsonrpc: "2.0", method: "trace_block", params: [EthereumJSONRPC.integer_to_quantity(2)]}
+      ]
+
+      assert FetchedBeneficiaries.requests(input) == expected_output
+    end
+
+    test "skips Genesis block" do
       input = %{
         0 => %{block_quantity: EthereumJSONRPC.integer_to_quantity(0)},
         1 => %{block_quantity: EthereumJSONRPC.integer_to_quantity(1)}
       }
 
       expected_output = [
-        %{id: 0, jsonrpc: "2.0", method: "trace_block", params: [EthereumJSONRPC.integer_to_quantity(0)]},
         %{id: 1, jsonrpc: "2.0", method: "trace_block", params: [EthereumJSONRPC.integer_to_quantity(1)]}
       ]