Cleanup

apps/indexer/lib/indexer/fetcher/optimism.ex

@@ -235,17 +235,17 @@ defmodule Indexer.Fetcher.Optimism do
     with {:start_block_l1_undefined, false} <- {:start_block_l1_undefined, is_nil(optimism_env[:start_block_l1])},
          {:reorg_monitor_started, true} <-
            {:reorg_monitor_started, !is_nil(Process.whereis(Indexer.Fetcher.RollupL1ReorgMonitor))},
+         json_rpc_named_arguments = json_rpc_named_arguments(optimism_l1_rpc),
          {:rpc_l1_undefined, false} <- {:rpc_l1_undefined, is_nil(optimism_l1_rpc)},
-         start_block_l1 = parse_integer(optimism_env[:start_block_l1]),
          {optimism_portal} <- {optimism_env[:optimism_l1_portal]},
+         start_block_l1 = parse_integer(optimism_env[:start_block_l1]),
          {:contract_is_valid, true} <-
            {:contract_is_valid,
             caller == Indexer.Fetcher.Optimism.WithdrawalEvent or Helper.address_correct?(output_oracle)},
          true <- start_block_l1 > 0,
          {last_l1_block_number, last_l1_transaction_hash} <- caller.get_last_l1_item(),
          {:start_block_l1_valid, true} <-
            {:start_block_l1_valid, start_block_l1 <= last_l1_block_number || last_l1_block_number == 0},
-         json_rpc_named_arguments = json_rpc_named_arguments(optimism_l1_rpc),
          {:ok, last_l1_transaction} <- get_transaction_by_hash(last_l1_transaction_hash, json_rpc_named_arguments),
          {:l1_transaction_not_found, false} <-
            {:l1_transaction_not_found, !is_nil(last_l1_transaction_hash) && is_nil(last_l1_transaction)},
@@ -379,7 +379,6 @@ defmodule Indexer.Fetcher.Optimism do
   """
   @spec requires_l1_reorg_monitor?() :: boolean()
   def requires_l1_reorg_monitor? do
-    optimism_config = Application.get_all_env(:indexer)[__MODULE__]
-    not is_nil(optimism_config[:optimism_l1_system_config])
+    false
   end
 end

apps/indexer/lib/indexer/fetcher/optimism/deposit.ex

@@ -74,8 +74,8 @@ defmodule Indexer.Fetcher.Optimism.Deposit do
     with {:start_block_l1_undefined, false} <- {:start_block_l1_undefined, is_nil(optimism_env[:start_block_l1])},
          {:optimism_portal_valid, true} <- {:optimism_portal_valid, Helper.address_correct?(optimism_portal)},
          {:rpc_l1_undefined, false} <- {:rpc_l1_undefined, is_nil(optimism_l1_rpc)},
-         start_block_l1 <- parse_integer(optimism_env[:start_block_l1]),
          json_rpc_named_arguments = Optimism.json_rpc_named_arguments(optimism_l1_rpc),
+         start_block_l1 <- parse_integer(optimism_env[:start_block_l1]),
          true <- start_block_l1 > 0,
          {last_l1_block_number, last_l1_transaction_hash} <- get_last_l1_item(),
          {:ok, last_l1_transaction} <-

apps/indexer/lib/indexer/fetcher/optimism/dispute_game.ex

@@ -53,11 +53,11 @@ defmodule Indexer.Fetcher.Optimism.DisputeGame do
     Logger.metadata(fetcher: @fetcher_name)
 
     env = Application.get_all_env(:indexer)[Optimism]
-    rpc = env[:optimism_l1_rpc]
     optimism_portal = env[:optimism_l1_portal]
+    rpc = env[:optimism_l1_rpc]
 
-    with {:rpc_l1_undefined, false} <- {:rpc_l1_undefined, is_nil(rpc)},
-         {:optimism_portal_valid, true} <- {:optimism_portal_valid, IndexerHelper.address_correct?(optimism_portal)},
+    with {:optimism_portal_valid, true} <- {:optimism_portal_valid, IndexerHelper.address_correct?(optimism_portal)},
+         {:rpc_l1_undefined, false} <- {:rpc_l1_undefined, is_nil(rpc)},
          json_rpc_named_arguments = IndexerHelper.json_rpc_named_arguments(rpc),
          dispute_game_factory = get_dispute_game_factory_address(optimism_portal, json_rpc_named_arguments),
          {:dispute_game_factory_available, true} <- {:dispute_game_factory_available, !is_nil(dispute_game_factory)},

apps/indexer/lib/indexer/fetcher/optimism/transaction_batch.ex

@@ -87,18 +87,19 @@ defmodule Indexer.Fetcher.Optimism.TransactionBatch do
     optimism_env = Application.get_all_env(:indexer)[Indexer.Fetcher.Optimism]
     optimism_l1_rpc = l1_rpc_url()
 
-    with {:start_block_l1_undefined, false} <- {:start_block_l1_undefined, is_nil(env[:start_block_l1])},
+    with {:start_block_l1_undefined, false} <- {:start_block_l1_undefined, is_nil(optimism_env[:start_block_l1])},
          {:genesis_block_l2_invalid, false} <-
            {:genesis_block_l2_invalid, is_nil(env[:genesis_block_l2]) or env[:genesis_block_l2] < 0},
          {:reorg_monitor_started, true} <-
            {:reorg_monitor_started, !is_nil(Process.whereis(RollupL1ReorgMonitor))},
          {:rpc_l1_undefined, false} <- {:rpc_l1_undefined, is_nil(optimism_l1_rpc)},
          json_rpc_named_arguments = Optimism.json_rpc_named_arguments(optimism_l1_rpc),
-         {batch_inbox, batch_submitter} <- {String.downcase(env[:batch_inbox]), String.downcase(env[:batch_submitter])},
+         {start_block_l1, batch_inbox, batch_submitter} <-
+           {String.downcase(env[:batch_inbox]), String.downcase(env[:batch_submitter]),
+            parse_integer(optimism_env[:start_block_l1])},
          {:batch_inbox_valid, true} <- {:batch_inbox_valid, Helper.address_correct?(batch_inbox)},
          {:batch_submitter_valid, true} <-
            {:batch_submitter_valid, Helper.address_correct?(batch_submitter)},
-         start_block_l1 = parse_integer(env[:start_block_l1]),
          false <- is_nil(start_block_l1),
          true <- start_block_l1 > 0,
          chunk_size = parse_integer(env[:blocks_chunk_size]),

config/runtime.exs

@@ -876,7 +876,6 @@ config :indexer, Indexer.Fetcher.Optimism.WithdrawalEvent.Supervisor, enabled: C
 config :indexer, Indexer.Fetcher.Optimism,
   optimism_l1_rpc: System.get_env("INDEXER_OPTIMISM_L1_RPC"),
   optimism_l1_portal: System.get_env("INDEXER_OPTIMISM_L1_PORTAL_CONTRACT"),
-  optimism_l1_system_config: System.get_env("INDEXER_OPTIMISM_L1_SYSTEM_CONFIG_CONTRACT"),
   start_block_l1: System.get_env("INDEXER_OPTIMISM_L1_START_BLOCK")
 
 config :indexer, Indexer.Fetcher.Optimism.Deposit,
@@ -892,7 +891,6 @@ config :indexer, Indexer.Fetcher.Optimism.Withdrawal,
     System.get_env("INDEXER_OPTIMISM_L2_MESSAGE_PASSER_CONTRACT", "0x4200000000000000000000000000000000000016")
 
 config :indexer, Indexer.Fetcher.Optimism.TransactionBatch,
-  start_block_l1: System.get_env("INDEXER_OPTIMISM_L1_BATCH_START_BLOCK"),
   batch_inbox: System.get_env("INDEXER_OPTIMISM_L1_BATCH_INBOX"),
   batch_submitter: System.get_env("INDEXER_OPTIMISM_L1_BATCH_SUBMITTER"),
   blocks_chunk_size: System.get_env("INDEXER_OPTIMISM_L1_BATCH_BLOCKS_CHUNK_SIZE", "4"),

docker-compose/envs/common-blockscout.env

@@ -284,18 +284,16 @@ INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER=false
 # INDEXER_SYSTEM_MEMORY_PERCENTAGE=
 # WITHDRAWALS_FIRST_BLOCK=
 INDEXER_OPTIMISM_L1_RPC=https://sepolia.drpc.org
-INDEXER_OPTIMISM_L1_START_BLOCK=5302698
-INDEXER_OPTIMISM_L1_BATCH_START_BLOCK=5302698
-INDEXER_OPTIMISM_L1_BATCH_INBOX=0xFF00000000000000000000000000000000743111
-INDEXER_OPTIMISM_L1_BATCH_SUBMITTER=0x0632215e32658508fC985BB80f22eE71377F7aAE
-# INDEXER_OPTIMISM_L1_SYSTEM_CONFIG_CONTRACT=0xB6f9579980aE46f61217A99145645341E49E2516
 INDEXER_OPTIMISM_L1_BATCH_BLOCKS_CHUNK_SIZE=4
 INDEXER_OPTIMISM_L2_BATCH_GENESIS_BLOCK_NUMBER=0
-INDEXER_OPTIMISM_L1_PORTAL_CONTRACT=0xB6f9579980aE46f61217A99145645341E49E2516
 INDEXER_OPTIMISM_L1_OUTPUT_ORACLE_CONTRACT=0x032d1e1dd960A4B027a9a35FF8B2b672E333Bc27
 INDEXER_OPTIMISM_L2_WITHDRAWALS_START_BLOCK=1
 INDEXER_OPTIMISM_L2_MESSAGE_PASSER_CONTRACT=0x4200000000000000000000000000000000000007
 INDEXER_OPTIMISM_L1_DEPOSITS_BATCH_SIZE=500
+INDEXER_OPTIMISM_L1_PORTAL_CONTRACT=0xB6f9579980aE46f61217A99145645341E49E2516
+INDEXER_OPTIMISM_L1_START_BLOCK=5302698
+INDEXER_OPTIMISM_L1_BATCH_INBOX=0xFF00000000000000000000000000000000743111
+INDEXER_OPTIMISM_L1_BATCH_SUBMITTER=0x0632215e32658508fC985BB80f22eE71377F7aAE
 # INDEXER_OPTIMISM_L1_DEPOSITS_TRANSACTION_TYPE=
 # INDEXER_SCROLL_L1_RPC=
 # INDEXER_SCROLL_L1_MESSENGER_CONTRACT=