From 841fd7be7022d4f00dcc7b6f8bbbd7b3a8174efa Mon Sep 17 00:00:00 2001 From: POA <33550681+poa@users.noreply.github.com> Date: Mon, 11 Sep 2023 11:23:10 +0300 Subject: [PATCH] Add INDEXER_ZKEVM_BATCHES_CHUNK_SIZE env variable --- apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex | 13 +++++++++---- config/runtime.exs | 3 +++ docker-compose/envs/common-blockscout.env | 1 + 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex b/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex index d93b8ce36c..41f419ff22 100644 --- a/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex +++ b/apps/indexer/lib/indexer/fetcher/zkevm_txn_batch.ex @@ -15,7 +15,6 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do alias Explorer.{Chain, Repo} alias Explorer.Chain.{ZkevmLifecycleTxn, ZkevmTxnBatch} - @batch_range_size 20 @recheck_latest_batch_interval 60 @zero_hash "0000000000000000000000000000000000000000000000000000000000000000" @@ -39,10 +38,13 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do Logger.metadata(fetcher: :zkevm_txn_batches) # Logger.configure(truncate: :infinity) + chunk_size = Application.get_all_env(:indexer)[Indexer.Fetcher.ZkevmTxnBatch][:chunk_size] + Process.send(self(), :continue, []) {:ok, %{ + chunk_size: chunk_size, json_rpc_named_arguments: args[:json_rpc_named_arguments], prev_latest_batch_number: 0, prev_virtual_batch_number: 0, @@ -54,6 +56,7 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do def handle_info( :continue, %{ + chunk_size: chunk_size, json_rpc_named_arguments: json_rpc_named_arguments, prev_latest_batch_number: prev_latest_batch_number, prev_virtual_batch_number: prev_virtual_batch_number, @@ -95,7 +98,9 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do Logger.info(log_message <> "Handling the batch range #{start_batch_number}..#{end_batch_number}.") {handle_duration, _} = - :timer.tc(fn -> handle_batch_range(start_batch_number, end_batch_number, json_rpc_named_arguments) end) + :timer.tc(fn -> + handle_batch_range(start_batch_number, end_batch_number, json_rpc_named_arguments, chunk_size) + end) { %{ @@ -151,9 +156,9 @@ defmodule Indexer.Fetcher.ZkevmTxnBatch do last_id + 1 end - defp handle_batch_range(start_batch_number, end_batch_number, json_rpc_named_arguments) do + defp handle_batch_range(start_batch_number, end_batch_number, json_rpc_named_arguments, chunk_size) do start_batch_number..end_batch_number - |> Enum.chunk_every(@batch_range_size) + |> Enum.chunk_every(chunk_size) |> Enum.each(fn chunk -> chunk_start = List.first(chunk) chunk_end = List.last(chunk) diff --git a/config/runtime.exs b/config/runtime.exs index fdc5fb80d2..7e2411a11b 100644 --- a/config/runtime.exs +++ b/config/runtime.exs @@ -613,6 +613,9 @@ config :indexer, Indexer.Fetcher.PolygonEdge.WithdrawalExit, start_block_l1: System.get_env("INDEXER_POLYGON_EDGE_L1_WITHDRAWALS_START_BLOCK"), exit_helper: System.get_env("INDEXER_POLYGON_EDGE_L1_EXIT_HELPER_CONTRACT") +config :indexer, Indexer.Fetcher.ZkevmTxnBatch, + chunk_size: ConfigHelper.parse_integer_env_var("INDEXER_ZKEVM_BATCHES_CHUNK_SIZE", 20) + config :indexer, Indexer.Fetcher.ZkevmTxnBatch.Supervisor, enabled: ConfigHelper.parse_bool_env_var("INDEXER_ZKEVM_BATCHES_ENABLED") diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env index 7cfdefc7e9..5dc9bcda8c 100644 --- a/docker-compose/envs/common-blockscout.env +++ b/docker-compose/envs/common-blockscout.env @@ -142,6 +142,7 @@ INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER=false # INDEXER_POLYGON_EDGE_L2_DEPOSITS_START_BLOCK= # INDEXER_POLYGON_EDGE_ETH_GET_LOGS_RANGE_SIZE= # INDEXER_ZKEVM_BATCHES_ENABLED= +# INDEXER_ZKEVM_BATCHES_CHUNK_SIZE= # INDEXER_REALTIME_FETCHER_MAX_GAP= # INDEXER_FETCHER_INIT_QUERY_LIMIT= # INDEXER_TOKEN_BALANCES_FETCHER_INIT_QUERY_LIMIT=