Skip to content

Commit 2d7f864

Browse files
committed
fix: explorer warnings
1 parent bd68852 commit 2d7f864

File tree

6 files changed

+24
-43
lines changed

6 files changed

+24
-43
lines changed

explorer/lib/explorer/contract_managers/aligned_layer_service_manager.ex

Lines changed: 16 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,6 @@ defmodule AlignedLayerServiceManager do
3636
|> Map.get("addresses")
3737
|> Map.get("alignedLayerServiceManager")
3838

39-
@first_block (case @environment do
40-
"devnet" -> 0
41-
"holesky" -> 1_728_056
42-
"mainnet" -> 19_000_000
43-
"sepolia" -> 9_062_616
44-
"hoodi" -> 1_093_860
45-
_ -> raise("Invalid environment")
46-
end)
47-
4839
use Ethers.Contract,
4940
abi_file: "lib/abi/AlignedLayerServiceManager.json",
5041
default_address: @aligned_layer_service_manager_address
@@ -85,7 +76,7 @@ defmodule AlignedLayerServiceManager do
8576
block_number = event |> Map.get(:block_number)
8677
tx_hash = event |> Map.get(:transaction_hash)
8778
Logger.info("Extracting new batch event info for block #{block_number}, tx: #{tx_hash}")
88-
79+
8980
new_batch = parse_new_batch_event(event)
9081
Logger.info("New batch event parsed: #{inspect(new_batch)}")
9182

@@ -114,20 +105,20 @@ defmodule AlignedLayerServiceManager do
114105

115106
def is_batch_responded(merkle_root, fromBlock) do
116107
Logger.info("Checking if batch is responded for merkle_root: #{merkle_root}, fromBlock: #{fromBlock}")
117-
108+
118109
event =
119110
Utils.string_to_bytes32(merkle_root)
120111
|> AlignedLayerServiceManager.EventFilters.batch_verified()
121112
|> Ethers.get_logs(fromBlock: fromBlock)
122113

123114
case event do
124-
{:error, reason} ->
115+
{:error, reason} ->
125116
Logger.error("Error checking batch response for #{merkle_root}: #{inspect(reason)}")
126117
{:error, reason}
127-
{_, []} ->
118+
{_, []} ->
128119
Logger.info("Batch #{merkle_root} not responded yet")
129120
false
130-
{:ok, events} ->
121+
{:ok, events} ->
131122
Logger.info("Batch #{merkle_root} responded, found #{length(events)} verification events")
132123
true
133124
end
@@ -141,11 +132,11 @@ defmodule AlignedLayerServiceManager do
141132

142133
batch_response =
143134
case was_batch_responded do
144-
true ->
135+
true ->
145136
Logger.info("Batch #{created_batch.batchMerkleRoot} was responded, fetching response details")
146137
fetch_batch_response(created_batch.batchMerkleRoot, batch_creation.block_number)
147138
# was not verified, fill with nils
148-
false ->
139+
false ->
149140
Logger.info("Batch #{created_batch.batchMerkleRoot} was not responded yet")
150141
%{block_number: nil, transaction_hash: nil, block_timestamp: nil}
151142
end
@@ -204,16 +195,16 @@ defmodule AlignedLayerServiceManager do
204195
end
205196
end
206197

207-
def fetch_batch_response(merkle_root, fromBlock \\ @first_block) do
198+
def fetch_batch_response(merkle_root, fromBlock) do
208199
Logger.info("Fetching batch response for merkle_root: #{merkle_root}, fromBlock: #{fromBlock}")
209200
case get_batch_verified_events(%{merkle_root: merkle_root, fromBlock: fromBlock}) do
210-
{:ok, batch_verified_info} ->
201+
{:ok, batch_verified_info} ->
211202
Logger.info("Successfully fetched batch response for #{merkle_root}")
212203
batch_verified_info
213-
{:empty, _} ->
204+
{:empty, _} ->
214205
Logger.info("No batch verified events found for #{merkle_root}")
215206
nil
216-
{:error, error} ->
207+
{:error, error} ->
217208
Logger.error("Error fetching batch response for #{merkle_root}: #{error}")
218209
raise("Error fetching batch response: #{error}")
219210
end
@@ -226,13 +217,13 @@ defmodule AlignedLayerServiceManager do
226217
|> Ethers.get_logs(fromBlock: fromBlock)
227218

228219
case event do
229-
{:error, reason} ->
220+
{:error, reason} ->
230221
Logger.error("Error getting batch verified events for #{merkle_root}: #{inspect(reason)}")
231222
{:error, reason}
232-
{_, []} ->
223+
{_, []} ->
233224
Logger.info("No batch verified events found for #{merkle_root}")
234225
{:empty, "No task found"}
235-
{:ok, events} ->
226+
{:ok, events} ->
236227
Logger.info("Found #{length(events)} batch verified events for #{merkle_root}")
237228
extract_batch_verified_event_info(events |> List.first())
238229
end
@@ -259,11 +250,11 @@ defmodule AlignedLayerServiceManager do
259250
def get_block_timestamp(block_number) do
260251
Logger.info("Fetching block timestamp for block #{block_number}")
261252
case Ethers.Utils.get_block_timestamp(block_number) do
262-
{:ok, timestamp} ->
253+
{:ok, timestamp} ->
263254
datetime = DateTime.from_unix!(timestamp)
264255
Logger.info("Block #{block_number} timestamp: #{datetime}")
265256
datetime
266-
{:error, error} ->
257+
{:error, error} ->
267258
Logger.error("Error fetching block timestamp for block #{block_number}: #{error}")
268259
raise("Error fetching block timestamp: #{error}")
269260
end

explorer/lib/explorer/contract_managers/batcher_payment_service_manager.ex

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,6 @@ defmodule BatcherPaymentServiceManager do
33

44
@aligned_config_file System.get_env("ALIGNED_CONFIG_FILE")
55

6-
@environment System.get_env("ENVIRONMENT")
7-
@first_block (case @environment do
8-
"devnet" -> 0
9-
"holesky" -> 1_728_056
10-
"mainnet" -> 19_000_000
11-
"sepolia" -> 9_062_616
12-
"hoodi" -> 1_093_860
13-
_ -> raise("Invalid environment")
14-
end)
15-
166
config_file_path =
177
case @aligned_config_file do
188
nil -> raise("ALIGNED_CONFIG_FILE not set in .env")

explorer/lib/explorer_web/components/agg_proofs_table.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ defmodule ExplorerWeb.AggProofsTable do
66

77
def agg_proofs_table(assigns) do
88
~H"""
9-
<.table id="agg_proofs" rows={@proofs}>
9+
<.table id="agg_proofs" rows={@agg_proofs}>
1010
<:col :let={proof} label="Merkle root" class="text-left">
1111
<.link navigate={~p"/aggregated_proofs/#{proof.id}"}>
1212
<span class="inline-flex gap-x-3 items-center group-hover:text-foreground/80">

explorer/lib/explorer_web/components/nav.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,9 @@ defmodule NavComponent do
199199
@doc """
200200
Renders a dropdown on hover component with links.
201201
"""
202-
attr(:title, :list, doc: "the selector title")
202+
attr(:title, :string, doc: "the selector title")
203203
attr(:class, :list, doc: "class for selector")
204-
attr(:links, :string, doc: "the links to render: (name, link, class)")
204+
attr(:links, :list, doc: "the links to render: (name, link, class)")
205205

206206
def nav_links_dropdown(assigns) do
207207
~H"""

explorer/lib/explorer_web/live/pages/agg_proofs/index.html.heex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<.card_preheding>Aggregation</.card_preheding>
33
<%= if @proofs != :empty and @proofs != [] do %>
44
<.card_background class="w-full overflow-x-auto sm:col-span-2">
5-
<.agg_proofs_table proofs={@proofs} />
5+
<.agg_proofs_table agg_proofs={@proofs} />
66
</.card_background>
77
<% else %>
88
<.empty_card_background text="No aggregated proofs To Display." class="sm:col-span-2" />

explorer/lib/explorer_web/live/utils.ex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,19 +191,19 @@ defmodule ExplorerWeb.Helpers do
191191
end
192192

193193
def get_aligned_contracts_addresses() do
194-
Map.merge(get_batcher_service_addresses(), get_proof_aggregation_addresses())
194+
Map.merge(get_verification_layer_addresses(), get_proof_aggregation_addresses())
195195
end
196196

197197
defp get_proof_aggregation_addresses() do
198198
proof_agg_config_file = System.get_env("ALIGNED_PROOF_AGG_CONFIG_FILE")
199199
{_, config_json_string} = File.read(proof_agg_config_file)
200-
proof_agg_service_addresses = Jason.decode!(config_json_string) |> Map.get("addresses")
200+
Jason.decode!(config_json_string) |> Map.get("addresses")
201201
end
202202

203-
defp get_batcher_service_addresses() do
203+
defp get_verification_layer_addresses() do
204204
aligned_config_file = System.get_env("ALIGNED_CONFIG_FILE")
205205
{_, config_json_string} = File.read(aligned_config_file)
206-
agg_service_addresses = Jason.decode!(config_json_string) |> Map.get("addresses")
206+
Jason.decode!(config_json_string) |> Map.get("addresses")
207207
end
208208

209209
def binary_to_hex_string(binary) do

0 commit comments

Comments
 (0)