Merge pull request #5504 from blockscout/vb-trace-first-block-geth

Extend TRACE_FIRST_BLOCK env var to use with Geth-like node

CHANGELOG.md

@@ -7,6 +7,7 @@
 - [#5268](https://github.com/blockscout/blockscout/pull/5268), [#5313](https://github.com/blockscout/blockscout/pull/5313) - Contract names display improvement
 
 ### Fixes
+- [#5504](https://github.com/blockscout/blockscout/pull/5504) - Extend TRACE_FIRST_BLOCK env var to geth variant
 - [#5488](https://github.com/blockscout/blockscout/pull/5488) - Split long contract output to multiple lines
 - [#5487](https://github.com/blockscout/blockscout/pull/5487) - Fix array displaying in decoded constructor args
 - [#5482](https://github.com/blockscout/blockscout/pull/5482) - Fix for querying of the contract read functions

apps/block_scout_web/assets/package-lock.json

@@ -95,10 +95,11 @@
       }
     },
     "../../../deps/phoenix": {
-      "version": "0.0.1"
+      "version": "1.5.13",
+      "license": "MIT"
     },
     "../../../deps/phoenix_html": {
-      "version": "0.0.1"
+      "version": "2.14.3"
     },
     "node_modules/@babel/code-frame": {
       "version": "7.16.7",

apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex

@@ -219,13 +219,7 @@ defmodule EthereumJSONRPC do
   @spec fetch_beneficiaries([block_number], json_rpc_named_arguments) ::
           {:ok, FetchedBeneficiaries.t()} | {:error, reason :: term} | :ignore
   def fetch_beneficiaries(block_numbers, json_rpc_named_arguments) when is_list(block_numbers) do
-    min_block = trace_first_block_to_fetch()
+    filtered_block_numbers = block_numbers_in_range(block_numbers)
-
-    filtered_block_numbers =
-      block_numbers
-      |> Enum.filter(fn block_number ->
-        block_number >= min_block
-      end)
 
     Keyword.fetch!(json_rpc_named_arguments, :variant).fetch_beneficiaries(
       filtered_block_numbers,
@@ -310,18 +304,21 @@ defmodule EthereumJSONRPC do
   Fetches internal transactions for entire blocks from variant API.
   """
   def fetch_block_internal_transactions(block_numbers, json_rpc_named_arguments) when is_list(block_numbers) do
+    filtered_block_numbers = block_numbers_in_range(block_numbers)
+
+    Keyword.fetch!(json_rpc_named_arguments, :variant).fetch_block_internal_transactions(
+      filtered_block_numbers,
+      json_rpc_named_arguments
+    )
+  end
+
+  def block_numbers_in_range(block_numbers) do
     min_block = trace_first_block_to_fetch()
 
-    filtered_block_numbers =
     block_numbers
     |> Enum.filter(fn block_number ->
       block_number >= min_block
     end)
-
-    Keyword.fetch!(json_rpc_named_arguments, :variant).fetch_block_internal_transactions(
-      filtered_block_numbers,
-      json_rpc_named_arguments
-    )
   end
 
   @doc """

apps/explorer/lib/explorer/chain.ex

@@ -7028,7 +7028,8 @@ defmodule Explorer.Chain do
     if transaction_index == 0 do
       0
     else
-      {:ok, traces} = fetch_block_internal_transactions([block_number], json_rpc_named_arguments)
+      filtered_block_numbers = EthereumJSONRPC.block_numbers_in_range([block_number])
+      {:ok, traces} = fetch_block_internal_transactions(filtered_block_numbers, json_rpc_named_arguments)
 
       sorted_traces =
         traces

apps/indexer/lib/indexer/fetcher/internal_transaction.ex

@@ -98,9 +98,10 @@ defmodule Indexer.Fetcher.InternalTransaction do
             )
   def run(block_numbers, json_rpc_named_arguments) do
     unique_numbers = Enum.uniq(block_numbers)
+    filtered_unique_numbers = EthereumJSONRPC.block_numbers_in_range(unique_numbers)
 
-    unique_numbers_count = Enum.count(unique_numbers)
+    filtered_unique_numbers_count = Enum.count(filtered_unique_numbers)
-    Logger.metadata(count: unique_numbers_count)
+    Logger.metadata(count: filtered_unique_numbers_count)
 
     Logger.debug("fetching internal transactions for blocks")
 
@@ -108,14 +109,14 @@ defmodule Indexer.Fetcher.InternalTransaction do
     |> Keyword.fetch!(:variant)
     |> case do
       EthereumJSONRPC.Parity ->
-        EthereumJSONRPC.fetch_block_internal_transactions(unique_numbers, json_rpc_named_arguments)
+        EthereumJSONRPC.fetch_block_internal_transactions(filtered_unique_numbers, json_rpc_named_arguments)
 
       EthereumJSONRPC.Besu ->
-        EthereumJSONRPC.fetch_block_internal_transactions(unique_numbers, json_rpc_named_arguments)
+        EthereumJSONRPC.fetch_block_internal_transactions(filtered_unique_numbers, json_rpc_named_arguments)
 
       _ ->
         try do
-          fetch_block_internal_transactions_by_transactions(unique_numbers, json_rpc_named_arguments)
+          fetch_block_internal_transactions_by_transactions(filtered_unique_numbers, json_rpc_named_arguments)
         rescue
           error ->
             {:error, error}
@@ -123,15 +124,15 @@ defmodule Indexer.Fetcher.InternalTransaction do
     end
     |> case do
       {:ok, internal_transactions_params} ->
-        import_internal_transaction(internal_transactions_params, unique_numbers)
+        import_internal_transaction(internal_transactions_params, filtered_unique_numbers)
 
       {:error, reason} ->
         Logger.error(fn -> ["failed to fetch internal transactions for blocks: ", inspect(reason)] end,
-          error_count: unique_numbers_count
+          error_count: filtered_unique_numbers_count
         )
 
         # re-queue the de-duped entries
-        {:retry, unique_numbers}
+        {:retry, filtered_unique_numbers}
 
       :ignore ->
         :ok