- <.distribution_row :for={{pid, pct} <- @decision_share} provider_id={pid} percentage={pct} />
+ <.distribution_row
+ :for={{pid, pct} <- @decision_share}
+ provider_id={pid}
+ provider_name={resolve_provider_name(@connections, pid)}
+ percentage={pct}
+ />
@@ -434,6 +440,7 @@ defmodule LassoWeb.Dashboard.Components.ChainDetailsPanel do
end
attr(:provider_id, :string, required: true)
+ attr(:provider_name, :string, required: true)
attr(:percentage, :any, required: true)
defp distribution_row(assigns) do
@@ -444,7 +451,7 @@ defmodule LassoWeb.Dashboard.Components.ChainDetailsPanel do
- {@provider_id}
+ {@provider_name}
{@pct}%
@@ -494,13 +501,19 @@ defmodule LassoWeb.Dashboard.Components.ChainDetailsPanel do
defp find_provider_name(_connections, nil), do: nil
defp find_provider_name(connections, decision) when is_list(connections) do
- case Enum.find(connections, &(&1.id == decision.provider_id)) do
+ resolve_provider_name(connections, decision.provider_id)
+ end
+
+ defp find_provider_name(_, decision), do: decision.provider_id
+
+ defp resolve_provider_name(connections, provider_id) when is_list(connections) do
+ case Enum.find(connections, &(&1.id == provider_id)) do
%{name: name} -> name
- _ -> decision.provider_id
+ _ -> provider_id
end
end
- defp find_provider_name(_, decision), do: decision.provider_id
+ defp resolve_provider_name(_, provider_id), do: provider_id
defp compute_filtered_chain_metrics(
"aggregate",
diff --git a/lib/lasso_web/dashboard/components/provider_details_panel.ex b/lib/lasso_web/dashboard/components/provider_details_panel.ex
index fde9620..b634f33 100644
--- a/lib/lasso_web/dashboard/components/provider_details_panel.ex
+++ b/lib/lasso_web/dashboard/components/provider_details_panel.ex
@@ -219,7 +219,7 @@ defmodule LassoWeb.Dashboard.Components.ProviderDetailsPanel do
)
optimistic_lag =
- if selected_region == "aggregate" do
+ if chain do
case StatusHelpers.calculate_optimistic_lag(chain, provider_id) do
{:ok, lag} -> lag
{:error, _} -> nil
@@ -230,8 +230,15 @@ defmodule LassoWeb.Dashboard.Components.ProviderDetailsPanel do
effective_lag = resolve_effective_lag(block_lag, optimistic_lag, conn)
+ display_block_height =
+ if is_integer(optimistic_lag) and is_integer(consensus_height) and is_integer(block_height) do
+ consensus_height + min(0, optimistic_lag)
+ else
+ block_height
+ end
+
%{
- block_height: block_height,
+ block_height: display_block_height,
consensus_height: consensus_height,
optimistic_lag: optimistic_lag,
effective_lag: effective_lag,
@@ -293,10 +300,15 @@ defmodule LassoWeb.Dashboard.Components.ProviderDetailsPanel do
}
end
- defp resolve_effective_lag(block_lag, optimistic_lag, conn) do
+ defp resolve_effective_lag(_block_lag, optimistic_lag, _conn)
+ when is_integer(optimistic_lag) do
+ abs(min(0, optimistic_lag))
+ end
+
+ defp resolve_effective_lag(block_lag, _optimistic_lag, conn) do
cond do
- is_integer(block_lag) and block_lag > 0 -> block_lag
- optimistic_lag != nil -> abs(min(0, optimistic_lag))
+ is_integer(block_lag) and block_lag < 0 -> abs(block_lag)
+ is_integer(block_lag) -> 0
true -> Map.get(conn, :blocks_behind, 0) || 0
end
end
diff --git a/lib/lasso_web/dashboard/dashboard.ex b/lib/lasso_web/dashboard/dashboard.ex
index b851e11..afb30b5 100644
--- a/lib/lasso_web/dashboard/dashboard.ex
+++ b/lib/lasso_web/dashboard/dashboard.ex
@@ -286,17 +286,7 @@ defmodule LassoWeb.Dashboard do
socket
|> assign(:connections, connections)
|> assign(:last_updated, DateTime.utc_now() |> DateTime.to_string())
- |> (fn s ->
- if length(batch) > 0 do
- s
- |> update(:events, fn list ->
- Enum.reverse(batch) ++ Enum.take(list, 199 - length(batch))
- end)
- |> push_event("events_batch", %{items: batch})
- else
- s
- end
- end).()
+ |> maybe_push_events_batch(batch)
{:noreply, socket}
end
@@ -738,6 +728,16 @@ defmodule LassoWeb.Dashboard do
{:noreply, assign(socket, :cluster_block_heights, heights)}
end
+ defp maybe_push_events_batch(socket, []), do: socket
+
+ defp maybe_push_events_batch(socket, batch) do
+ socket
+ |> update(:events, fn list ->
+ Enum.reverse(batch) ++ Enum.take(list, 199 - length(batch))
+ end)
+ |> push_event("events_batch", %{items: batch})
+ end
+
@impl true
def render(assigns) do
~H"""
diff --git a/lib/lasso_web/dashboard/provider_connection.ex b/lib/lasso_web/dashboard/provider_connection.ex
index ebae35b..500c3f3 100644
--- a/lib/lasso_web/dashboard/provider_connection.ex
+++ b/lib/lasso_web/dashboard/provider_connection.ex
@@ -47,7 +47,7 @@ defmodule LassoWeb.Dashboard.ProviderConnection do
url = Map.get(instance_config, :url)
ws_url = Map.get(instance_config, :ws_url)
- provider_name = get_in(instance_config, [:canonical_config, :name]) || provider_id
+ provider_name = profile_provider[:name] || provider_id
provider_type =
cond do
diff --git a/lib/lasso_web/sockets/rpc_socket.ex b/lib/lasso_web/sockets/rpc_socket.ex
index 5e116b7..ece75d9 100644
--- a/lib/lasso_web/sockets/rpc_socket.ex
+++ b/lib/lasso_web/sockets/rpc_socket.ex
@@ -456,7 +456,7 @@ defmodule LassoWeb.RPCSocket do
# Map URL strategy strings to atoms (avoids String.to_atom)
@strategy_map %{
"fastest" => :fastest,
- "round-robin" => :round_robin,
+ "round-robin" => :load_balanced,
"latency-weighted" => :latency_weighted
}
diff --git a/test/integration/request_pipeline_integration_test.exs b/test/integration/request_pipeline_integration_test.exs
index 1015820..7c13d85 100644
--- a/test/integration/request_pipeline_integration_test.exs
+++ b/test/integration/request_pipeline_integration_test.exs
@@ -818,7 +818,6 @@ defmodule Lasso.RPC.RequestPipelineIntegrationTest do
:closed
)
-
# Request with priority strategy should still succeed via failover
{:ok, result, _ctx} =
RequestPipeline.execute_via_channels(
diff --git a/test/lasso/config/profile_validator_test.exs b/test/lasso/config/profile_validator_test.exs
index 527159f..d050830 100644
--- a/test/lasso/config/profile_validator_test.exs
+++ b/test/lasso/config/profile_validator_test.exs
@@ -168,8 +168,8 @@ defmodule Lasso.Config.ProfileValidatorTest do
assert 400 = ProfileValidator.error_to_http_status(:profile_empty)
end
- test "returns 503 for profile not found" do
- assert 503 = ProfileValidator.error_to_http_status(:profile_not_found)
+ test "returns 404 for profile not found" do
+ assert 404 = ProfileValidator.error_to_http_status(:profile_not_found)
end
end
diff --git a/test/lasso/providers/probe_coordinator_test.exs b/test/lasso/providers/probe_coordinator_test.exs
index 6395578..0a7e1c0 100644
--- a/test/lasso/providers/probe_coordinator_test.exs
+++ b/test/lasso/providers/probe_coordinator_test.exs
@@ -179,6 +179,66 @@ defmodule Lasso.Providers.ProbeCoordinatorTest do
end
end
+ describe "minimum probe interval" do
+ test "enforces 10s floor between probes regardless of backoff" do
+ {:ok, pid} = ProbeCoordinator.start_link(@chain)
+ instance_ids = Catalog.list_instances_for_chain(@chain)
+ [first_id | _] = instance_ids
+
+ state = :sys.get_state(pid)
+ inst = Map.get(state.instances, first_id)
+
+ # Set last_probe_monotonic to 5 seconds ago with zero backoff
+ now = System.monotonic_time(:millisecond)
+
+ modified = %{
+ inst
+ | last_probe_monotonic: now - 5_000,
+ current_backoff_ms: 0
+ }
+
+ new_state = %{state | instances: Map.put(state.instances, first_id, modified)}
+ :sys.replace_state(pid, fn _ -> new_state end)
+
+ # Wait for a tick cycle
+ Process.sleep(300)
+
+ # The instance should NOT have been probed (5s < 10s minimum)
+ after_state = :sys.get_state(pid)
+ after_inst = Map.get(after_state.instances, first_id)
+ assert after_inst.last_probe_monotonic == now - 5_000
+ end
+
+ test "allows probing after minimum interval has elapsed" do
+ {:ok, pid} = ProbeCoordinator.start_link(@chain)
+ instance_ids = Catalog.list_instances_for_chain(@chain)
+ [first_id | _] = instance_ids
+
+ state = :sys.get_state(pid)
+ inst = Map.get(state.instances, first_id)
+
+ # Set last_probe_monotonic to 11 seconds ago with zero backoff
+ now = System.monotonic_time(:millisecond)
+
+ modified = %{
+ inst
+ | last_probe_monotonic: now - 11_000,
+ current_backoff_ms: 0
+ }
+
+ new_state = %{state | instances: Map.put(state.instances, first_id, modified)}
+ :sys.replace_state(pid, fn _ -> new_state end)
+
+ # Wait for a tick cycle
+ Process.sleep(300)
+
+ # The instance should have been probed (11s > 10s minimum)
+ after_state = :sys.get_state(pid)
+ after_inst = Map.get(after_state.instances, first_id)
+ assert after_inst.last_probe_monotonic > now - 11_000
+ end
+ end
+
describe "via_name/1" do
test "returns a Registry via tuple" do
{:via, Registry, {Lasso.Registry, key}} = ProbeCoordinator.via_name("ethereum")