Skip to content

Commit 08c26b5

Browse files
committed
refactor: indexing by proof id instead of merkle_root
1 parent d0a6015 commit 08c26b5

5 files changed

Lines changed: 11 additions & 11 deletions

File tree

explorer/lib/explorer/models/aggregated_proofs.ex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ defmodule AggregatedProofs do
6161
end
6262
end
6363

64-
def get_aggregated_proof_by_merkle_root(merkle_root) do
65-
Explorer.Repo.get_by(AggregatedProofs, merkle_root: merkle_root)
64+
def get_aggregated_proof_by_id(id) do
65+
Explorer.Repo.get_by(AggregatedProofs, id: id)
6666
end
6767

6868
def get_paginated_proofs(%{page: page, page_size: size}) do
@@ -78,12 +78,12 @@ defmodule AggregatedProofs do
7878
end
7979

8080
def get_last_page(page_size) do
81-
total_proofs = Explorer.Repo.aggregate(AggregatedProofs, :count, :merkle_root)
81+
total_proofs = Explorer.Repo.aggregate(AggregatedProofs, :count, :id)
8282
last_page = div(total_proofs, page_size)
8383
if rem(total_proofs, page_size) > 0, do: last_page + 1, else: last_page
8484
end
8585

8686
def get_number_of_agg_proofs() do
87-
Explorer.Repo.aggregate(AggregatedProofs, :count, :merkle_root)
87+
Explorer.Repo.aggregate(AggregatedProofs, :count, :id)
8888
end
8989
end

explorer/lib/explorer/models/aggregation_mode_proof.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ defmodule AggregationModeProof do
4545
end
4646
end
4747

48-
def get_all_proof_hashes(merkle_root) do
48+
def get_all_proof_hashes(id) do
4949
query =
5050
from(proof in AggregationModeProof,
51-
where: proof.merkle_root == ^merkle_root,
51+
where: proof.agg_proof_id == ^id,
5252
select: proof.proof_hash
5353
)
5454

explorer/lib/explorer_web/components/agg_proofs_table.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ defmodule ExplorerWeb.AggProofsTable do
88
~H"""
99
<.table id="agg_proofs" rows={@proofs}>
1010
<:col :let={proof} label="Merkle root" class="text-left">
11-
<.link navigate={~p"/aggregated_proofs/#{proof.merkle_root}"}>
11+
<.link navigate={~p"/aggregated_proofs/#{proof.id}"}>
1212
<span class="inline-flex gap-x-3 items-center group-hover:text-foreground/80">
1313
<%= Helpers.shorten_hash(proof.merkle_root, 6) %>
1414
<.right_arrow />

explorer/lib/explorer_web/live/pages/agg_proof/index.ex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ defmodule ExplorerWeb.AggProof.Index do
33
use ExplorerWeb, :live_view
44

55
@impl true
6-
def mount(%{"merkle_root" => merkle_root}, _, socket) do
6+
def mount(%{"id" => id}, _, socket) do
77
agg_proof =
8-
AggregatedProofs.get_aggregated_proof_by_merkle_root(merkle_root)
8+
AggregatedProofs.get_aggregated_proof_by_id(id)
99

1010
{
1111
:ok,
@@ -19,7 +19,7 @@ defmodule ExplorerWeb.AggProof.Index do
1919

2020
@impl true
2121
def handle_event("show_proofs", _value, socket) do
22-
proofs = AggregationModeProof.get_all_proof_hashes(socket.assigns.agg_proof.merkle_root)
22+
proofs = AggregationModeProof.get_all_proof_hashes(socket.assigns.agg_proof.id)
2323
{:noreply, assign(socket, proof_hashes: proofs)}
2424
end
2525

explorer/lib/explorer_web/router.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ defmodule ExplorerWeb.Router do
4848
live "/batches/:merkle_root", Batch.Index
4949
live "/batches", Batches.Index
5050
live "/aggregated_proofs", AggProofs.Index
51-
live "/aggregated_proofs/:merkle_root", AggProof.Index
51+
live "/aggregated_proofs/:id", AggProof.Index
5252
live "/restaked", Restakes.Index
5353
live "/restaked/:address", Restake.Index
5454
live "/operators", Operators.Index

0 commit comments

Comments
 (0)