Pull fixes from testnet (#1718)

Author: JuArce

alerts/.env.example

@@ -19,7 +19,9 @@ EXPRESSION=<GREP_EXPRESSION>
 RPC_URL=<YOUR_RPC_URL>
 PAYMENT_CONTRACT_ADDRESS=<YOUR_PAYMENT_CONTRACT_ADDRESS>
 BALANCE_THRESHOLD=<YOUR_BALANCE_THRESHOLD_IN_ETH>
+WALLET_NAME=<YOUR_WALLET_NAME> # Example: "Task sender"
 WALLET_ADDRESS=<YOUR_WALLET_ADDRESS>
+NETWORK=<MAINNET|HOLESKY|STAGE>
 
 # Variables for sender_with_alert.sh
 REPETITIONS=<REPETITIONS>

alerts/balance_alerts.sh

@@ -25,12 +25,12 @@ balance_alert=false
 
 while :
 do
-  balance_wei=$(cast call --rpc-url $RPC_URL $PAYMENT_CONTRACT_ADDRESS "UserBalances(address)(uint256)" $WALLET_ADDRESS | cut -d' ' -f1)
+  balance_wei=$(cast call --rpc-url $RPC_URL $PAYMENT_CONTRACT_ADDRESS "user_balances(address)(uint256)" $WALLET_ADDRESS | cut -d' ' -f1)
 
   balance_eth=$(cast from-wei $balance_wei)
 
   if [ 1 -eq "$(echo "$balance_eth < $BALANCE_THRESHOLD" | bc)" ]; then
-    message="⚠️ WARNING: Wallet $WALLET_ADDRESS balance ($balance_eth ETH) is below $BALANCE_THRESHOLD ETH"
+    message="⚠️ WARNING: $WALLET_NAME ($NETWORK) Wallet ($WALLET_ADDRESS) balance ($balance_eth ETH) is below $BALANCE_THRESHOLD ETH"
     printf "$message\n"
     if [ "$balance_alert" = false ]; then
       send_slack_message "$message"

explorer/lib/explorer/models/batches.ex

@@ -164,6 +164,25 @@ defmodule Batches do
     end
   end
 
+  def get_last_24h_verified_proof_stats() do
+    minutes_in_a_day = 1440
+    threshold_datetime = DateTime.utc_now() |> DateTime.add(-1 * minutes_in_a_day, :minute) # Last 24 hours
+
+    query = from(b in Batches,
+      where: b.is_verified == true and b.submission_timestamp > ^threshold_datetime,
+      select: {sum(b.amount_of_proofs), avg(b.fee_per_proof)})
+
+    {amount_of_proofs, avg_fee_per_proof} = case Explorer.Repo.one(query) do
+      nil -> {0, 0.0}
+      result -> result
+    end
+
+    %{
+      amount_of_proofs: amount_of_proofs,
+      avg_fee_per_proof: avg_fee_per_proof
+    }
+  end
+
   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})

explorer/lib/explorer_web/controllers/data_controller.ex

@@ -0,0 +1,21 @@
+defmodule ExplorerWeb.DataController do
+  use ExplorerWeb, :controller
+
+  def verified_proofs_in_last_24_hours(conn, _params) do
+    %{
+      amount_of_proofs: amount_of_proofs,
+      avg_fee_per_proof: avg_fee_per_proof
+    } = Batches.get_last_24h_verified_proof_stats()
+
+    avg_fee_per_proof_usd =
+      case EthConverter.wei_to_usd_sf(avg_fee_per_proof, 2) do
+        {:ok, value} -> value
+        _ -> 0
+      end
+
+    render(conn, :show, %{
+      amount_of_proofs: amount_of_proofs,
+      avg_fee_per_proof_usd: avg_fee_per_proof_usd
+    })
+  end
+end

explorer/lib/explorer_web/controllers/data_json.ex

@@ -0,0 +1,11 @@
+defmodule ExplorerWeb.DataJSON do
+  def show(%{
+        amount_of_proofs: amount_of_proofs,
+        avg_fee_per_proof_usd: avg_fee_per_proof_usd
+      }) do
+    %{
+      amount_of_proofs: amount_of_proofs,
+      avg_fee_per_proof_usd: avg_fee_per_proof_usd
+    }
+  end
+end

explorer/lib/explorer_web/live/eth_converter.ex

@@ -58,6 +58,8 @@ defmodule EthConverter do
     end
   end
 
+  defp round_to_sf(%Decimal{coef: 0} = _value, _sf), do: Decimal.new("0")
+
   defp round_to_sf(value, significant_figures) do
     # Convert the value to a float and calculate the magnitude
     value_float = Decimal.to_float(value)

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

@@ -34,7 +34,7 @@
         type="number"
         class={
           classes([
-            "border border-foreground/20 text-muted-foreground w-20 focus:ring-primary",
+            "text-center border border-foreground/20 text-muted-foreground w-20 focus:ring-primary",
             "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",
             "[appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none"

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

@@ -42,13 +42,21 @@ defmodule ExplorerWeb.Home.Index do
       %{
         title: "Proofs verified",
         value: Helpers.convert_number_to_shorthand(verified_proofs),
-        tooltip_text: "= #{Helpers.format_number(verified_proofs)} proofs",
+        tooltip_text:
+          case verified_proofs >= 1000 do
+            true -> "= #{Helpers.format_number(verified_proofs)} proofs"
+            _ -> nil
+          end,
         link: nil
       },
       %{
         title: "Total batches",
         value: Helpers.convert_number_to_shorthand(verified_batches),
-        tooltip_text: "= #{Helpers.format_number(verified_batches)} batches",
+        tooltip_text:
+          case verified_batches >= 1000 do
+            true -> "= #{Helpers.format_number(verified_batches)} batches"
+            _ -> nil
+          end,
         link: nil
       },
       %{
@@ -146,7 +154,7 @@ defmodule ExplorerWeb.Home.Index do
     |> assign(
       stats: [],
       latest_batches: [],
-      cost_per_proof_data: %{points: [], extra_data: %{}},
+      cost_per_proof_chart: %{points: [], extra_data: %{}},
       batch_size_chart_data: %{points: [], extra_data: %{}}
     )
   end

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

@@ -34,7 +34,7 @@
     <div class="flex flex-wrap md:flex-row flex-col gap-5">
       <.card
         title="Cost per proof"
-        subtitle="Cost of proving over time"
+        subtitle="Verification cost over time"
         class="p-0 flex-1"
         header_container_class="px-10 pt-8"
       >

explorer/lib/explorer_web/live/utils.ex

@@ -7,6 +7,11 @@ defmodule ExplorerWeb.Helpers do
     end
   end
 
+  def convert_number_to_shorthand(number) when number >= 1_000_000_000 do
+    formatted_number = Float.round(number / 1_000_000_000, 2)
+    "#{remove_trailing_zeros(formatted_number)}B"
+  end
+
   def convert_number_to_shorthand(number) when number >= 1_000_000 do
     formatted_number = Float.round(number / 1_000_000, 2)
     "#{remove_trailing_zeros(formatted_number)}M"