feat: show proof hashes in each batch (yetanotherco#609)

Co-authored-by: Gian <58370608+glpecile@users.noreply.github.com>

Author: uri-99

explorer/lib/explorer/aligned_layer_service_manager.ex

@@ -112,6 +112,7 @@ defmodule AlignedLayerServiceManager do
       response_transaction_hash: batch_response.transaction_hash,
       response_timestamp: batch_response.block_timestamp,
       amount_of_proofs: nil,
+      proof_hashes: nil
     }
   end
 
@@ -133,6 +134,7 @@ defmodule AlignedLayerServiceManager do
           response_transaction_hash: batch_response.transaction_hash,
           response_timestamp: batch_response.block_timestamp,
           amount_of_proofs: unverified_batch.amount_of_proofs,
+          proof_hashes: nil #don't need this value to update an existing but unverified batch, it is on another table
         }
     end
   end

explorer/lib/explorer/models/batch_structs.ex

@@ -29,6 +29,7 @@ defmodule BatchDB do
     :submission_block_number,
     :submission_transaction_hash,
     :submission_timestamp,
+    :proof_hashes
   ]
   defstruct [
     :merkle_root,
@@ -40,6 +41,7 @@ defmodule BatchDB do
     :response_block_number,
     :response_transaction_hash,
     :response_timestamp,
-    :data_pointer
+    :data_pointer,
+    :proof_hashes
   ]
 end

explorer/lib/explorer/models/batches.ex

@@ -44,12 +44,16 @@ defmodule Batches do
       response_block_number: batch_db.response_block_number,
       response_transaction_hash: batch_db.response_transaction_hash,
       response_timestamp: batch_db.response_timestamp,
-      data_pointer: batch_db.data_pointer
+      data_pointer: batch_db.data_pointer,
     }
   end
 
-  def generate_changeset(%BatchDB{} = batch_db) do
-    Batches.changeset(%Batches{}, Map.from_struct(Batches.cast_to_batches(batch_db)))
+  # returns changeset for both Batches and Proofs table
+  def generate_changesets(%BatchDB{} = batch_db) do
+    batches_changeset = Batches.changeset(%Batches{}, Map.from_struct(Batches.cast_to_batches(batch_db)))
+    proofs = Proofs.cast_to_proofs(batch_db)
+
+    {batches_changeset, proofs}
   end
 
   def get_batch(%{merkle_root: merkle_root}) do
@@ -118,54 +122,56 @@ defmodule Batches do
     end
   end
 
-  def get_amount_of_proofs(%{merkle_root: merkle_root}) do
-    query = from(b in Batches,
-      where: b.merkle_root == ^merkle_root,
-      select: b.amount_of_proofs)
-
-    case Explorer.Repo.one(query) do
-      nil -> nil
-      result -> result
-    end
-  end
-
-  def insert_or_update(changeset) do
-    merkle_root = changeset.changes.merkle_root
+  def insert_or_update(batch_changeset, proofs) do
+    merkle_root = batch_changeset.changes.merkle_root
+    stored_proofs = Proofs.get_proofs_from_batch(%{merkle_root: merkle_root})
     case Explorer.Repo.get(Batches, merkle_root) do
       nil ->
-        "New Batch, inserting to DB:" |> IO.puts()
-        case Explorer.Repo.insert(changeset) do
-          {:ok, _} ->
-            "Batch inserted successfully" |> IO.puts()
-            {:ok, :empty}
-
-          {:error, changeset} ->
-            "Batch insert failed #{changeset}" |> IO.puts()
-            {:error, changeset}
-        end
+        multi = Ecto.Multi.new()
+          |> Ecto.Multi.insert(:insert_batch, batch_changeset)
+          |> Ecto.Multi.insert_all(:insert_all, Proofs, proofs)
+
+          case Explorer.Repo.transaction(multi) do
+            {:ok, _} ->
+              IO.puts("Batch inserted successfully")
+              {:ok, :success}
+
+            {:error, _failed_operation, failed_changeset, _reason} ->
+              IO.puts("Batch insert failed:")
+              IO.inspect(failed_changeset)
+              {:error, failed_changeset}
+          end
+
       existing_batch ->
         try do
-          if existing_batch.is_verified != changeset.changes.is_verified
-            or existing_batch.amount_of_proofs != changeset.changes.amount_of_proofs  # rewrites if it was writen with DB's default
-            or existing_batch.data_pointer != changeset.changes.data_pointer          # rewrites if it was writen with DB's default
-            or existing_batch.submission_block_number != changeset.changes.submission_block_number          # reorg may change submission_block_number
-            or existing_batch.submission_transaction_hash != changeset.changes.submission_transaction_hash  # reorg may change submission_tx_hash
-            or (Map.has_key?(changeset.changes, :block_number)
-              and  existing_batch.response_block_number != changeset.changes.response_block_number)         # reorg may change response_block_number
-            or (Map.has_key?(changeset.changes, :response_transaction_hash)
-              and existing_batch.response_transaction_hash != changeset.changes.response_transaction_hash)  # reorg may change response_tx_hash
+          if existing_batch.is_verified != batch_changeset.changes.is_verified
+            or existing_batch.amount_of_proofs != batch_changeset.changes.amount_of_proofs  # rewrites if it was writen with DB's default
+            or existing_batch.data_pointer != batch_changeset.changes.data_pointer          # rewrites if it was writen with DB's default
+            or existing_batch.submission_block_number != batch_changeset.changes.submission_block_number          # reorg may change submission_block_number
+            or existing_batch.submission_transaction_hash != batch_changeset.changes.submission_transaction_hash  # reorg may change submission_tx_hash
+            or (Map.has_key?(batch_changeset.changes, :block_number)
+              and  existing_batch.response_block_number != batch_changeset.changes.response_block_number)         # reorg may change response_block_number
+            or (Map.has_key?(batch_changeset.changes, :response_transaction_hash)
+              and existing_batch.response_transaction_hash != batch_changeset.changes.response_transaction_hash)  # reorg may change response_tx_hash
+            or stored_proofs == nil and proofs != %{}                 # no proofs registered in DB, but some received
           do
             "Batch values have changed, updating in DB" |> IO.puts()
-            updated_changeset = Ecto.Changeset.change(existing_batch, changeset.changes)
-            case Explorer.Repo.update(updated_changeset) do
+            updated_changeset = Ecto.Changeset.change(existing_batch, batch_changeset.changes) # no changes in proofs table
+
+            multi =
+              Ecto.Multi.new()
+              |> Ecto.Multi.update(:update_batch, updated_changeset)
+              |> (fn m -> if stored_proofs == nil and proofs != %{}, do: Ecto.Multi.insert_all(m, :insert_proofs, Proofs, proofs), else: m end).()
+
+            case Explorer.Repo.transaction(multi) do
               {:ok, _} ->
-                "Batch updated successfully" |> IO.puts()
+                "Batch updated and new proofs inserted successfully" |> IO.puts()
                 {:ok, :empty}
-
-              {:error, changeset} ->
-                "Batch update failed #{changeset}" |> IO.puts()
+              {:error, _, changeset, _} ->
+                "Error: #{inspect(changeset.errors)}" |> IO.puts()
                 {:error, changeset}
             end
+
           end
         rescue
           error ->

explorer/lib/explorer/models/proofs.ex

@@ -0,0 +1,46 @@
+defmodule Proofs do
+  use Ecto.Schema
+  import Ecto.Changeset
+  import Ecto.Query
+
+  schema "proofs" do
+    field :batch_merkle_root, :string
+    field :proof_hash, :binary
+
+    timestamps()
+  end
+
+  @doc false
+  def changeset(new_proof, updates) do
+    new_proof
+    |> cast(updates, [:batch_merkle_root, :proof_hash])
+    |> validate_required([:batch_merkle_root, :proof_hash])
+    |> validate_format(:batch_merkle_root, ~r/0x[a-fA-F0-9]{64}/)
+    # |> validate_format(:proof_hash, ~r/0x[a-fA-F0-9]{64}/) //TODO is binary, check size
+  end
+
+  def cast_to_proofs(%BatchDB{} = batch) do
+    case batch.proof_hashes do
+      nil -> %{}
+      proof_hashes -> Enum.map(proof_hashes, fn proof_hash ->
+        %{batch_merkle_root: batch.merkle_root, proof_hash: proof_hash, inserted_at: NaiveDateTime.truncate(NaiveDateTime.utc_now(), :second), updated_at: NaiveDateTime.truncate(NaiveDateTime.utc_now(), :second)}
+      end)
+    end
+  end
+
+  def get_proofs_from_batch(%{merkle_root: batch_merkle_root}) do
+    query = from(p in Proofs,
+    where: p.batch_merkle_root == ^batch_merkle_root,
+    select: p)
+
+    case Explorer.Repo.all(query) do
+      nil ->
+        nil
+      [] ->
+        nil
+      result ->
+        result
+    end
+  end
+
+end

explorer/lib/explorer/periodically.ex

@@ -60,10 +60,12 @@ defmodule Explorer.Periodically do
 
       {:ok, lock} ->
         "Processing batch: #{batch.merkle_root}" |> IO.inspect
-        batch
-          |> Utils.extract_amount_of_proofs
-          |> Batches.generate_changeset
-          |> Batches.insert_or_update
+        {batch_changeset, proofs} =
+          batch
+            |> Utils.extract_info_from_data_pointer
+            |> Batches.generate_changesets
+
+        Batches.insert_or_update(batch_changeset, proofs)
           |> case do
             {:ok, _} ->
               IO.puts("Broadcasting update_views")
@@ -72,7 +74,6 @@ defmodule Explorer.Periodically do
               IO.puts("Some error in DB operation, not broadcasting update_views")
               IO.inspect(error)
             nil -> nil #no changes in DB
-
           end
 
         "Done processing batch: #{batch.merkle_root}" |> IO.inspect
@@ -83,11 +84,18 @@ defmodule Explorer.Periodically do
   defp process_unverified_batches() do
     "verifying previous unverified batches..." |> IO.inspect()
     unverified_batches = Batches.get_unverified_batches()
-    unverified_batches
-      |> Enum.map(&AlignedLayerServiceManager.extract_batch_response/1)
-      |> Enum.reject(&is_nil/1)
-      |> Enum.map(&Batches.generate_changeset/1)
-      |> Enum.map(&Batches.insert_or_update/1)
+
+    array_of_changest_tuples =
+      unverified_batches
+        |> Enum.map(&AlignedLayerServiceManager.extract_batch_response/1)
+        |> Enum.reject(&is_nil/1)
+        |> Enum.map(&Batches.generate_changesets/1)
+
+    Enum.map(
+      array_of_changest_tuples,
+      fn {batch_changeset, proofs} ->
+        Batches.insert_or_update(batch_changeset, proofs)
+      end)
   end
 
 end

explorer/lib/explorer_web/components/core_components.ex

@@ -214,7 +214,7 @@ defmodule ExplorerWeb.CoreComponents do
   end
 
   @doc """
-  Renders a button.
+  Renders a button. To add an icon just search for the icon name in the https://heroicons.com/ and pass it as the icon attribute.
 
   ## Examples
 
@@ -224,6 +224,8 @@ defmodule ExplorerWeb.CoreComponents do
   attr :type, :string, default: nil
   attr :class, :string, default: nil
   attr :rest, :global, include: ~w(disabled form name value)
+  attr :icon, :string, default: nil
+  attr :icon_class, :string, default: nil
 
   slot :inner_block, required: true
 
@@ -234,11 +236,12 @@ defmodule ExplorerWeb.CoreComponents do
       class={[
         "phx-submit-loading:opacity-75 rounded-lg bg-card hover:bg-muted py-2 px-3",
         "text-sm font-semibold leading-6 text-foregound active:text-foregound/80",
-        "border border-foreground/20",
+        "border border-foreground/20 inline-flex items-center gap-1.5",
         @class
       ]}
       {@rest}
     >
+      <.icon :if={@icon != nil} name={"hero-#{@icon}"} class={"size-4 stroke-inherit #{@icon_class}"} />
       <%= render_slot(@inner_block) %>
     </button>
     """

explorer/lib/explorer_web/components/search.ex

@@ -35,16 +35,16 @@ defmodule SearchComponent do
       <input
         phx-hook="SearchFocus"
         id={"input_#{assigns.id}"}
-        class="pr-10 shadow-md flex h-10 w-full file:border-0 text-foreground file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed flex-1 rounded-md border border-foreground/20 bg-card px-4 py-2 text-sm font-medium transition-colors hover:bg-foreground/10 focus:outline-none focus:ring-1 disabled:pointer-events-none disabled:opacity-50 hover:text-foreground"
+        class="pr-10 shadow-md flex h-10 w-full file:border-0 text-foreground file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed flex-1 rounded-md border border-foreground/20 bg-card px-4 py-2 text-sm font-medium transition-colors hover:bg-muted focus:outline-none focus:ring-1 disabled:pointer-events-none disabled:opacity-50 hover:text-foreground"
         type="search"
         placeholder="Search by merkle root hash..."
         name="batch[merkle_root]"
       />
       <.button
         type="submit"
-        class="absolute right-5 sm:right-1 -top-0.5 whitespace-nowrap text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 bg-transparent border-none text-muted-foreground hover:text-foreground size-10 rounded-full shadow-none hover:bg-transparent"
+        class="absolute right-5 sm:right-1 top-0.5 transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 bg-transparent border-none size-10 shadow-none hover:bg-transparent text-muted-foreground"
       >
-        <.icon name="hero-magnifying-glass-solid" class="size-4" />
+        <.icon name="hero-magnifying-glass-solid" class="size-5 hover:text-foreground" />
         <span class="sr-only">Search</span>
       </.button>
     </form>

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

@@ -8,13 +8,6 @@ defmodule ExplorerWeb.Batch.Index do
 
     Phoenix.PubSub.subscribe(Explorer.PubSub, "update_views")
 
-    if merkle_root == nil do
-      {
-        :empty,
-        assign(socket, newBatchEvent: :empty, batchWasResponded: :empty)
-      }
-    end
-
     current_batch =
       case Batches.get_batch(%{merkle_root: merkle_root}) do
         nil -> :empty
@@ -26,14 +19,24 @@ defmodule ExplorerWeb.Batch.Index do
       assign(socket,
         merkle_root: merkle_root,
         current_batch: current_batch,
+        proof_hashes: :empty,
         network: System.get_env("ENVIRONMENT"),
         site_url: System.get_env("PHX_HOST"),
         page_title: Utils.shorten_hash(merkle_root)
       )
     }
   rescue
     _ ->
-      {:ok, assign(socket, merkle_root: :empty, newBatchInfo: :empty, batchWasResponded: :empty)}
+      {:ok,
+       socket
+       |> assign(
+         merkle_root: :empty,
+         current_batch: :empty,
+         newBatchInfo: :empty,
+         batchWasResponded: :empty,
+         proof_hashes: :empty,
+         proofs: :empty
+       )}
   end
 
   @impl true
@@ -49,5 +52,24 @@ defmodule ExplorerWeb.Batch.Index do
     }
   end
 
+  @impl true
+  def handle_event("show_proofs", _value, socket) do
+    {:noreply, assign(socket, proof_hashes: get_proofs(socket.assigns.merkle_root))}
+  end
+
+  @impl true
+  def handle_event("hide_proofs", _value, socket) do
+    {:noreply, assign(socket, proof_hashes: :empty)}
+  end
+
+  defp get_proofs(merkle_root) do
+    case Proofs.get_proofs_from_batch(%{merkle_root: merkle_root}) do
+      proofs when is_list(proofs) ->
+        Enum.map(proofs, fn proof -> "0x" <> Base.encode16(proof.proof_hash, case: :lower) end)
+      _ ->
+        :nil
+    end
+  end
+
   embed_templates "*"
 end

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

@@ -71,6 +71,25 @@
           text={"Just%20submitted%20a%20proof%20via%20@alignedlayer%0AI%20am%20now%20%23aligned%20✅%0A#{@site_url}/batches/#{@merkle_root}"}
         />
       <% end %>
+      Proofs in this batch:
+      <%= if @proof_hashes != :empty do %>
+        <%= if @proof_hashes == :nil do %>
+          <p class="normal-case">
+            Proofs couldn't be shown for this Batch
+          </p>
+        <% else %>
+          <div class="h-32 overflow-y-auto text-foreground space-y-2">
+            <p :for={proof <- @proof_hashes}><%= proof %></p>
+            <.button class="w-fit text-foreground" phx-click="hide_proofs">
+              <.icon name="hero-eye-slash" class="size-4" /> Hide Proofs
+            </.button>
+          </div>
+        <% end %>
+      <% else %>
+        <.button class="w-fit text-foreground font-semibold" phx-click="show_proofs">
+          <.icon name="hero-eye" class="size-4" /> Show Proofs
+        </.button>
+      <% end %>
     </.card>
   <% else %>
     <div class="flex flex-col space-y-6 justify-center grow relative text-center md:pt-14">