diff --git a/apps/block_scout_web/lib/block_scout_web/templates/block_transaction/404.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/block_transaction/404.html.eex
index 5f87d8debbf5..84fe3df3aa39 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/block_transaction/404.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/block_transaction/404.html.eex
@@ -10,4 +10,4 @@
-
\ No newline at end of file
+
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/chain/show.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/chain/show.html.eex
index 33b1995cfa0f..189955032356 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/chain/show.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/chain/show.html.eex
@@ -92,18 +92,20 @@
- <%= case @average_block_time do %>
- <% {:error, :disabled} -> %>
- <%= nil %>
- <% average_block_time -> %>
-
+ <%= unless Application.get_env(:explorer, :chain_type) == :optimism do %>
+ <%= case @average_block_time do %>
+ <% {:error, :disabled} -> %>
+ <%= nil %>
+ <% average_block_time -> %>
+
+ <% end %>
<% end %>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/internal_transaction/_tile.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/internal_transaction/_tile.html.eex
index 27ede917dd8a..3c23ba78c6fa 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/internal_transaction/_tile.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/internal_transaction/_tile.html.eex
@@ -33,7 +33,7 @@
to: block_path(BlockScoutWeb.Endpoint, :show, @internal_transaction.block_number)
) %>
-
+
<%= if assigns[:current_address] do %>
<%= if assigns[:current_address].hash == @internal_transaction.from_address_hash do %>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex
index 1f8707d57f69..eb7342cf9319 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex
@@ -83,7 +83,7 @@
<%= gettext("Tokens") %>
-
+
<%= link(
gettext("All"),
class: "dropdown-item #{tab_status("tokens", @conn.request_path)}",
@@ -105,7 +105,7 @@
<%= gettext("APIs") %>
-
+
<%= link(
gettext("GraphQL"),
class: "dropdown-item #{tab_status("graphiql", @conn.request_path)}",
@@ -160,24 +160,24 @@
<%= subnetwork_title() %>
-
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction/_tile.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction/_tile.html.eex
index c582d6747444..d7fa7e29c32b 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/transaction/_tile.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction/_tile.html.eex
@@ -48,7 +48,7 @@
<%= value(@transaction, include_label: false) %> <%= Explorer.coin_name() %>
-
+
<%= formatted_fee(@transaction, denomination: :ether, include_label: false) %> <%= gettext "TX Fee" %>
@@ -80,7 +80,7 @@
<%= @transaction |> block_number() |> BlockScoutWeb.RenderHelper.render_partial() %>
-
+
<%= if from_or_to_address?(@transaction, assigns[:current_address]) do %>
<%= if @transaction.from_address_hash == assigns[:current_address].hash do %>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction/_total_transfers.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction/_total_transfers.html.eex
index 4896e6e85312..e2933904c270 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/transaction/_total_transfers.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction/_total_transfers.html.eex
@@ -1,7 +1,7 @@
<%= case token_transfer_amount(@transfer) do %>
<% {:ok, :erc721_instance} -> %>
<%= render BlockScoutWeb.TransactionView, "_transfer_token_with_id.html", transfer: @transfer, token_id: List.first(@transfer.token_ids) %>
- <% {:ok, :erc1155_instance, value} -> %>
+ <% {:ok, :erc1155_erc404_instance, value} -> %>
<% transfer_type = Chain.get_token_transfer_type(@transfer) %>
<%= if transfer_type == :token_spawning do %>
<%= render BlockScoutWeb.TransactionView, "_transfer_token_with_id.html", transfer: @transfer, token_id: List.first(@transfer.token_ids) %>
@@ -9,7 +9,7 @@
<%= "#{value} " %>
<%= render BlockScoutWeb.TransactionView, "_transfer_token_with_id.html", transfer: @transfer, token_id: List.first(@transfer.token_ids) %>
<% end %>
- <% {:ok, :erc1155_instance, values, token_ids, _decimals} -> %>
+ <% {:ok, :erc1155_erc404_instance, values, token_ids, _decimals} -> %>
<% values_ids = Enum.zip(values, token_ids) %>
<%= for {value, token_id} <- values_ids do %>
- <%= if Enum.count(main_nets) > 0 do %>
- Mainnets
- <%= for %{url: url, title: title} <- main_nets do %>
+
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex
index 34ceb918738a..57a85d771e08 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex
@@ -97,7 +97,7 @@
<% session = Explorer.Account.enabled?() && Plug.Conn.get_session(@conn, :current_user) %>
<%= render BlockScoutWeb.LayoutView, "_topnav.html", current_user: session, conn: @conn %>
<%= if session && !session[:email_verified] do %>
- 
" alt="" onerror="if (this.src != '/images/icons/token_icon_default.svg') this.src = '/images/icons/token_icon_default.svg';"/>
\ No newline at end of file
+" alt="" onerror="if (this.src != '/images/icons/token_icon_default.svg') this.src = '/images/icons/token_icon_default.svg';"/>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/tokens/overview/_details.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/tokens/overview/_details.html.eex
index e3b1d90529ca..80a6ba2077d5 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/tokens/overview/_details.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/tokens/overview/_details.html.eex
@@ -54,10 +54,10 @@
<%= link(
@token.contract_address_hash,
- to: AccessHelper.get_path(@conn, :address_path, :show,
+ to: AccessHelper.get_path(@conn, :address_path, :show,
Address.checksum(@token.contract_address_hash)),
"data-test": "token_contract_address"
- )
+ )
%>
@@ -99,7 +99,7 @@
- <% end %>
+ <% end %>
<% end %>
<%= gettext("Please confirm your email address to use the My Account feature.") %> <%= gettext("A confirmation email was sent to") %> <%=session[:email] %> <%= gettext "on sign up. Didn’t receive?" %> <%= gettext "Resend verification email" %>.
+<%= gettext("Please confirm your email address to use the My Account feature.") %> <%= gettext("A confirmation email was sent to") %> <%=session[:email] %> <%= gettext "on sign up. Didn’t receive?" %> <%= gettext "Resend verification email" %>.
<% else %><%= get_flash(@conn, :info) %>
<% end %> diff --git a/apps/block_scout_web/lib/block_scout_web/templates/tokens/_token_icon.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/tokens/_token_icon.html.eex index 5ccb004cd27a..9a4de756d7d3 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/tokens/_token_icon.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/tokens/_token_icon.html.eex @@ -1,2 +1,2 @@ <% token_icon_url = Explorer.Chain.get_token_icon_url_by(@chain_id, @address) %> -- @@ -134,7 +134,7 @@ <%= @token.decimals %>
- <%= render BlockScoutWeb.CommonComponentsView, "_i_tooltip_2.html", diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction/_pending_tile.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction/_pending_tile.html.eex index d1b33ffeeb91..fd1a1496f183 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/transaction/_pending_tile.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction/_pending_tile.html.eex @@ -18,7 +18,7 @@ <%= BlockScoutWeb.TransactionView.value(@transaction, include_label: false) %> <%= Explorer.coin_name() %> - <%= BlockScoutWeb.TransactionView.formatted_fee(@transaction, denomination: :ether, include_label: false) %> <%= gettext "TX Fee" %> + <%= BlockScoutWeb.TransactionView.formatted_fee(@transaction, denomination: :ether, include_label: false) %> <%= gettext "TX Fee" %>
@@ -20,4 +20,4 @@
<% {:ok, value} -> %>
<%= value %>
<%= " " %><%= render BlockScoutWeb.TransactionView, "_link_to_token_symbol.html", transfer: @transfer %>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction/_total_transfers_from_to.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction/_total_transfers_from_to.html.eex
index d26557b9c32a..91de91125ad1 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/transaction/_total_transfers_from_to.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction/_total_transfers_from_to.html.eex
@@ -40,7 +40,7 @@ style: "position: relative;"%>
For
-<% end %>
+<% end %>
<%= render BlockScoutWeb.TransactionView, "_total_transfers.html", transfer: @transfer %>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction/overview.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction/overview.html.eex
index ebd4a61cadc7..21229d73ade2 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/transaction/overview.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction/overview.html.eex
@@ -195,9 +195,29 @@
<% end %>
+ <%= if Application.get_env(:explorer, :chain_type) == :optimism && @transaction.l1_block_number do %>
+
+
-
+
- + <%= render BlockScoutWeb.CommonComponentsView, "_i_tooltip_2.html", + text: gettext("Block number containing the transaction on L1.") %> + <%= gettext "L1 Block" %> +
- + <%= if block do %> + <%= link( + @transaction.l1_block_number, + class: "transaction__link", + to: "https://eth-goerli.blockscout.com/block/#{@transaction.l1_block_number}" + ) %> + <% else %> + <%= formatted_result(status) %> + <% end %> + +
- <%= render BlockScoutWeb.CommonComponentsView, "_i_tooltip_2.html", @@ -275,7 +295,7 @@ <% {_type, %{token_transfers: token_transfers} = transaction_with_transfers} when is_list(token_transfers) and token_transfers != [] -> %> <% %{transfers: transfers, mintings: mintings, burnings: burnings, creations: creations} = aggregate_token_transfers(transaction_with_transfers.token_transfers) %> - <%= if Enum.count(transfers) > 0 do %> + <%= unless Enum.empty?(transfers) do %>
- <%= render BlockScoutWeb.CommonComponentsView, "_i_tooltip_2.html", @@ -291,7 +311,7 @@
- <%= render BlockScoutWeb.CommonComponentsView, "_i_tooltip_2.html", @@ -308,7 +328,7 @@
- <%= render BlockScoutWeb.CommonComponentsView, "_i_tooltip_2.html", @@ -324,7 +344,7 @@
- <%= render BlockScoutWeb.CommonComponentsView, "_i_tooltip_2.html", @@ -371,12 +391,18 @@ <% end %>
- - <%= render BlockScoutWeb.CommonComponentsView, "_i_tooltip_2.html", - text: gettext("Price per unit of gas specified by the sender. Higher gas prices can prioritize transaction inclusion during times of high usage.") %> - <%= gettext "Gas Price" %> + <%= if Application.get_env(:explorer, :chain_type) == :optimism do %> + <%= render BlockScoutWeb.CommonComponentsView, "_i_tooltip_2.html", + text: gettext("Price per unit of gas specified by the sender on L2. Higher gas prices can prioritize transaction inclusion during times of high usage.") %> + <%= gettext "L2 Gas Price" %> + <% else %> + <%= render BlockScoutWeb.CommonComponentsView, "_i_tooltip_2.html", + text: gettext("Price per unit of gas specified by the sender. Higher gas prices can prioritize transaction inclusion during times of high usage.") %> + <%= gettext "Gas Price" %> + <% end %>
- <%= gas_price(@transaction, :gwei) %>
- - <%= render BlockScoutWeb.CommonComponentsView, "_i_tooltip_2.html", - text: gettext("Maximum gas amount approved for the transaction.") %> - <%= gettext "Gas Limit" %> + <%= if Application.get_env(:explorer, :chain_type) == :optimism do %> + <%= render BlockScoutWeb.CommonComponentsView, "_i_tooltip_2.html", + text: gettext("Maximum gas amount approved for the transaction on L2.") %> + <%= gettext "L2 Gas Limit" %> + <% else %> + <%= render BlockScoutWeb.CommonComponentsView, "_i_tooltip_2.html", + text: gettext("Maximum gas amount approved for the transaction.") %> + <%= gettext "Gas Limit" %> + <% end %>
- <%= format_gas_limit(@transaction.gas) %>
- - <%= render BlockScoutWeb.CommonComponentsView, "_i_tooltip_2.html", - text: gettext("Actual gas amount used by the transaction.") %> - <%= gettext "Gas Used by Transaction" %> + <%= if Application.get_env(:explorer, :chain_type) == :optimism do %> + <%= render BlockScoutWeb.CommonComponentsView, "_i_tooltip_2.html", + text: gettext("Actual gas amount used by the transaction on L2.") %> + <%= gettext "L2 Gas Used by Transaction" %> + <% else %> + <%= render BlockScoutWeb.CommonComponentsView, "_i_tooltip_2.html", + text: gettext("Actual gas amount used by the transaction.") %> + <%= gettext "Gas Used by Transaction" %> + <% end %> <% gas_used_perc = gas_used_perc(@transaction) %>
- <%= gas_used(@transaction) %> <%= if gas_used_perc, do: "| #{gas_used_perc}%" %>
-
+
- + <%= render BlockScoutWeb.CommonComponentsView, "_i_tooltip_2.html", + text: gettext("L1 Gas Used by Transaction") %> + <%= gettext "L1 Gas Used by Transaction" %> + +
- <%= l1_gas_used(@transaction) %> +
-
+
- + <%= render BlockScoutWeb.CommonComponentsView, "_i_tooltip_2.html", + text: gettext("L1 Gas Price") %> + <%= gettext "L1 Gas Price" %> + +
- <%= l1_gas_price(@transaction, :gwei) %> +
-
+
- + <%= render BlockScoutWeb.CommonComponentsView, "_i_tooltip_2.html", + text: gettext("L1 Fee Scalar") %> + <%= gettext "L1 Fee Scalar" %> + +
- <%= @transaction.l1_fee_scalar %> +
-
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction_raw_trace/_card_body.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction_raw_trace/_card_body.html.eex
index dcee7b71bc9b..1d105bf4ba7b 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/transaction_raw_trace/_card_body.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction_raw_trace/_card_body.html.eex
@@ -1,5 +1,5 @@
<%= gettext "Raw Trace" %> - <%= if Enum.count(@internal_transactions) > 0 do %> + <%= unless Enum.empty?(@internal_transactions) do %> <% raw_trace_text = for {line, _} <- raw_traces_with_lines(@internal_transactions), do: line %> <%= render BlockScoutWeb.CommonComponentsView, "_btn_copy.html", id: "tx-raw-trace-input", @@ -10,10 +10,10 @@ style: "float: right;" %> <% end %>
-<%= if Enum.count(@internal_transactions) > 0 do %> -
+<%= if Enum.empty?(@internal_transactions) do %> +<%= for {line, number} <- raw_traces_with_lines(@internal_transactions) do %><%= line %><% end %>+ <%= gettext "No trace entries found." %> +<% else %> -- <%= gettext "No trace entries found." %> --<% end %> \ No newline at end of file +
+<% end %> diff --git a/apps/block_scout_web/lib/block_scout_web/utility/event_handlers_metrics.ex b/apps/block_scout_web/lib/block_scout_web/utility/event_handlers_metrics.ex new file mode 100644 index 000000000000..ed2709bddce1 --- /dev/null +++ b/apps/block_scout_web/lib/block_scout_web/utility/event_handlers_metrics.ex @@ -0,0 +1,45 @@ +defmodule BlockScoutWeb.Utility.EventHandlersMetrics do + @moduledoc """ + Module responsible for periodically setting current event handlers queue length metrics. + """ + + use GenServer + + alias BlockScoutWeb.{MainPageRealtimeEventHandler, RealtimeEventHandler, SmartContractRealtimeEventHandler} + alias BlockScoutWeb.Prometheus.Instrumenter + + @interval :timer.minutes(1) + + @spec start_link(term()) :: GenServer.on_start() + def start_link(_) do + GenServer.start_link(__MODULE__, :ok, name: __MODULE__) + end + + def init(_) do + schedule_next_run() + + {:ok, %{}} + end + + def handle_info(:set_metrics, state) do + set_metrics() + schedule_next_run() + + {:noreply, state} + end + + defp set_metrics do + set_handler_metric(MainPageRealtimeEventHandler, :main_page) + set_handler_metric(RealtimeEventHandler, :common) + set_handler_metric(SmartContractRealtimeEventHandler, :smart_contract) + end + + defp set_handler_metric(handler, label) do + {_, queue_length} = Process.info(Process.whereis(handler), :message_queue_len) + Instrumenter.event_handler_queue_length(label, queue_length) + end + + defp schedule_next_run do + Process.send_after(self(), :set_metrics, @interval) + end +end diff --git a/apps/block_scout_web/lib/block_scout_web/views/access_helper.ex b/apps/block_scout_web/lib/block_scout_web/views/access_helper.ex index ecfb0ffe556e..8d200b36de00 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/access_helper.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/access_helper.ex @@ -53,6 +53,42 @@ defmodule BlockScoutWeb.AccessHelper do |> Conn.halt() end + def check_rate_limit(conn, graphql?: true) do + rate_limit_config = Application.get_env(:block_scout_web, Api.GraphQL) + + if rate_limit_config[:rate_limit_disabled?] do + :ok + else + check_graphql_rate_limit_inner(conn, rate_limit_config) + end + end + + defp check_graphql_rate_limit_inner(conn, rate_limit_config) do + global_limit = rate_limit_config[:global_limit] + limit_by_key = rate_limit_config[:limit_by_key] + time_interval_limit = rate_limit_config[:time_interval_limit] + static_api_key = rate_limit_config[:static_api_key] + limit_by_ip = rate_limit_config[:limit_by_ip] + time_interval_by_ip = rate_limit_config[:time_interval_limit_by_ip] + + ip_string = conn_to_ip_string(conn) + plan = get_plan(conn.query_params) + + cond do + check_api_key(conn) && get_api_key(conn) == static_api_key -> + rate_limit(static_api_key, limit_by_key, time_interval_limit) + + check_api_key(conn) && !is_nil(plan) -> + conn + |> get_api_key() + |> rate_limit(min(plan.max_req_per_second, limit_by_key), time_interval_limit) + + true -> + rate_limit("graphql_#{ip_string}", limit_by_ip, time_interval_by_ip) == :ok && + rate_limit("graphql", global_limit, time_interval_limit) == :ok + end + end + def check_rate_limit(conn) do rate_limit_config = Application.get_env(:block_scout_web, :api_rate_limit) diff --git a/apps/block_scout_web/lib/block_scout_web/views/account/api/v1/account_view.ex b/apps/block_scout_web/lib/block_scout_web/views/account/api/v2/account_view.ex similarity index 65% rename from apps/block_scout_web/lib/block_scout_web/views/account/api/v1/account_view.ex rename to apps/block_scout_web/lib/block_scout_web/views/account/api/v2/account_view.ex index 0e3a65e61653..632b3109501f 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/account/api/v1/account_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/account/api/v2/account_view.ex @@ -1,4 +1,4 @@ -defmodule BlockScoutWeb.Account.Api.V1.AccountView do +defmodule BlockScoutWeb.Account.Api.V2.AccountView do def render("message.json", %{message: message}) do %{ "message" => message diff --git a/apps/block_scout_web/lib/block_scout_web/views/account/api/v1/tags_view.ex b/apps/block_scout_web/lib/block_scout_web/views/account/api/v2/tags_view.ex similarity index 92% rename from apps/block_scout_web/lib/block_scout_web/views/account/api/v1/tags_view.ex rename to apps/block_scout_web/lib/block_scout_web/views/account/api/v2/tags_view.ex index d97e35f9145b..80670000d2e6 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/account/api/v1/tags_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/account/api/v2/tags_view.ex @@ -1,4 +1,4 @@ -defmodule BlockScoutWeb.Account.Api.V1.TagsView do +defmodule BlockScoutWeb.Account.Api.V2.TagsView do def render("address_tags.json", %{tags_map: tags_map}) do tags_map end diff --git a/apps/block_scout_web/lib/block_scout_web/views/account/api/v1/user_view.ex b/apps/block_scout_web/lib/block_scout_web/views/account/api/v2/user_view.ex similarity index 96% rename from apps/block_scout_web/lib/block_scout_web/views/account/api/v1/user_view.ex rename to apps/block_scout_web/lib/block_scout_web/views/account/api/v2/user_view.ex index 26c8d7c8295b..fb86dd26bcdc 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/account/api/v1/user_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/account/api/v2/user_view.ex @@ -1,5 +1,5 @@ -defmodule BlockScoutWeb.Account.Api.V1.UserView do - alias BlockScoutWeb.Account.Api.V1.AccountView +defmodule BlockScoutWeb.Account.Api.V2.UserView do + alias BlockScoutWeb.Account.Api.V2.AccountView alias BlockScoutWeb.API.V2.Helper alias Ecto.Changeset alias Explorer.Chain @@ -112,12 +112,15 @@ defmodule BlockScoutWeb.Account.Api.V1.UserView do "ERC-721" => %{ "incoming" => watchlist.watch_erc_721_input, "outcoming" => watchlist.watch_erc_721_output - } - # , + }, # "ERC-1155" => %{ # "incoming" => watchlist.watch_erc_1155_input, # "outcoming" => watchlist.watch_erc_1155_output - # } + # }, + "ERC-404" => %{ + "incoming" => watchlist.watch_erc_404_input, + "outcoming" => watchlist.watch_erc_404_output + } }, "notification_methods" => %{ "email" => watchlist.notify_email diff --git a/apps/block_scout_web/lib/block_scout_web/views/account/watchlist_view.ex b/apps/block_scout_web/lib/block_scout_web/views/account/watchlist_view.ex index c6d513a2bff1..b6fa5009f151 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/account/watchlist_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/account/watchlist_view.ex @@ -4,7 +4,7 @@ defmodule BlockScoutWeb.Account.WatchlistView do alias BlockScoutWeb.Account.WatchlistAddressView alias Explorer.Account.WatchlistAddress alias Explorer.Market - alias Indexer.Fetcher.CoinBalanceOnDemand + alias Indexer.Fetcher.OnDemand.CoinBalance, as: CoinBalanceOnDemand def coin_balance_status(address) do CoinBalanceOnDemand.trigger_fetch(address) diff --git a/apps/block_scout_web/lib/block_scout_web/views/address_view.ex b/apps/block_scout_web/lib/block_scout_web/views/address_view.ex index 532aceed6b5f..324bc54ba7c0 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/address_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/address_view.ex @@ -283,7 +283,7 @@ defmodule BlockScoutWeb.AddressView do def has_decompiled_code?(address) do address.has_decompiled_code? || - (Ecto.assoc_loaded?(address.decompiled_smart_contracts) && Enum.count(address.decompiled_smart_contracts) > 0) + (Ecto.assoc_loaded?(address.decompiled_smart_contracts) && not Enum.empty?(address.decompiled_smart_contracts)) end def token_title(%Token{name: nil, contract_address_hash: contract_address_hash}) do diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/eth_rpc/view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/eth_rpc/view.ex index 16f85b303ff2..d2b29c0117c6 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/api/eth_rpc/view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/api/eth_rpc/view.ex @@ -59,6 +59,14 @@ defmodule BlockScoutWeb.API.EthRPC.View do """ end + def encode(%BlockScoutWeb.API.EthRPC.View{id: id, error: error}, _options) when is_map(error) do + error = Poison.encode!(error) + + """ + {"jsonrpc":"2.0","error": #{error},"id": #{id}} + """ + end + def encode(%BlockScoutWeb.API.EthRPC.View{id: id, error: error}, _options) do """ {"jsonrpc":"2.0","error": "#{error}","id": #{id}} @@ -75,6 +83,14 @@ defmodule BlockScoutWeb.API.EthRPC.View do """ end + def encode(%BlockScoutWeb.API.EthRPC.View{id: id, error: error}, _options) when is_map(error) do + error = Jason.encode!(error) + + """ + {"jsonrpc":"2.0","error": #{error},"id": #{id}} + """ + end + def encode(%BlockScoutWeb.API.EthRPC.View{id: id, error: error}, _options) do """ {"jsonrpc":"2.0","error": "#{error}","id": #{id}} diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/rpc/address_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/rpc/address_view.ex index 25ecdb2fc961..eca2f51a14e0 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/api/rpc/address_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/api/rpc/address_view.ex @@ -44,7 +44,7 @@ defmodule BlockScoutWeb.API.RPC.AddressView do end def render("tokennfttx.json", %{token_transfers: token_transfers, max_block_number: max_block_number}) do - data = Enum.map(token_transfers, &prepare_nft_token_transfer(&1, max_block_number)) + data = Enum.map(token_transfers, &prepare_nft_transfer(&1, max_block_number)) RPCView.render("show.json", data: data) end @@ -192,6 +192,13 @@ defmodule BlockScoutWeb.API.RPC.AddressView do |> Map.put_new(:values, token_transfer.amounts) end + defp prepare_token_transfer(%{token_type: "ERC-404"} = token_transfer) do + token_transfer + |> prepare_common_token_transfer() + |> Map.put_new(:tokenIDs, token_transfer.token_ids) + |> Map.put_new(:values, token_transfer.amounts) + end + defp prepare_token_transfer(%{token_type: "ERC-20"} = token_transfer) do token_transfer |> prepare_common_token_transfer() @@ -202,7 +209,7 @@ defmodule BlockScoutWeb.API.RPC.AddressView do prepare_common_token_transfer(token_transfer) end - defp prepare_nft_token_transfer(token_transfer, max_block_number) do + defp prepare_nft_transfer(token_transfer, max_block_number) do %{ "blockNumber" => to_string(token_transfer.block_number), "timeStamp" => to_string(DateTime.to_unix(token_transfer.block.timestamp)), diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/rpc/contract_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/rpc/contract_view.ex index 24178233be63..0aa978a29d8c 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/api/rpc/contract_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/api/rpc/contract_view.ex @@ -124,7 +124,9 @@ defmodule BlockScoutWeb.API.RPC.ContractView do defp set_external_libraries(contract_output, contract) do external_libraries = Map.get(contract, :external_libraries, []) - if Enum.count(external_libraries) > 0 do + if Enum.empty?(external_libraries) do + contract_output + else external_libraries_without_id = Enum.map(external_libraries, fn %{name: name, address_hash: address_hash} -> %{"name" => name, "address_hash" => address_hash} @@ -132,8 +134,6 @@ defmodule BlockScoutWeb.API.RPC.ContractView do contract_output |> Map.put_new(:ExternalLibraries, external_libraries_without_id) - else - contract_output end end diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/rpc/token_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/rpc/token_view.ex index 9ccab7c9d163..f2c8de82dd6b 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/api/rpc/token_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/api/rpc/token_view.ex @@ -2,6 +2,8 @@ defmodule BlockScoutWeb.API.RPC.TokenView do use BlockScoutWeb, :view alias BlockScoutWeb.API.RPC.RPCView + alias BlockScoutWeb.BridgedTokensView + alias Explorer.Chain.CurrencyHelper def render("gettoken.json", %{token: token}) do RPCView.render("show.json", data: prepare_token(token)) @@ -12,6 +14,11 @@ defmodule BlockScoutWeb.API.RPC.TokenView do RPCView.render("show.json", data: data) end + def render("bridgedtokenlist.json", %{bridged_tokens: bridged_tokens}) do + data = Enum.map(bridged_tokens, &prepare_bridged_token/1) + RPCView.render("show.json", data: data) + end + def render("error.json", assigns) do RPCView.render("error.json", assigns) end @@ -34,4 +41,21 @@ defmodule BlockScoutWeb.API.RPC.TokenView do "value" => token_holder.value } end + + defp prepare_bridged_token({token, bridged_token}) do + total_supply = CurrencyHelper.divide_decimals(token.total_supply, token.decimals) + usd_value = BridgedTokensView.bridged_token_usd_cap(bridged_token, token) + + %{ + "foreignChainId" => bridged_token.foreign_chain_id, + "foreignTokenContractAddressHash" => bridged_token.foreign_token_contract_address_hash, + "homeContractAddressHash" => token.contract_address_hash, + "homeDecimals" => token.decimals, + "homeHolderCount" => if(token.holder_count, do: to_string(token.holder_count), else: "0"), + "homeName" => token.name, + "homeSymbol" => token.symbol, + "homeTotalSupply" => total_supply, + "homeUsdValue" => usd_value + } + end end diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex index aafe02d9a90b..53efa74bec86 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/address_view.ex @@ -34,7 +34,11 @@ defmodule BlockScoutWeb.API.V2.AddressView do end def render("coin_balances_by_day.json", %{coin_balances_by_day: coin_balances_by_day}) do - Enum.map(coin_balances_by_day, &prepare_coin_balance_history_by_day_entry/1) + %{ + :items => Enum.map(coin_balances_by_day, &prepare_coin_balance_history_by_day_entry/1), + :days => + Application.get_env(:block_scout_web, BlockScoutWeb.Chain.Address.CoinBalance)[:coin_balance_history_days] + } end def render("tokens.json", %{tokens: tokens, next_page_params: next_page_params}) do @@ -230,7 +234,7 @@ defmodule BlockScoutWeb.API.V2.AddressView do ) :: map() def fetch_and_render_token_instance(token_id, token, address_hash, token_balance) do token_instance = - case Chain.erc721_or_erc1155_token_instance_from_token_id_and_token_address( + case Chain.nft_instance_from_token_id_and_token_address( token_id, token.contract_address_hash, @api_true diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/blob_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/blob_view.ex index 680fa5f04604..fcb792ac095e 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/blob_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/blob_view.ex @@ -7,10 +7,6 @@ defmodule BlockScoutWeb.API.V2.BlobView do blob |> prepare_blob() |> Map.put("transaction_hashes", transaction_hashes) end - def render("blob.json", %{transaction_hashes: transaction_hashes}) do - %{"transaction_hashes" => transaction_hashes} - end - def render("blobs.json", %{blobs: blobs}) do %{"items" => Enum.map(blobs, &prepare_blob(&1))} end diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/block_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/block_view.ex index 68ad9aa45329..ee712ef9997a 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/block_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/block_view.ex @@ -100,38 +100,32 @@ defmodule BlockScoutWeb.API.V2.BlockView do def count_withdrawals(_), do: nil case Application.compile_env(:explorer, :chain_type) do - "rsk" -> + :rsk -> defp chain_type_fields(result, block, single_block?) do if single_block? do - result - |> Map.put("minimum_gas_price", block.minimum_gas_price) - |> Map.put("bitcoin_merged_mining_header", block.bitcoin_merged_mining_header) - |> Map.put("bitcoin_merged_mining_coinbase_transaction", block.bitcoin_merged_mining_coinbase_transaction) - |> Map.put("bitcoin_merged_mining_merkle_proof", block.bitcoin_merged_mining_merkle_proof) - |> Map.put("hash_for_merged_mining", block.hash_for_merged_mining) + # credo:disable-for-next-line Credo.Check.Design.AliasUsage + BlockScoutWeb.API.V2.RootstockView.extend_block_json_response(result, block) else result end end - "ethereum" -> + :zksync -> defp chain_type_fields(result, block, single_block?) do if single_block? do - blob_gas_price = Block.transaction_blob_gas_price(block.transactions) - burnt_blob_transaction_fees = Decimal.mult(block.blob_gas_used || 0, blob_gas_price || 0) - - result - |> Map.put("blob_gas_used", block.blob_gas_used) - |> Map.put("excess_blob_gas", block.excess_blob_gas) - |> Map.put("blob_gas_price", blob_gas_price) - |> Map.put("burnt_blob_fees", burnt_blob_transaction_fees) + # credo:disable-for-next-line Credo.Check.Design.AliasUsage + BlockScoutWeb.API.V2.ZkSyncView.extend_block_json_response(result, block) else result - |> Map.put("blob_gas_used", block.blob_gas_used) - |> Map.put("excess_blob_gas", block.excess_blob_gas) end end + :ethereum -> + defp chain_type_fields(result, block, single_block?) do + # credo:disable-for-next-line Credo.Check.Design.AliasUsage + BlockScoutWeb.API.V2.EthereumView.extend_block_json_response(result, block, single_block?) + end + _ -> defp chain_type_fields(result, _block, _single_block?) do result diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/config_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/config_view.ex index 865d13a7c1a1..3e744ccd4ddd 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/config_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/config_view.ex @@ -1,10 +1,4 @@ defmodule BlockScoutWeb.API.V2.ConfigView do - def render("json_rpc_url.json", %{url: url}) do - %{ - "json_rpc_url" => url - } - end - def render("backend_version.json", %{version: version}) do %{ "backend_version" => version diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/ethereum_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/ethereum_view.ex new file mode 100644 index 000000000000..6f7af666458a --- /dev/null +++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/ethereum_view.ex @@ -0,0 +1,49 @@ +defmodule BlockScoutWeb.API.V2.EthereumView do + alias Explorer.Chain.{Block, Transaction} + + defp count_blob_transactions(%Block{transactions: txs}) when is_list(txs), + # EIP-2718 blob transaction type + do: Enum.count(txs, &(&1.type == 3)) + + defp count_blob_transactions(_), do: nil + + def extend_transaction_json_response(out_json, %Transaction{} = transaction) do + case Map.get(transaction, :beacon_blob_transaction) do + nil -> + out_json + + %Ecto.Association.NotLoaded{} -> + out_json + + item -> + out_json + |> Map.put("max_fee_per_blob_gas", item.max_fee_per_blob_gas) + |> Map.put("blob_versioned_hashes", item.blob_versioned_hashes) + |> Map.put("blob_gas_used", item.blob_gas_used) + |> Map.put("blob_gas_price", item.blob_gas_price) + |> Map.put("burnt_blob_fee", Decimal.mult(item.blob_gas_used, item.blob_gas_price)) + end + end + + def extend_block_json_response(out_json, %Block{} = block, single_block?) do + blob_gas_used = Map.get(block, :blob_gas_used) + excess_blob_gas = Map.get(block, :excess_blob_gas) + + extended_out_json = + out_json + |> Map.put("blob_tx_count", count_blob_transactions(block)) + |> Map.put("blob_gas_used", blob_gas_used) + |> Map.put("excess_blob_gas", excess_blob_gas) + + if single_block? do + blob_gas_price = Block.transaction_blob_gas_price(block.transactions) + burnt_blob_transaction_fees = Decimal.mult(blob_gas_used || 0, blob_gas_price || 0) + + extended_out_json + |> Map.put("blob_gas_price", blob_gas_price) + |> Map.put("burnt_blob_fees", burnt_blob_transaction_fees) + else + extended_out_json + end + end +end diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/helper.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/helper.ex index 2839b49439da..f7643c6db897 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/helper.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/helper.ex @@ -59,20 +59,22 @@ defmodule BlockScoutWeb.API.V2.Helper do "name" => address_name(address), "implementation_name" => implementation_name(address), "is_verified" => verified?(address), - "ens_domain_name" => address.ens_domain_name + "ens_domain_name" => address.ens_domain_name, + "metadata" => address.metadata } end - def address_with_info(%{ens_domain_name: name}, address_hash) do - nil - |> address_with_info(address_hash) - |> Map.put("ens_domain_name", name) - end - def address_with_info(%NotLoaded{}, address_hash) do address_with_info(nil, address_hash) end + def address_with_info(address_info, address_hash) when is_map(address_info) do + nil + |> address_with_info(address_hash) + |> Map.put("ens_domain_name", address_info[:ens_domain_name]) + |> Map.put("metadata", address_info[:metadata]) + end + def address_with_info(nil, nil) do nil end @@ -83,7 +85,9 @@ defmodule BlockScoutWeb.API.V2.Helper do "is_contract" => false, "name" => nil, "implementation_name" => nil, - "is_verified" => nil + "is_verified" => nil, + "ens_domain_name" => nil, + "metadata" => nil } end diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/optimism_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/optimism_view.ex new file mode 100644 index 000000000000..e50614859ec2 --- /dev/null +++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/optimism_view.ex @@ -0,0 +1,240 @@ +defmodule BlockScoutWeb.API.V2.OptimismView do + use BlockScoutWeb, :view + + import Ecto.Query, only: [from: 2] + + alias BlockScoutWeb.API.V2.Helper + alias Explorer.{Chain, Repo} + alias Explorer.Helper, as: ExplorerHelper + alias Explorer.Chain.{Block, Transaction} + alias Explorer.Chain.Optimism.Withdrawal + + @doc """ + Function to render GET requests to `/api/v2/optimism/txn-batches` endpoint. + """ + @spec render(binary(), map()) :: map() | list() | non_neg_integer() + def render("optimism_txn_batches.json", %{ + batches: batches, + next_page_params: next_page_params + }) do + items = + batches + |> Enum.map(fn batch -> + Task.async(fn -> + tx_count = + Repo.replica().aggregate( + from( + t in Transaction, + inner_join: b in Block, + on: b.hash == t.block_hash and b.consensus == true, + where: t.block_number == ^batch.l2_block_number + ), + :count, + timeout: :infinity + ) + + %{ + "l2_block_number" => batch.l2_block_number, + "tx_count" => tx_count, + "l1_tx_hashes" => batch.frame_sequence.l1_transaction_hashes, + "l1_timestamp" => batch.frame_sequence.l1_timestamp + } + end) + end) + |> Task.yield_many(:infinity) + |> Enum.map(fn {_task, {:ok, item}} -> item end) + + %{ + items: items, + next_page_params: next_page_params + } + end + + @doc """ + Function to render GET requests to `/api/v2/optimism/output-roots` endpoint. + """ + def render("optimism_output_roots.json", %{ + roots: roots, + next_page_params: next_page_params + }) do + %{ + items: + Enum.map(roots, fn r -> + %{ + "l2_output_index" => r.l2_output_index, + "l2_block_number" => r.l2_block_number, + "l1_tx_hash" => r.l1_transaction_hash, + "l1_timestamp" => r.l1_timestamp, + "l1_block_number" => r.l1_block_number, + "output_root" => r.output_root + } + end), + next_page_params: next_page_params + } + end + + @doc """ + Function to render GET requests to `/api/v2/optimism/games` endpoint. + """ + def render("optimism_games.json", %{ + games: games, + next_page_params: next_page_params + }) do + %{ + items: + Enum.map(games, fn g -> + status = + case g.status do + 0 -> "In progress" + 1 -> "Challenger wins" + 2 -> "Defender wins" + end + + [l2_block_number] = ExplorerHelper.decode_data(g.extra_data, [{:uint, 256}]) + + %{ + "index" => g.index, + "game_type" => g.game_type, + "contract_address" => g.address, + "l2_block_number" => l2_block_number, + "created_at" => g.created_at, + "status" => status, + "resolved_at" => g.resolved_at + } + end), + next_page_params: next_page_params + } + end + + @doc """ + Function to render GET requests to `/api/v2/optimism/deposits` endpoint. + """ + def render("optimism_deposits.json", %{ + deposits: deposits, + next_page_params: next_page_params + }) do + %{ + items: + Enum.map(deposits, fn deposit -> + %{ + "l1_block_number" => deposit.l1_block_number, + "l2_tx_hash" => deposit.l2_transaction_hash, + "l1_block_timestamp" => deposit.l1_block_timestamp, + "l1_tx_hash" => deposit.l1_transaction_hash, + "l1_tx_origin" => deposit.l1_transaction_origin, + "l2_tx_gas_limit" => deposit.l2_transaction.gas + } + end), + next_page_params: next_page_params + } + end + + @doc """ + Function to render GET requests to `/api/v2/main-page/optimism-deposits` endpoint. + """ + def render("optimism_deposits.json", %{deposits: deposits}) do + Enum.map(deposits, fn deposit -> + %{ + "l1_block_number" => deposit.l1_block_number, + "l1_block_timestamp" => deposit.l1_block_timestamp, + "l1_tx_hash" => deposit.l1_transaction_hash, + "l2_tx_hash" => deposit.l2_transaction_hash + } + end) + end + + @doc """ + Function to render GET requests to `/api/v2/optimism/withdrawals` endpoint. + """ + def render("optimism_withdrawals.json", %{ + withdrawals: withdrawals, + next_page_params: next_page_params, + conn: conn + }) do + respected_games = Withdrawal.respected_games() + + %{ + items: + Enum.map(withdrawals, fn w -> + msg_nonce = + Bitwise.band( + Decimal.to_integer(w.msg_nonce), + 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF + ) + + msg_nonce_version = Bitwise.bsr(Decimal.to_integer(w.msg_nonce), 240) + + {from_address, from_address_hash} = + with false <- is_nil(w.from), + {:ok, address} <- + Chain.hash_to_address( + w.from, + [necessity_by_association: %{:names => :optional, :smart_contract => :optional}, api?: true], + false + ) do + {address, address.hash} + else + _ -> {nil, nil} + end + + {status, challenge_period_end} = Withdrawal.status(w, respected_games) + + %{ + "msg_nonce_raw" => Decimal.to_string(w.msg_nonce, :normal), + "msg_nonce" => msg_nonce, + "msg_nonce_version" => msg_nonce_version, + "from" => Helper.address_with_info(conn, from_address, from_address_hash, w.from), + "l2_tx_hash" => w.l2_transaction_hash, + "l2_timestamp" => w.l2_timestamp, + "status" => status, + "l1_tx_hash" => w.l1_transaction_hash, + "challenge_period_end" => challenge_period_end + } + end), + next_page_params: next_page_params + } + end + + @doc """ + Function to render GET requests to `/api/v2/optimism/:entity/count` endpoints. + """ + def render("optimism_items_count.json", %{count: count}) do + count + end + + @doc """ + Extends the json output with a sub-map containing information related + zksync: batch number and associated L1 transactions and their timestmaps. + """ + @spec extend_transaction_json_response(map(), map()) :: map() + def extend_transaction_json_response(out_json, %Transaction{} = transaction) do + out_json + |> add_optional_transaction_field(transaction, :l1_fee) + |> add_optional_transaction_field(transaction, :l1_fee_scalar) + |> add_optional_transaction_field(transaction, :l1_gas_price) + |> add_optional_transaction_field(transaction, :l1_gas_used) + |> add_optimism_fields(transaction.hash) + end + + defp add_optional_transaction_field(out_json, transaction, field) do + case Map.get(transaction, field) do + nil -> out_json + value -> Map.put(out_json, Atom.to_string(field), value) + end + end + + defp add_optimism_fields(out_json, transaction_hash) do + withdrawals = + transaction_hash + |> Withdrawal.transaction_statuses() + |> Enum.map(fn {nonce, status, l1_transaction_hash} -> + %{ + "nonce" => nonce, + "status" => status, + "l1_transaction_hash" => l1_transaction_hash + } + end) + + Map.put(out_json, "op_withdrawals", withdrawals) + end +end diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/polygon_edge_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/polygon_edge_view.ex index 3a813a6a1960..3e92f7893ff3 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/polygon_edge_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/polygon_edge_view.ex @@ -1,6 +1,10 @@ defmodule BlockScoutWeb.API.V2.PolygonEdgeView do use BlockScoutWeb, :view + alias BlockScoutWeb.API.V2.Helper + alias Explorer.Chain + alias Explorer.Chain.PolygonEdge.Reader + @spec render(String.t(), map()) :: map() def render("polygon_edge_deposits.json", %{ deposits: deposits, @@ -47,4 +51,47 @@ defmodule BlockScoutWeb.API.V2.PolygonEdgeView do def render("polygon_edge_items_count.json", %{count: count}) do count end + + def extend_transaction_json_response(out_json, tx_hash, connection) do + out_json + |> Map.put("polygon_edge_deposit", polygon_edge_deposit(tx_hash, connection)) + |> Map.put("polygon_edge_withdrawal", polygon_edge_withdrawal(tx_hash, connection)) + end + + defp polygon_edge_deposit(transaction_hash, conn) do + transaction_hash + |> Reader.deposit_by_transaction_hash() + |> polygon_edge_deposit_or_withdrawal(conn) + end + + defp polygon_edge_withdrawal(transaction_hash, conn) do + transaction_hash + |> Reader.withdrawal_by_transaction_hash() + |> polygon_edge_deposit_or_withdrawal(conn) + end + + defp polygon_edge_deposit_or_withdrawal(item, conn) do + if not is_nil(item) do + {from_address, from_address_hash} = hash_to_address_and_hash(item.from) + {to_address, to_address_hash} = hash_to_address_and_hash(item.to) + + item + |> Map.put(:from, Helper.address_with_info(conn, from_address, from_address_hash, item.from)) + |> Map.put(:to, Helper.address_with_info(conn, to_address, to_address_hash, item.to)) + end + end + + defp hash_to_address_and_hash(hash) do + with false <- is_nil(hash), + {:ok, address} <- + Chain.hash_to_address( + hash, + [necessity_by_association: %{:names => :optional, :smart_contract => :optional}, api?: true], + false + ) do + {address, address.hash} + else + _ -> {nil, nil} + end + end end diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/polygon_zkevm_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/polygon_zkevm_view.ex index 1f99d6e5749e..ccf6e33573b5 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/polygon_zkevm_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/polygon_zkevm_view.ex @@ -1,6 +1,9 @@ defmodule BlockScoutWeb.API.V2.PolygonZkevmView do use BlockScoutWeb, :view + alias Explorer.Chain.PolygonZkevm.Reader + alias Explorer.Chain.Transaction + @doc """ Function to render GET requests to `/api/v2/zkevm/batches/:batch_number` endpoint. """ @@ -85,8 +88,8 @@ defmodule BlockScoutWeb.API.V2.PolygonZkevmView do decimals = cond do - not is_nil(Map.get(l1_token, :decimals)) -> Map.get(l1_token, :decimals) - not is_nil(Map.get(l2_token, :decimals)) -> Map.get(l2_token, :decimals) + not is_nil(Map.get(l1_token, :decimals)) -> Reader.sanitize_decimals(Map.get(l1_token, :decimals)) + not is_nil(Map.get(l2_token, :decimals)) -> Reader.sanitize_decimals(Map.get(l2_token, :decimals)) true -> env[:native_decimals] end @@ -158,4 +161,30 @@ defmodule BlockScoutWeb.API.V2.PolygonZkevmView do } end) end + + def extend_transaction_json_response(out_json, %Transaction{} = transaction) do + extended_result = + out_json + |> add_optional_transaction_field(transaction, "zkevm_batch_number", :zkevm_batch, :number) + |> add_optional_transaction_field(transaction, "zkevm_sequence_hash", :zkevm_sequence_transaction, :hash) + |> add_optional_transaction_field(transaction, "zkevm_verify_hash", :zkevm_verify_transaction, :hash) + + Map.put(extended_result, "zkevm_status", zkevm_status(extended_result)) + end + + defp zkevm_status(result_map) do + if is_nil(Map.get(result_map, "zkevm_sequence_hash")) do + "Confirmed by Sequencer" + else + "L1 Confirmed" + end + end + + defp add_optional_transaction_field(out_json, transaction, out_field, association, association_field) do + case Map.get(transaction, association) do + nil -> out_json + %Ecto.Association.NotLoaded{} -> out_json + item -> Map.put(out_json, out_field, Map.get(item, association_field)) + end + end end diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/rootstock_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/rootstock_view.ex new file mode 100644 index 000000000000..06d4d8e68f21 --- /dev/null +++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/rootstock_view.ex @@ -0,0 +1,19 @@ +defmodule BlockScoutWeb.API.V2.RootstockView do + alias Explorer.Chain.Block + + def extend_block_json_response(out_json, %Block{} = block) do + out_json + |> add_optional_transaction_field(block, :minimum_gas_price) + |> add_optional_transaction_field(block, :bitcoin_merged_mining_header) + |> add_optional_transaction_field(block, :bitcoin_merged_mining_coinbase_transaction) + |> add_optional_transaction_field(block, :bitcoin_merged_mining_merkle_proof) + |> add_optional_transaction_field(block, :hash_for_merged_mining) + end + + defp add_optional_transaction_field(out_json, block, field) do + case Map.get(block, field) do + nil -> out_json + value -> Map.put(out_json, Atom.to_string(field), value) + end + end +end diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex index 4d9fbea846ad..f59ba29822d9 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/search_view.ex @@ -36,19 +36,35 @@ defmodule BlockScoutWeb.API.V2.SearchView do "total_supply" => search_result.total_supply, "circulating_market_cap" => search_result.circulating_market_cap && to_string(search_result.circulating_market_cap), - "is_verified_via_admin_panel" => search_result.is_verified_via_admin_panel + "is_verified_via_admin_panel" => search_result.is_verified_via_admin_panel, + "certified" => if(search_result.certified, do: search_result.certified, else: false), + "priority" => search_result.priority + } + end + + def prepare_search_result(%{type: "contract"} = search_result) do + %{ + "type" => search_result.type, + "name" => search_result.name, + "address" => search_result.address_hash, + "url" => address_path(Endpoint, :show, search_result.address_hash), + "is_smart_contract_verified" => search_result.verified, + "ens_info" => search_result[:ens_info], + "certified" => if(search_result.certified, do: search_result.certified, else: false), + "priority" => search_result.priority } end def prepare_search_result(%{type: address_or_contract_or_label} = search_result) - when address_or_contract_or_label in ["address", "contract", "label"] do + when address_or_contract_or_label in ["address", "label", "ens_domain"] do %{ "type" => search_result.type, "name" => search_result.name, "address" => search_result.address_hash, "url" => address_path(Endpoint, :show, search_result.address_hash), "is_smart_contract_verified" => search_result.verified, - "ens_info" => search_result[:ens_info] + "ens_info" => search_result[:ens_info], + "priority" => search_result.priority } end @@ -69,7 +85,8 @@ defmodule BlockScoutWeb.API.V2.SearchView do "block_hash" => block_hash, "url" => block_path(Endpoint, :show, block_hash), "timestamp" => search_result.timestamp, - "block_type" => block |> BlockView.block_type() |> String.downcase() + "block_type" => block |> BlockView.block_type() |> String.downcase(), + "priority" => search_result.priority } end @@ -80,7 +97,8 @@ defmodule BlockScoutWeb.API.V2.SearchView do "type" => search_result.type, "tx_hash" => tx_hash, "url" => transaction_path(Endpoint, :show, tx_hash), - "timestamp" => search_result.timestamp + "timestamp" => search_result.timestamp, + "priority" => search_result.priority } end @@ -90,7 +108,8 @@ defmodule BlockScoutWeb.API.V2.SearchView do %{ "type" => search_result.type, "user_operation_hash" => user_operation_hash, - "timestamp" => search_result.timestamp + "timestamp" => search_result.timestamp, + "priority" => search_result.priority } end @@ -100,7 +119,8 @@ defmodule BlockScoutWeb.API.V2.SearchView do %{ "type" => search_result.type, "blob_hash" => blob_hash, - "timestamp" => search_result.timestamp + "timestamp" => search_result.timestamp, + "priority" => search_result.priority } end @@ -119,6 +139,10 @@ defmodule BlockScoutWeb.API.V2.SearchView do %{"type" => "address", "parameter" => Address.checksum(item.hash)} end + defp redirect_search_results(%{address_hash: address_hash}) do + %{"type" => "address", "parameter" => address_hash} + end + defp redirect_search_results(%Block{} = item) do %{"type" => "block", "parameter" => to_string(item.hash)} end diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex index a0e7196b5843..c61d6a33992d 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/smart_contract_view.ex @@ -22,8 +22,8 @@ defmodule BlockScoutWeb.API.V2.SmartContractView do %{"items" => Enum.map(smart_contracts, &prepare_smart_contract_for_list/1), "next_page_params" => next_page_params} end - def render("smart_contract.json", %{address: address}) do - prepare_smart_contract(address) + def render("smart_contract.json", %{address: address, conn: conn}) do + prepare_smart_contract(address, conn) end def render("read_functions.json", %{functions: functions}) do @@ -146,12 +146,18 @@ defmodule BlockScoutWeb.API.V2.SmartContractView do defp prepare_output(output), do: output # credo:disable-for-next-line - def prepare_smart_contract(%Address{smart_contract: %SmartContract{} = smart_contract} = address) do + def prepare_smart_contract(%Address{smart_contract: %SmartContract{} = smart_contract} = address, conn) do minimal_proxy_template = EIP1167.get_implementation_address(address.hash, @api_true) bytecode_twin = SmartContract.get_address_verified_twin_contract(address.hash, @api_true) metadata_for_verification = minimal_proxy_template || bytecode_twin.verified_contract smart_contract_verified = AddressView.smart_contract_verified?(address) fully_verified = SmartContract.verified_with_full_match?(address.hash, @api_true) + write_methods? = AddressView.smart_contract_with_write_functions?(address) + + is_proxy = AddressView.smart_contract_is_proxy?(address, @api_true) + + read_custom_abi? = AddressView.has_address_custom_abi_with_read_functions?(conn, address.hash) + write_custom_abi? = AddressView.has_address_custom_abi_with_write_functions?(conn, address.hash) additional_sources = additional_sources(smart_contract, smart_contract_verified, minimal_proxy_template, bytecode_twin) @@ -168,7 +174,14 @@ defmodule BlockScoutWeb.API.V2.SmartContractView do "is_fully_verified" => fully_verified, "is_verified_via_sourcify" => address.smart_contract.verified_via_sourcify && smart_contract_verified, "is_verified_via_eth_bytecode_db" => address.smart_contract.verified_via_eth_bytecode_db, + "is_verified_via_verifier_alliance" => address.smart_contract.verified_via_verifier_alliance, "is_vyper_contract" => target_contract.is_vyper_contract, + "has_custom_methods_read" => read_custom_abi?, + "has_custom_methods_write" => write_custom_abi?, + "has_methods_read" => AddressView.smart_contract_with_read_only_functions?(address), + "has_methods_write" => write_methods?, + "has_methods_read_proxy" => is_proxy, + "has_methods_write_proxy" => is_proxy && write_methods?, "minimal_proxy_address_hash" => minimal_proxy_template && Address.checksum(metadata_for_verification.address_hash), "sourcify_repo_url" => @@ -195,13 +208,21 @@ defmodule BlockScoutWeb.API.V2.SmartContractView do do: format_constructor_arguments(target_contract.abi, target_contract.constructor_arguments) ), "language" => smart_contract_language(smart_contract), - "license_type" => smart_contract.license_type + "license_type" => smart_contract.license_type, + "certified" => if(smart_contract.certified, do: smart_contract.certified, else: false) } |> Map.merge(bytecode_info(address)) end - def prepare_smart_contract(address) do - bytecode_info(address) + def prepare_smart_contract(address, conn) do + read_custom_abi? = AddressView.has_address_custom_abi_with_read_functions?(conn, address.hash) + write_custom_abi? = AddressView.has_address_custom_abi_with_write_functions?(conn, address.hash) + + %{ + "has_custom_methods_read" => read_custom_abi?, + "has_custom_methods_write" => write_custom_abi? + } + |> Map.merge(bytecode_info(address)) end @doc """ @@ -306,7 +327,8 @@ defmodule BlockScoutWeb.API.V2.SmartContractView do "has_constructor_args" => !is_nil(smart_contract.constructor_arguments), "coin_balance" => if(smart_contract.address.fetched_coin_balance, do: smart_contract.address.fetched_coin_balance.value), - "license_type" => smart_contract.license_type + "license_type" => smart_contract.license_type, + "certified" => if(smart_contract.certified, do: smart_contract.certified, else: false) } end @@ -335,15 +357,43 @@ defmodule BlockScoutWeb.API.V2.SmartContractView do end) end - def render_json(value, type) when is_list(value) do - type = - if String.ends_with?(type, "[]") do - String.slice(type, 0..-3) - else - type + def render_json(value, type) when is_list(value) and is_tuple(type) do + item_type = + case type do + {:array, item_type, _} -> item_type + {:array, item_type} -> item_type end - value |> Enum.map(&render_json(&1, type)) + value |> Enum.map(&render_json(&1, item_type)) + end + + def render_json(value, type) when is_list(value) and not is_tuple(type) do + sanitized_type = + case type do + "tuple[" <> rest -> + # we need to convert tuple[...][] or tuple[...][n] into (...)[] or (...)[n] + # before sending it to the `FunctionSelector.decode_type/1. See https://github.com/poanetwork/ex_abi/issues/168. + tuple_item_types = + rest + |> String.split("]") + |> Enum.slice(0..-3) + |> Enum.join("]") + + array_str = "[" <> (rest |> String.split("[") |> List.last()) + + "(" <> tuple_item_types <> ")" <> array_str + + _ -> + type + end + + item_type = + case FunctionSelector.decode_type(sanitized_type) do + {:array, item_type, _} -> item_type + {:array, item_type} -> item_type + end + + value |> Enum.map(&render_json(&1, item_type)) end def render_json(value, type) when type in [:address, "address", "address payable"] do @@ -355,6 +405,6 @@ defmodule BlockScoutWeb.API.V2.SmartContractView do end def render_json(value, _type) do - value + to_string(value) end end diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/stability_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/stability_view.ex new file mode 100644 index 000000000000..f713428a3d08 --- /dev/null +++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/stability_view.ex @@ -0,0 +1,126 @@ +defmodule BlockScoutWeb.API.V2.StabilityView do + alias BlockScoutWeb.API.V2.{Helper, TokenView} + alias Explorer.Chain.{Hash, Log, Token, Transaction} + + @api_true [api?: true] + @transaction_fee_event_signature "0x99e7b0ba56da2819c37c047f0511fd2bf6c9b4e27b4a979a19d6da0f74be8155" + @transaction_fee_event_abi [ + %{ + "anonymous" => false, + "inputs" => [ + %{ + "indexed" => false, + "internalType" => "address", + "name" => "token", + "type" => "address" + }, + %{ + "indexed" => false, + "internalType" => "uint256", + "name" => "totalFee", + "type" => "uint256" + }, + %{ + "indexed" => false, + "internalType" => "address", + "name" => "validator", + "type" => "address" + }, + %{ + "indexed" => false, + "internalType" => "uint256", + "name" => "validatorFee", + "type" => "uint256" + }, + %{ + "indexed" => false, + "internalType" => "address", + "name" => "dapp", + "type" => "address" + }, + %{ + "indexed" => false, + "internalType" => "uint256", + "name" => "dappFee", + "type" => "uint256" + } + ], + "name" => "TransactionFee", + "type" => "event" + } + ] + + def extend_transaction_json_response(out_json, %Transaction{} = transaction) do + case transaction.transaction_fee_log do + [ + {"token", "address", false, token_address_hash}, + {"totalFee", "uint256", false, total_fee}, + {"validator", "address", false, validator_address_hash}, + {"validatorFee", "uint256", false, validator_fee}, + {"dapp", "address", false, dapp_address_hash}, + {"dappFee", "uint256", false, dapp_fee} + ] -> + stability_fee = %{ + "token" => + TokenView.render("token.json", %{ + token: transaction.transaction_fee_token, + contract_address_hash: bytes_to_address_hash(token_address_hash) + }), + "validator_address" => + Helper.address_with_info(nil, nil, bytes_to_address_hash(validator_address_hash), false), + "dapp_address" => Helper.address_with_info(nil, nil, bytes_to_address_hash(dapp_address_hash), false), + "total_fee" => to_string(total_fee), + "dapp_fee" => to_string(dapp_fee), + "validator_fee" => to_string(validator_fee) + } + + out_json + |> Map.put("stability_fee", stability_fee) + + _ -> + out_json + end + end + + def transform_transactions(transactions) do + do_extend_with_stability_fees_info(transactions) + end + + defp do_extend_with_stability_fees_info(transactions) when is_list(transactions) do + {transactions, _tokens_acc} = + Enum.map_reduce(transactions, %{}, fn transaction, tokens_acc -> + case Log.fetch_log_by_tx_hash_and_first_topic(transaction.hash, @transaction_fee_event_signature, @api_true) do + fee_log when not is_nil(fee_log) -> + {:ok, _selector, mapping} = Log.find_and_decode(@transaction_fee_event_abi, fee_log, transaction.hash) + + [{"token", "address", false, token_address_hash}, _, _, _, _, _] = mapping + + {token, new_tokens_acc} = check_tokens_acc(bytes_to_address_hash(token_address_hash), tokens_acc) + + {%Transaction{transaction | transaction_fee_log: mapping, transaction_fee_token: token}, new_tokens_acc} + + _ -> + {transaction, tokens_acc} + end + end) + + transactions + end + + defp do_extend_with_stability_fees_info(transaction) do + [transaction] = do_extend_with_stability_fees_info([transaction]) + transaction + end + + defp check_tokens_acc(token_address_hash, tokens_acc) do + if Map.has_key?(tokens_acc, token_address_hash) do + {tokens_acc[token_address_hash], tokens_acc} + else + token = Token.get_by_contract_address_hash(token_address_hash, @api_true) + + {token, Map.put(tokens_acc, token_address_hash, token)} + end + end + + defp bytes_to_address_hash(bytes), do: %Hash{byte_count: 20, bytes: bytes} +end diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/suave_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/suave_view.ex new file mode 100644 index 000000000000..8bbee60b6f1c --- /dev/null +++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/suave_view.ex @@ -0,0 +1,130 @@ +defmodule BlockScoutWeb.API.V2.SuaveView do + alias BlockScoutWeb.API.V2.Helper, as: APIHelper + alias BlockScoutWeb.API.V2.TransactionView + + alias Explorer.Helper, as: ExplorerHelper + + alias Ecto.Association.NotLoaded + alias Explorer.Chain.{Hash, Transaction} + + @suave_bid_event "0x83481d5b04dea534715acad673a8177a46fc93882760f36bdc16ccac439d504e" + + def extend_transaction_json_response(%Transaction{} = transaction, out_json, single_tx?, conn, watchlist_names) do + if is_nil(Map.get(transaction, :execution_node_hash)) do + out_json + else + wrapped_to_address = Map.get(transaction, :wrapped_to_address) + wrapped_to_address_hash = Map.get(transaction, :wrapped_to_address_hash) + wrapped_input = Map.get(transaction, :wrapped_input) + wrapped_hash = Map.get(transaction, :wrapped_hash) + execution_node = Map.get(transaction, :execution_node) + execution_node_hash = Map.get(transaction, :execution_node_hash) + wrapped_type = Map.get(transaction, :wrapped_type) + wrapped_nonce = Map.get(transaction, :wrapped_nonce) + wrapped_gas = Map.get(transaction, :wrapped_gas) + wrapped_gas_price = Map.get(transaction, :wrapped_gas_price) + wrapped_max_priority_fee_per_gas = Map.get(transaction, :wrapped_max_priority_fee_per_gas) + wrapped_max_fee_per_gas = Map.get(transaction, :wrapped_max_fee_per_gas) + wrapped_value = Map.get(transaction, :wrapped_value) + + {[wrapped_decoded_input], _, _} = + TransactionView.decode_transactions( + [ + %Transaction{ + to_address: wrapped_to_address, + input: wrapped_input, + hash: wrapped_hash + } + ], + false + ) + + out_json + |> Map.put("allowed_peekers", suave_parse_allowed_peekers(transaction.logs)) + |> Map.put( + "execution_node", + APIHelper.address_with_info( + conn, + execution_node, + execution_node_hash, + single_tx?, + watchlist_names + ) + ) + |> Map.put("wrapped", %{ + "type" => wrapped_type, + "nonce" => wrapped_nonce, + "to" => + APIHelper.address_with_info( + conn, + wrapped_to_address, + wrapped_to_address_hash, + single_tx?, + watchlist_names + ), + "gas_limit" => wrapped_gas, + "gas_price" => wrapped_gas_price, + "fee" => + TransactionView.format_fee( + Transaction.fee( + %Transaction{gas: wrapped_gas, gas_price: wrapped_gas_price, gas_used: nil}, + :wei + ) + ), + "max_priority_fee_per_gas" => wrapped_max_priority_fee_per_gas, + "max_fee_per_gas" => wrapped_max_fee_per_gas, + "value" => wrapped_value, + "hash" => wrapped_hash, + "method" => + TransactionView.method_name( + %Transaction{to_address: wrapped_to_address, input: wrapped_input}, + wrapped_decoded_input + ), + "decoded_input" => TransactionView.decoded_input(wrapped_decoded_input), + "raw_input" => wrapped_input + }) + end + end + + # @spec suave_parse_allowed_peekers(Ecto.Schema.has_many(Log.t())) :: [String.t()] + defp suave_parse_allowed_peekers(%NotLoaded{}), do: [] + + defp suave_parse_allowed_peekers(logs) do + suave_bid_contracts = + Application.get_all_env(:explorer)[Transaction][:suave_bid_contracts] + |> String.split(",") + |> Enum.map(fn sbc -> String.downcase(String.trim(sbc)) end) + + bid_event = + Enum.find(logs, fn log -> + sanitize_log_first_topic(log.first_topic) == @suave_bid_event && + Enum.member?(suave_bid_contracts, String.downcase(Hash.to_string(log.address_hash))) + end) + + if is_nil(bid_event) do + [] + else + [_bid_id, _decryption_condition, allowed_peekers] = + ExplorerHelper.decode_data(bid_event.data, [{:bytes, 16}, {:uint, 64}, {:array, :address}]) + + Enum.map(allowed_peekers, fn peeker -> + "0x" <> Base.encode16(peeker, case: :lower) + end) + end + end + + defp sanitize_log_first_topic(first_topic) do + if is_nil(first_topic) do + "" + else + sanitized = + if is_binary(first_topic) do + first_topic + else + Hash.to_string(first_topic) + end + + String.downcase(sanitized) + end + end +end diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/token_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/token_view.ex index a6b5fc99f72b..f1ed2d99537c 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/token_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/token_view.ex @@ -36,6 +36,7 @@ defmodule BlockScoutWeb.API.V2.TokenView do "type" => token.type, "holders" => prepare_holders_count(token.holder_count), "exchange_rate" => exchange_rate(token), + "volume_24h" => token.volume_24h, "total_supply" => token.total_supply, "icon_url" => token.icon_url, "circulating_market_cap" => token.circulating_market_cap diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex index 5eea21c5a697..40ce0d5edb36 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/transaction_view.ex @@ -2,6 +2,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do use BlockScoutWeb, :view alias BlockScoutWeb.API.V2.{ApiView, Helper, TokenView} + alias BlockScoutWeb.{ABIEncodedValueView, TransactionView} alias BlockScoutWeb.Models.GetTransactionTags alias BlockScoutWeb.Tokens.Helper, as: TokensHelper @@ -10,13 +11,11 @@ defmodule BlockScoutWeb.API.V2.TransactionView do alias Explorer.{Chain, Market} alias Explorer.Chain.{Address, Block, InternalTransaction, Log, Token, Transaction, Wei} alias Explorer.Chain.Block.Reward - alias Explorer.Chain.PolygonEdge.Reader alias Explorer.Chain.Transaction.StateChange alias Explorer.Counters.AverageBlockTime alias Timex.Duration import BlockScoutWeb.Account.AuthController, only: [current_user: 1] - import Explorer.Chain.Transaction, only: [maybe_prepare_stability_fees: 1, bytes_to_address_hash: 1] @api_true [api?: true] @@ -36,7 +35,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do %{ "items" => transactions - |> maybe_prepare_stability_fees() + |> chain_type_transformations() |> Enum.zip(decoded_transactions) |> Enum.map(fn {tx, decoded_input} -> prepare_transaction(tx, conn, false, block_height, watchlist_names, decoded_input) @@ -54,7 +53,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do {decoded_transactions, _, _} = decode_transactions(transactions, true) transactions - |> maybe_prepare_stability_fees() + |> chain_type_transformations() |> Enum.zip(decoded_transactions) |> Enum.map(fn {tx, decoded_input} -> prepare_transaction(tx, conn, false, block_height, watchlist_names, decoded_input) @@ -68,7 +67,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do %{ "items" => transactions - |> maybe_prepare_stability_fees() + |> chain_type_transformations() |> Enum.zip(decoded_transactions) |> Enum.map(fn {tx, decoded_input} -> prepare_transaction(tx, conn, false, block_height, decoded_input) end), "next_page_params" => next_page_params @@ -86,7 +85,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do {decoded_transactions, _, _} = decode_transactions(transactions, true) transactions - |> maybe_prepare_stability_fees() + |> chain_type_transformations() |> Enum.zip(decoded_transactions) |> Enum.map(fn {tx, decoded_input} -> prepare_transaction(tx, conn, false, block_height, decoded_input) end) end @@ -94,7 +93,10 @@ defmodule BlockScoutWeb.API.V2.TransactionView do def render("transaction.json", %{transaction: transaction, conn: conn}) do block_height = Chain.block_height(@api_true) {[decoded_input], _, _} = decode_transactions([transaction], false) - prepare_transaction(transaction |> maybe_prepare_stability_fees(), conn, true, block_height, decoded_input) + + transaction + |> chain_type_transformations() + |> prepare_transaction(conn, true, block_height, decoded_input) end def render("raw_trace.json", %{internal_transactions: internal_transactions}) do @@ -145,10 +147,20 @@ defmodule BlockScoutWeb.API.V2.TransactionView do def render("internal_transactions.json", %{ internal_transactions: internal_transactions, next_page_params: next_page_params, - conn: conn + block: block }) do %{ - "items" => Enum.map(internal_transactions, &prepare_internal_transaction(&1, conn)), + "items" => Enum.map(internal_transactions, &prepare_internal_transaction(&1, block)), + "next_page_params" => next_page_params + } + end + + def render("internal_transactions.json", %{ + internal_transactions: internal_transactions, + next_page_params: next_page_params + }) do + %{ + "items" => Enum.map(internal_transactions, &prepare_internal_transaction(&1)), "next_page_params" => next_page_params } end @@ -182,6 +194,20 @@ defmodule BlockScoutWeb.API.V2.TransactionView do } end + def render("stats.json", %{ + transactions_count_24h: transactions_count, + pending_transactions_count: pending_transactions_count, + transaction_fees_sum_24h: transaction_fees_sum, + transaction_fees_avg_24h: transaction_fees_avg + }) do + %{ + "transactions_count_24h" => transactions_count, + "pending_transactions_count" => pending_transactions_count, + "transaction_fees_sum_24h" => transaction_fees_sum, + "transaction_fees_avg_24h" => transaction_fees_avg + } + end + @doc """ Decodes list of logs """ @@ -250,14 +276,14 @@ defmodule BlockScoutWeb.API.V2.TransactionView do {:ok, :erc721_instance} -> %{"token_id" => token_transfer.token_ids && List.first(token_transfer.token_ids)} - {:ok, :erc1155_instance, value, decimals} -> + {:ok, :erc1155_erc404_instance, value, decimals} -> %{ "token_id" => token_transfer.token_ids && List.first(token_transfer.token_ids), "value" => value, "decimals" => decimals } - {:ok, :erc1155_instance, values, token_ids, decimals} -> + {:ok, :erc1155_erc404_instance, values, token_ids, decimals} -> %{ "token_id" => token_ids && List.first(token_ids), "value" => values && List.first(values), @@ -272,7 +298,7 @@ defmodule BlockScoutWeb.API.V2.TransactionView do end end - def prepare_internal_transaction(internal_transaction, _conn) do + def prepare_internal_transaction(internal_transaction, block \\ nil) do %{ "error" => internal_transaction.error, "success" => is_nil(internal_transaction.error), @@ -291,9 +317,10 @@ defmodule BlockScoutWeb.API.V2.TransactionView do ), "value" => internal_transaction.value, "block" => internal_transaction.block_number, - "timestamp" => internal_transaction.block.timestamp, + "timestamp" => (block && block.timestamp) || internal_transaction.block.timestamp, "index" => internal_transaction.index, - "gas_limit" => internal_transaction.gas + "gas_limit" => internal_transaction.gas, + "block_index" => internal_transaction.block_index } end @@ -437,131 +464,6 @@ defmodule BlockScoutWeb.API.V2.TransactionView do result |> chain_type_fields(transaction, single_tx?, conn, watchlist_names) - |> maybe_put_stability_fee(transaction) - end - - defp chain_type_fields(result, transaction, single_tx?, conn, watchlist_names) do - case {single_tx?, Application.get_env(:explorer, :chain_type)} do - {true, "polygon_edge"} -> - result - |> Map.put("polygon_edge_deposit", polygon_edge_deposit(transaction.hash, conn)) - |> Map.put("polygon_edge_withdrawal", polygon_edge_withdrawal(transaction.hash, conn)) - - {true, "polygon_zkevm"} -> - extended_result = - result - |> add_optional_transaction_field(transaction, "zkevm_batch_number", :zkevm_batch, :number) - |> add_optional_transaction_field(transaction, "zkevm_sequence_hash", :zkevm_sequence_transaction, :hash) - |> add_optional_transaction_field(transaction, "zkevm_verify_hash", :zkevm_verify_transaction, :hash) - - Map.put(extended_result, "zkevm_status", zkevm_status(extended_result)) - - {true, "suave"} -> - suave_fields(transaction, result, single_tx?, conn, watchlist_names) - - {_, "ethereum"} -> - case Map.get(transaction, :beacon_blob_transaction) do - nil -> - result - - %Ecto.Association.NotLoaded{} -> - result - - item -> - result - |> Map.put("max_fee_per_blob_gas", item.max_fee_per_blob_gas) - |> Map.put("blob_versioned_hashes", item.blob_versioned_hashes) - |> Map.put("blob_gas_used", item.blob_gas_used) - |> Map.put("blob_gas_price", item.blob_gas_price) - |> Map.put("burnt_blob_fee", Decimal.mult(item.blob_gas_used, item.blob_gas_price)) - end - - _ -> - result - end - end - - defp add_optional_transaction_field(result, transaction, field_name, assoc_name, assoc_field) do - case Map.get(transaction, assoc_name) do - nil -> result - %Ecto.Association.NotLoaded{} -> result - item -> Map.put(result, field_name, Map.get(item, assoc_field)) - end - end - - defp zkevm_status(result_map) do - if is_nil(Map.get(result_map, "zkevm_sequence_hash")) do - "Confirmed by Sequencer" - else - "L1 Confirmed" - end - end - - if Application.compile_env(:explorer, :chain_type) != "suave" do - defp suave_fields(_transaction, result, _single_tx?, _conn, _watchlist_names), do: result - else - defp suave_fields(transaction, result, single_tx?, conn, watchlist_names) do - if is_nil(transaction.execution_node_hash) do - result - else - {[wrapped_decoded_input], _, _} = - decode_transactions( - [ - %Transaction{ - to_address: transaction.wrapped_to_address, - input: transaction.wrapped_input, - hash: transaction.wrapped_hash - } - ], - false - ) - - result - |> Map.put("allowed_peekers", Transaction.suave_parse_allowed_peekers(transaction.logs)) - |> Map.put( - "execution_node", - Helper.address_with_info( - conn, - transaction.execution_node, - transaction.execution_node_hash, - single_tx?, - watchlist_names - ) - ) - |> Map.put("wrapped", %{ - "type" => transaction.wrapped_type, - "nonce" => transaction.wrapped_nonce, - "to" => - Helper.address_with_info( - conn, - transaction.wrapped_to_address, - transaction.wrapped_to_address_hash, - single_tx?, - watchlist_names - ), - "gas_limit" => transaction.wrapped_gas, - "gas_price" => transaction.wrapped_gas_price, - "fee" => - format_fee( - Transaction.fee( - %Transaction{gas: transaction.wrapped_gas, gas_price: transaction.wrapped_gas_price, gas_used: nil}, - :wei - ) - ), - "max_priority_fee_per_gas" => transaction.wrapped_max_priority_fee_per_gas, - "max_fee_per_gas" => transaction.wrapped_max_fee_per_gas, - "value" => transaction.wrapped_value, - "hash" => transaction.wrapped_hash, - "method" => - method_name( - %Transaction{to_address: transaction.wrapped_to_address, input: transaction.wrapped_input}, - wrapped_decoded_input - ), - "decoded_input" => decoded_input(wrapped_decoded_input), - "raw_input" => transaction.wrapped_input - }) - end - end end def token_transfers(_, _conn, false), do: nil @@ -892,71 +794,111 @@ defmodule BlockScoutWeb.API.V2.TransactionView do Map.merge(map, %{"change" => change}) end - defp polygon_edge_deposit(transaction_hash, conn) do - transaction_hash - |> Reader.deposit_by_transaction_hash() - |> polygon_edge_deposit_or_withdrawal(conn) - end + case Application.compile_env(:explorer, :chain_type) do + :polygon_edge -> + defp chain_type_transformations(transactions) do + transactions + end - defp polygon_edge_withdrawal(transaction_hash, conn) do - transaction_hash - |> Reader.withdrawal_by_transaction_hash() - |> polygon_edge_deposit_or_withdrawal(conn) - end + defp chain_type_fields(result, transaction, single_tx?, conn, _watchlist_names) do + if single_tx? do + # credo:disable-for-next-line Credo.Check.Design.AliasUsage + BlockScoutWeb.API.V2.PolygonEdgeView.extend_transaction_json_response(result, transaction.hash, conn) + else + result + end + end - defp polygon_edge_deposit_or_withdrawal(item, conn) do - if not is_nil(item) do - {from_address, from_address_hash} = hash_to_address_and_hash(item.from) - {to_address, to_address_hash} = hash_to_address_and_hash(item.to) + :polygon_zkevm -> + defp chain_type_transformations(transactions) do + transactions + end - item - |> Map.put(:from, Helper.address_with_info(conn, from_address, from_address_hash, item.from)) - |> Map.put(:to, Helper.address_with_info(conn, to_address, to_address_hash, item.to)) - end - end + defp chain_type_fields(result, transaction, single_tx?, _conn, _watchlist_names) do + if single_tx? do + # credo:disable-for-next-line Credo.Check.Design.AliasUsage + BlockScoutWeb.API.V2.PolygonZkevmView.extend_transaction_json_response(result, transaction) + else + result + end + end - defp hash_to_address_and_hash(hash) do - with false <- is_nil(hash), - {:ok, address} <- - Chain.hash_to_address( - hash, - [necessity_by_association: %{:names => :optional, :smart_contract => :optional}, api?: true], - false - ) do - {address, address.hash} - else - _ -> {nil, nil} - end - end + :zksync -> + defp chain_type_transformations(transactions) do + transactions + end - defp maybe_put_stability_fee(body, transaction) do - with "stability" <- Application.get_env(:explorer, :chain_type), - [ - {"token", "address", false, token_address_hash}, - {"totalFee", "uint256", false, total_fee}, - {"validator", "address", false, validator_address_hash}, - {"validatorFee", "uint256", false, validator_fee}, - {"dapp", "address", false, dapp_address_hash}, - {"dappFee", "uint256", false, dapp_fee} - ] <- transaction.transaction_fee_log do - stability_fee = %{ - "token" => - TokenView.render("token.json", %{ - token: transaction.transaction_fee_token, - contract_address_hash: bytes_to_address_hash(token_address_hash) - }), - "validator_address" => Helper.address_with_info(nil, nil, bytes_to_address_hash(validator_address_hash), false), - "dapp_address" => Helper.address_with_info(nil, nil, bytes_to_address_hash(dapp_address_hash), false), - "total_fee" => to_string(total_fee), - "dapp_fee" => to_string(dapp_fee), - "validator_fee" => to_string(validator_fee) - } - - body - |> Map.put("stability_fee", stability_fee) - else - _ -> - body - end + defp chain_type_fields(result, transaction, single_tx?, _conn, _watchlist_names) do + if single_tx? do + # credo:disable-for-next-line Credo.Check.Design.AliasUsage + BlockScoutWeb.API.V2.ZkSyncView.extend_transaction_json_response(result, transaction) + else + result + end + end + + :optimism -> + defp chain_type_transformations(transactions) do + transactions + end + + defp chain_type_fields(result, transaction, single_tx?, _conn, _watchlist_names) do + if single_tx? do + # credo:disable-for-next-line Credo.Check.Design.AliasUsage + BlockScoutWeb.API.V2.OptimismView.extend_transaction_json_response(result, transaction) + else + result + end + end + + :suave -> + defp chain_type_transformations(transactions) do + transactions + end + + defp chain_type_fields(result, transaction, single_tx?, conn, watchlist_names) do + if single_tx? do + # credo:disable-for-next-line Credo.Check.Design.AliasUsage + BlockScoutWeb.API.V2.SuaveView.extend_transaction_json_response( + transaction, + result, + single_tx?, + conn, + watchlist_names + ) + else + result + end + end + + :stability -> + defp chain_type_transformations(transactions) do + # credo:disable-for-next-line Credo.Check.Design.AliasUsage + BlockScoutWeb.API.V2.StabilityView.transform_transactions(transactions) + end + + defp chain_type_fields(result, transaction, _single_tx?, _conn, _watchlist_names) do + # credo:disable-for-next-line Credo.Check.Design.AliasUsage + BlockScoutWeb.API.V2.StabilityView.extend_transaction_json_response(result, transaction) + end + + :ethereum -> + defp chain_type_transformations(transactions) do + transactions + end + + defp chain_type_fields(result, transaction, _single_tx?, _conn, _watchlist_names) do + # credo:disable-for-next-line Credo.Check.Design.AliasUsage + BlockScoutWeb.API.V2.EthereumView.extend_transaction_json_response(result, transaction) + end + + _ -> + defp chain_type_transformations(transactions) do + transactions + end + + defp chain_type_fields(result, _transaction, _single_tx?, _conn, _watchlist_names) do + result + end end end diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/validator_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/validator_view.ex new file mode 100644 index 000000000000..e5b719557b95 --- /dev/null +++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/validator_view.ex @@ -0,0 +1,17 @@ +defmodule BlockScoutWeb.API.V2.ValidatorView do + use BlockScoutWeb, :view + + alias BlockScoutWeb.API.V2.Helper + + def render("stability_validators.json", %{validators: validators, next_page_params: next_page_params}) do + %{"items" => Enum.map(validators, &prepare_validator(&1)), "next_page_params" => next_page_params} + end + + defp prepare_validator(validator) do + %{ + "address" => Helper.address_with_info(nil, validator.address, validator.address_hash, true), + "state" => validator.state, + "blocks_validated_count" => validator.blocks_validated + } + end +end diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/v2/zksync_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/v2/zksync_view.ex new file mode 100644 index 000000000000..0d4f3a8d81e5 --- /dev/null +++ b/apps/block_scout_web/lib/block_scout_web/views/api/v2/zksync_view.ex @@ -0,0 +1,229 @@ +defmodule BlockScoutWeb.API.V2.ZkSyncView do + use BlockScoutWeb, :view + + alias Explorer.Chain.{Block, Transaction} + alias Explorer.Chain.ZkSync.TransactionBatch + + @doc """ + Function to render GET requests to `/api/v2/zksync/batches/:batch_number` endpoint. + """ + @spec render(binary(), map()) :: map() | non_neg_integer() + def render("zksync_batch.json", %{batch: batch}) do + %{ + "number" => batch.number, + "timestamp" => batch.timestamp, + "root_hash" => batch.root_hash, + "l1_tx_count" => batch.l1_tx_count, + "l2_tx_count" => batch.l2_tx_count, + "l1_gas_price" => batch.l1_gas_price, + "l2_fair_gas_price" => batch.l2_fair_gas_price, + "start_block" => batch.start_block, + "end_block" => batch.end_block + } + |> add_l1_txs_info_and_status(batch) + end + + @doc """ + Function to render GET requests to `/api/v2/zksync/batches` endpoint. + """ + def render("zksync_batches.json", %{ + batches: batches, + next_page_params: next_page_params + }) do + %{ + items: render_zksync_batches(batches), + next_page_params: next_page_params + } + end + + @doc """ + Function to render GET requests to `/api/v2/main-page/zksync/batches/confirmed` endpoint. + """ + def render("zksync_batches.json", %{batches: batches}) do + %{items: render_zksync_batches(batches)} + end + + @doc """ + Function to render GET requests to `/api/v2/zksync/batches/count` endpoint. + """ + def render("zksync_batches_count.json", %{count: count}) do + count + end + + @doc """ + Function to render GET requests to `/api/v2/main-page/zksync/batches/latest-number` endpoint. + """ + def render("zksync_batch_latest_number.json", %{number: number}) do + number + end + + defp render_zksync_batches(batches) do + Enum.map(batches, fn batch -> + %{ + "number" => batch.number, + "timestamp" => batch.timestamp, + "tx_count" => batch.l1_tx_count + batch.l2_tx_count + } + |> add_l1_txs_info_and_status(batch) + end) + end + + @doc """ + Extends the json output with a sub-map containing information related + zksync: batch number and associated L1 transactions and their timestmaps. + + ## Parameters + - `out_json`: a map defining output json which will be extended + - `transaction`: transaction structure containing zksync related data + + ## Returns + A map extended with data related zksync rollup + """ + @spec extend_transaction_json_response(map(), %{ + :__struct__ => Explorer.Chain.Transaction, + :zksync_batch => any(), + :zksync_commit_transaction => any(), + :zksync_execute_transaction => any(), + :zksync_prove_transaction => any(), + optional(any()) => any() + }) :: map() + def extend_transaction_json_response(out_json, %Transaction{} = transaction) do + do_add_zksync_info(out_json, transaction) + end + + @doc """ + Extends the json output with a sub-map containing information related + zksync: batch number and associated L1 transactions and their timestmaps. + + ## Parameters + - `out_json`: a map defining output json which will be extended + - `block`: block structure containing zksync related data + + ## Returns + A map extended with data related zksync rollup + """ + @spec extend_block_json_response(map(), %{ + :__struct__ => Explorer.Chain.Block, + :zksync_batch => any(), + :zksync_commit_transaction => any(), + :zksync_execute_transaction => any(), + :zksync_prove_transaction => any(), + optional(any()) => any() + }) :: map() + def extend_block_json_response(out_json, %Block{} = block) do + do_add_zksync_info(out_json, block) + end + + defp do_add_zksync_info(out_json, zksync_entity) do + res = + %{} + |> do_add_l1_txs_info_and_status(%{ + batch_number: get_batch_number(zksync_entity), + commit_transaction: zksync_entity.zksync_commit_transaction, + prove_transaction: zksync_entity.zksync_prove_transaction, + execute_transaction: zksync_entity.zksync_execute_transaction + }) + |> Map.put("batch_number", get_batch_number(zksync_entity)) + + Map.put(out_json, "zksync", res) + end + + defp get_batch_number(zksync_entity) do + case Map.get(zksync_entity, :zksync_batch) do + nil -> nil + %Ecto.Association.NotLoaded{} -> nil + value -> value.number + end + end + + defp add_l1_txs_info_and_status(out_json, %TransactionBatch{} = batch) do + do_add_l1_txs_info_and_status(out_json, batch) + end + + defp do_add_l1_txs_info_and_status(out_json, zksync_item) do + l1_txs = get_associated_l1_txs(zksync_item) + + out_json + |> Map.merge(%{ + "status" => batch_status(zksync_item), + "commit_transaction_hash" => get_2map_data(l1_txs, :commit_transaction, :hash), + "commit_transaction_timestamp" => get_2map_data(l1_txs, :commit_transaction, :ts), + "prove_transaction_hash" => get_2map_data(l1_txs, :prove_transaction, :hash), + "prove_transaction_timestamp" => get_2map_data(l1_txs, :prove_transaction, :ts), + "execute_transaction_hash" => get_2map_data(l1_txs, :execute_transaction, :hash), + "execute_transaction_timestamp" => get_2map_data(l1_txs, :execute_transaction, :ts) + }) + end + + # Extract transaction hash and timestamp for L1 transactions associated with + # a zksync rollup entity: batch, transaction or block. + # + # ## Parameters + # - `zksync_item`: A batch, transaction, or block. + # + # ## Returns + # A map containing nesting maps describing corresponding L1 transactions + defp get_associated_l1_txs(zksync_item) do + [:commit_transaction, :prove_transaction, :execute_transaction] + |> Enum.reduce(%{}, fn key, l1_txs -> + case Map.get(zksync_item, key) do + nil -> Map.put(l1_txs, key, nil) + %Ecto.Association.NotLoaded{} -> Map.put(l1_txs, key, nil) + value -> Map.put(l1_txs, key, %{hash: value.hash, ts: value.timestamp}) + end + end) + end + + # Inspects L1 transactions of the batch to determine the batch status. + # + # ## Parameters + # - `zksync_item`: A batch, transaction, or block. + # + # ## Returns + # A string with one of predefined statuses + defp batch_status(zksync_item) do + cond do + specified?(zksync_item.execute_transaction) -> "Executed on L1" + specified?(zksync_item.prove_transaction) -> "Validated on L1" + specified?(zksync_item.commit_transaction) -> "Sent to L1" + # Batch entity itself has no batch_number + not Map.has_key?(zksync_item, :batch_number) -> "Sealed on L2" + not is_nil(zksync_item.batch_number) -> "Sealed on L2" + true -> "Processed on L2" + end + end + + # Checks if an item associated with a DB entity has actual value + # + # ## Parameters + # - `associated_item`: an item associated with a DB entity + # + # ## Returns + # - `false`: if the item is nil or not loaded + # - `true`: if the item has actual value + defp specified?(associated_item) do + case associated_item do + nil -> false + %Ecto.Association.NotLoaded{} -> false + _ -> true + end + end + + # Gets the value of an element nested in a map using two keys. + # + # Clarification: Returns `map[key1][key2]` + # + # ## Parameters + # - `map`: The high-level map. + # - `key1`: The key of the element in `map`. + # - `key2`: The key of the element in the map accessible by `map[key1]`. + # + # ## Returns + # The value of the element, or `nil` if the map accessible by `key1` does not exist. + defp get_2map_data(map, key1, key2) do + case Map.get(map, key1) do + nil -> nil + inner_map -> Map.get(inner_map, key2) + end + end +end diff --git a/apps/block_scout_web/lib/block_scout_web/views/bridged_tokens_view.ex b/apps/block_scout_web/lib/block_scout_web/views/bridged_tokens_view.ex new file mode 100644 index 000000000000..3cf7e32512c7 --- /dev/null +++ b/apps/block_scout_web/lib/block_scout_web/views/bridged_tokens_view.ex @@ -0,0 +1,24 @@ +defmodule BlockScoutWeb.BridgedTokensView do + use BlockScoutWeb, :view + + alias Explorer.Chain.{BridgedToken, CurrencyHelper, Token} + + @doc """ + Calculates capitalization of the bridged token in USD. + """ + @spec bridged_token_usd_cap(BridgedToken.t(), Token.t()) :: String.t() + def bridged_token_usd_cap(bridged_token, token) do + usd_cap = + if bridged_token.custom_cap do + bridged_token.custom_cap + else + if bridged_token.exchange_rate && token.total_supply do + Decimal.mult(bridged_token.exchange_rate, CurrencyHelper.divide_decimals(token.total_supply, token.decimals)) + else + Decimal.new(0) + end + end + + usd_cap |> Decimal.to_float() |> :erlang.float_to_binary([:compact, decimals: 20]) + end +end diff --git a/apps/block_scout_web/lib/block_scout_web/views/cldr_helper/number.ex b/apps/block_scout_web/lib/block_scout_web/views/cldr_helper/number.ex index fa3ad1f1c1f8..0d1c0e1e139f 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/cldr_helper/number.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/cldr_helper/number.ex @@ -17,6 +17,8 @@ defmodule BlockScoutWeb.CldrHelper.Number do end end + def to_string!(nil), do: "" + def to_string!(decimal) do # We do this to trick Dialyzer to not complain about non-local returns caused by bug in Cldr.Number.to_string! spec case :erlang.phash2(1, 1) do diff --git a/apps/block_scout_web/lib/block_scout_web/views/currency_helper.ex b/apps/block_scout_web/lib/block_scout_web/views/currency_helper.ex index 3093509ef591..7dc513fcdc83 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/currency_helper.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/currency_helper.ex @@ -4,6 +4,7 @@ defmodule BlockScoutWeb.CurrencyHelper do """ alias BlockScoutWeb.CldrHelper.Number + alias Explorer.Chain.CurrencyHelper @doc """ Formats the given integer value to a currency format. @@ -79,7 +80,7 @@ defmodule BlockScoutWeb.CurrencyHelper do format_according_to_decimals(value, Decimal.new(18)) else value - |> divide_decimals(decimals) + |> CurrencyHelper.divide_decimals(decimals) |> thousands_separator() end end @@ -91,11 +92,4 @@ defmodule BlockScoutWeb.CurrencyHelper do Decimal.to_string(value, :normal) end end - - @spec divide_decimals(Decimal.t(), Decimal.t()) :: Decimal.t() - def divide_decimals(%{sign: sign, coef: coef, exp: exp}, decimals) do - sign - |> Decimal.new(coef, exp - Decimal.to_integer(decimals)) - |> Decimal.normalize() - end end diff --git a/apps/block_scout_web/lib/block_scout_web/views/internal_transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/internal_transaction_view.ex index 46252f72ce4e..191be34d7d94 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/internal_transaction_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/internal_transaction_view.ex @@ -22,6 +22,7 @@ defmodule BlockScoutWeb.InternalTransactionView do def type(%InternalTransaction{type: :call, call_type: :callcode}), do: gettext("Call Code") def type(%InternalTransaction{type: :call, call_type: :delegatecall}), do: gettext("Delegate Call") def type(%InternalTransaction{type: :call, call_type: :staticcall}), do: gettext("Static Call") + def type(%InternalTransaction{type: :call, call_type: :invalid}), do: gettext("Invalid") def type(%InternalTransaction{type: :create}), do: gettext("Create") def type(%InternalTransaction{type: :create2}), do: gettext("Create2") def type(%InternalTransaction{type: :selfdestruct}), do: gettext("Self-Destruct") diff --git a/apps/block_scout_web/lib/block_scout_web/views/nft_helper.ex b/apps/block_scout_web/lib/block_scout_web/views/nft_helper.ex index a998729ebbd7..d13ba236765b 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/nft_helper.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/nft_helper.ex @@ -54,6 +54,7 @@ defmodule BlockScoutWeb.NFTHelper do def retrieve_image(image_url) do image_url + |> URI.decode() |> URI.encode() |> compose_ipfs_url() end diff --git a/apps/block_scout_web/lib/block_scout_web/views/tokens/helper.ex b/apps/block_scout_web/lib/block_scout_web/views/tokens/helper.ex index 309732bd85f2..b8757f444499 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/tokens/helper.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/tokens/helper.ex @@ -67,19 +67,21 @@ defmodule BlockScoutWeb.Tokens.Helper do end # TODO: remove this clause along with token transfer denormalization - defp do_token_transfer_amount(%Token{type: "ERC-1155", decimals: decimals}, nil, amount, amounts, token_ids) do + defp do_token_transfer_amount(%Token{type: type, decimals: decimals}, nil, amount, amounts, token_ids) + when type in ["ERC-1155", "ERC-404"] do if amount do - {:ok, :erc1155_instance, CurrencyHelper.format_according_to_decimals(amount, decimals)} + {:ok, :erc1155_erc404_instance, CurrencyHelper.format_according_to_decimals(amount, decimals)} else - {:ok, :erc1155_instance, amounts, token_ids, decimals} + {:ok, :erc1155_erc404_instance, amounts, token_ids, decimals} end end - defp do_token_transfer_amount(%Token{decimals: decimals}, "ERC-1155", amount, amounts, token_ids) do + defp do_token_transfer_amount(%Token{decimals: decimals}, type, amount, amounts, token_ids) + when type in ["ERC-1155", "ERC-404"] do if amount do - {:ok, :erc1155_instance, CurrencyHelper.format_according_to_decimals(amount, decimals)} + {:ok, :erc1155_erc404_instance, CurrencyHelper.format_according_to_decimals(amount, decimals)} else - {:ok, :erc1155_instance, amounts, token_ids, decimals} + {:ok, :erc1155_erc404_instance, amounts, token_ids, decimals} end end @@ -142,30 +144,32 @@ defmodule BlockScoutWeb.Tokens.Helper do # TODO: remove this clause along with token transfer denormalization defp do_token_transfer_amount_for_api( - %Token{type: "ERC-1155", decimals: decimals}, + %Token{type: type, decimals: decimals}, nil, amount, amounts, token_ids - ) do + ) + when type in ["ERC-1155", "ERC-404"] do if amount do - {:ok, :erc1155_instance, amount, decimals} + {:ok, :erc1155_erc404_instance, amount, decimals} else - {:ok, :erc1155_instance, amounts, token_ids, decimals} + {:ok, :erc1155_erc404_instance, amounts, token_ids, decimals} end end defp do_token_transfer_amount_for_api( %Token{decimals: decimals}, - "ERC-1155", + type, amount, amounts, token_ids - ) do + ) + when type in ["ERC-1155", "ERC-404"] do if amount do - {:ok, :erc1155_instance, amount, decimals} + {:ok, :erc1155_erc404_instance, amount, decimals} else - {:ok, :erc1155_instance, amounts, token_ids, decimals} + {:ok, :erc1155_erc404_instance, amounts, token_ids, decimals} end end diff --git a/apps/block_scout_web/lib/block_scout_web/views/tokens/holder_view.ex b/apps/block_scout_web/lib/block_scout_web/views/tokens/holder_view.ex index 2edfd9398119..745b041ddd64 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/tokens/holder_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/tokens/holder_view.ex @@ -70,6 +70,16 @@ defmodule BlockScoutWeb.Tokens.HolderView do to_string(format_according_to_decimals(value, decimals)) <> " TokenID " <> to_string(id) end + def format_token_balance_value(value, id, %Token{type: "ERC-404", decimals: decimals}) do + base = to_string(format_according_to_decimals(value, decimals)) + + if id do + base <> " TokenID " <> to_string(id) + else + base + end + end + def format_token_balance_value(value, _id, _token) do value end diff --git a/apps/block_scout_web/lib/block_scout_web/views/tokens/instance/overview_view.ex b/apps/block_scout_web/lib/block_scout_web/views/tokens/instance/overview_view.ex index c0a68df2d304..640b34fa0d82 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/tokens/instance/overview_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/tokens/instance/overview_view.ex @@ -1,9 +1,9 @@ defmodule BlockScoutWeb.Tokens.Instance.OverviewView do use BlockScoutWeb, :view - alias BlockScoutWeb.{CurrencyHelper, NFTHelper} + alias BlockScoutWeb.NFTHelper alias Explorer.Chain - alias Explorer.Chain.{Address, SmartContract, Token} + alias Explorer.Chain.{Address, CurrencyHelper, SmartContract, Token} alias Explorer.SmartContract.Helper import BlockScoutWeb.APIDocsView, only: [blockscout_url: 1] diff --git a/apps/block_scout_web/lib/block_scout_web/views/tokens/overview_view.ex b/apps/block_scout_web/lib/block_scout_web/views/tokens/overview_view.ex index 441ac1a0a4f1..ce1abc8957fc 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/tokens/overview_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/tokens/overview_view.ex @@ -1,13 +1,12 @@ defmodule BlockScoutWeb.Tokens.OverviewView do use BlockScoutWeb, :view + alias BlockScoutWeb.{AccessHelper, LayoutView} alias Explorer.{Chain, CustomContractsHelper} - alias Explorer.Chain.{Address, SmartContract, Token} + alias Explorer.Chain.{Address, CurrencyHelper, SmartContract, Token} alias Explorer.Chain.SmartContract.Proxy alias Explorer.SmartContract.{Helper, Writer} - alias BlockScoutWeb.{AccessHelper, CurrencyHelper, LayoutView} - import BlockScoutWeb.AddressView, only: [from_address_hash: 1, contract_interaction_disabled?: 0] @tabs ["token-transfers", "token-holders", "read-contract", "inventory"] @@ -44,6 +43,7 @@ defmodule BlockScoutWeb.Tokens.OverviewView do def display_inventory?(%Token{type: "ERC-721"}), do: true def display_inventory?(%Token{type: "ERC-1155"}), do: true + def display_inventory?(%Token{type: "ERC-404"}), do: true def display_inventory?(_), do: false def smart_contract_with_read_only_functions?( diff --git a/apps/block_scout_web/lib/block_scout_web/views/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/transaction_view.ex index 4d94264b5ed9..587c57cf062f 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/transaction_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/transaction_view.ex @@ -223,6 +223,7 @@ defmodule BlockScoutWeb.TransactionView do :erc20 -> gettext("ERC-20 ") :erc721 -> gettext("ERC-721 ") :erc1155 -> gettext("ERC-1155 ") + :erc404 -> gettext("ERC-404 ") _ -> "" end end @@ -409,12 +410,26 @@ defmodule BlockScoutWeb.TransactionView do format_wei_value(gas_price, unit) end + def l1_gas_price(transaction, unit) when unit in ~w(wei gwei ether)a do + case Map.get(transaction, :l1_gas_price) do + nil -> nil + value -> format_wei_value(value, unit) + end + end + def gas_used(%Transaction{gas_used: nil}), do: gettext("Pending") def gas_used(%Transaction{gas_used: gas_used}) do Number.to_string!(gas_used) end + def l1_gas_used(transaction) do + case Map.get(transaction, :l1_gas_used) do + nil -> gettext("Pending") + value -> Number.to_string!(value) + end + end + def gas_used_perc(%Transaction{gas_used: nil}), do: nil def gas_used_perc(%Transaction{gas_used: gas_used, gas: gas}) do diff --git a/apps/block_scout_web/mix.exs b/apps/block_scout_web/mix.exs index 81be6caa8eb6..79748184703c 100644 --- a/apps/block_scout_web/mix.exs +++ b/apps/block_scout_web/mix.exs @@ -23,8 +23,17 @@ defmodule BlockScoutWeb.Mixfile do dialyzer: :test ], start_permanent: Mix.env() == :prod, - version: "6.2.0", - xref: [exclude: [Explorer.Chain.PolygonZkevm.Reader, Explorer.Chain.Beacon.Reader]] + version: "6.5.0", + xref: [ + exclude: [ + Explorer.Chain.PolygonZkevm.Reader, + Explorer.Chain.Beacon.Reader, + Explorer.Chain.Cache.OptimismFinalizationPeriod, + Explorer.Chain.Optimism.OutputRoot, + Explorer.Chain.Optimism.WithdrawalEvent, + Explorer.Chain.ZkSync.Reader + ] + ] ] end @@ -60,7 +69,7 @@ defmodule BlockScoutWeb.Mixfile do # Integrates Absinthe subscriptions with Phoenix {:absinthe_phoenix, "~> 2.0.0"}, # Plug support for Absinthe - {:absinthe_plug, git: "https://github.com/blockscout/absinthe_plug.git", tag: "1.5.3", override: true}, + {:absinthe_plug, git: "https://github.com/blockscout/absinthe_plug.git", tag: "1.5.8", override: true}, # Absinthe support for the Relay framework {:absinthe_relay, "~> 1.5"}, {:bypass, "~> 2.1", only: :test}, diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot index 3912a1c094b7..d56fadb7cfb6 100644 --- a/apps/block_scout_web/priv/gettext/default.pot +++ b/apps/block_scout_web/priv/gettext/default.pot @@ -1,16 +1,15 @@ -#: lib/block_scout_web/views/address_token_balance_view.ex:10 -#, elixir-autogen, elixir-format -msgid "%{count} token" -msgid_plural "%{count} tokens" -msgstr[0] "" -msgstr[1] "" - -#: lib/block_scout_web/templates/block/_tile.html.eex:29 -#, elixir-autogen, elixir-format -msgid "%{count} transaction" -msgid_plural "%{count} transactions" -msgstr[0] "" -msgstr[1] "" +## This file is a PO Template file. +## +## "msgid"s here are often extracted from source code. +## Add new messages manually only if they're dynamic +## messages that can't be statically extracted. +## +## Run "mix gettext.extract" to bring this file up to +## date. Leave "msgstr"s empty as changing them here has no +## effect: edit them in PO (.po) files instead. +# +msgid "" +msgstr "" #: lib/block_scout_web/templates/common_components/_minimal_proxy_pattern.html.eex:9 #, elixir-autogen, elixir-format @@ -53,6 +52,20 @@ msgstr "" msgid "%{count} Transactions" msgstr "" +#: lib/block_scout_web/views/address_token_balance_view.ex:10 +#, elixir-autogen, elixir-format +msgid "%{count} token" +msgid_plural "%{count} tokens" +msgstr[0] "" +msgstr[1] "" + +#: lib/block_scout_web/templates/block/_tile.html.eex:29 +#, elixir-autogen, elixir-format +msgid "%{count} transaction" +msgid_plural "%{count} transactions" +msgstr[0] "" +msgstr[1] "" + #: lib/block_scout_web/templates/transaction/_actions.html.eex:101 #, elixir-autogen, elixir-format msgid "%{qty} of Token ID [%{link_to_id}]" @@ -68,7 +81,7 @@ msgstr "" msgid "%{subnetwork} Explorer - BlockScout" msgstr "" -#: lib/block_scout_web/views/transaction_view.ex:374 +#: lib/block_scout_web/views/transaction_view.ex:375 #, elixir-autogen, elixir-format msgid "(Awaiting internal transactions for status)" msgstr "" @@ -199,11 +212,6 @@ msgstr "" msgid "Actions" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:451 -#, elixir-autogen, elixir-format -msgid "Actual gas amount used by the transaction." -msgstr "" - #: lib/block_scout_web/templates/account/api_key/form.html.eex:7 #: lib/block_scout_web/templates/account/custom_abi/form.html.eex:8 #: lib/block_scout_web/templates/layout/_add_chain_to_mm.html.eex:10 @@ -270,12 +278,12 @@ msgstr "" msgid "Address" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:243 +#: lib/block_scout_web/templates/transaction/overview.html.eex:263 #, elixir-autogen, elixir-format msgid "Address (external or contract) receiving the transaction." msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:225 +#: lib/block_scout_web/templates/transaction/overview.html.eex:245 #, elixir-autogen, elixir-format msgid "Address (external or contract) sending the transaction." msgstr "" @@ -346,14 +354,7 @@ msgstr "" msgid "All tokens in the account and total value." msgstr "" -#: lib/block_scout_web/templates/address_withdrawal/index.html.eex:41 -#: lib/block_scout_web/templates/block_withdrawal/index.html.eex:32 -#: lib/block_scout_web/templates/withdrawal/index.html.eex:38 -#, elixir-autogen, elixir-format -msgid "Amount" -msgstr "" - -#: lib/block_scout_web/templates/transaction/overview.html.eex:437 +#: lib/block_scout_web/templates/transaction/overview.html.eex:469 #, elixir-autogen, elixir-format msgid "Amount of" msgstr "" @@ -383,11 +384,6 @@ msgstr "" msgid "Average" msgstr "" -#: lib/block_scout_web/templates/chain/show.html.eex:101 -#, elixir-autogen, elixir-format -msgid "Average block time" -msgstr "" - #: lib/block_scout_web/templates/account/api_key/form.html.eex:25 #, elixir-autogen, elixir-format msgid "Back to API keys (Cancel)" @@ -455,17 +451,7 @@ msgstr "" msgid "Base URL:" msgstr "" -#: lib/block_scout_web/templates/withdrawal/_metatags.html.eex:2 -#, elixir-autogen, elixir-format -msgid "Beacon chain withdrawals - %{subnetwork} Explorer" -msgstr "" - -#: lib/block_scout_web/templates/withdrawal/_metatags.html.eex:7 -#, elixir-autogen, elixir-format -msgid "Beacon chain, Withdrawals, %{subnetwork}, %{coin}" -msgstr "" - -#: lib/block_scout_web/templates/transaction/overview.html.eex:472 +#: lib/block_scout_web/templates/transaction/overview.html.eex:545 #, elixir-autogen, elixir-format msgid "Binary data included with the transaction. See input / logs below for additional info." msgstr "" @@ -541,7 +527,7 @@ msgstr "" msgid "Blockchain" msgstr "" -#: lib/block_scout_web/templates/chain/show.html.eex:154 +#: lib/block_scout_web/templates/chain/show.html.eex:156 #: lib/block_scout_web/templates/layout/_topnav.html.eex:34 #: lib/block_scout_web/templates/layout/_topnav.html.eex:38 #, elixir-autogen, elixir-format @@ -698,7 +684,7 @@ msgstr "" msgid "Compiler version" msgstr "" -#: lib/block_scout_web/views/transaction_view.ex:367 +#: lib/block_scout_web/views/transaction_view.ex:368 #, elixir-autogen, elixir-format msgid "Confirmed" msgstr "" @@ -758,7 +744,7 @@ msgid "Constructor args" msgstr "" #: lib/block_scout_web/templates/tokens/overview/_details.html.eex:52 -#: lib/block_scout_web/templates/transaction/overview.html.eex:253 +#: lib/block_scout_web/templates/transaction/overview.html.eex:273 #, elixir-autogen, elixir-format msgid "Contract" msgstr "" @@ -783,12 +769,12 @@ msgstr "" msgid "Contract Address Pending" msgstr "" -#: lib/block_scout_web/views/transaction_view.ex:483 +#: lib/block_scout_web/views/transaction_view.ex:497 #, elixir-autogen, elixir-format msgid "Contract Call" msgstr "" -#: lib/block_scout_web/views/transaction_view.ex:480 +#: lib/block_scout_web/views/transaction_view.ex:494 #, elixir-autogen, elixir-format msgid "Contract Creation" msgstr "" @@ -909,8 +895,8 @@ msgstr "" #: lib/block_scout_web/templates/account/watchlist_address/row.html.eex:7 #: lib/block_scout_web/templates/transaction/_total_transfers_from_to.html.eex:17 #: lib/block_scout_web/templates/transaction/_total_transfers_from_to.html.eex:18 -#: lib/block_scout_web/templates/transaction/overview.html.eex:233 -#: lib/block_scout_web/templates/transaction/overview.html.eex:234 +#: lib/block_scout_web/templates/transaction/overview.html.eex:253 +#: lib/block_scout_web/templates/transaction/overview.html.eex:254 #, elixir-autogen, elixir-format msgid "Copy From Address" msgstr "" @@ -945,10 +931,10 @@ msgstr "" #: lib/block_scout_web/templates/transaction/_total_transfers_from_to.html.eex:34 #: lib/block_scout_web/templates/transaction/_total_transfers_from_to.html.eex:35 -#: lib/block_scout_web/templates/transaction/overview.html.eex:260 -#: lib/block_scout_web/templates/transaction/overview.html.eex:261 -#: lib/block_scout_web/templates/transaction/overview.html.eex:268 -#: lib/block_scout_web/templates/transaction/overview.html.eex:269 +#: lib/block_scout_web/templates/transaction/overview.html.eex:280 +#: lib/block_scout_web/templates/transaction/overview.html.eex:281 +#: lib/block_scout_web/templates/transaction/overview.html.eex:288 +#: lib/block_scout_web/templates/transaction/overview.html.eex:289 #, elixir-autogen, elixir-format msgid "Copy To Address" msgstr "" @@ -969,20 +955,20 @@ msgstr "" msgid "Copy Txn Hash" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:498 +#: lib/block_scout_web/templates/transaction/overview.html.eex:571 #, elixir-autogen, elixir-format msgid "Copy Txn Hex Input" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:504 +#: lib/block_scout_web/templates/transaction/overview.html.eex:577 #, elixir-autogen, elixir-format msgid "Copy Txn UTF-8 Input" msgstr "" #: lib/block_scout_web/templates/log/_data_decoded_view.html.eex:20 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:41 -#: lib/block_scout_web/templates/transaction/overview.html.eex:497 -#: lib/block_scout_web/templates/transaction/overview.html.eex:503 +#: lib/block_scout_web/templates/transaction/overview.html.eex:570 +#: lib/block_scout_web/templates/transaction/overview.html.eex:576 #: lib/block_scout_web/templates/transaction_raw_trace/_card_body.html.eex:8 #, elixir-autogen, elixir-format msgid "Copy Value" @@ -1292,12 +1278,12 @@ msgstr "" msgid "Error trying to fetch balances." msgstr "" -#: lib/block_scout_web/views/transaction_view.ex:378 +#: lib/block_scout_web/views/transaction_view.ex:379 #, elixir-autogen, elixir-format msgid "Error: %{reason}" msgstr "" -#: lib/block_scout_web/views/transaction_view.ex:376 +#: lib/block_scout_web/views/transaction_view.ex:377 #, elixir-autogen, elixir-format msgid "Error: (Awaiting internal transactions for reason)" msgstr "" @@ -1329,6 +1315,11 @@ msgstr "" msgid "Expand" msgstr "" +#: lib/block_scout_web/templates/csv_export/index.html.eex:14 +#, elixir-autogen, elixir-format +msgid "Export" +msgstr "" + #: lib/block_scout_web/templates/csv_export/index.html.eex:10 #, elixir-autogen, elixir-format msgid "Export Data" @@ -1411,7 +1402,7 @@ msgstr "" #: lib/block_scout_web/templates/address_internal_transaction/index.html.eex:38 #: lib/block_scout_web/templates/address_token_transfer/index.html.eex:40 #: lib/block_scout_web/templates/address_transaction/index.html.eex:34 -#: lib/block_scout_web/templates/transaction/overview.html.eex:226 +#: lib/block_scout_web/templates/transaction/overview.html.eex:246 #: lib/block_scout_web/views/address_internal_transaction_view.ex:10 #: lib/block_scout_web/views/address_token_transfer_view.ex:10 #: lib/block_scout_web/views/address_transaction_view.ex:10 @@ -1426,16 +1417,11 @@ msgstr "" #: lib/block_scout_web/templates/block/_tile.html.eex:67 #: lib/block_scout_web/templates/block/overview.html.eex:187 -#: lib/block_scout_web/templates/transaction/overview.html.eex:399 +#: lib/block_scout_web/templates/transaction/overview.html.eex:430 #, elixir-autogen, elixir-format msgid "Gas Limit" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:379 -#, elixir-autogen, elixir-format -msgid "Gas Price" -msgstr "" - #: lib/block_scout_web/templates/address/overview.html.eex:240 #: lib/block_scout_web/templates/block/_tile.html.eex:73 #: lib/block_scout_web/templates/block/overview.html.eex:178 @@ -1443,11 +1429,6 @@ msgstr "" msgid "Gas Used" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:452 -#, elixir-autogen, elixir-format -msgid "Gas Used by Transaction" -msgstr "" - #: lib/block_scout_web/templates/chain/gas_price_oracle_legend_item.html.eex:3 #: lib/block_scout_web/templates/chain/gas_price_oracle_legend_item.html.eex:18 #, elixir-autogen, elixir-format @@ -1495,13 +1476,13 @@ msgstr "" msgid "Hash" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:480 -#: lib/block_scout_web/templates/transaction/overview.html.eex:484 +#: lib/block_scout_web/templates/transaction/overview.html.eex:553 +#: lib/block_scout_web/templates/transaction/overview.html.eex:557 #, elixir-autogen, elixir-format msgid "Hex (Default)" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:204 +#: lib/block_scout_web/templates/transaction/overview.html.eex:224 #, elixir-autogen, elixir-format msgid "Highlighted events of the transaction." msgstr "" @@ -1560,14 +1541,7 @@ msgstr "" msgid "Incoming" msgstr "" -#: lib/block_scout_web/templates/address_withdrawal/index.html.eex:29 -#: lib/block_scout_web/templates/block_withdrawal/index.html.eex:23 -#: lib/block_scout_web/templates/withdrawal/index.html.eex:23 -#, elixir-autogen, elixir-format -msgid "Index" -msgstr "" - -#: lib/block_scout_web/templates/transaction/overview.html.eex:464 +#: lib/block_scout_web/templates/transaction/overview.html.eex:537 #, elixir-autogen, elixir-format msgid "Index position of Transaction in the block." msgstr "" @@ -1587,7 +1561,7 @@ msgstr "" msgid "Input" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:245 +#: lib/block_scout_web/templates/transaction/overview.html.eex:265 #, elixir-autogen, elixir-format msgid "Interacted With (To)" msgstr "" @@ -1602,7 +1576,7 @@ msgstr "" #: lib/block_scout_web/templates/transaction/_tabs.html.eex:11 #: lib/block_scout_web/templates/transaction_internal_transaction/index.html.eex:6 #: lib/block_scout_web/views/address_view.ex:376 -#: lib/block_scout_web/views/transaction_view.ex:538 +#: lib/block_scout_web/views/transaction_view.ex:552 #, elixir-autogen, elixir-format msgid "Internal Transactions" msgstr "" @@ -1662,22 +1636,22 @@ msgstr "" msgid "License ID" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:331 +#: lib/block_scout_web/templates/transaction/overview.html.eex:351 #, elixir-autogen, elixir-format msgid "List of ERC-1155 tokens created in the transaction." msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:315 +#: lib/block_scout_web/templates/transaction/overview.html.eex:335 #, elixir-autogen, elixir-format msgid "List of token burnt in the transaction." msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:298 +#: lib/block_scout_web/templates/transaction/overview.html.eex:318 #, elixir-autogen, elixir-format msgid "List of token minted in the transaction." msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:282 +#: lib/block_scout_web/templates/transaction/overview.html.eex:302 #, elixir-autogen, elixir-format msgid "List of token transferred in the transaction." msgstr "" @@ -1719,7 +1693,7 @@ msgstr "" #: lib/block_scout_web/templates/transaction/_tabs.html.eex:17 #: lib/block_scout_web/templates/transaction_log/index.html.eex:8 #: lib/block_scout_web/views/address_view.ex:387 -#: lib/block_scout_web/views/transaction_view.ex:539 +#: lib/block_scout_web/views/transaction_view.ex:553 #, elixir-autogen, elixir-format msgid "Logs" msgstr "" @@ -1742,27 +1716,22 @@ msgstr "" msgid "Market cap" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:408 +#: lib/block_scout_web/templates/transaction/overview.html.eex:440 #, elixir-autogen, elixir-format msgid "Max Fee per Gas" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:418 +#: lib/block_scout_web/templates/transaction/overview.html.eex:450 #, elixir-autogen, elixir-format msgid "Max Priority Fee per Gas" msgstr "" -#: lib/block_scout_web/views/transaction_view.ex:330 +#: lib/block_scout_web/views/transaction_view.ex:331 #, elixir-autogen, elixir-format msgid "Max of" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:398 -#, elixir-autogen, elixir-format -msgid "Maximum gas amount approved for the transaction." -msgstr "" - -#: lib/block_scout_web/templates/transaction/overview.html.eex:407 +#: lib/block_scout_web/templates/transaction/overview.html.eex:439 #, elixir-autogen, elixir-format msgid "Maximum total amount per unit of gas a user is willing to pay for a transaction, including base fee and priority fee." msgstr "" @@ -1824,7 +1793,7 @@ msgid "More internal transactions have come in" msgstr "" #: lib/block_scout_web/templates/address_transaction/index.html.eex:46 -#: lib/block_scout_web/templates/chain/show.html.eex:217 +#: lib/block_scout_web/templates/chain/show.html.eex:219 #: lib/block_scout_web/templates/pending_transaction/index.html.eex:13 #: lib/block_scout_web/templates/transaction/index.html.eex:19 #, elixir-autogen, elixir-format @@ -1904,6 +1873,16 @@ msgstr "" msgid "New Smart Contract Verification" msgstr "" +#: lib/block_scout_web/templates/address_contract_verification_via_standard_json_input/new.html.eex:9 +#, elixir-autogen, elixir-format +msgid "New Smart Contract Verification via Standard input JSON" +msgstr "" + +#: lib/block_scout_web/templates/address_contract_verification_via_json/new.html.eex:5 +#, elixir-autogen, elixir-format +msgid "New Smart Contract Verification via metadata JSON" +msgstr "" + #: lib/block_scout_web/templates/address_contract_verification_via_flattened_code/new.html.eex:9 #: lib/block_scout_web/templates/address_contract_verification_via_multi_part_files/new.html.eex:7 #, elixir-autogen, elixir-format @@ -1944,7 +1923,7 @@ msgid "No trace entries found." msgstr "" #: lib/block_scout_web/templates/block/overview.html.eex:196 -#: lib/block_scout_web/templates/transaction/overview.html.eex:462 +#: lib/block_scout_web/templates/transaction/overview.html.eex:535 #, elixir-autogen, elixir-format msgid "Nonce" msgstr "" @@ -2065,7 +2044,8 @@ msgstr "" #: lib/block_scout_web/templates/layout/_topnav.html.eex:63 #: lib/block_scout_web/views/transaction_view.ex:373 -#: lib/block_scout_web/views/transaction_view.ex:412 +#: lib/block_scout_web/views/transaction_view.ex:419 +#: lib/block_scout_web/views/transaction_view.ex:427 #, elixir-autogen, elixir-format msgid "Pending" msgstr "" @@ -2097,7 +2077,7 @@ msgstr "" msgid "Please select what types of notifications you will receive:" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:464 +#: lib/block_scout_web/templates/transaction/overview.html.eex:537 #, elixir-autogen, elixir-format msgid "Position" msgstr "" @@ -2134,13 +2114,8 @@ msgstr "" msgid "Price per token on the exchanges" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:378 -#, elixir-autogen, elixir-format -msgid "Price per unit of gas specified by the sender. Higher gas prices can prioritize transaction inclusion during times of high usage." -msgstr "" - #: lib/block_scout_web/templates/block/overview.html.eex:225 -#: lib/block_scout_web/templates/transaction/overview.html.eex:428 +#: lib/block_scout_web/templates/transaction/overview.html.eex:460 #, elixir-autogen, elixir-format msgid "Priority Fee / Tip" msgstr "" @@ -2194,14 +2169,14 @@ msgstr "" msgid "RPC" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:473 +#: lib/block_scout_web/templates/transaction/overview.html.eex:546 #, elixir-autogen, elixir-format msgid "Raw Input" msgstr "" #: lib/block_scout_web/templates/transaction/_tabs.html.eex:24 #: lib/block_scout_web/templates/transaction_raw_trace/_card_body.html.eex:1 -#: lib/block_scout_web/views/transaction_view.ex:540 +#: lib/block_scout_web/views/transaction_view.ex:554 #, elixir-autogen, elixir-format msgid "Raw Trace" msgstr "" @@ -2319,7 +2294,7 @@ msgstr "" msgid "Save" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:206 +#: lib/block_scout_web/templates/transaction/overview.html.eex:226 #, elixir-autogen, elixir-format msgid "Scroll to see more" msgstr "" @@ -2459,7 +2434,7 @@ msgstr "" #: lib/block_scout_web/templates/address_withdrawal/index.html.eex:20 #: lib/block_scout_web/templates/block_transaction/index.html.eex:14 #: lib/block_scout_web/templates/block_withdrawal/index.html.eex:14 -#: lib/block_scout_web/templates/chain/show.html.eex:158 +#: lib/block_scout_web/templates/chain/show.html.eex:160 #: lib/block_scout_web/templates/pending_transaction/index.html.eex:18 #: lib/block_scout_web/templates/tokens/holder/index.html.eex:24 #: lib/block_scout_web/templates/tokens/instance/holder/index.html.eex:23 @@ -2477,7 +2452,7 @@ msgstr "" msgid "Something went wrong, click to reload." msgstr "" -#: lib/block_scout_web/templates/chain/show.html.eex:223 +#: lib/block_scout_web/templates/chain/show.html.eex:225 #, elixir-autogen, elixir-format msgid "Something went wrong, click to retry." msgstr "" @@ -2514,7 +2489,7 @@ msgstr "" #: lib/block_scout_web/templates/transaction/_tabs.html.eex:29 #: lib/block_scout_web/templates/transaction_state/index.html.eex:6 -#: lib/block_scout_web/views/transaction_view.ex:541 +#: lib/block_scout_web/views/transaction_view.ex:555 #, elixir-autogen, elixir-format msgid "State changes" msgstr "" @@ -2540,7 +2515,7 @@ msgid "Submit an Issue" msgstr "" #: lib/block_scout_web/templates/transaction/_emission_reward_tile.html.eex:8 -#: lib/block_scout_web/views/transaction_view.ex:375 +#: lib/block_scout_web/views/transaction_view.ex:376 #, elixir-autogen, elixir-format msgid "Success" msgstr "" @@ -2551,11 +2526,6 @@ msgstr "" msgid "TX Fee" msgstr "" -#: lib/block_scout_web/templates/layout/_footer.html.eex:31 -#, elixir-autogen, elixir-format -msgid "Telegram" -msgstr "" - #: lib/block_scout_web/templates/layout/_footer.html.eex:67 #, elixir-autogen, elixir-format msgid "Test Networks" @@ -2816,7 +2786,7 @@ msgstr "" #: lib/block_scout_web/templates/address_token_transfer/index.html.eex:34 #: lib/block_scout_web/templates/address_transaction/index.html.eex:28 #: lib/block_scout_web/templates/block_withdrawal/index.html.eex:29 -#: lib/block_scout_web/templates/transaction/overview.html.eex:247 +#: lib/block_scout_web/templates/transaction/overview.html.eex:267 #: lib/block_scout_web/templates/withdrawal/index.html.eex:32 #: lib/block_scout_web/views/address_internal_transaction_view.ex:9 #: lib/block_scout_web/views/address_token_transfer_view.ex:9 @@ -2849,13 +2819,13 @@ msgid "Token" msgstr "" #: lib/block_scout_web/templates/common_components/_token_transfer_type_display_name.html.eex:3 -#: lib/block_scout_web/views/transaction_view.ex:474 +#: lib/block_scout_web/views/transaction_view.ex:488 #, elixir-autogen, elixir-format msgid "Token Burning" msgstr "" #: lib/block_scout_web/templates/common_components/_token_transfer_type_display_name.html.eex:7 -#: lib/block_scout_web/views/transaction_view.ex:475 +#: lib/block_scout_web/views/transaction_view.ex:489 #, elixir-autogen, elixir-format msgid "Token Creation" msgstr "" @@ -2883,14 +2853,14 @@ msgid "Token ID" msgstr "" #: lib/block_scout_web/templates/common_components/_token_transfer_type_display_name.html.eex:5 -#: lib/block_scout_web/views/transaction_view.ex:473 +#: lib/block_scout_web/views/transaction_view.ex:487 #, elixir-autogen, elixir-format msgid "Token Minting" msgstr "" #: lib/block_scout_web/templates/common_components/_token_transfer_type_display_name.html.eex:9 #: lib/block_scout_web/templates/common_components/_token_transfer_type_display_name.html.eex:11 -#: lib/block_scout_web/views/transaction_view.ex:476 +#: lib/block_scout_web/views/transaction_view.ex:490 #, elixir-autogen, elixir-format msgid "Token Transfer" msgstr "" @@ -2906,7 +2876,7 @@ msgstr "" #: lib/block_scout_web/views/address_view.ex:378 #: lib/block_scout_web/views/tokens/instance/overview_view.ex:114 #: lib/block_scout_web/views/tokens/overview_view.ex:40 -#: lib/block_scout_web/views/transaction_view.ex:537 +#: lib/block_scout_web/views/transaction_view.ex:551 #, elixir-autogen, elixir-format msgid "Token Transfers" msgstr "" @@ -2932,22 +2902,22 @@ msgstr "" msgid "Tokens" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:316 +#: lib/block_scout_web/templates/transaction/overview.html.eex:336 #, elixir-autogen, elixir-format msgid "Tokens Burnt" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:332 +#: lib/block_scout_web/templates/transaction/overview.html.eex:352 #, elixir-autogen, elixir-format msgid "Tokens Created" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:299 +#: lib/block_scout_web/templates/transaction/overview.html.eex:319 #, elixir-autogen, elixir-format msgid "Tokens Minted" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:283 +#: lib/block_scout_web/templates/transaction/overview.html.eex:303 #, elixir-autogen, elixir-format msgid "Tokens Transferred" msgstr "" @@ -2989,7 +2959,7 @@ msgstr "" msgid "Total Supply * Price" msgstr "" -#: lib/block_scout_web/templates/chain/show.html.eex:131 +#: lib/block_scout_web/templates/chain/show.html.eex:133 #, elixir-autogen, elixir-format msgid "Total blocks" msgstr "" @@ -3009,12 +2979,12 @@ msgstr "" msgid "Total supply" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:363 +#: lib/block_scout_web/templates/transaction/overview.html.eex:383 #, elixir-autogen, elixir-format msgid "Total transaction fee." msgstr "" -#: lib/block_scout_web/templates/chain/show.html.eex:110 +#: lib/block_scout_web/templates/chain/show.html.eex:112 #, elixir-autogen, elixir-format msgid "Total transactions" msgstr "" @@ -3022,7 +2992,7 @@ msgstr "" #: lib/block_scout_web/templates/account/tag_transaction/form.html.eex:11 #: lib/block_scout_web/templates/account/tag_transaction/index.html.eex:23 #: lib/block_scout_web/templates/address_logs/_logs.html.eex:19 -#: lib/block_scout_web/views/transaction_view.ex:486 +#: lib/block_scout_web/views/transaction_view.ex:500 #, elixir-autogen, elixir-format msgid "Transaction" msgstr "" @@ -3037,12 +3007,7 @@ msgstr "" msgid "Transaction %{transaction}, %{subnetwork} %{transaction}" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:205 -#, elixir-autogen, elixir-format -msgid "Transaction Action" -msgstr "" - -#: lib/block_scout_web/templates/transaction/overview.html.eex:438 +#: lib/block_scout_web/templates/transaction/overview.html.eex:470 #, elixir-autogen, elixir-format msgid "Transaction Burnt Fee" msgstr "" @@ -3052,7 +3017,7 @@ msgstr "" msgid "Transaction Details" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:364 +#: lib/block_scout_web/templates/transaction/overview.html.eex:384 #, elixir-autogen, elixir-format msgid "Transaction Fee" msgstr "" @@ -3075,17 +3040,17 @@ msgstr "" msgid "Transaction Tags" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:388 +#: lib/block_scout_web/templates/transaction/overview.html.eex:414 #, elixir-autogen, elixir-format msgid "Transaction Type" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:461 +#: lib/block_scout_web/templates/transaction/overview.html.eex:534 #, elixir-autogen, elixir-format msgid "Transaction number from the sending address. Each transaction sent from an address increments the nonce by 1." msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:387 +#: lib/block_scout_web/templates/transaction/overview.html.eex:413 #, elixir-autogen, elixir-format msgid "Transaction type, introduced in EIP-2718." msgstr "" @@ -3098,7 +3063,7 @@ msgstr "" #: lib/block_scout_web/templates/address_transaction/index.html.eex:13 #: lib/block_scout_web/templates/block/_tabs.html.eex:4 #: lib/block_scout_web/templates/block/overview.html.eex:80 -#: lib/block_scout_web/templates/chain/show.html.eex:214 +#: lib/block_scout_web/templates/chain/show.html.eex:216 #: lib/block_scout_web/templates/layout/_topnav.html.eex:49 #: lib/block_scout_web/views/address_view.ex:377 #, elixir-autogen, elixir-format @@ -3161,7 +3126,7 @@ msgstr "" msgid "UML diagram" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:487 +#: lib/block_scout_web/templates/transaction/overview.html.eex:560 #, elixir-autogen, elixir-format msgid "UTF-8" msgstr "" @@ -3177,7 +3142,7 @@ msgstr "" msgid "Uncles" msgstr "" -#: lib/block_scout_web/views/transaction_view.ex:366 +#: lib/block_scout_web/views/transaction_view.ex:367 #, elixir-autogen, elixir-format msgid "Unconfirmed" msgstr "" @@ -3198,12 +3163,12 @@ msgstr "" msgid "Update" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:417 +#: lib/block_scout_web/templates/transaction/overview.html.eex:449 #, elixir-autogen, elixir-format msgid "User defined maximum fee (tip) per unit of gas paid to validator for transaction prioritization." msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:427 +#: lib/block_scout_web/templates/transaction/overview.html.eex:459 #, elixir-autogen, elixir-format msgid "User-defined tip sent to validator for transaction priority/inclusion." msgstr "" @@ -3238,19 +3203,12 @@ msgstr "" msgid "Validator Name" msgstr "" -#: lib/block_scout_web/templates/address_withdrawal/index.html.eex:32 -#: lib/block_scout_web/templates/block_withdrawal/index.html.eex:26 -#: lib/block_scout_web/templates/withdrawal/index.html.eex:26 -#, elixir-autogen, elixir-format -msgid "Validator index" -msgstr "" - -#: lib/block_scout_web/templates/transaction/overview.html.eex:349 +#: lib/block_scout_web/templates/transaction/overview.html.eex:369 #, elixir-autogen, elixir-format msgid "Value" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:348 +#: lib/block_scout_web/templates/transaction/overview.html.eex:368 #, elixir-autogen, elixir-format msgid "Value sent in the native token (and USD) if applicable." msgstr "" @@ -3339,12 +3297,12 @@ msgstr "" msgid "Via multi-part files" msgstr "" -#: lib/block_scout_web/templates/chain/show.html.eex:153 +#: lib/block_scout_web/templates/chain/show.html.eex:155 #, elixir-autogen, elixir-format msgid "View All Blocks" msgstr "" -#: lib/block_scout_web/templates/chain/show.html.eex:213 +#: lib/block_scout_web/templates/chain/show.html.eex:215 #, elixir-autogen, elixir-format msgid "View All Transactions" msgstr "" @@ -3422,7 +3380,7 @@ msgstr "" msgid "Waiting for transaction's confirmation..." msgstr "" -#: lib/block_scout_web/templates/chain/show.html.eex:139 +#: lib/block_scout_web/templates/chain/show.html.eex:141 #, elixir-autogen, elixir-format msgid "Wallet addresses" msgstr "" @@ -3531,6 +3489,12 @@ msgstr "" msgid "Your request contained an error, perhaps a mistyped tx/block/address hash. Try again, and check the developer tools console for more info." msgstr "" +#: lib/block_scout_web/templates/verified_contracts/index.html.eex:38 +#: lib/block_scout_web/views/verified_contracts_view.ex:12 +#, elixir-autogen, elixir-format +msgid "Yul" +msgstr "" + #: lib/block_scout_web/templates/address/overview.html.eex:111 #, elixir-autogen, elixir-format msgid "at" @@ -3541,12 +3505,22 @@ msgstr "" msgid "balance of the address" msgstr "" +#: lib/block_scout_web/templates/transaction/overview.html.eex:437 +#, elixir-autogen, elixir-format +msgid "burnt for this transaction. Equals Block Base Fee per Gas * Gas Used." +msgstr "" + +#: lib/block_scout_web/templates/block/overview.html.eex:215 +#, elixir-autogen, elixir-format +msgid "burnt from transactions included in the block (Base fee (per unit of gas) * Gas Used)." +msgstr "" + #: lib/block_scout_web/templates/address_contract/index.html.eex:27 #, elixir-autogen, elixir-format msgid "button" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:256 +#: lib/block_scout_web/templates/transaction/overview.html.eex:276 #, elixir-autogen, elixir-format msgid "created" msgstr "" @@ -3576,6 +3550,11 @@ msgstr "" msgid "false" msgstr "" +#: lib/block_scout_web/templates/csv_export/index.html.eex:14 +#, elixir-autogen, elixir-format +msgid "for address" +msgstr "" + #: lib/block_scout_web/templates/address_logs/_logs.html.eex:10 #: lib/block_scout_web/templates/transaction/_decoded_input.html.eex:12 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:10 @@ -3627,6 +3606,11 @@ msgstr "" msgid "string" msgstr "" +#: lib/block_scout_web/templates/csv_export/index.html.eex:17 +#, elixir-autogen, elixir-format +msgid "to CSV file" +msgstr "" + #: lib/block_scout_web/views/address_contract_view.ex:29 #, elixir-autogen, elixir-format msgid "true" @@ -3637,6 +3621,88 @@ msgstr "" msgid "truffle flattener" msgstr "" +#: lib/block_scout_web/templates/transaction/overview.html.eex:484 +#, elixir-autogen, elixir-format +msgid "Actual gas amount used by the transaction on L2." +msgstr "" + +#: lib/block_scout_web/templates/transaction/overview.html.eex:203 +#, elixir-autogen, elixir-format +msgid "Block number containing the transaction on L1." +msgstr "" + +#: lib/block_scout_web/templates/transaction/overview.html.eex:204 +#, elixir-autogen, elixir-format +msgid "L1 Block" +msgstr "" + +#: lib/block_scout_web/templates/transaction/overview.html.eex:523 +#: lib/block_scout_web/templates/transaction/overview.html.eex:524 +#, elixir-autogen, elixir-format +msgid "L1 Fee Scalar" +msgstr "" + +#: lib/block_scout_web/templates/transaction/overview.html.eex:512 +#: lib/block_scout_web/templates/transaction/overview.html.eex:513 +#, elixir-autogen, elixir-format +msgid "L1 Gas Price" +msgstr "" + +#: lib/block_scout_web/templates/transaction/overview.html.eex:501 +#: lib/block_scout_web/templates/transaction/overview.html.eex:502 +#, elixir-autogen, elixir-format +msgid "L1 Gas Used by Transaction" +msgstr "" + +#: lib/block_scout_web/templates/transaction/overview.html.eex:426 +#, elixir-autogen, elixir-format +msgid "L2 Gas Limit" +msgstr "" + +#: lib/block_scout_web/templates/transaction/overview.html.eex:400 +#, elixir-autogen, elixir-format +msgid "L2 Gas Price" +msgstr "" + +#: lib/block_scout_web/templates/transaction/overview.html.eex:485 +#, elixir-autogen, elixir-format +msgid "L2 Gas Used by Transaction" +msgstr "" + +#: lib/block_scout_web/templates/transaction/overview.html.eex:425 +#, elixir-autogen, elixir-format +msgid "Maximum gas amount approved for the transaction on L2." +msgstr "" + +#: lib/block_scout_web/templates/transaction/overview.html.eex:399 +#, elixir-autogen, elixir-format +msgid "Price per unit of gas specified by the sender on L2. Higher gas prices can prioritize transaction inclusion during times of high usage." +msgstr "" + +#: lib/block_scout_web/templates/address_withdrawal/index.html.eex:41 +#: lib/block_scout_web/templates/block_withdrawal/index.html.eex:32 +#: lib/block_scout_web/templates/withdrawal/index.html.eex:38 +#, elixir-autogen, elixir-format +msgid "Amount" +msgstr "" + +#: lib/block_scout_web/templates/withdrawal/_metatags.html.eex:2 +#, elixir-autogen, elixir-format +msgid "Beacon chain withdrawals - %{subnetwork} Explorer" +msgstr "" + +#: lib/block_scout_web/templates/withdrawal/_metatags.html.eex:7 +#, elixir-autogen, elixir-format +msgid "Beacon chain, Withdrawals, %{subnetwork}, %{coin}" +msgstr "" + +#: lib/block_scout_web/templates/address_withdrawal/index.html.eex:29 +#: lib/block_scout_web/templates/block_withdrawal/index.html.eex:23 +#: lib/block_scout_web/templates/withdrawal/index.html.eex:23 +#, elixir-autogen, elixir-format +msgid "Index" +msgstr "" + #: lib/block_scout_web/templates/address_contract_verification_via_standard_json_input/new.html.eex:9 #, elixir-autogen, elixir-format msgid "New Smart Contract Verification via Standard input JSON" @@ -3647,38 +3713,54 @@ msgstr "" msgid "New Smart Contract Verification via metadata JSON" msgstr "" +#: lib/block_scout_web/templates/layout/_footer.html.eex:31 +#, elixir-autogen, elixir-format +msgid "Telegram" +msgstr "" + +#: lib/block_scout_web/templates/transaction/overview.html.eex:225 +#, elixir-autogen, elixir-format +msgid "Transaction Action" +msgstr "" + +#: lib/block_scout_web/templates/address_withdrawal/index.html.eex:32 +#: lib/block_scout_web/templates/block_withdrawal/index.html.eex:26 +#: lib/block_scout_web/templates/withdrawal/index.html.eex:26 +#, elixir-autogen, elixir-format +msgid "Validator index" +msgstr "" + #: lib/block_scout_web/templates/withdrawal/index.html.eex:11 #, elixir-autogen, elixir-format msgid "%{withdrawals_count} withdrawals processed and %{withdrawals_sum} withdrawn." msgstr "" -#: lib/block_scout_web/templates/csv_export/index.html.eex:14 +#: lib/block_scout_web/templates/transaction/overview.html.eex:488 #, elixir-autogen, elixir-format -msgid "Export" +msgid "Actual gas amount used by the transaction." msgstr "" -#: lib/block_scout_web/templates/csv_export/index.html.eex:14 +#: lib/block_scout_web/templates/chain/show.html.eex:102 #, elixir-autogen, elixir-format -msgid "for address" +msgid "Average block time" msgstr "" -#: lib/block_scout_web/templates/csv_export/index.html.eex:17 +#: lib/block_scout_web/templates/transaction/overview.html.eex:404 #, elixir-autogen, elixir-format -msgid "to CSV file" +msgid "Gas Price" msgstr "" -#: lib/block_scout_web/templates/verified_contracts/index.html.eex:38 -#: lib/block_scout_web/views/verified_contracts_view.ex:12 +#: lib/block_scout_web/templates/transaction/overview.html.eex:489 #, elixir-autogen, elixir-format -msgid "Yul" +msgid "Gas Used by Transaction" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:437 +#: lib/block_scout_web/templates/transaction/overview.html.eex:429 #, elixir-autogen, elixir-format -msgid "burnt for this transaction. Equals Block Base Fee per Gas * Gas Used." +msgid "Maximum gas amount approved for the transaction." msgstr "" -#: lib/block_scout_web/templates/block/overview.html.eex:215 +#: lib/block_scout_web/templates/transaction/overview.html.eex:403 #, elixir-autogen, elixir-format -msgid "burnt from transactions included in the block (Base fee (per unit of gas) * Gas Used)." +msgid "Price per unit of gas specified by the sender. Higher gas prices can prioritize transaction inclusion during times of high usage." msgstr "" diff --git a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po index c36ed9283cf0..b6e1f7825b65 100644 --- a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po +++ b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po @@ -1,16 +1,15 @@ -#: lib/block_scout_web/views/address_token_balance_view.ex:10 -#, elixir-autogen, elixir-format -msgid "%{count} token" -msgid_plural "%{count} tokens" -msgstr[0] "" -msgstr[1] "" - -#: lib/block_scout_web/templates/block/_tile.html.eex:29 -#, elixir-autogen, elixir-format -msgid "%{count} transaction" -msgid_plural "%{count} transactions" -msgstr[0] "" -msgstr[1] "" +## "msgid"s in this file come from POT (.pot) files. +### +### Do not add, change, or remove "msgid"s manually here as +### they're tied to the ones in the corresponding POT file +### (with the same domain). +### +### Use "mix gettext.extract --merge" or "mix gettext.merge" +### to merge POT files into PO files. +msgid "" +msgstr "" +"Language: en\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: lib/block_scout_web/templates/common_components/_minimal_proxy_pattern.html.eex:9 #, elixir-autogen, elixir-format @@ -53,6 +52,20 @@ msgstr "" msgid "%{count} Transactions" msgstr "" +#: lib/block_scout_web/views/address_token_balance_view.ex:10 +#, elixir-autogen, elixir-format +msgid "%{count} token" +msgid_plural "%{count} tokens" +msgstr[0] "" +msgstr[1] "" + +#: lib/block_scout_web/templates/block/_tile.html.eex:29 +#, elixir-autogen, elixir-format +msgid "%{count} transaction" +msgid_plural "%{count} transactions" +msgstr[0] "" +msgstr[1] "" + #: lib/block_scout_web/templates/transaction/_actions.html.eex:101 #, elixir-autogen, elixir-format msgid "%{qty} of Token ID [%{link_to_id}]" @@ -68,7 +81,7 @@ msgstr "" msgid "%{subnetwork} Explorer - BlockScout" msgstr "" -#: lib/block_scout_web/views/transaction_view.ex:374 +#: lib/block_scout_web/views/transaction_view.ex:375 #, elixir-autogen, elixir-format msgid "(Awaiting internal transactions for status)" msgstr "" @@ -199,11 +212,6 @@ msgstr "" msgid "Actions" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:451 -#, elixir-autogen, elixir-format -msgid "Actual gas amount used by the transaction." -msgstr "" - #: lib/block_scout_web/templates/account/api_key/form.html.eex:7 #: lib/block_scout_web/templates/account/custom_abi/form.html.eex:8 #: lib/block_scout_web/templates/layout/_add_chain_to_mm.html.eex:10 @@ -270,12 +278,12 @@ msgstr "" msgid "Address" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:243 +#: lib/block_scout_web/templates/transaction/overview.html.eex:263 #, elixir-autogen, elixir-format msgid "Address (external or contract) receiving the transaction." msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:225 +#: lib/block_scout_web/templates/transaction/overview.html.eex:245 #, elixir-autogen, elixir-format msgid "Address (external or contract) sending the transaction." msgstr "" @@ -346,14 +354,7 @@ msgstr "" msgid "All tokens in the account and total value." msgstr "" -#: lib/block_scout_web/templates/address_withdrawal/index.html.eex:41 -#: lib/block_scout_web/templates/block_withdrawal/index.html.eex:32 -#: lib/block_scout_web/templates/withdrawal/index.html.eex:38 -#, elixir-autogen, elixir-format -msgid "Amount" -msgstr "" - -#: lib/block_scout_web/templates/transaction/overview.html.eex:437 +#: lib/block_scout_web/templates/transaction/overview.html.eex:469 #, elixir-autogen, elixir-format msgid "Amount of" msgstr "" @@ -383,11 +384,6 @@ msgstr "" msgid "Average" msgstr "" -#: lib/block_scout_web/templates/chain/show.html.eex:101 -#, elixir-autogen, elixir-format -msgid "Average block time" -msgstr "" - #: lib/block_scout_web/templates/account/api_key/form.html.eex:25 #, elixir-autogen, elixir-format msgid "Back to API keys (Cancel)" @@ -455,17 +451,7 @@ msgstr "" msgid "Base URL:" msgstr "" -#: lib/block_scout_web/templates/withdrawal/_metatags.html.eex:2 -#, elixir-autogen, elixir-format -msgid "Beacon chain withdrawals - %{subnetwork} Explorer" -msgstr "" - -#: lib/block_scout_web/templates/withdrawal/_metatags.html.eex:7 -#, elixir-autogen, elixir-format -msgid "Beacon chain, Withdrawals, %{subnetwork}, %{coin}" -msgstr "" - -#: lib/block_scout_web/templates/transaction/overview.html.eex:472 +#: lib/block_scout_web/templates/transaction/overview.html.eex:545 #, elixir-autogen, elixir-format msgid "Binary data included with the transaction. See input / logs below for additional info." msgstr "" @@ -541,7 +527,7 @@ msgstr "" msgid "Blockchain" msgstr "" -#: lib/block_scout_web/templates/chain/show.html.eex:154 +#: lib/block_scout_web/templates/chain/show.html.eex:156 #: lib/block_scout_web/templates/layout/_topnav.html.eex:34 #: lib/block_scout_web/templates/layout/_topnav.html.eex:38 #, elixir-autogen, elixir-format @@ -698,7 +684,7 @@ msgstr "" msgid "Compiler version" msgstr "" -#: lib/block_scout_web/views/transaction_view.ex:367 +#: lib/block_scout_web/views/transaction_view.ex:368 #, elixir-autogen, elixir-format msgid "Confirmed" msgstr "" @@ -758,7 +744,7 @@ msgid "Constructor args" msgstr "" #: lib/block_scout_web/templates/tokens/overview/_details.html.eex:52 -#: lib/block_scout_web/templates/transaction/overview.html.eex:253 +#: lib/block_scout_web/templates/transaction/overview.html.eex:273 #, elixir-autogen, elixir-format msgid "Contract" msgstr "" @@ -783,12 +769,12 @@ msgstr "" msgid "Contract Address Pending" msgstr "" -#: lib/block_scout_web/views/transaction_view.ex:483 +#: lib/block_scout_web/views/transaction_view.ex:497 #, elixir-autogen, elixir-format msgid "Contract Call" msgstr "" -#: lib/block_scout_web/views/transaction_view.ex:480 +#: lib/block_scout_web/views/transaction_view.ex:494 #, elixir-autogen, elixir-format msgid "Contract Creation" msgstr "" @@ -909,8 +895,8 @@ msgstr "" #: lib/block_scout_web/templates/account/watchlist_address/row.html.eex:7 #: lib/block_scout_web/templates/transaction/_total_transfers_from_to.html.eex:17 #: lib/block_scout_web/templates/transaction/_total_transfers_from_to.html.eex:18 -#: lib/block_scout_web/templates/transaction/overview.html.eex:233 -#: lib/block_scout_web/templates/transaction/overview.html.eex:234 +#: lib/block_scout_web/templates/transaction/overview.html.eex:253 +#: lib/block_scout_web/templates/transaction/overview.html.eex:254 #, elixir-autogen, elixir-format msgid "Copy From Address" msgstr "" @@ -945,10 +931,10 @@ msgstr "" #: lib/block_scout_web/templates/transaction/_total_transfers_from_to.html.eex:34 #: lib/block_scout_web/templates/transaction/_total_transfers_from_to.html.eex:35 -#: lib/block_scout_web/templates/transaction/overview.html.eex:260 -#: lib/block_scout_web/templates/transaction/overview.html.eex:261 -#: lib/block_scout_web/templates/transaction/overview.html.eex:268 -#: lib/block_scout_web/templates/transaction/overview.html.eex:269 +#: lib/block_scout_web/templates/transaction/overview.html.eex:280 +#: lib/block_scout_web/templates/transaction/overview.html.eex:281 +#: lib/block_scout_web/templates/transaction/overview.html.eex:288 +#: lib/block_scout_web/templates/transaction/overview.html.eex:289 #, elixir-autogen, elixir-format msgid "Copy To Address" msgstr "" @@ -969,20 +955,20 @@ msgstr "" msgid "Copy Txn Hash" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:498 +#: lib/block_scout_web/templates/transaction/overview.html.eex:571 #, elixir-autogen, elixir-format msgid "Copy Txn Hex Input" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:504 +#: lib/block_scout_web/templates/transaction/overview.html.eex:577 #, elixir-autogen, elixir-format msgid "Copy Txn UTF-8 Input" msgstr "" #: lib/block_scout_web/templates/log/_data_decoded_view.html.eex:20 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:41 -#: lib/block_scout_web/templates/transaction/overview.html.eex:497 -#: lib/block_scout_web/templates/transaction/overview.html.eex:503 +#: lib/block_scout_web/templates/transaction/overview.html.eex:570 +#: lib/block_scout_web/templates/transaction/overview.html.eex:576 #: lib/block_scout_web/templates/transaction_raw_trace/_card_body.html.eex:8 #, elixir-autogen, elixir-format msgid "Copy Value" @@ -1292,12 +1278,12 @@ msgstr "" msgid "Error trying to fetch balances." msgstr "" -#: lib/block_scout_web/views/transaction_view.ex:378 +#: lib/block_scout_web/views/transaction_view.ex:379 #, elixir-autogen, elixir-format msgid "Error: %{reason}" msgstr "" -#: lib/block_scout_web/views/transaction_view.ex:376 +#: lib/block_scout_web/views/transaction_view.ex:377 #, elixir-autogen, elixir-format msgid "Error: (Awaiting internal transactions for reason)" msgstr "" @@ -1329,6 +1315,11 @@ msgstr "" msgid "Expand" msgstr "" +#: lib/block_scout_web/templates/csv_export/index.html.eex:14 +#, elixir-autogen, elixir-format +msgid "Export" +msgstr "" + #: lib/block_scout_web/templates/csv_export/index.html.eex:10 #, elixir-autogen, elixir-format msgid "Export Data" @@ -1411,7 +1402,7 @@ msgstr "" #: lib/block_scout_web/templates/address_internal_transaction/index.html.eex:38 #: lib/block_scout_web/templates/address_token_transfer/index.html.eex:40 #: lib/block_scout_web/templates/address_transaction/index.html.eex:34 -#: lib/block_scout_web/templates/transaction/overview.html.eex:226 +#: lib/block_scout_web/templates/transaction/overview.html.eex:246 #: lib/block_scout_web/views/address_internal_transaction_view.ex:10 #: lib/block_scout_web/views/address_token_transfer_view.ex:10 #: lib/block_scout_web/views/address_transaction_view.ex:10 @@ -1426,16 +1417,11 @@ msgstr "" #: lib/block_scout_web/templates/block/_tile.html.eex:67 #: lib/block_scout_web/templates/block/overview.html.eex:187 -#: lib/block_scout_web/templates/transaction/overview.html.eex:399 +#: lib/block_scout_web/templates/transaction/overview.html.eex:430 #, elixir-autogen, elixir-format msgid "Gas Limit" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:379 -#, elixir-autogen, elixir-format -msgid "Gas Price" -msgstr "" - #: lib/block_scout_web/templates/address/overview.html.eex:240 #: lib/block_scout_web/templates/block/_tile.html.eex:73 #: lib/block_scout_web/templates/block/overview.html.eex:178 @@ -1443,11 +1429,6 @@ msgstr "" msgid "Gas Used" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:452 -#, elixir-autogen, elixir-format -msgid "Gas Used by Transaction" -msgstr "" - #: lib/block_scout_web/templates/chain/gas_price_oracle_legend_item.html.eex:3 #: lib/block_scout_web/templates/chain/gas_price_oracle_legend_item.html.eex:18 #, elixir-autogen, elixir-format @@ -1495,13 +1476,13 @@ msgstr "" msgid "Hash" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:480 -#: lib/block_scout_web/templates/transaction/overview.html.eex:484 +#: lib/block_scout_web/templates/transaction/overview.html.eex:553 +#: lib/block_scout_web/templates/transaction/overview.html.eex:557 #, elixir-autogen, elixir-format msgid "Hex (Default)" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:204 +#: lib/block_scout_web/templates/transaction/overview.html.eex:224 #, elixir-autogen, elixir-format msgid "Highlighted events of the transaction." msgstr "" @@ -1560,14 +1541,7 @@ msgstr "" msgid "Incoming" msgstr "" -#: lib/block_scout_web/templates/address_withdrawal/index.html.eex:29 -#: lib/block_scout_web/templates/block_withdrawal/index.html.eex:23 -#: lib/block_scout_web/templates/withdrawal/index.html.eex:23 -#, elixir-autogen, elixir-format -msgid "Index" -msgstr "" - -#: lib/block_scout_web/templates/transaction/overview.html.eex:464 +#: lib/block_scout_web/templates/transaction/overview.html.eex:537 #, elixir-autogen, elixir-format msgid "Index position of Transaction in the block." msgstr "" @@ -1587,7 +1561,7 @@ msgstr "" msgid "Input" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:245 +#: lib/block_scout_web/templates/transaction/overview.html.eex:265 #, elixir-autogen, elixir-format msgid "Interacted With (To)" msgstr "" @@ -1602,7 +1576,7 @@ msgstr "" #: lib/block_scout_web/templates/transaction/_tabs.html.eex:11 #: lib/block_scout_web/templates/transaction_internal_transaction/index.html.eex:6 #: lib/block_scout_web/views/address_view.ex:376 -#: lib/block_scout_web/views/transaction_view.ex:538 +#: lib/block_scout_web/views/transaction_view.ex:552 #, elixir-autogen, elixir-format msgid "Internal Transactions" msgstr "" @@ -1662,22 +1636,22 @@ msgstr "" msgid "License ID" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:331 +#: lib/block_scout_web/templates/transaction/overview.html.eex:351 #, elixir-autogen, elixir-format msgid "List of ERC-1155 tokens created in the transaction." msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:315 +#: lib/block_scout_web/templates/transaction/overview.html.eex:335 #, elixir-autogen, elixir-format msgid "List of token burnt in the transaction." msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:298 +#: lib/block_scout_web/templates/transaction/overview.html.eex:318 #, elixir-autogen, elixir-format msgid "List of token minted in the transaction." msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:282 +#: lib/block_scout_web/templates/transaction/overview.html.eex:302 #, elixir-autogen, elixir-format msgid "List of token transferred in the transaction." msgstr "" @@ -1719,7 +1693,7 @@ msgstr "" #: lib/block_scout_web/templates/transaction/_tabs.html.eex:17 #: lib/block_scout_web/templates/transaction_log/index.html.eex:8 #: lib/block_scout_web/views/address_view.ex:387 -#: lib/block_scout_web/views/transaction_view.ex:539 +#: lib/block_scout_web/views/transaction_view.ex:553 #, elixir-autogen, elixir-format msgid "Logs" msgstr "" @@ -1742,27 +1716,22 @@ msgstr "" msgid "Market cap" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:408 +#: lib/block_scout_web/templates/transaction/overview.html.eex:440 #, elixir-autogen, elixir-format msgid "Max Fee per Gas" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:418 +#: lib/block_scout_web/templates/transaction/overview.html.eex:450 #, elixir-autogen, elixir-format msgid "Max Priority Fee per Gas" msgstr "" -#: lib/block_scout_web/views/transaction_view.ex:330 +#: lib/block_scout_web/views/transaction_view.ex:331 #, elixir-autogen, elixir-format msgid "Max of" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:398 -#, elixir-autogen, elixir-format -msgid "Maximum gas amount approved for the transaction." -msgstr "" - -#: lib/block_scout_web/templates/transaction/overview.html.eex:407 +#: lib/block_scout_web/templates/transaction/overview.html.eex:439 #, elixir-autogen, elixir-format msgid "Maximum total amount per unit of gas a user is willing to pay for a transaction, including base fee and priority fee." msgstr "" @@ -1824,7 +1793,7 @@ msgid "More internal transactions have come in" msgstr "" #: lib/block_scout_web/templates/address_transaction/index.html.eex:46 -#: lib/block_scout_web/templates/chain/show.html.eex:217 +#: lib/block_scout_web/templates/chain/show.html.eex:219 #: lib/block_scout_web/templates/pending_transaction/index.html.eex:13 #: lib/block_scout_web/templates/transaction/index.html.eex:19 #, elixir-autogen, elixir-format @@ -1904,6 +1873,16 @@ msgstr "" msgid "New Smart Contract Verification" msgstr "" +#: lib/block_scout_web/templates/address_contract_verification_via_standard_json_input/new.html.eex:9 +#, elixir-autogen, elixir-format +msgid "New Smart Contract Verification via Standard input JSON" +msgstr "" + +#: lib/block_scout_web/templates/address_contract_verification_via_json/new.html.eex:5 +#, elixir-autogen, elixir-format +msgid "New Smart Contract Verification via metadata JSON" +msgstr "" + #: lib/block_scout_web/templates/address_contract_verification_via_flattened_code/new.html.eex:9 #: lib/block_scout_web/templates/address_contract_verification_via_multi_part_files/new.html.eex:7 #, elixir-autogen, elixir-format @@ -1944,7 +1923,7 @@ msgid "No trace entries found." msgstr "" #: lib/block_scout_web/templates/block/overview.html.eex:196 -#: lib/block_scout_web/templates/transaction/overview.html.eex:462 +#: lib/block_scout_web/templates/transaction/overview.html.eex:535 #, elixir-autogen, elixir-format msgid "Nonce" msgstr "" @@ -2065,7 +2044,8 @@ msgstr "" #: lib/block_scout_web/templates/layout/_topnav.html.eex:63 #: lib/block_scout_web/views/transaction_view.ex:373 -#: lib/block_scout_web/views/transaction_view.ex:412 +#: lib/block_scout_web/views/transaction_view.ex:419 +#: lib/block_scout_web/views/transaction_view.ex:427 #, elixir-autogen, elixir-format msgid "Pending" msgstr "" @@ -2097,7 +2077,7 @@ msgstr "" msgid "Please select what types of notifications you will receive:" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:464 +#: lib/block_scout_web/templates/transaction/overview.html.eex:537 #, elixir-autogen, elixir-format msgid "Position" msgstr "" @@ -2134,13 +2114,8 @@ msgstr "" msgid "Price per token on the exchanges" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:378 -#, elixir-autogen, elixir-format -msgid "Price per unit of gas specified by the sender. Higher gas prices can prioritize transaction inclusion during times of high usage." -msgstr "" - #: lib/block_scout_web/templates/block/overview.html.eex:225 -#: lib/block_scout_web/templates/transaction/overview.html.eex:428 +#: lib/block_scout_web/templates/transaction/overview.html.eex:460 #, elixir-autogen, elixir-format msgid "Priority Fee / Tip" msgstr "" @@ -2194,14 +2169,14 @@ msgstr "" msgid "RPC" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:473 +#: lib/block_scout_web/templates/transaction/overview.html.eex:546 #, elixir-autogen, elixir-format msgid "Raw Input" msgstr "" #: lib/block_scout_web/templates/transaction/_tabs.html.eex:24 #: lib/block_scout_web/templates/transaction_raw_trace/_card_body.html.eex:1 -#: lib/block_scout_web/views/transaction_view.ex:540 +#: lib/block_scout_web/views/transaction_view.ex:554 #, elixir-autogen, elixir-format msgid "Raw Trace" msgstr "" @@ -2319,7 +2294,7 @@ msgstr "" msgid "Save" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:206 +#: lib/block_scout_web/templates/transaction/overview.html.eex:226 #, elixir-autogen, elixir-format msgid "Scroll to see more" msgstr "" @@ -2459,7 +2434,7 @@ msgstr "" #: lib/block_scout_web/templates/address_withdrawal/index.html.eex:20 #: lib/block_scout_web/templates/block_transaction/index.html.eex:14 #: lib/block_scout_web/templates/block_withdrawal/index.html.eex:14 -#: lib/block_scout_web/templates/chain/show.html.eex:158 +#: lib/block_scout_web/templates/chain/show.html.eex:160 #: lib/block_scout_web/templates/pending_transaction/index.html.eex:18 #: lib/block_scout_web/templates/tokens/holder/index.html.eex:24 #: lib/block_scout_web/templates/tokens/instance/holder/index.html.eex:23 @@ -2477,7 +2452,7 @@ msgstr "" msgid "Something went wrong, click to reload." msgstr "" -#: lib/block_scout_web/templates/chain/show.html.eex:223 +#: lib/block_scout_web/templates/chain/show.html.eex:225 #, elixir-autogen, elixir-format msgid "Something went wrong, click to retry." msgstr "" @@ -2514,7 +2489,7 @@ msgstr "" #: lib/block_scout_web/templates/transaction/_tabs.html.eex:29 #: lib/block_scout_web/templates/transaction_state/index.html.eex:6 -#: lib/block_scout_web/views/transaction_view.ex:541 +#: lib/block_scout_web/views/transaction_view.ex:555 #, elixir-autogen, elixir-format msgid "State changes" msgstr "" @@ -2540,7 +2515,7 @@ msgid "Submit an Issue" msgstr "" #: lib/block_scout_web/templates/transaction/_emission_reward_tile.html.eex:8 -#: lib/block_scout_web/views/transaction_view.ex:375 +#: lib/block_scout_web/views/transaction_view.ex:376 #, elixir-autogen, elixir-format msgid "Success" msgstr "" @@ -2551,11 +2526,6 @@ msgstr "" msgid "TX Fee" msgstr "" -#: lib/block_scout_web/templates/layout/_footer.html.eex:31 -#, elixir-autogen, elixir-format -msgid "Telegram" -msgstr "" - #: lib/block_scout_web/templates/layout/_footer.html.eex:67 #, elixir-autogen, elixir-format msgid "Test Networks" @@ -2816,7 +2786,7 @@ msgstr "" #: lib/block_scout_web/templates/address_token_transfer/index.html.eex:34 #: lib/block_scout_web/templates/address_transaction/index.html.eex:28 #: lib/block_scout_web/templates/block_withdrawal/index.html.eex:29 -#: lib/block_scout_web/templates/transaction/overview.html.eex:247 +#: lib/block_scout_web/templates/transaction/overview.html.eex:267 #: lib/block_scout_web/templates/withdrawal/index.html.eex:32 #: lib/block_scout_web/views/address_internal_transaction_view.ex:9 #: lib/block_scout_web/views/address_token_transfer_view.ex:9 @@ -2849,13 +2819,13 @@ msgid "Token" msgstr "" #: lib/block_scout_web/templates/common_components/_token_transfer_type_display_name.html.eex:3 -#: lib/block_scout_web/views/transaction_view.ex:474 +#: lib/block_scout_web/views/transaction_view.ex:488 #, elixir-autogen, elixir-format msgid "Token Burning" msgstr "" #: lib/block_scout_web/templates/common_components/_token_transfer_type_display_name.html.eex:7 -#: lib/block_scout_web/views/transaction_view.ex:475 +#: lib/block_scout_web/views/transaction_view.ex:489 #, elixir-autogen, elixir-format msgid "Token Creation" msgstr "" @@ -2883,14 +2853,14 @@ msgid "Token ID" msgstr "" #: lib/block_scout_web/templates/common_components/_token_transfer_type_display_name.html.eex:5 -#: lib/block_scout_web/views/transaction_view.ex:473 +#: lib/block_scout_web/views/transaction_view.ex:487 #, elixir-autogen, elixir-format msgid "Token Minting" msgstr "" #: lib/block_scout_web/templates/common_components/_token_transfer_type_display_name.html.eex:9 #: lib/block_scout_web/templates/common_components/_token_transfer_type_display_name.html.eex:11 -#: lib/block_scout_web/views/transaction_view.ex:476 +#: lib/block_scout_web/views/transaction_view.ex:490 #, elixir-autogen, elixir-format msgid "Token Transfer" msgstr "" @@ -2906,7 +2876,7 @@ msgstr "" #: lib/block_scout_web/views/address_view.ex:378 #: lib/block_scout_web/views/tokens/instance/overview_view.ex:114 #: lib/block_scout_web/views/tokens/overview_view.ex:40 -#: lib/block_scout_web/views/transaction_view.ex:537 +#: lib/block_scout_web/views/transaction_view.ex:551 #, elixir-autogen, elixir-format msgid "Token Transfers" msgstr "" @@ -2932,22 +2902,22 @@ msgstr "" msgid "Tokens" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:316 +#: lib/block_scout_web/templates/transaction/overview.html.eex:336 #, elixir-autogen, elixir-format msgid "Tokens Burnt" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:332 +#: lib/block_scout_web/templates/transaction/overview.html.eex:352 #, elixir-autogen, elixir-format msgid "Tokens Created" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:299 +#: lib/block_scout_web/templates/transaction/overview.html.eex:319 #, elixir-autogen, elixir-format msgid "Tokens Minted" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:283 +#: lib/block_scout_web/templates/transaction/overview.html.eex:303 #, elixir-autogen, elixir-format msgid "Tokens Transferred" msgstr "" @@ -2989,7 +2959,7 @@ msgstr "" msgid "Total Supply * Price" msgstr "" -#: lib/block_scout_web/templates/chain/show.html.eex:131 +#: lib/block_scout_web/templates/chain/show.html.eex:133 #, elixir-autogen, elixir-format msgid "Total blocks" msgstr "" @@ -3009,12 +2979,12 @@ msgstr "" msgid "Total supply" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:363 +#: lib/block_scout_web/templates/transaction/overview.html.eex:383 #, elixir-autogen, elixir-format msgid "Total transaction fee." msgstr "" -#: lib/block_scout_web/templates/chain/show.html.eex:110 +#: lib/block_scout_web/templates/chain/show.html.eex:112 #, elixir-autogen, elixir-format msgid "Total transactions" msgstr "" @@ -3022,7 +2992,7 @@ msgstr "" #: lib/block_scout_web/templates/account/tag_transaction/form.html.eex:11 #: lib/block_scout_web/templates/account/tag_transaction/index.html.eex:23 #: lib/block_scout_web/templates/address_logs/_logs.html.eex:19 -#: lib/block_scout_web/views/transaction_view.ex:486 +#: lib/block_scout_web/views/transaction_view.ex:500 #, elixir-autogen, elixir-format msgid "Transaction" msgstr "" @@ -3037,12 +3007,7 @@ msgstr "" msgid "Transaction %{transaction}, %{subnetwork} %{transaction}" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:205 -#, elixir-autogen, elixir-format -msgid "Transaction Action" -msgstr "" - -#: lib/block_scout_web/templates/transaction/overview.html.eex:438 +#: lib/block_scout_web/templates/transaction/overview.html.eex:470 #, elixir-autogen, elixir-format msgid "Transaction Burnt Fee" msgstr "" @@ -3052,7 +3017,7 @@ msgstr "" msgid "Transaction Details" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:364 +#: lib/block_scout_web/templates/transaction/overview.html.eex:384 #, elixir-autogen, elixir-format msgid "Transaction Fee" msgstr "" @@ -3075,17 +3040,17 @@ msgstr "" msgid "Transaction Tags" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:388 +#: lib/block_scout_web/templates/transaction/overview.html.eex:414 #, elixir-autogen, elixir-format msgid "Transaction Type" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:461 +#: lib/block_scout_web/templates/transaction/overview.html.eex:534 #, elixir-autogen, elixir-format msgid "Transaction number from the sending address. Each transaction sent from an address increments the nonce by 1." msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:387 +#: lib/block_scout_web/templates/transaction/overview.html.eex:413 #, elixir-autogen, elixir-format msgid "Transaction type, introduced in EIP-2718." msgstr "" @@ -3098,7 +3063,7 @@ msgstr "" #: lib/block_scout_web/templates/address_transaction/index.html.eex:13 #: lib/block_scout_web/templates/block/_tabs.html.eex:4 #: lib/block_scout_web/templates/block/overview.html.eex:80 -#: lib/block_scout_web/templates/chain/show.html.eex:214 +#: lib/block_scout_web/templates/chain/show.html.eex:216 #: lib/block_scout_web/templates/layout/_topnav.html.eex:49 #: lib/block_scout_web/views/address_view.ex:377 #, elixir-autogen, elixir-format @@ -3161,7 +3126,7 @@ msgstr "" msgid "UML diagram" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:487 +#: lib/block_scout_web/templates/transaction/overview.html.eex:560 #, elixir-autogen, elixir-format msgid "UTF-8" msgstr "" @@ -3177,7 +3142,7 @@ msgstr "" msgid "Uncles" msgstr "" -#: lib/block_scout_web/views/transaction_view.ex:366 +#: lib/block_scout_web/views/transaction_view.ex:367 #, elixir-autogen, elixir-format msgid "Unconfirmed" msgstr "" @@ -3198,12 +3163,12 @@ msgstr "" msgid "Update" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:417 +#: lib/block_scout_web/templates/transaction/overview.html.eex:449 #, elixir-autogen, elixir-format msgid "User defined maximum fee (tip) per unit of gas paid to validator for transaction prioritization." msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:427 +#: lib/block_scout_web/templates/transaction/overview.html.eex:459 #, elixir-autogen, elixir-format msgid "User-defined tip sent to validator for transaction priority/inclusion." msgstr "" @@ -3238,19 +3203,12 @@ msgstr "" msgid "Validator Name" msgstr "" -#: lib/block_scout_web/templates/address_withdrawal/index.html.eex:32 -#: lib/block_scout_web/templates/block_withdrawal/index.html.eex:26 -#: lib/block_scout_web/templates/withdrawal/index.html.eex:26 -#, elixir-autogen, elixir-format -msgid "Validator index" -msgstr "" - -#: lib/block_scout_web/templates/transaction/overview.html.eex:349 +#: lib/block_scout_web/templates/transaction/overview.html.eex:369 #, elixir-autogen, elixir-format msgid "Value" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:348 +#: lib/block_scout_web/templates/transaction/overview.html.eex:368 #, elixir-autogen, elixir-format msgid "Value sent in the native token (and USD) if applicable." msgstr "" @@ -3339,12 +3297,12 @@ msgstr "" msgid "Via multi-part files" msgstr "" -#: lib/block_scout_web/templates/chain/show.html.eex:153 +#: lib/block_scout_web/templates/chain/show.html.eex:155 #, elixir-autogen, elixir-format msgid "View All Blocks" msgstr "" -#: lib/block_scout_web/templates/chain/show.html.eex:213 +#: lib/block_scout_web/templates/chain/show.html.eex:215 #, elixir-autogen, elixir-format msgid "View All Transactions" msgstr "" @@ -3422,7 +3380,7 @@ msgstr "" msgid "Waiting for transaction's confirmation..." msgstr "" -#: lib/block_scout_web/templates/chain/show.html.eex:139 +#: lib/block_scout_web/templates/chain/show.html.eex:141 #, elixir-autogen, elixir-format msgid "Wallet addresses" msgstr "" @@ -3531,6 +3489,12 @@ msgstr "" msgid "Your request contained an error, perhaps a mistyped tx/block/address hash. Try again, and check the developer tools console for more info." msgstr "" +#: lib/block_scout_web/templates/verified_contracts/index.html.eex:38 +#: lib/block_scout_web/views/verified_contracts_view.ex:12 +#, elixir-autogen, elixir-format +msgid "Yul" +msgstr "" + #: lib/block_scout_web/templates/address/overview.html.eex:111 #, elixir-autogen, elixir-format msgid "at" @@ -3541,12 +3505,22 @@ msgstr "" msgid "balance of the address" msgstr "" +#: lib/block_scout_web/templates/transaction/overview.html.eex:437 +#, elixir-autogen, elixir-format +msgid "burnt for this transaction. Equals Block Base Fee per Gas * Gas Used." +msgstr "" + +#: lib/block_scout_web/templates/block/overview.html.eex:215 +#, elixir-autogen, elixir-format +msgid "burnt from transactions included in the block (Base fee (per unit of gas) * Gas Used)." +msgstr "" + #: lib/block_scout_web/templates/address_contract/index.html.eex:27 #, elixir-autogen, elixir-format msgid "button" msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:256 +#: lib/block_scout_web/templates/transaction/overview.html.eex:276 #, elixir-autogen, elixir-format msgid "created" msgstr "" @@ -3576,6 +3550,11 @@ msgstr "" msgid "false" msgstr "" +#: lib/block_scout_web/templates/csv_export/index.html.eex:14 +#, elixir-autogen, elixir-format +msgid "for address" +msgstr "" + #: lib/block_scout_web/templates/address_logs/_logs.html.eex:10 #: lib/block_scout_web/templates/transaction/_decoded_input.html.eex:12 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:10 @@ -3627,6 +3606,11 @@ msgstr "" msgid "string" msgstr "" +#: lib/block_scout_web/templates/csv_export/index.html.eex:17 +#, elixir-autogen, elixir-format +msgid "to CSV file" +msgstr "" + #: lib/block_scout_web/views/address_contract_view.ex:29 #, elixir-autogen, elixir-format msgid "true" @@ -3637,48 +3621,129 @@ msgstr "" msgid "truffle flattener" msgstr "" -#: lib/block_scout_web/templates/address_contract_verification_via_standard_json_input/new.html.eex:9 +#: lib/block_scout_web/templates/transaction/overview.html.eex:484 +#, elixir-autogen, elixir-format +msgid "Actual gas amount used by the transaction on L2." +msgstr "" + +#: lib/block_scout_web/templates/transaction/overview.html.eex:203 #, elixir-autogen, elixir-format, fuzzy -msgid "New Smart Contract Verification via Standard input JSON" +msgid "Block number containing the transaction on L1." msgstr "" -#: lib/block_scout_web/templates/address_contract_verification_via_json/new.html.eex:5 +#: lib/block_scout_web/templates/transaction/overview.html.eex:204 #, elixir-autogen, elixir-format, fuzzy -msgid "New Smart Contract Verification via metadata JSON" +msgid "L1 Block" msgstr "" -#: lib/block_scout_web/templates/withdrawal/index.html.eex:11 +#: lib/block_scout_web/templates/transaction/overview.html.eex:523 +#: lib/block_scout_web/templates/transaction/overview.html.eex:524 +#, elixir-autogen, elixir-format +msgid "L1 Fee Scalar" +msgstr "" + +#: lib/block_scout_web/templates/transaction/overview.html.eex:512 +#: lib/block_scout_web/templates/transaction/overview.html.eex:513 #, elixir-autogen, elixir-format, fuzzy -msgid "%{withdrawals_count} withdrawals processed and %{withdrawals_sum} withdrawn." +msgid "L1 Gas Price" msgstr "" -#: lib/block_scout_web/templates/csv_export/index.html.eex:14 +#: lib/block_scout_web/templates/transaction/overview.html.eex:501 +#: lib/block_scout_web/templates/transaction/overview.html.eex:502 +#, elixir-autogen, elixir-format +msgid "L1 Gas Used by Transaction" +msgstr "" + +#: lib/block_scout_web/templates/transaction/overview.html.eex:426 #, elixir-autogen, elixir-format, fuzzy -msgid "Export" +msgid "L2 Gas Limit" msgstr "" -#: lib/block_scout_web/templates/csv_export/index.html.eex:14 +#: lib/block_scout_web/templates/transaction/overview.html.eex:400 #, elixir-autogen, elixir-format, fuzzy -msgid "for address" +msgid "L2 Gas Price" msgstr "" -#: lib/block_scout_web/templates/csv_export/index.html.eex:17 +#: lib/block_scout_web/templates/transaction/overview.html.eex:485 #, elixir-autogen, elixir-format -msgid "to CSV file" +msgid "L2 Gas Used by Transaction" msgstr "" -#: lib/block_scout_web/templates/verified_contracts/index.html.eex:38 -#: lib/block_scout_web/views/verified_contracts_view.ex:12 +#: lib/block_scout_web/templates/transaction/overview.html.eex:425 #, elixir-autogen, elixir-format -msgid "Yul" +msgid "Maximum gas amount approved for the transaction on L2." msgstr "" -#: lib/block_scout_web/templates/transaction/overview.html.eex:437 +#: lib/block_scout_web/templates/transaction/overview.html.eex:399 +#, elixir-autogen, elixir-format +msgid "Price per unit of gas specified by the sender on L2. Higher gas prices can prioritize transaction inclusion during times of high usage." +msgstr "" + +#: lib/block_scout_web/templates/address_withdrawal/index.html.eex:41 +#: lib/block_scout_web/templates/block_withdrawal/index.html.eex:32 +#: lib/block_scout_web/templates/withdrawal/index.html.eex:38 #, elixir-autogen, elixir-format, fuzzy -msgid "burnt for this transaction. Equals Block Base Fee per Gas * Gas Used." +msgid "Amount" msgstr "" -#: lib/block_scout_web/templates/block/overview.html.eex:215 +#: lib/block_scout_web/templates/withdrawal/_metatags.html.eex:2 +#, elixir-autogen, elixir-format +msgid "Beacon chain withdrawals - %{subnetwork} Explorer" +msgstr "" + +#: lib/block_scout_web/templates/withdrawal/_metatags.html.eex:7 +#, elixir-autogen, elixir-format +msgid "Beacon chain, Withdrawals, %{subnetwork}, %{coin}" +msgstr "" + +#: lib/block_scout_web/templates/layout/_footer.html.eex:31 +#, elixir-autogen, elixir-format +msgid "Telegram" +msgstr "" + +#: lib/block_scout_web/templates/transaction/overview.html.eex:225 #, elixir-autogen, elixir-format, fuzzy -msgid "burnt from transactions included in the block (Base fee (per unit of gas) * Gas Used)." +msgid "Transaction Action" +msgstr "" + +#: lib/block_scout_web/templates/address_withdrawal/index.html.eex:32 +#: lib/block_scout_web/templates/block_withdrawal/index.html.eex:26 +#: lib/block_scout_web/templates/withdrawal/index.html.eex:26 +#, elixir-autogen, elixir-format, fuzzy +msgid "Validator index" +msgstr "" + +#: lib/block_scout_web/templates/withdrawal/index.html.eex:11 +#, elixir-autogen, elixir-format +msgid "%{withdrawals_count} withdrawals processed and %{withdrawals_sum} withdrawn." +msgstr "" + +#: lib/block_scout_web/templates/transaction/overview.html.eex:488 +#, elixir-autogen, elixir-format, fuzzy +msgid "Actual gas amount used by the transaction." +msgstr "" + +#: lib/block_scout_web/templates/chain/show.html.eex:102 +#, elixir-autogen, elixir-format +msgid "Average block time" +msgstr "" + +#: lib/block_scout_web/templates/transaction/overview.html.eex:404 +#, elixir-autogen, elixir-format, fuzzy +msgid "Gas Price" +msgstr "" + +#: lib/block_scout_web/templates/transaction/overview.html.eex:489 +#, elixir-autogen, elixir-format, fuzzy +msgid "Gas Used by Transaction" +msgstr "" + +#: lib/block_scout_web/templates/transaction/overview.html.eex:429 +#, elixir-autogen, elixir-format, fuzzy +msgid "Maximum gas amount approved for the transaction." +msgstr "" + +#: lib/block_scout_web/templates/transaction/overview.html.eex:403 +#, elixir-autogen, elixir-format, fuzzy +msgid "Price per unit of gas specified by the sender. Higher gas prices can prioritize transaction inclusion during times of high usage." msgstr "" diff --git a/apps/block_scout_web/test/block_scout_web/chain_test.exs b/apps/block_scout_web/test/block_scout_web/chain_test.exs index cb5f5bde573f..efbde82db628 100644 --- a/apps/block_scout_web/test/block_scout_web/chain_test.exs +++ b/apps/block_scout_web/test/block_scout_web/chain_test.exs @@ -44,20 +44,6 @@ defmodule BlockScoutWeb.ChainTest do assert {:ok, %Address{hash: ^hash}} = address |> Phoenix.Param.to_param() |> Chain.from_param() end - test "finds a token by its name" do - name = "AYR" - insert(:token, symbol: name) - - assert {:ok, %Address{}} = name |> Chain.from_param() - end - - test "finds a token by its name even if lowercase name was passed" do - name = "ayr" - insert(:token, symbol: String.upcase(name)) - - assert {:ok, %Address{}} = name |> Chain.from_param() - end - test "returns {:error, :not_found} when garbage is passed in" do assert {:error, :not_found} = Chain.from_param("any ol' thing") end diff --git a/apps/block_scout_web/test/block_scout_web/controllers/account/api/v1/user_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/account/api/v2/user_controller_test.exs similarity index 84% rename from apps/block_scout_web/test/block_scout_web/controllers/account/api/v1/user_controller_test.exs rename to apps/block_scout_web/test/block_scout_web/controllers/account/api/v2/user_controller_test.exs index cb8359f003f5..a30a4156414e 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/account/api/v1/user_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/account/api/v2/user_controller_test.exs @@ -1,4 +1,4 @@ -defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do +defmodule BlockScoutWeb.Account.Api.V2.UserControllerTest do use BlockScoutWeb.ConnCase alias Explorer.Account.{ @@ -19,11 +19,11 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do {:ok, user: user, conn: Plug.Test.init_test_session(conn, current_user: user)} end - describe "Test account/api/v1/user" do + describe "Test account/api/account/v2/user" do test "get user info", %{conn: conn, user: user} do result_conn = conn - |> get("/api/account/v1/user/info") + |> get("/api/account/v2/user/info") |> doc(description: "Get info about user") assert json_response(result_conn, 200) == %{ @@ -37,7 +37,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do test "post private address tag", %{conn: conn} do tag_address_response = conn - |> post("/api/account/v1/user/tags/address", %{ + |> post("/api/account/v2/user/tags/address", %{ "address_hash" => "0x3e9ac8f16c92bc4f093357933b5befbf1e16987b", "name" => "MyName" }) @@ -45,7 +45,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do |> json_response(200) conn - |> get("/api/account/v1/tags/address/0x3e9ac8f16c92bc4f093357933b5befbf1e16987b") + |> get("/api/account/v2/tags/address/0x3e9ac8f16c92bc4f093357933b5befbf1e16987b") |> doc(description: "Get tags for address") |> json_response(200) @@ -69,11 +69,11 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do end assert conn - |> post("/api/account/v1/user/tags/address", build(:tag_address)) + |> post("/api/account/v2/user/tags/address", build(:tag_address)) |> json_response(200) assert conn - |> post("/api/account/v1/user/tags/address", build(:tag_address)) + |> post("/api/account/v2/user/tags/address", build(:tag_address)) |> json_response(422) Application.put_env(:explorer, Explorer.Account, old_env) @@ -103,13 +103,14 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do tag_address_response = conn - |> post("/api/account/v1/user/tags/address", address_tag) + |> post("/api/account/v2/user/tags/address", address_tag) |> json_response(200) _response = conn - |> get("/api/account/v1/user/tags/address") - |> json_response(200) == [tag_address_response] + |> get("/api/account/v2/user/tags/address") + |> json_response(200) + |> Map.get("items") == [tag_address_response] assert tag_address_response["address_hash"] == address_tag["address_hash"] assert tag_address_response["name"] == address_tag["name"] @@ -119,7 +120,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do new_tag_address_response = conn - |> put("/api/account/v1/user/tags/address/#{tag_address_response["id"]}", new_address_tag) + |> put("/api/account/v2/user/tags/address/#{tag_address_response["id"]}", new_address_tag) |> doc(description: "Edit private address tag") |> json_response(200) @@ -137,7 +138,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do Enum.map(zipped, fn {addr, name} -> id = (conn - |> post("/api/account/v1/user/tags/address", %{ + |> post("/api/account/v2/user/tags/address", %{ "address_hash" => addr, "name" => name }) @@ -157,7 +158,8 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do "private_tags" => [], "public_tags" => [], "watchlist_names" => [], - "ens_domain_name" => nil + "ens_domain_name" => nil, + "metadata" => nil } }} end) @@ -165,7 +167,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do assert Enum.all?(created, fn {addr, map_tag, _} -> response = conn - |> get("/api/account/v1/tags/address/#{addr}") + |> get("/api/account/v2/tags/address/#{addr}") |> json_response(200) response["personal_tags"] == [map_tag] @@ -173,9 +175,10 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do response = conn - |> get("/api/account/v1/user/tags/address") + |> get("/api/account/v2/user/tags/address") |> doc(description: "Get private addresses tags") |> json_response(200) + |> Map.get("items") assert Enum.all?(created, fn {_, _, map} -> map in response end) end @@ -189,7 +192,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do Enum.map(zipped, fn {addr, name} -> id = (conn - |> post("/api/account/v1/user/tags/address", %{ + |> post("/api/account/v2/user/tags/address", %{ "address_hash" => addr, "name" => name }) @@ -209,7 +212,8 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do "private_tags" => [], "public_tags" => [], "watchlist_names" => [], - "ens_domain_name" => nil + "ens_domain_name" => nil, + "metadata" => nil } }} end) @@ -217,7 +221,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do assert Enum.all?(created, fn {addr, map_tag, _} -> response = conn - |> get("/api/account/v1/tags/address/#{addr}") + |> get("/api/account/v2/tags/address/#{addr}") |> json_response(200) response["personal_tags"] == [map_tag] @@ -225,32 +229,34 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do response = conn - |> get("/api/account/v1/user/tags/address") + |> get("/api/account/v2/user/tags/address") |> json_response(200) + |> Map.get("items") assert Enum.all?(created, fn {_, _, map} -> map in response end) {_, _, %{"id" => id}} = Enum.at(created, 0) assert conn - |> delete("/api/account/v1/user/tags/address/#{id}") + |> delete("/api/account/v2/user/tags/address/#{id}") |> doc("Delete private address tag") |> json_response(200) == %{"message" => "OK"} assert Enum.all?(Enum.drop(created, 1), fn {_, _, %{"id" => id}} -> conn - |> delete("/api/account/v1/user/tags/address/#{id}") + |> delete("/api/account/v2/user/tags/address/#{id}") |> json_response(200) == %{"message" => "OK"} end) assert conn - |> get("/api/account/v1/user/tags/address") - |> json_response(200) == [] + |> get("/api/account/v2/user/tags/address") + |> json_response(200) + |> Map.get("items") == [] assert Enum.all?(created, fn {addr, _, _} -> response = conn - |> get("/api/account/v1/tags/address/#{addr}") + |> get("/api/account/v2/tags/address/#{addr}") |> json_response(200) response["personal_tags"] == [] @@ -262,7 +268,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do tx_hash = to_string(insert(:transaction).hash) assert conn - |> post("/api/account/v1/user/tags/transaction", %{ + |> post("/api/account/v2/user/tags/transaction", %{ "transaction_hash" => tx_hash_non_existing, "name" => "MyName" }) @@ -271,7 +277,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do tag_transaction_response = conn - |> post("/api/account/v1/user/tags/transaction", %{ + |> post("/api/account/v2/user/tags/transaction", %{ "transaction_hash" => tx_hash, "name" => "MyName" }) @@ -279,7 +285,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do |> json_response(200) conn - |> get("/api/account/v1/tags/transaction/#{tx_hash}") + |> get("/api/account/v2/tags/transaction/#{tx_hash}") |> doc(description: "Get tags for transaction") |> json_response(200) @@ -303,11 +309,11 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do end assert conn - |> post("/api/account/v1/user/tags/transaction", build(:tag_transaction)) + |> post("/api/account/v2/user/tags/transaction", build(:tag_transaction)) |> json_response(200) assert conn - |> post("/api/account/v1/user/tags/transaction", build(:tag_transaction)) + |> post("/api/account/v2/user/tags/transaction", build(:tag_transaction)) |> json_response(422) Application.put_env(:explorer, Explorer.Account, old_env) @@ -337,12 +343,12 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do tag_response = conn - |> post("/api/account/v1/user/tags/transaction", tx_tag) + |> post("/api/account/v2/user/tags/transaction", tx_tag) |> json_response(200) _response = conn - |> get("/api/account/v1/user/tags/transaction") + |> get("/api/account/v2/user/tags/transaction") |> json_response(200) == [tag_response] assert tag_response["address_hash"] == tx_tag["address_hash"] @@ -353,7 +359,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do new_tag_response = conn - |> put("/api/account/v1/user/tags/transaction/#{tag_response["id"]}", new_tx_tag) + |> put("/api/account/v2/user/tags/transaction/#{tag_response["id"]}", new_tx_tag) |> doc(description: "Edit private transaction tag") |> json_response(200) @@ -371,7 +377,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do Enum.map(zipped, fn {tx_hash, name} -> id = (conn - |> post("/api/account/v1/user/tags/transaction", %{ + |> post("/api/account/v2/user/tags/transaction", %{ "transaction_hash" => tx_hash, "name" => name }) @@ -383,7 +389,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do assert Enum.all?(created, fn {tx_hash, map_tag, _} -> response = conn - |> get("/api/account/v1/tags/transaction/#{tx_hash}") + |> get("/api/account/v2/tags/transaction/#{tx_hash}") |> json_response(200) response["personal_tx_tag"] == map_tag @@ -391,9 +397,10 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do response = conn - |> get("/api/account/v1/user/tags/transaction") + |> get("/api/account/v2/user/tags/transaction") |> doc(description: "Get private transactions tags") |> json_response(200) + |> Map.get("items") assert Enum.all?(created, fn {_, _, map} -> map in response end) end @@ -407,7 +414,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do Enum.map(zipped, fn {tx_hash, name} -> id = (conn - |> post("/api/account/v1/user/tags/transaction", %{ + |> post("/api/account/v2/user/tags/transaction", %{ "transaction_hash" => tx_hash, "name" => name }) @@ -419,7 +426,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do assert Enum.all?(created, fn {tx_hash, map_tag, _} -> response = conn - |> get("/api/account/v1/tags/transaction/#{tx_hash}") + |> get("/api/account/v2/tags/transaction/#{tx_hash}") |> json_response(200) response["personal_tx_tag"] == map_tag @@ -427,33 +434,36 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do response = conn - |> get("/api/account/v1/user/tags/transaction") + |> get("/api/account/v2/user/tags/transaction") |> json_response(200) + |> Map.get("items") assert Enum.all?(created, fn {_, _, map} -> map in response end) {_, _, %{"id" => id}} = Enum.at(created, 0) assert conn - |> delete("/api/account/v1/user/tags/transaction/#{id}") + |> delete("/api/account/v2/user/tags/transaction/#{id}") |> doc("Delete private transaction tag") |> json_response(200) == %{"message" => "OK"} assert Enum.all?(Enum.drop(created, 1), fn {_, _, %{"id" => id}} -> conn - |> delete("/api/account/v1/user/tags/transaction/#{id}") + |> delete("/api/account/v2/user/tags/transaction/#{id}") |> json_response(200) == %{"message" => "OK"} end) assert conn - |> get("/api/account/v1/user/tags/transaction") - |> json_response(200) == [] + |> get("/api/account/v2/user/tags/transaction") + |> json_response(200) + |> Map.get("items") == [] assert Enum.all?(created, fn {addr, _, _} -> response = conn - |> get("/api/account/v1/tags/transaction/#{addr}") + |> get("/api/account/v2/tags/transaction/#{addr}") |> json_response(200) + |> Map.get("items") response["personal_tx_tag"] == nil end) @@ -465,7 +475,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do post_watchlist_address_response = conn |> post( - "/api/account/v1/user/watchlist", + "/api/account/v2/user/watchlist", watchlist_address_map ) |> doc(description: "Add address to watch list") @@ -476,7 +486,8 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do assert post_watchlist_address_response["notification_methods"] == watchlist_address_map["notification_methods"] assert post_watchlist_address_response["address_hash"] == watchlist_address_map["address_hash"] - get_watchlist_address_response = conn |> get("/api/account/v1/user/watchlist") |> json_response(200) |> Enum.at(0) + get_watchlist_address_response = + conn |> get("/api/account/v2/user/watchlist") |> json_response(200) |> Map.get("items") |> Enum.at(0) assert get_watchlist_address_response["notification_settings"] == watchlist_address_map["notification_settings"] assert get_watchlist_address_response["name"] == watchlist_address_map["name"] @@ -489,20 +500,21 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do post_watchlist_address_response_1 = conn |> post( - "/api/account/v1/user/watchlist", + "/api/account/v2/user/watchlist", watchlist_address_map_1 ) |> json_response(200) get_watchlist_address_response_1_0 = conn - |> get("/api/account/v1/user/watchlist") + |> get("/api/account/v2/user/watchlist") |> doc(description: "Get addresses from watchlists") |> json_response(200) + |> Map.get("items") |> Enum.at(1) get_watchlist_address_response_1_1 = - conn |> get("/api/account/v1/user/watchlist") |> json_response(200) |> Enum.at(0) + conn |> get("/api/account/v2/user/watchlist") |> json_response(200) |> Map.get("items") |> Enum.at(0) assert get_watchlist_address_response_1_0 == get_watchlist_address_response @@ -533,11 +545,11 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do end assert conn - |> post("/api/account/v1/user/watchlist", build(:watchlist_address)) + |> post("/api/account/v2/user/watchlist", build(:watchlist_address)) |> json_response(200) assert conn - |> post("/api/account/v1/user/watchlist", build(:watchlist_address)) + |> post("/api/account/v2/user/watchlist", build(:watchlist_address)) |> json_response(422) Application.put_env(:explorer, Explorer.Account, old_env) @@ -568,7 +580,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do post_watchlist_address_response = conn |> post( - "/api/account/v1/user/watchlist", + "/api/account/v2/user/watchlist", watchlist_address_map ) |> json_response(200) @@ -578,7 +590,8 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do assert post_watchlist_address_response["notification_methods"] == watchlist_address_map["notification_methods"] assert post_watchlist_address_response["address_hash"] == watchlist_address_map["address_hash"] - get_watchlist_address_response = conn |> get("/api/account/v1/user/watchlist") |> json_response(200) |> Enum.at(0) + get_watchlist_address_response = + conn |> get("/api/account/v2/user/watchlist") |> json_response(200) |> Map.get("items") |> Enum.at(0) assert get_watchlist_address_response["notification_settings"] == watchlist_address_map["notification_settings"] assert get_watchlist_address_response["name"] == watchlist_address_map["name"] @@ -591,16 +604,16 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do post_watchlist_address_response_1 = conn |> post( - "/api/account/v1/user/watchlist", + "/api/account/v2/user/watchlist", watchlist_address_map_1 ) |> json_response(200) - get_watchlist_address_response_1_0 = - conn |> get("/api/account/v1/user/watchlist") |> json_response(200) |> Enum.at(1) + get_watchlist_address_response_1 = conn |> get("/api/account/v2/user/watchlist") |> json_response(200) - get_watchlist_address_response_1_1 = - conn |> get("/api/account/v1/user/watchlist") |> json_response(200) |> Enum.at(0) + get_watchlist_address_response_1_0 = get_watchlist_address_response_1 |> Map.get("items") |> Enum.at(1) + + get_watchlist_address_response_1_1 = get_watchlist_address_response_1 |> Map.get("items") |> Enum.at(0) assert get_watchlist_address_response_1_0 == get_watchlist_address_response @@ -616,15 +629,15 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do assert get_watchlist_address_response_1_1["id"] == post_watchlist_address_response_1["id"] assert conn - |> delete("/api/account/v1/user/watchlist/#{get_watchlist_address_response_1_1["id"]}") + |> delete("/api/account/v2/user/watchlist/#{get_watchlist_address_response_1_1["id"]}") |> doc(description: "Delete address from watchlist by id") |> json_response(200) == %{"message" => "OK"} assert conn - |> delete("/api/account/v1/user/watchlist/#{get_watchlist_address_response_1_0["id"]}") + |> delete("/api/account/v2/user/watchlist/#{get_watchlist_address_response_1_0["id"]}") |> json_response(200) == %{"message" => "OK"} - assert conn |> get("/api/account/v1/user/watchlist") |> json_response(200) == [] + assert conn |> get("/api/account/v2/user/watchlist") |> json_response(200) |> Map.get("items") == [] end test "put watchlist address", %{conn: conn} do @@ -633,7 +646,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do post_watchlist_address_response = conn |> post( - "/api/account/v1/user/watchlist", + "/api/account/v2/user/watchlist", watchlist_address_map ) |> json_response(200) @@ -643,7 +656,8 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do assert post_watchlist_address_response["notification_methods"] == watchlist_address_map["notification_methods"] assert post_watchlist_address_response["address_hash"] == watchlist_address_map["address_hash"] - get_watchlist_address_response = conn |> get("/api/account/v1/user/watchlist") |> json_response(200) |> Enum.at(0) + get_watchlist_address_response = + conn |> get("/api/account/v2/user/watchlist") |> json_response(200) |> Map.get("items") |> Enum.at(0) assert get_watchlist_address_response["notification_settings"] == watchlist_address_map["notification_settings"] assert get_watchlist_address_response["name"] == watchlist_address_map["name"] @@ -656,7 +670,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do put_watchlist_address_response = conn |> put( - "/api/account/v1/user/watchlist/#{post_watchlist_address_response["id"]}", + "/api/account/v2/user/watchlist/#{post_watchlist_address_response["id"]}", new_watchlist_address_map ) |> doc(description: "Edit watchlist address") @@ -677,7 +691,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do post_watchlist_address_response = conn |> post( - "/api/account/v1/user/watchlist", + "/api/account/v2/user/watchlist", watchlist_address_map ) |> json_response(200) @@ -689,7 +703,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do assert conn |> post( - "/api/account/v1/user/watchlist", + "/api/account/v2/user/watchlist", watchlist_address_map ) |> doc(description: "Example of error on creating watchlist address") @@ -700,14 +714,14 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do post_watchlist_address_response_1 = conn |> post( - "/api/account/v1/user/watchlist", + "/api/account/v2/user/watchlist", new_watchlist_address_map ) |> json_response(200) assert conn |> put( - "/api/account/v1/user/watchlist/#{post_watchlist_address_response_1["id"]}", + "/api/account/v2/user/watchlist/#{post_watchlist_address_response_1["id"]}", watchlist_address_map ) |> doc(description: "Example of error on editing watchlist address") @@ -719,19 +733,21 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do conn |> post( - "/api/account/v1/user/watchlist", + "/api/account/v2/user/watchlist", watchlist_address_map ) |> json_response(200) + |> Map.get("items") watchlist_address_map_1 = build(:watchlist_address) conn |> post( - "/api/account/v1/user/watchlist", + "/api/account/v2/user/watchlist", watchlist_address_map_1 ) |> json_response(200) + |> Map.get("items") values = for _i <- 0..149 do @@ -763,7 +779,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do |> Enum.sort(fn x1, x2 -> Decimal.compare(x1, x2) in [:gt, :eq] end) |> Enum.take(150) - [wa2, wa1] = conn |> get("/api/account/v1/user/watchlist") |> json_response(200) + [wa2, wa1] = conn |> get("/api/account/v2/user/watchlist") |> json_response(200) |> Map.get("items") assert wa1["tokens_fiat_value"] |> Decimal.new() |> Decimal.round(13) == values |> Enum.reduce(Decimal.new(0), fn x, acc -> Decimal.add(x, acc) end) |> Decimal.round(13) @@ -783,10 +799,11 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do conn |> post( - "/api/account/v1/user/watchlist", + "/api/account/v2/user/watchlist", watchlist_address_map ) |> json_response(200) + |> Map.get("items") values = for _i <- 0..148 do @@ -810,7 +827,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do token_contract_address_hash: token.contract_address_hash ) - [wa1] = conn |> get("/api/account/v1/user/watchlist") |> json_response(200) + [wa1] = conn |> get("/api/account/v2/user/watchlist") |> json_response(200) |> Map.get("items") assert wa1["tokens_fiat_value"] |> Decimal.new() |> Decimal.round(13) == values |> Enum.reduce(Decimal.new(0), fn x, acc -> Decimal.add(x, acc) end) |> Decimal.round(13) @@ -823,7 +840,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do post_api_key_response = conn |> post( - "/api/account/v1/user/api_keys", + "/api/account/v2/user/api_keys", %{"name" => "test"} ) |> doc(description: "Add api key") @@ -837,7 +854,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do Enum.each(0..2, fn _x -> conn |> post( - "/api/account/v1/user/api_keys", + "/api/account/v2/user/api_keys", %{"name" => "test"} ) |> json_response(200) @@ -845,14 +862,14 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do assert conn |> post( - "/api/account/v1/user/api_keys", + "/api/account/v2/user/api_keys", %{"name" => "test"} ) |> doc(description: "Example of error on creating api key") |> json_response(422) == %{"errors" => %{"name" => ["Max 3 keys per account"]}} assert conn - |> get("/api/account/v1/user/api_keys") + |> get("/api/account/v2/user/api_keys") |> doc(description: "Get api keys list") |> json_response(200) |> Enum.count() == 3 @@ -862,7 +879,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do post_api_key_response = conn |> post( - "/api/account/v1/user/api_keys", + "/api/account/v2/user/api_keys", %{"name" => "test"} ) |> json_response(200) @@ -873,7 +890,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do put_api_key_response = conn |> put( - "/api/account/v1/user/api_keys/#{post_api_key_response["api_key"]}", + "/api/account/v2/user/api_keys/#{post_api_key_response["api_key"]}", %{"name" => "test_1"} ) |> doc(description: "Edit api key") @@ -883,7 +900,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do assert put_api_key_response["name"] == "test_1" assert conn - |> get("/api/account/v1/user/api_keys") + |> get("/api/account/v2/user/api_keys") |> json_response(200) == [put_api_key_response] end @@ -891,7 +908,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do post_api_key_response = conn |> post( - "/api/account/v1/user/api_keys", + "/api/account/v2/user/api_keys", %{"name" => "test"} ) |> json_response(200) @@ -900,17 +917,17 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do assert post_api_key_response["api_key"] assert conn - |> get("/api/account/v1/user/api_keys") + |> get("/api/account/v2/user/api_keys") |> json_response(200) |> Enum.count() == 1 assert conn - |> delete("/api/account/v1/user/api_keys/#{post_api_key_response["api_key"]}") + |> delete("/api/account/v2/user/api_keys/#{post_api_key_response["api_key"]}") |> doc(description: "Delete api key") |> json_response(200) == %{"message" => "OK"} assert conn - |> get("/api/account/v1/user/api_keys") + |> get("/api/account/v2/user/api_keys") |> json_response(200) == [] end @@ -920,7 +937,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do post_custom_abi_response = conn |> post( - "/api/account/v1/user/custom_abis", + "/api/account/v2/user/custom_abis", custom_abi ) |> doc(description: "Add custom abi") @@ -936,7 +953,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do Enum.each(0..14, fn _x -> conn |> post( - "/api/account/v1/user/custom_abis", + "/api/account/v2/user/custom_abis", build(:custom_abi) ) |> json_response(200) @@ -944,14 +961,14 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do assert conn |> post( - "/api/account/v1/user/custom_abis", + "/api/account/v2/user/custom_abis", build(:custom_abi) ) |> doc(description: "Example of error on creating custom abi") |> json_response(422) == %{"errors" => %{"name" => ["Max 15 ABIs per account"]}} assert conn - |> get("/api/account/v1/user/custom_abis") + |> get("/api/account/v2/user/custom_abis") |> doc(description: "Get custom abis list") |> json_response(200) |> Enum.count() == 15 @@ -963,7 +980,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do post_custom_abi_response = conn |> post( - "/api/account/v1/user/custom_abis", + "/api/account/v2/user/custom_abis", custom_abi ) |> json_response(200) @@ -978,7 +995,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do put_custom_abi_response = conn |> put( - "/api/account/v1/user/custom_abis/#{post_custom_abi_response["id"]}", + "/api/account/v2/user/custom_abis/#{post_custom_abi_response["id"]}", custom_abi_1 ) |> doc(description: "Edit custom abi") @@ -990,7 +1007,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do assert put_custom_abi_response["abi"] == custom_abi_1["abi"] assert conn - |> get("/api/account/v1/user/custom_abis") + |> get("/api/account/v2/user/custom_abis") |> json_response(200) == [put_custom_abi_response] end @@ -1000,7 +1017,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do post_custom_abi_response = conn |> post( - "/api/account/v1/user/custom_abis", + "/api/account/v2/user/custom_abis", custom_abi ) |> json_response(200) @@ -1009,17 +1026,17 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do assert post_custom_abi_response["id"] assert conn - |> get("/api/account/v1/user/custom_abis") + |> get("/api/account/v2/user/custom_abis") |> json_response(200) |> Enum.count() == 1 assert conn - |> delete("/api/account/v1/user/custom_abis/#{post_custom_abi_response["id"]}") + |> delete("/api/account/v2/user/custom_abis/#{post_custom_abi_response["id"]}") |> doc(description: "Delete custom abi") |> json_response(200) == %{"message" => "OK"} assert conn - |> get("/api/account/v1/user/custom_abis") + |> get("/api/account/v2/user/custom_abis") |> json_response(200) == [] end end @@ -1031,7 +1048,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do post_public_tags_request_response = conn |> post( - "/api/account/v1/user/public_tags", + "/api/account/v2/user/public_tags", public_tags_request ) |> doc(description: "Submit request to add a public tag") @@ -1054,7 +1071,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do post_public_tags_request_response = conn |> post( - "/api/account/v1/user/public_tags", + "/api/account/v2/user/public_tags", public_tags_request ) |> json_response(200) @@ -1070,7 +1087,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do assert post_public_tags_request_response["id"] assert conn - |> get("/api/account/v1/user/public_tags") + |> get("/api/account/v2/user/public_tags") |> json_response(200) |> Enum.map(&convert_date/1) == [post_public_tags_request_response] @@ -1086,7 +1103,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do response = conn |> post( - "/api/account/v1/user/public_tags", + "/api/account/v2/user/public_tags", request ) |> json_response(200) @@ -1106,7 +1123,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do |> Enum.reverse() assert conn - |> get("/api/account/v1/user/public_tags") + |> get("/api/account/v2/user/public_tags") |> doc(description: "Get list of requests to add a public tag") |> json_response(200) |> Enum.map(&convert_date/1) == final_list @@ -1114,18 +1131,18 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do %{"id" => id} = Enum.at(final_list, 0) assert conn - |> delete("/api/account/v1/user/public_tags/#{id}", %{"remove_reason" => "reason"}) + |> delete("/api/account/v2/user/public_tags/#{id}", %{"remove_reason" => "reason"}) |> doc(description: "Delete public tags request") |> json_response(200) == %{"message" => "OK"} Enum.each(Enum.drop(final_list, 1), fn request -> assert conn - |> delete("/api/account/v1/user/public_tags/#{request["id"]}", %{"remove_reason" => "reason"}) + |> delete("/api/account/v2/user/public_tags/#{request["id"]}", %{"remove_reason" => "reason"}) |> json_response(200) == %{"message" => "OK"} end) assert conn - |> get("/api/account/v1/user/public_tags") + |> get("/api/account/v2/user/public_tags") |> json_response(200) == [] end @@ -1135,7 +1152,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do post_public_tags_request_response = conn |> post( - "/api/account/v1/user/public_tags", + "/api/account/v2/user/public_tags", public_tags_request ) |> json_response(200) @@ -1151,7 +1168,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do assert post_public_tags_request_response["id"] assert conn - |> get("/api/account/v1/user/public_tags") + |> get("/api/account/v2/user/public_tags") |> json_response(200) |> Enum.map(&convert_date/1) == [post_public_tags_request_response] @@ -1162,7 +1179,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do put_public_tags_request_response = conn |> put( - "/api/account/v1/user/public_tags/#{post_public_tags_request_response["id"]}", + "/api/account/v2/user/public_tags/#{post_public_tags_request_response["id"]}", new_public_tags_request ) |> doc(description: "Edit request to add a public tag") @@ -1179,7 +1196,7 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do assert put_public_tags_request_response["id"] == post_public_tags_request_response["id"] assert conn - |> get("/api/account/v1/user/public_tags") + |> get("/api/account/v2/user/public_tags") |> json_response(200) |> Enum.map(&convert_date/1) == [put_public_tags_request_response] @@ -1218,6 +1235,10 @@ defmodule BlockScoutWeb.Account.Api.V1.UserControllerTest do "ERC-721" => %{ "incoming" => watchlist.watch_erc_721_input, "outcoming" => watchlist.watch_erc_721_output + }, + "ERC-404" => %{ + "incoming" => watchlist.watch_erc_404_input, + "outcoming" => watchlist.watch_erc_404_output } } diff --git a/apps/block_scout_web/test/block_scout_web/controllers/address_internal_transaction_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/address_internal_transaction_controller_test.exs index 86a15c8d43fb..1750f9bab103 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/address_internal_transaction_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/address_internal_transaction_controller_test.exs @@ -403,6 +403,19 @@ defmodule BlockScoutWeb.AddressInternalTransactionControllerTest do path = address_internal_transaction_path(BlockScoutWeb.Endpoint, :index, Address.checksum(address.hash)) + empty_page_response = + conn + |> get(path, %{ + "block_number" => Integer.to_string(0), + "transaction_index" => Integer.to_string(0), + "index" => "0", + "type" => "JSON" + }) + |> json_response(200) + |> Map.get("items") + + assert Enum.count(empty_page_response) == 0 + first_page_response = conn |> get(path, %{"type" => "JSON"}) diff --git a/apps/block_scout_web/test/block_scout_web/controllers/address_token_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/address_token_controller_test.exs index b96ede11e8db..475987d235a1 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/address_token_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/address_token_controller_test.exs @@ -161,6 +161,37 @@ defmodule BlockScoutWeb.AddressTokenControllerTest do assert 1 = length(response_2nd_page["items"]) end + test "returns next page of results based on last seen token for erc-404", %{conn: conn} do + address = insert(:address) + + 1..51 + |> Enum.reduce([], fn _i, acc -> + token = insert(:token, name: "FN2 Token", type: "ERC-404") + + insert( + :address_current_token_balance, + token_contract_address_hash: token.contract_address_hash, + address: address, + value: 3 + ) + + acc ++ [token.name] + end) + + conn = + get(conn, address_token_path(BlockScoutWeb.Endpoint, :index, Address.checksum(address.hash)), %{ + "type" => "JSON" + }) + + assert response = json_response(conn, 200) + + request_2nd_page = get(conn, response["next_page_path"], %{"type" => "JSON"}) + + assert response_2nd_page = json_response(request_2nd_page, 200) + + assert 1 = length(response_2nd_page["items"]) + end + test "next_page_params exists if not on last page", %{conn: conn} do address = insert(:address) diff --git a/apps/block_scout_web/test/block_scout_web/controllers/address_transaction_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/address_transaction_controller_test.exs index ad86587530fc..4c0c8ea80e18 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/address_transaction_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/address_transaction_controller_test.exs @@ -427,5 +427,40 @@ defmodule BlockScoutWeb.AddressTransactionControllerTest do assert conn.resp_body |> String.split("\n") |> Enum.count() == 5 end + + test "handles null filter", %{conn: conn} do + BlockScoutWeb.TestCaptchaHelper + |> expect(:recaptcha_passed?, fn _captcha_response -> true end) + + address = insert(:address) + + transaction = + :transaction + |> insert() + |> with_block() + + insert(:log, + address: address, + index: 3, + transaction: transaction, + block: transaction.block, + block_number: transaction.block_number + ) + + from_period = Timex.format!(Timex.shift(Timex.now(), minutes: -1), "%Y-%m-%d", :strftime) + to_period = Timex.format!(Timex.now(), "%Y-%m-%d", :strftime) + + conn = + get(conn, "/api/v1/logs-csv", %{ + "address_id" => Address.checksum(address.hash), + "filter_type" => "null", + "filter_value" => "null", + "from_period" => from_period, + "to_period" => to_period, + "recaptcha_response" => "123" + }) + + assert conn.resp_body |> String.split("\n") |> Enum.count() == 3 + end end end diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/address_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/address_controller_test.exs index 5a9475258e3f..0901f55f6f7b 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/address_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/address_controller_test.exs @@ -7,7 +7,7 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do alias Explorer.Chain alias Explorer.Chain.{Events.Subscriber, Transaction, Wei} alias Explorer.Counters.{AddressesCounter, AverageBlockTime} - alias Indexer.Fetcher.CoinBalanceOnDemand + alias Indexer.Fetcher.OnDemand.CoinBalance, as: CoinBalanceOnDemand alias Explorer.Repo setup :set_mox_global diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/block_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/block_controller_test.exs index ef8ce3513d47..3060f17102c3 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/block_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/block_controller_test.exs @@ -1,8 +1,6 @@ defmodule BlockScoutWeb.API.RPC.BlockControllerTest do use BlockScoutWeb.ConnCase - import EthereumJSONRPC, only: [integer_to_quantity: 1] - alias BlockScoutWeb.Chain alias Explorer.Chain.{Hash, Wei} alias Explorer.Counters.AverageBlockTime @@ -58,8 +56,6 @@ defmodule BlockScoutWeb.API.RPC.BlockControllerTest do |> insert(gas_price: 1) |> with_block(block, gas_used: 1) - block_quantity = integer_to_quantity(block.number) - expected_reward = emission_reward.reward |> Wei.to(:wei) @@ -101,8 +97,6 @@ defmodule BlockScoutWeb.API.RPC.BlockControllerTest do |> insert(gas_price: 1) |> with_block(block, gas_used: 1) - block_quantity = integer_to_quantity(block.number) - decimal_emission_reward = Wei.to(emission_reward.reward, :wei) uncle1_reward = diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs index b77a23a39a30..7e224aec353b 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs @@ -3,7 +3,7 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do alias Explorer.Counters.{AddressesCounter, AverageBlockTime} alias Explorer.Repo - alias Indexer.Fetcher.CoinBalanceOnDemand + alias Indexer.Fetcher.OnDemand.CoinBalance, as: CoinBalanceOnDemand @first_topic_hex_string_1 "0x7fcf532c15f0a6db0bd6d0e038bea71d30d808c7d98cb3bf7268a95bf5081b65" @first_topic_hex_string_2 "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef" @@ -198,7 +198,8 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do assert Enum.count(response["result"]) == 1000 - {last_log_index, ""} = Integer.parse(List.last(response["result"])["logIndex"], 16) + "0x" <> hexadecimal_digits = List.last(response["result"])["logIndex"] + {last_log_index, ""} = Integer.parse(hexadecimal_digits, 16) next_page_params = %{ "blockNumber" => Integer.to_string(transaction.block_number, 16), @@ -225,7 +226,8 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do assert Enum.all?(inserted_records, fn record -> Enum.any?(all_found_logs, fn found_log -> - {index, ""} = Integer.parse(found_log["logIndex"], 16) + "0x" <> hexadecimal_digits = found_log["logIndex"] + {index, ""} = Integer.parse(hexadecimal_digits, 16) record.index == index end) @@ -456,6 +458,49 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do assert [%{"data" => "0x030303"}] = response["result"] end + + test "numerical fields are hexadecimals with 0x prefix", + %{conn: conn, api_params: api_params} do + address = insert(:address) + block = insert(:block, number: 0) + transaction = insert(:transaction, from_address: address) |> with_block(block) + + insert(:log, + block: block, + block_number: block.number, + address: address, + transaction: transaction, + data: "0x010101", + first_topic: topic(@first_topic_hex_string_1) + ) + + params = + params(api_params, [ + %{ + "address" => to_string(address.hash), + "topics" => [@first_topic_hex_string_1] + } + ]) + + response = + conn + |> post("/api/eth-rpc", params) + |> json_response(200) + + [result] = response["result"] + + assert result + |> Map.take([ + "address", + "blockHash", + "blockNumber", + "data", + "transactionIndex", + "logIndex", + "transactionHash" + ]) + |> Enum.all?(fn {_, v} -> String.starts_with?(v, "0x") end) + end end describe "eth_get_balance" do diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs index 4189d1a1129f..1570317cf69c 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/address_controller_test.exs @@ -1,7 +1,9 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do use BlockScoutWeb.ConnCase use EthereumJSONRPC.Case, async: false + use BlockScoutWeb.ChannelCase + alias ABI.{TypeDecoder, TypeEncoder} alias BlockScoutWeb.Models.UserFromAuth alias Explorer.{Chain, Repo} alias Explorer.Chain.Address.Counters @@ -22,6 +24,7 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do alias Explorer.Account.WatchlistAddress alias Explorer.Chain.Address.CurrentTokenBalance + alias Plug.Conn import Explorer.Chain, only: [hash_to_lower_case_string: 1] import Mox @@ -85,7 +88,8 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do "has_token_transfers" => false, "watchlist_address_id" => nil, "has_beacon_chain_withdrawals" => false, - "ens_domain_name" => nil + "ens_domain_name" => nil, + "metadata" => nil } request = get(conn, "/api/v2/addresses/#{Address.checksum(address.hash)}") @@ -1681,11 +1685,14 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do response = json_response(request, 200) - assert [ - %{"date" => _, "value" => "2000"}, - %{"date" => _, "value" => "1000"}, - %{"date" => _, "value" => "1000"} - ] = response + assert %{ + "days" => 10, + "items" => [ + %{"date" => _, "value" => "2000"}, + %{"date" => _, "value" => "1000"}, + %{"date" => _, "value" => "1000"} + ] + } = response end end @@ -1757,6 +1764,84 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do check_paginated_response(response, response_2nd_page, logs) end + # https://github.com/blockscout/blockscout/issues/9926 + test "regression test for 9926", %{conn: conn} do + address = insert(:address, hash: "0x036cec1a199234fC02f72d29e596a09440825f1C") + + tx = + :transaction + |> insert() + |> with_block() + + log = + insert(:log, + transaction: tx, + index: 1, + block: tx.block, + block_number: tx.block_number, + address: address + ) + + bypass = Bypass.open() + + old_chain_id = Application.get_env(:block_scout_web, :chain_id) + chain_id = 1 + Application.put_env(:block_scout_web, :chain_id, chain_id) + + old_env_bens = Application.get_env(:explorer, Explorer.MicroserviceInterfaces.BENS) + + Application.put_env(:explorer, Explorer.MicroserviceInterfaces.BENS, + service_url: "http://localhost:#{bypass.port}", + enabled: true + ) + + old_env_metadata = Application.get_env(:explorer, Explorer.MicroserviceInterfaces.Metadata) + + Application.put_env(:explorer, Explorer.MicroserviceInterfaces.Metadata, + service_url: "http://localhost:#{bypass.port}", + enabled: true + ) + + Bypass.expect_once(bypass, "POST", "api/v1/#{chain_id}/addresses:batch_resolve_names", fn conn -> + Conn.resp( + conn, + 200, + Jason.encode!(%{ + "names" => %{ + to_string(address) => "test.eth" + } + }) + ) + end) + + Bypass.expect_once(bypass, "POST", "api/v1/metadata", fn conn -> + Conn.resp( + conn, + 200, + Jason.encode!(%{ + "addresses" => %{ + to_string(address) => %{"tags" => [%{"slug" => "tag", "meta" => "{\"styles\":\"danger_high\"}"}]} + } + }) + ) + end) + + request = get(conn, "/api/v2/addresses/#{address.hash}/logs") + + assert response = json_response(request, 200) + assert Enum.count(response["items"]) == 1 + assert response["next_page_params"] == nil + compare_item(log, Enum.at(response["items"], 0)) + log = Enum.at(response["items"], 0) + assert log["address"]["ens_domain_name"] == "test.eth" + assert log["address"]["metadata"] == %{"tags" => [%{"slug" => "tag", "meta" => %{"styles" => "danger_high"}}]} + + Application.put_env(:block_scout_web, :chain_id, old_chain_id) + Application.put_env(:explorer, Explorer.MicroserviceInterfaces.BENS, old_env_bens) + Application.put_env(:explorer, Explorer.MicroserviceInterfaces.Metadata, old_env_metadata) + Bypass.down(bypass) + end + test "logs can be filtered by topic", %{conn: conn} do address = insert(:address) @@ -1835,7 +1920,7 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do ) |> Repo.preload([:token]) end - |> Enum.sort_by(fn x -> x.value end, :asc) + |> Enum.sort_by(fn x -> Decimal.to_integer(x.value) end, :asc) ctbs_erc_1155 = for _ <- 0..50 do @@ -1846,7 +1931,7 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do ) |> Repo.preload([:token]) end - |> Enum.sort_by(fn x -> x.value end, :asc) + |> Enum.sort_by(fn x -> Decimal.to_integer(x.value) end, :asc) filter = %{"type" => "ERC-20"} request = get(conn, "/api/v2/addresses/#{address.hash}/tokens", filter) @@ -1883,6 +1968,291 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do end end + describe "checks Indexer.Fetcher.OnDemand.TokenBalance" do + setup do + Supervisor.terminate_child(Explorer.Supervisor, Explorer.Chain.Cache.BlockNumber.child_id()) + Supervisor.restart_child(Explorer.Supervisor, Explorer.Chain.Cache.BlockNumber.child_id()) + old_env = Application.get_env(:indexer, Indexer.Fetcher.OnDemand.TokenBalance) + + Application.put_env( + :indexer, + Indexer.Fetcher.OnDemand.TokenBalance, + Keyword.put(old_env, :fallback_threshold_in_blocks, 0) + ) + + on_exit(fn -> + Application.put_env(:indexer, Indexer.Fetcher.OnDemand.TokenBalance, old_env) + end) + end + + test "Indexer.Fetcher.OnDemand.TokenBalance broadcasts only updated balances", %{conn: conn} do + address = insert(:address) + + ctbs_erc_20 = + for i <- 0..1 do + ctb = + insert(:address_current_token_balance_with_token_id_and_fixed_token_type, + address: address, + token_type: "ERC-20", + token_id: nil + ) + + {to_string(ctb.token_contract_address_hash), + Decimal.to_integer(ctb.value) + if(rem(i, 2) == 0, do: 1, else: 0)} + end + |> Enum.into(%{}) + + ctbs_erc_721 = + for i <- 0..1 do + ctb = + insert(:address_current_token_balance_with_token_id_and_fixed_token_type, + address: address, + token_type: "ERC-721", + token_id: nil + ) + + {to_string(ctb.token_contract_address_hash), + Decimal.to_integer(ctb.value) + if(rem(i, 2) == 0, do: 1, else: 0)} + end + |> Enum.into(%{}) + + other_balances = Map.merge(ctbs_erc_20, ctbs_erc_721) + + balances_erc_1155 = + for i <- 0..1 do + ctb = + insert(:address_current_token_balance_with_token_id_and_fixed_token_type, + address: address, + token_type: "ERC-1155", + token_id: Enum.random(1..100_000) + ) + + {{to_string(ctb.token_contract_address_hash), to_string(ctb.token_id)}, + Decimal.to_integer(ctb.value) + if(rem(i, 2) == 0, do: 1, else: 0)} + end + |> Enum.into(%{}) + + block_number_hex = "0x" <> (Integer.to_string(insert(:block).number, 16) |> String.upcase()) + + expect(EthereumJSONRPC.Mox, :json_rpc, fn [ + %{ + id: id_1, + jsonrpc: "2.0", + method: "eth_call", + params: [ + %{ + data: "0x00fdd58e" <> request_1, + to: contract_address_1 + }, + ^block_number_hex + ] + }, + %{ + id: id_2, + jsonrpc: "2.0", + method: "eth_call", + params: [ + %{ + data: "0x00fdd58e" <> request_2, + to: contract_address_2 + }, + ^block_number_hex + ] + } + ], + _options -> + types_list = [:address, {:uint, 256}] + + [address_1, token_id_1] = request_1 |> Base.decode16!(case: :lower) |> TypeDecoder.decode_raw(types_list) + + assert address_1 == address.hash.bytes + + result_1 = + balances_erc_1155[{contract_address_1 |> String.downcase(), to_string(token_id_1)}] + |> List.wrap() + |> TypeEncoder.encode_raw([{:uint, 256}], :standard) + |> Base.encode16(case: :lower) + + [address_2, token_id_2] = request_2 |> Base.decode16!(case: :lower) |> TypeDecoder.decode_raw(types_list) + + assert address_2 == address.hash.bytes + + result_2 = + balances_erc_1155[{contract_address_2 |> String.downcase(), to_string(token_id_2)}] + |> List.wrap() + |> TypeEncoder.encode_raw([{:uint, 256}], :standard) + |> Base.encode16(case: :lower) + + {:ok, + [ + %{ + id: id_1, + jsonrpc: "2.0", + result: "0x" <> result_1 + }, + %{ + id: id_2, + jsonrpc: "2.0", + result: "0x" <> result_2 + } + ]} + end) + + expect(EthereumJSONRPC.Mox, :json_rpc, fn [ + %{ + id: id_1, + jsonrpc: "2.0", + method: "eth_call", + params: [ + %{ + data: "0x70a08231" <> request_1, + to: contract_address_1 + }, + ^block_number_hex + ] + }, + %{ + id: id_2, + jsonrpc: "2.0", + method: "eth_call", + params: [ + %{ + data: "0x70a08231" <> request_2, + to: contract_address_2 + }, + ^block_number_hex + ] + }, + %{ + id: id_3, + jsonrpc: "2.0", + method: "eth_call", + params: [ + %{ + data: "0x70a08231" <> request_3, + to: contract_address_3 + }, + ^block_number_hex + ] + }, + %{ + id: id_4, + jsonrpc: "2.0", + method: "eth_call", + params: [ + %{ + data: "0x70a08231" <> request_4, + to: contract_address_4 + }, + ^block_number_hex + ] + } + ], + _options -> + types_list = [:address] + + assert request_1 |> Base.decode16!(case: :lower) |> TypeDecoder.decode_raw(types_list) == [address.hash.bytes] + + assert request_2 |> Base.decode16!(case: :lower) |> TypeDecoder.decode_raw(types_list) == [address.hash.bytes] + + assert request_3 |> Base.decode16!(case: :lower) |> TypeDecoder.decode_raw(types_list) == [address.hash.bytes] + + assert request_4 |> Base.decode16!(case: :lower) |> TypeDecoder.decode_raw(types_list) == [address.hash.bytes] + + result_1 = + other_balances[contract_address_1 |> String.downcase()] + |> List.wrap() + |> TypeEncoder.encode_raw([{:uint, 256}], :standard) + |> Base.encode16(case: :lower) + + result_2 = + other_balances[contract_address_2 |> String.downcase()] + |> List.wrap() + |> TypeEncoder.encode_raw([{:uint, 256}], :standard) + |> Base.encode16(case: :lower) + + result_3 = + other_balances[contract_address_3 |> String.downcase()] + |> List.wrap() + |> TypeEncoder.encode_raw([{:uint, 256}], :standard) + |> Base.encode16(case: :lower) + + result_4 = + other_balances[contract_address_4 |> String.downcase()] + |> List.wrap() + |> TypeEncoder.encode_raw([{:uint, 256}], :standard) + |> Base.encode16(case: :lower) + + {:ok, + [ + %{ + id: id_1, + jsonrpc: "2.0", + result: "0x" <> result_1 + }, + %{ + id: id_2, + jsonrpc: "2.0", + result: "0x" <> result_2 + }, + %{ + id: id_3, + jsonrpc: "2.0", + result: "0x" <> result_3 + }, + %{ + id: id_4, + jsonrpc: "2.0", + result: "0x" <> result_4 + } + ]} + end) + + topic = "addresses:#{address.hash}" + + {:ok, _reply, _socket} = + BlockScoutWeb.UserSocketV2 + |> socket("no_id", %{}) + |> subscribe_and_join(topic) + + request = get(conn, "/api/v2/addresses/#{address.hash}/tokens") + assert _response = json_response(request, 200) + overflow = false + + assert_receive %Phoenix.Socket.Message{ + payload: %{token_balances: [ctb_erc_20], overflow: ^overflow}, + event: "updated_token_balances_erc_20", + topic: ^topic + }, + :timer.seconds(1) + + assert_receive %Phoenix.Socket.Message{ + payload: %{token_balances: [ctb_erc_721], overflow: ^overflow}, + event: "updated_token_balances_erc_721", + topic: ^topic + }, + :timer.seconds(1) + + assert_receive %Phoenix.Socket.Message{ + payload: %{token_balances: [ctb_erc_1155], overflow: ^overflow}, + event: "updated_token_balances_erc_1155", + topic: ^topic + }, + :timer.seconds(1) + + assert Decimal.to_integer(ctb_erc_20["value"]) == + other_balances[ctb_erc_20["token"]["address"] |> String.downcase()] + + assert Decimal.to_integer(ctb_erc_721["value"]) == + other_balances[ctb_erc_721["token"]["address"] |> String.downcase()] + + assert Decimal.to_integer(ctb_erc_1155["value"]) == + balances_erc_1155[ + {ctb_erc_1155["token"]["address"] |> String.downcase(), to_string(ctb_erc_1155["token_id"])} + ] + end + end + describe "/addresses/{address_hash}/withdrawals" do test "get empty list on non existing address", %{conn: conn} do address = build(:address) @@ -2278,6 +2648,42 @@ defmodule BlockScoutWeb.API.V2.AddressControllerTest do check_paginated_response(response, response_2nd_page, token_instances) end + test "get paginated ERC-404 nft", %{conn: conn, endpoint: endpoint} do + address = insert(:address) + + insert_list(51, :address_current_token_balance_with_token_id) + + token_instances = + for _ <- 0..50 do + token = insert(:token, type: "ERC-404") + + ti = + insert(:token_instance, + token_contract_address_hash: token.contract_address_hash + ) + |> Repo.preload([:token]) + + current_token_balance = + insert(:address_current_token_balance_with_token_id_and_fixed_token_type, + address: address, + token_type: "ERC-404", + token_id: ti.token_id, + token_contract_address_hash: token.contract_address_hash + ) + + %Instance{ti | current_token_balance: current_token_balance} + end + |> Enum.sort_by(&{&1.token_contract_address_hash, &1.token_id}, :desc) + + request = get(conn, endpoint.(address.hash)) + assert response = json_response(request, 200) + + request_2nd_page = get(conn, endpoint.(address.hash), response["next_page_params"]) + assert response_2nd_page = json_response(request_2nd_page, 200) + + check_paginated_response(response, response_2nd_page, token_instances) + end + test "test filters", %{conn: conn, endpoint: endpoint} do address = insert(:address) diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/block_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/block_controller_test.exs index 5a29e5168366..9ba0952cb111 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/block_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/block_controller_test.exs @@ -1,7 +1,7 @@ defmodule BlockScoutWeb.API.V2.BlockControllerTest do use BlockScoutWeb.ConnCase - alias Explorer.Chain.{Address, Block, Transaction, Withdrawal} + alias Explorer.Chain.{Address, Block, InternalTransaction, Transaction, Withdrawal} setup do Supervisor.terminate_child(Explorer.Supervisor, Explorer.Chain.Cache.Blocks.child_id()) @@ -386,6 +386,84 @@ defmodule BlockScoutWeb.API.V2.BlockControllerTest do end end + describe "/blocks/{block_hash_or_number}/internal-transactions" do + test "returns 422 on invalid parameter", %{conn: conn} do + request_1 = get(conn, "/api/v2/blocks/0x123123/internal-transactions") + assert %{"message" => "Invalid hash"} = json_response(request_1, 422) + + request_2 = get(conn, "/api/v2/blocks/123qwe/internal-transactions") + assert %{"message" => "Invalid number"} = json_response(request_2, 422) + end + + test "returns 404 on non existing block", %{conn: conn} do + block = build(:block) + + request_1 = get(conn, "/api/v2/blocks/#{block.number}/internal-transactions") + assert %{"message" => "Not found"} = json_response(request_1, 404) + + request_2 = get(conn, "/api/v2/blocks/#{block.hash}/internal-transactions") + assert %{"message" => "Not found"} = json_response(request_2, 404) + end + + test "returns empty list", %{conn: conn} do + block = insert(:block) + + request = get(conn, "/api/v2/blocks/#{block.hash}/internal-transactions") + assert %{"items" => [], "next_page_params" => nil} = json_response(request, 200) + + request = get(conn, "/api/v2/blocks/#{block.number}/internal-transactions") + assert %{"items" => [], "next_page_params" => nil} = json_response(request, 200) + end + + test "can paginate internal transactions", %{conn: conn} do + block = insert(:block) + + request = get(conn, "/api/v2/blocks/#{block.hash}/internal-transactions") + assert %{"items" => [], "next_page_params" => nil} = json_response(request, 200) + + tx = + :transaction + |> insert() + |> with_block(block) + + insert(:internal_transaction, + transaction: tx, + index: 0, + block_number: tx.block_number, + transaction_index: tx.index, + block_hash: tx.block_hash, + block_index: 0 + ) + + internal_txs = + 51..1 + |> Enum.map(fn index -> + tx = + :transaction + |> insert() + |> with_block(block) + + insert(:internal_transaction, + transaction: tx, + index: index, + block_number: tx.block_number, + transaction_index: tx.index, + block_hash: tx.block_hash, + block_index: index + ) + end) + + request = get(conn, "/api/v2/blocks/#{block.hash}/internal-transactions") + assert response = json_response(request, 200) + + request_2nd_page = get(conn, "/api/v2/blocks/#{block.hash}/internal-transactions", response["next_page_params"]) + + assert response_2nd_page = json_response(request_2nd_page, 200) + + check_paginated_response(response, response_2nd_page, internal_txs) + end + end + defp compare_item(%Block{} = block, json) do assert to_string(block.hash) == json["hash"] assert block.number == json["height"] @@ -403,6 +481,15 @@ defmodule BlockScoutWeb.API.V2.BlockControllerTest do assert withdrawal.index == json["index"] end + defp compare_item(%InternalTransaction{} = internal_tx, json) do + assert internal_tx.block_number == json["block"] + assert to_string(internal_tx.gas) == json["gas_limit"] + assert internal_tx.index == json["index"] + assert to_string(internal_tx.transaction_hash) == json["transaction_hash"] + assert Address.checksum(internal_tx.from_address_hash) == json["from"]["hash"] + assert Address.checksum(internal_tx.to_address_hash) == json["to"]["hash"] + end + defp check_paginated_response(first_page_resp, second_page_resp, list) do assert Enum.count(first_page_resp["items"]) == 50 assert first_page_resp["next_page_params"] != nil diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/config_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/config_controller_test.exs index 0c00722d58bb..eb55d1225b1b 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/config_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/config_controller_test.exs @@ -1,22 +1,22 @@ defmodule BlockScoutWeb.API.V2.ConfigControllerTest do use BlockScoutWeb.ConnCase - describe "/config/json-rpc-url" do + describe "/config/backend-version" do test "get json rps url if set", %{conn: conn} do - url = "http://rps.url:1234/v1" - Application.put_env(:block_scout_web, :json_rpc, url) + version = "v6.3.0-beta" + Application.put_env(:block_scout_web, :version, version) - request = get(conn, "/api/v2/config/json-rpc-url") + request = get(conn, "/api/v2/config/backend-version") - assert %{"json_rpc_url" => ^url} = json_response(request, 200) + assert %{"backend_version" => ^version} = json_response(request, 200) end - test "get empty json rps url if not set", %{conn: conn} do - Application.put_env(:block_scout_web, :json_rpc, nil) + test "get nil backend version if not set", %{conn: conn} do + Application.put_env(:block_scout_web, :version, nil) - request = get(conn, "/api/v2/config/json-rpc-url") + request = get(conn, "/api/v2/config/backend-version") - assert %{"json_rpc_url" => nil} = json_response(request, 200) + assert %{"backend_version" => nil} = json_response(request, 200) end end end diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs index 6df1eddb73d3..072efeb0dbcb 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/smart_contract_controller_test.exs @@ -36,6 +36,8 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do assert response == %{ + "has_custom_methods_read" => false, + "has_custom_methods_write" => false, "is_self_destructed" => false, "deployed_bytecode" => to_string(address.contract_code), "creation_bytecode" => nil @@ -53,6 +55,8 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do assert response == %{ + "has_custom_methods_read" => false, + "has_custom_methods_write" => false, "is_self_destructed" => false, "deployed_bytecode" => to_string(address.contract_code), "creation_bytecode" => @@ -86,6 +90,12 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do "is_fully_verified" => true, "is_verified_via_sourcify" => target_contract.verified_via_sourcify, "is_vyper_contract" => target_contract.is_vyper_contract, + "has_methods_read" => true, + "has_methods_write" => true, + "has_methods_read_proxy" => true, + "has_methods_write_proxy" => true, + "has_custom_methods_read" => false, + "has_custom_methods_write" => false, "minimal_proxy_address_hash" => nil, "sourcify_repo_url" => if(target_contract.verified_via_sourcify, @@ -112,10 +122,14 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do "0x608060405234801561001057600080fd5b5060df8061001f6000396000f3006080604052600436106049576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806360fe47b114604e5780636d4ce63c146078575b600080fd5b348015605957600080fd5b5060766004803603810190808035906020019092919050505060a0565b005b348015608357600080fd5b50608a60aa565b6040518082815260200191505060405180910390f35b8060008190555050565b600080549050905600a165627a7a7230582061b7676067d537e410bb704932a9984739a959416170ea17bda192ac1218d2790029", "abi" => target_contract.abi, "is_verified_via_eth_bytecode_db" => target_contract.verified_via_eth_bytecode_db, + "is_verified_via_verifier_alliance" => target_contract.verified_via_verifier_alliance, "language" => smart_contract_language(target_contract), - "license_type" => "none" + "license_type" => "none", + "certified" => false } + get_eip1967_implementation_non_zero_address() + request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(target_contract.address_hash)}") response = json_response(request, 200) @@ -176,6 +190,12 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do "is_fully_verified" => true, "is_verified_via_sourcify" => target_contract.verified_via_sourcify, "is_vyper_contract" => target_contract.is_vyper_contract, + "has_methods_read" => true, + "has_methods_read_proxy" => false, + "has_methods_write" => true, + "has_methods_write_proxy" => false, + "has_custom_methods_read" => false, + "has_custom_methods_write" => false, "minimal_proxy_address_hash" => nil, "sourcify_repo_url" => if(target_contract.verified_via_sourcify, @@ -205,10 +225,14 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do "0x608060405234801561001057600080fd5b5060df8061001f6000396000f3006080604052600436106049576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806360fe47b114604e5780636d4ce63c146078575b600080fd5b348015605957600080fd5b5060766004803603810190808035906020019092919050505060a0565b005b348015608357600080fd5b50608a60aa565b6040518082815260200191505060405180910390f35b8060008190555050565b600080549050905600a165627a7a7230582061b7676067d537e410bb704932a9984739a959416170ea17bda192ac1218d2790029", "abi" => target_contract.abi, "is_verified_via_eth_bytecode_db" => target_contract.verified_via_eth_bytecode_db, + "is_verified_via_verifier_alliance" => target_contract.verified_via_verifier_alliance, "language" => smart_contract_language(target_contract), - "license_type" => "gnu_agpl_v3" + "license_type" => "gnu_agpl_v3", + "certified" => false } + get_eip1967_implementation_error_response() + request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(target_contract.address_hash)}") response = json_response(request, 200) @@ -277,6 +301,12 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do "is_fully_verified" => false, "is_verified_via_sourcify" => false, "is_vyper_contract" => target_contract.is_vyper_contract, + "has_methods_read" => true, + "has_methods_write" => true, + "has_methods_read_proxy" => false, + "has_methods_write_proxy" => false, + "has_custom_methods_read" => false, + "has_custom_methods_write" => false, "minimal_proxy_address_hash" => nil, "sourcify_repo_url" => nil, "can_be_visualized_via_sol2uml" => false, @@ -300,10 +330,14 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do "0x608060405234801561001057600080fd5b5060df8061001f6000396000f3006080604052600436106049576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806360fe47b114604e5780636d4ce63c146078575b600080fd5b348015605957600080fd5b5060766004803603810190808035906020019092919050505060a0565b005b348015608357600080fd5b50608a60aa565b6040518082815260200191505060405180910390f35b8060008190555050565b600080549050905600a165627a7a7230582061b7676067d537e410bb704932a9984739a959416170ea17bda192ac1218d2790029", "abi" => target_contract.abi, "is_verified_via_eth_bytecode_db" => target_contract.verified_via_eth_bytecode_db, + "is_verified_via_verifier_alliance" => target_contract.verified_via_verifier_alliance, "language" => smart_contract_language(target_contract), - "license_type" => "none" + "license_type" => "none", + "certified" => false } + get_eip1967_implementation_error_response() + request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(address.hash)}") response = json_response(request, 200) @@ -387,6 +421,12 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do "is_fully_verified" => false, "is_verified_via_sourcify" => false, "is_vyper_contract" => implementation_contract.is_vyper_contract, + "has_methods_read" => true, + "has_methods_write" => true, + "has_methods_read_proxy" => true, + "has_methods_write_proxy" => true, + "has_custom_methods_read" => false, + "has_custom_methods_write" => false, "minimal_proxy_address_hash" => Address.checksum("0x" <> implementation_contract_address_hash_string), "sourcify_repo_url" => nil, "can_be_visualized_via_sol2uml" => false, @@ -411,8 +451,10 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do "creation_bytecode" => proxy_tx_input, "abi" => implementation_contract.abi, "is_verified_via_eth_bytecode_db" => implementation_contract.verified_via_eth_bytecode_db, + "is_verified_via_verifier_alliance" => implementation_contract.verified_via_verifier_alliance, "language" => smart_contract_language(implementation_contract), - "license_type" => "bsd_3_clause" + "license_type" => "bsd_3_clause", + "certified" => false } request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(proxy_address.hash)}") @@ -471,6 +513,8 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do Conn.resp(conn, 200, eth_bytecode_response) end) + get_eip1967_implementation_error_response() + request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(address.hash)}") assert_receive %Phoenix.Socket.Message{ @@ -491,6 +535,8 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do assert response == %{ + "has_custom_methods_read" => false, + "has_custom_methods_write" => false, "is_self_destructed" => false, "deployed_bytecode" => to_string(address.contract_code), "creation_bytecode" => @@ -550,6 +596,8 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do Conn.resp(conn, 200, eth_bytecode_response) end) + get_eip1967_implementation_error_response() + request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(address.hash)}") assert_receive %Phoenix.Socket.Message{ @@ -570,6 +618,8 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do assert response == %{ + "has_custom_methods_read" => false, + "has_custom_methods_write" => false, "is_self_destructed" => false, "deployed_bytecode" => to_string(address.contract_code), "creation_bytecode" => @@ -696,12 +746,16 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do assert response == %{ + "has_custom_methods_read" => false, + "has_custom_methods_write" => false, "is_self_destructed" => false, "deployed_bytecode" => to_string(address.contract_code), "creation_bytecode" => "0x608060405234801561001057600080fd5b5060df8061001f6000396000f3006080604052600436106049576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806360fe47b114604e5780636d4ce63c146078575b600080fd5b348015605957600080fd5b5060766004803603810190808035906020019092919050505060a0565b005b348015608357600080fd5b50608a60aa565b6040518082815260200191505060405180910390f35b8060008190555050565b600080549050905600a165627a7a7230582061b7676067d537e410bb704932a9984739a959416170ea17bda192ac1218d2790029" } + get_eip1967_implementation_error_response() + request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(address.hash)}") assert response = json_response(request, 200) assert %{"is_verified" => true} = response @@ -759,6 +813,8 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do Conn.resp(conn, 200, eth_bytecode_response) end) + get_eip1967_implementation_error_response() + request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(address.hash)}") assert_receive %Phoenix.Socket.Message{ @@ -779,6 +835,8 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do assert response == %{ + "has_custom_methods_read" => false, + "has_custom_methods_write" => false, "is_self_destructed" => false, "deployed_bytecode" => to_string(address.contract_code), "creation_bytecode" => @@ -825,6 +883,349 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do GenServer.stop(pid) end + test "automatically verify contract using search-all (allianceSources) endpoint", %{conn: conn} do + {:ok, pid} = Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand.start_link([]) + old_chain_id = Application.get_env(:block_scout_web, :chain_id) + + Application.put_env(:block_scout_web, :chain_id, 5) + + bypass = Bypass.open() + + eth_bytecode_response = + File.read!("./test/support/fixture/smart_contract/eth_bytecode_db_search_all_alliance_sources_response.json") + + old_env = Application.get_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour) + + Application.put_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour, + service_url: "http://localhost:#{bypass.port}", + enabled: true, + type: "eth_bytecode_db", + eth_bytecode_db?: true + ) + + address = insert(:contract_address) + + insert(:transaction, + created_contract_address_hash: address.hash, + input: + "0x608060405234801561001057600080fd5b5060df8061001f6000396000f3006080604052600436106049576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806360fe47b114604e5780636d4ce63c146078575b600080fd5b348015605957600080fd5b5060766004803603810190808035906020019092919050505060a0565b005b348015608357600080fd5b50608a60aa565b6040518082815260200191505060405180910390f35b8060008190555050565b600080549050905600a165627a7a7230582061b7676067d537e410bb704932a9984739a959416170ea17bda192ac1218d2790029" + ) + |> with_block() + + topic = "addresses:#{address.hash}" + + {:ok, _reply, _socket} = + BlockScoutWeb.UserSocketV2 + |> socket("no_id", %{}) + |> subscribe_and_join(topic) + + Bypass.expect_once(bypass, "POST", "/api/v2/bytecodes/sources_search_all", fn conn -> + Conn.resp(conn, 200, eth_bytecode_response) + end) + + get_eip1967_implementation_non_zero_address() + + request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(address.hash)}") + + assert_receive %Phoenix.Socket.Message{ + payload: %{}, + event: "eth_bytecode_db_lookup_started", + topic: ^topic + }, + :timer.seconds(1) + + assert_receive %Phoenix.Socket.Message{ + payload: %{}, + event: "smart_contract_was_verified", + topic: ^topic + }, + :timer.seconds(1) + + response = json_response(request, 200) + + assert response == + %{ + "has_custom_methods_read" => false, + "has_custom_methods_write" => false, + "is_self_destructed" => false, + "deployed_bytecode" => to_string(address.contract_code), + "creation_bytecode" => + "0x608060405234801561001057600080fd5b5060df8061001f6000396000f3006080604052600436106049576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806360fe47b114604e5780636d4ce63c146078575b600080fd5b348015605957600080fd5b5060766004803603810190808035906020019092919050505060a0565b005b348015608357600080fd5b50608a60aa565b6040518082815260200191505060405180910390f35b8060008190555050565b600080549050905600a165627a7a7230582061b7676067d537e410bb704932a9984739a959416170ea17bda192ac1218d2790029" + } + + request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(address.hash)}") + assert response = json_response(request, 200) + assert %{"is_verified" => true} = response + assert %{"is_verified_via_eth_bytecode_db" => true} = response + assert %{"is_partially_verified" => true} = response + assert %{"is_verified_via_sourcify" => false} = response + assert %{"is_verified_via_verifier_alliance" => true} = response + assert %{"is_fully_verified" => false} = response + + smart_contract = Jason.decode!(eth_bytecode_response)["allianceSources"] |> List.first() + assert response["compiler_settings"] == Jason.decode!(smart_contract["compilerSettings"]) + assert response["name"] == smart_contract["contractName"] + assert response["compiler_version"] == smart_contract["compilerVersion"] + assert response["file_path"] == smart_contract["fileName"] + assert response["constructor_args"] == smart_contract["constructorArguments"] + assert response["abi"] == Jason.decode!(smart_contract["abi"]) + + assert response["source_code"] == smart_contract["sourceFiles"][smart_contract["fileName"]] + + assert response["external_libraries"] == [ + %{ + "address_hash" => "0x00000000D41867734BBee4C6863D9255b2b06aC1", + "name" => "__CACHE_BREAKER__" + } + ] + + additional_sources = + for file_name <- Map.keys(smart_contract["sourceFiles"]), smart_contract["fileName"] != file_name do + %{ + "source_code" => smart_contract["sourceFiles"][file_name], + "file_path" => file_name + } + end + + assert response["additional_sources"] |> Enum.sort_by(fn x -> x["file_path"] end) == + additional_sources |> Enum.sort_by(fn x -> x["file_path"] end) + + Application.put_env(:block_scout_web, :chain_id, old_chain_id) + Application.put_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour, old_env) + Bypass.down(bypass) + GenServer.stop(pid) + end + + test "automatically verify contract using search-all (prefer sourcify FULL match) endpoint", %{conn: conn} do + {:ok, pid} = Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand.start_link([]) + old_chain_id = Application.get_env(:block_scout_web, :chain_id) + + Application.put_env(:block_scout_web, :chain_id, 5) + + bypass = Bypass.open() + + eth_bytecode_response = + File.read!( + "./test/support/fixture/smart_contract/eth_bytecode_db_search_all_alliance_sources_partial_response.json" + ) + + old_env = Application.get_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour) + + Application.put_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour, + service_url: "http://localhost:#{bypass.port}", + enabled: true, + type: "eth_bytecode_db", + eth_bytecode_db?: true + ) + + address = insert(:contract_address) + + insert(:transaction, + created_contract_address_hash: address.hash, + input: + "0x608060405234801561001057600080fd5b5060df8061001f6000396000f3006080604052600436106049576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806360fe47b114604e5780636d4ce63c146078575b600080fd5b348015605957600080fd5b5060766004803603810190808035906020019092919050505060a0565b005b348015608357600080fd5b50608a60aa565b6040518082815260200191505060405180910390f35b8060008190555050565b600080549050905600a165627a7a7230582061b7676067d537e410bb704932a9984739a959416170ea17bda192ac1218d2790029" + ) + |> with_block() + + topic = "addresses:#{address.hash}" + + {:ok, _reply, _socket} = + BlockScoutWeb.UserSocketV2 + |> socket("no_id", %{}) + |> subscribe_and_join(topic) + + Bypass.expect_once(bypass, "POST", "/api/v2/bytecodes/sources_search_all", fn conn -> + Conn.resp(conn, 200, eth_bytecode_response) + end) + + get_eip1967_implementation_non_zero_address() + + request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(address.hash)}") + + assert_receive %Phoenix.Socket.Message{ + payload: %{}, + event: "eth_bytecode_db_lookup_started", + topic: ^topic + }, + :timer.seconds(1) + + assert_receive %Phoenix.Socket.Message{ + payload: %{}, + event: "smart_contract_was_verified", + topic: ^topic + }, + :timer.seconds(1) + + response = json_response(request, 200) + + assert response == + %{ + "has_custom_methods_read" => false, + "has_custom_methods_write" => false, + "is_self_destructed" => false, + "deployed_bytecode" => to_string(address.contract_code), + "creation_bytecode" => + "0x608060405234801561001057600080fd5b5060df8061001f6000396000f3006080604052600436106049576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806360fe47b114604e5780636d4ce63c146078575b600080fd5b348015605957600080fd5b5060766004803603810190808035906020019092919050505060a0565b005b348015608357600080fd5b50608a60aa565b6040518082815260200191505060405180910390f35b8060008190555050565b600080549050905600a165627a7a7230582061b7676067d537e410bb704932a9984739a959416170ea17bda192ac1218d2790029" + } + + request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(address.hash)}") + assert response = json_response(request, 200) + assert %{"is_verified" => true} = response + assert %{"is_verified_via_eth_bytecode_db" => true} = response + assert %{"is_partially_verified" => false} = response + assert %{"is_verified_via_sourcify" => true} = response + assert %{"is_verified_via_verifier_alliance" => false} = response + assert %{"is_fully_verified" => true} = response + + smart_contract = Jason.decode!(eth_bytecode_response)["sourcifySources"] |> List.first() + assert response["compiler_settings"] == Jason.decode!(smart_contract["compilerSettings"]) + assert response["name"] == smart_contract["contractName"] + assert response["compiler_version"] == smart_contract["compilerVersion"] + assert response["file_path"] == smart_contract["fileName"] + assert response["constructor_args"] == smart_contract["constructorArguments"] + assert response["abi"] == Jason.decode!(smart_contract["abi"]) + + assert response["source_code"] == smart_contract["sourceFiles"][smart_contract["fileName"]] + + assert response["external_libraries"] == [ + %{ + "address_hash" => "0x00000000D41867734BBee4C6863D9255b2b06aC1", + "name" => "__CACHE_BREAKER__" + } + ] + + additional_sources = + for file_name <- Map.keys(smart_contract["sourceFiles"]), smart_contract["fileName"] != file_name do + %{ + "source_code" => smart_contract["sourceFiles"][file_name], + "file_path" => file_name + } + end + + assert response["additional_sources"] |> Enum.sort_by(fn x -> x["file_path"] end) == + additional_sources |> Enum.sort_by(fn x -> x["file_path"] end) + + Application.put_env(:block_scout_web, :chain_id, old_chain_id) + Application.put_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour, old_env) + Bypass.down(bypass) + GenServer.stop(pid) + end + + test "automatically verify contract using search-all (take eth bytecode db FULL match) endpoint", %{conn: conn} do + {:ok, pid} = Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand.start_link([]) + old_chain_id = Application.get_env(:block_scout_web, :chain_id) + + Application.put_env(:block_scout_web, :chain_id, 5) + + bypass = Bypass.open() + + eth_bytecode_response = + File.read!( + "./test/support/fixture/smart_contract/eth_bytecode_db_search_all_alliance_sources_partial_response_eth_bdb_full.json" + ) + + old_env = Application.get_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour) + + Application.put_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour, + service_url: "http://localhost:#{bypass.port}", + enabled: true, + type: "eth_bytecode_db", + eth_bytecode_db?: true + ) + + address = insert(:contract_address) + + insert(:transaction, + created_contract_address_hash: address.hash, + input: + "0x608060405234801561001057600080fd5b5060df8061001f6000396000f3006080604052600436106049576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806360fe47b114604e5780636d4ce63c146078575b600080fd5b348015605957600080fd5b5060766004803603810190808035906020019092919050505060a0565b005b348015608357600080fd5b50608a60aa565b6040518082815260200191505060405180910390f35b8060008190555050565b600080549050905600a165627a7a7230582061b7676067d537e410bb704932a9984739a959416170ea17bda192ac1218d2790029" + ) + |> with_block() + + topic = "addresses:#{address.hash}" + + {:ok, _reply, _socket} = + BlockScoutWeb.UserSocketV2 + |> socket("no_id", %{}) + |> subscribe_and_join(topic) + + Bypass.expect_once(bypass, "POST", "/api/v2/bytecodes/sources_search_all", fn conn -> + Conn.resp(conn, 200, eth_bytecode_response) + end) + + get_eip1967_implementation_non_zero_address() + + request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(address.hash)}") + + assert_receive %Phoenix.Socket.Message{ + payload: %{}, + event: "eth_bytecode_db_lookup_started", + topic: ^topic + }, + :timer.seconds(1) + + assert_receive %Phoenix.Socket.Message{ + payload: %{}, + event: "smart_contract_was_verified", + topic: ^topic + }, + :timer.seconds(1) + + response = json_response(request, 200) + + assert response == + %{ + "has_custom_methods_read" => false, + "has_custom_methods_write" => false, + "is_self_destructed" => false, + "deployed_bytecode" => to_string(address.contract_code), + "creation_bytecode" => + "0x608060405234801561001057600080fd5b5060df8061001f6000396000f3006080604052600436106049576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806360fe47b114604e5780636d4ce63c146078575b600080fd5b348015605957600080fd5b5060766004803603810190808035906020019092919050505060a0565b005b348015608357600080fd5b50608a60aa565b6040518082815260200191505060405180910390f35b8060008190555050565b600080549050905600a165627a7a7230582061b7676067d537e410bb704932a9984739a959416170ea17bda192ac1218d2790029" + } + + request = get(conn, "/api/v2/smart-contracts/#{Address.checksum(address.hash)}") + assert response = json_response(request, 200) + assert %{"is_verified" => true} = response + assert %{"is_verified_via_eth_bytecode_db" => true} = response + assert %{"is_partially_verified" => false} = response + assert %{"is_verified_via_sourcify" => false} = response + assert %{"is_verified_via_verifier_alliance" => false} = response + assert %{"is_fully_verified" => true} = response + + smart_contract = Jason.decode!(eth_bytecode_response)["ethBytecodeDbSources"] |> List.first() + assert response["compiler_settings"] == Jason.decode!(smart_contract["compilerSettings"]) + assert response["name"] == smart_contract["contractName"] + assert response["compiler_version"] == smart_contract["compilerVersion"] + assert response["file_path"] == smart_contract["fileName"] + assert response["constructor_args"] == smart_contract["constructorArguments"] + assert response["abi"] == Jason.decode!(smart_contract["abi"]) + + assert response["source_code"] == smart_contract["sourceFiles"][smart_contract["fileName"]] + + assert response["external_libraries"] == [ + %{ + "address_hash" => "0x00000000D41867734BBee4C6863D9255b2b06aC1", + "name" => "__CACHE_BREAKER__" + } + ] + + additional_sources = + for file_name <- Map.keys(smart_contract["sourceFiles"]), smart_contract["fileName"] != file_name do + %{ + "source_code" => smart_contract["sourceFiles"][file_name], + "file_path" => file_name + } + end + + assert response["additional_sources"] |> Enum.sort_by(fn x -> x["file_path"] end) == + additional_sources |> Enum.sort_by(fn x -> x["file_path"] end) + + Application.put_env(:block_scout_web, :chain_id, old_chain_id) + Application.put_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour, old_env) + Bypass.down(bypass) + GenServer.stop(pid) + end + test "check fetch interval for LookUpSmartContractSourcesOnDemand and use sources:search endpoint since chain_id is unset", %{conn: conn} do {:ok, pid} = Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand.start_link([]) @@ -1126,13 +1527,13 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do "tuple[bytes32,uint256,bytes32,uint256,address,address,uint256,bool,tuple[address,bytes32[],bytes][]]", "value" => [ "0xfe6a43fa23a0269092cbf97cb908e1d5a49a18fd6942baf2467fb5b221e39ab2", - 1000, + "1000", "0xfe6a43fa23a0269092cbf97cb908e1d5a49a18fd6942baf2467fb5b221e39ab2", - 10, + "10", "0xbb36c792b9b45aaf8b848a1392b0d6559202729e", "0xbb36c792b9b45aaf8b848a1392b0d6559202729e", - 123_123, - true, + "123123", + "true", [ [ "0xbb36c792b9b45aaf8b848a1392b0d6559202729e", @@ -1173,6 +1574,64 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do refute %{"type" => "receive"} in response end + test "ensure read-methods are not duplicated", %{conn: conn} do + abi = [ + %{ + "inputs" => [], + "name" => "test", + "outputs" => [ + %{"internalType" => "uint256", "name" => "", "type" => "uint256"} + ], + "stateMutability" => "pure", + "type" => "function" + } + ] + + id = + abi + |> ABI.parse_specification() + |> Enum.at(0) + |> Map.fetch!(:method_id) + + target_contract = insert(:smart_contract, abi: abi) + + expect( + EthereumJSONRPC.Mox, + :json_rpc, + fn [%{id: id, method: "eth_call", params: _params}], _opts -> + {:ok, + [ + %{ + id: id, + jsonrpc: "2.0", + result: "0x00000000000000000000000000000000000000000000009d37020ac9049a8040" + } + ]} + end + ) + + request = get(conn, "/api/v2/smart-contracts/#{target_contract.address_hash}/methods-read") + + assert response = json_response(request, 200) + + assert response == [ + %{ + "type" => "function", + "stateMutability" => "pure", + "outputs" => [ + %{ + "type" => "uint256", + "value" => "2900102562052921000000" + } + ], + "name" => "test", + "names" => ["uint256"], + "inputs" => [], + "method_id" => Base.encode16(id, case: :lower) + } + ] + end + test "get array of addresses within read-methods", %{conn: conn} do abi = [ %{ @@ -1377,6 +1836,158 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do "names" => ["bytes"] } in response end + + test "Digests tuple array type", %{conn: conn} do + abi = [ + %{ + "inputs" => [], + "stateMutability" => "nonpayable", + "type" => "constructor" + }, + %{ + "inputs" => [ + %{ + "internalType" => "address", + "name" => "", + "type" => "address" + } + ], + "name" => "contributions", + "outputs" => [ + %{ + "internalType" => "uint256", + "name" => "iterations", + "type" => "uint256" + } + ], + "stateMutability" => "view", + "type" => "function" + }, + %{ + "inputs" => [ + %{ + "internalType" => "uint256", + "name" => "", + "type" => "uint256" + } + ], + "name" => "contributors", + "outputs" => [ + %{ + "internalType" => "address", + "name" => "", + "type" => "address" + } + ], + "stateMutability" => "view", + "type" => "function" + }, + %{ + "inputs" => [], + "name" => "getTopTenContributors", + "outputs" => [ + %{ + "internalType" => "address[10]", + "name" => "", + "type" => "address[10]" + }, + %{ + "internalType" => "uint256[10]", + "name" => "", + "type" => "uint256[10]" + } + ], + "stateMutability" => "view", + "type" => "function" + } + ] + + # id_2 = + # abi + # |> ABI.parse_specification() + # |> Enum.at(0) + # |> Map.fetch!(:method_id) + + target_contract = insert(:smart_contract, abi: abi) + address_hash_string = to_string(target_contract.address_hash) + + EthereumJSONRPC.Mox + |> expect( + :json_rpc, + fn [ + %{ + id: id, + method: "eth_call", + params: [ + %{data: "0x94ec8506", to: ^address_hash_string}, + "latest" + ] + } + ], + _opts -> + {:ok, + [ + %{ + id: id, + jsonrpc: "2.0", + result: + "0x000000000000000000000000af1caf51d49b0e63d1ff7e5d4ed6ea26d15f3f9d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" + } + ]} + end + ) + + request = get(conn, "/api/v2/smart-contracts/#{target_contract.address_hash}/methods-read") + assert response = json_response(request, 200) + + assert [ + %{ + "inputs" => [%{"internalType" => "address", "name" => "", "type" => "address"}], + "method_id" => "42e94c90", + "name" => "contributions", + "outputs" => [%{"internalType" => "uint256", "name" => "iterations", "type" => "uint256"}], + "stateMutability" => "view", + "type" => "function" + }, + %{ + "inputs" => [%{"internalType" => "uint256", "name" => "", "type" => "uint256"}], + "method_id" => "3cb5d100", + "name" => "contributors", + "outputs" => [%{"internalType" => "address", "name" => "", "type" => "address"}], + "stateMutability" => "view", + "type" => "function" + }, + %{ + "inputs" => [], + "method_id" => "94ec8506", + "name" => "getTopTenContributors", + "names" => ["address[10]", "uint256[10]"], + "outputs" => [ + %{ + "type" => "address[10]", + "value" => [ + "0xaf1caf51d49b0e63d1ff7e5d4ed6ea26d15f3f9d", + "0x0000000000000000000000000000000000000000", + "0x0000000000000000000000000000000000000000", + "0x0000000000000000000000000000000000000000", + "0x0000000000000000000000000000000000000000", + "0x0000000000000000000000000000000000000000", + "0x0000000000000000000000000000000000000000", + "0x0000000000000000000000000000000000000000", + "0x0000000000000000000000000000000000000000", + "0x0000000000000000000000000000000000000000" + ] + }, + %{ + "type" => "uint256[10]", + "value" => ["1", "0", "0", "0", "0", "0", "0", "0", "0", "0"] + } + ], + "stateMutability" => "view", + "type" => "function" + } + ] == response + end end describe "/smart-contracts/{address_hash}/query-read-method" do @@ -1477,7 +2088,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do assert %{ "is_error" => false, - "result" => %{"names" => ["bool"], "output" => [%{"type" => "bool", "value" => true}]} + "result" => %{"names" => ["bool"], "output" => [%{"type" => "bool", "value" => "true"}]} } == response end @@ -1578,13 +2189,13 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do "tuple[bytes32,uint256,bytes32,uint256,address,address,uint256,bool,tuple[address,bytes32[],bytes][]]", "value" => [ "0xfe6a43fa23a0269092cbf97cb908e1d5a49a18fd6942baf2467fb5b221e39ab2", - 1000, + "1000", "0xfe6a43fa23a0269092cbf97cb908e1d5a49a18fd6942baf2467fb5b221e39ab2", - 10, + "10", "0xbb36c792b9b45aaf8b848a1392b0d6559202729e", "0xbb36c792b9b45aaf8b848a1392b0d6559202729e", - 123_123, - true, + "123123", + "true", [ [ "0xbb36c792b9b45aaf8b848a1392b0d6559202729e", @@ -1930,7 +2541,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do conn |> post( - "/api/account/v1/user/custom_abis", + "/api/account/v2/user/custom_abis", custom_abi ) @@ -1982,7 +2593,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do conn |> post( - "/api/account/v1/user/custom_abis", + "/api/account/v2/user/custom_abis", custom_abi ) @@ -2049,7 +2660,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do conn |> post( - "/api/account/v1/user/custom_abis", + "/api/account/v2/user/custom_abis", custom_abi ) @@ -2087,7 +2698,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do assert %{ "is_error" => false, - "result" => %{"names" => ["bool"], "output" => [%{"type" => "bool", "value" => true}]} + "result" => %{"names" => ["bool"], "output" => [%{"type" => "bool", "value" => "true"}]} } == response end @@ -2167,7 +2778,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do "result" => %{ "names" => ["amounts"], "output" => [ - %{"type" => "uint256[]", "value" => [1_000_000_000_000_000_000_000, 15_520_773_838_563_941]} + %{"type" => "uint256[]", "value" => ["1000000000000000000000", "15520773838563941"]} ] } } == response @@ -2365,7 +2976,7 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do assert %{ "is_error" => false, - "result" => %{"names" => ["bool"], "output" => [%{"type" => "bool", "value" => true}]} + "result" => %{"names" => ["bool"], "output" => [%{"type" => "bool", "value" => "true"}]} } == response end @@ -2826,4 +3437,107 @@ defmodule BlockScoutWeb.API.V2.SmartContractControllerTest do {:ok, "0x000000000000000000000000#{address_hash |> to_string() |> String.replace("0x", "")}"} end) end + + def get_eip1967_implementation_non_zero_address do + expect(EthereumJSONRPC.Mox, :json_rpc, fn %{ + id: 0, + method: "eth_getStorageAt", + params: [ + _, + "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc", + "latest" + ] + }, + _options -> + {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"} + end) + |> expect(:json_rpc, fn %{ + id: 0, + method: "eth_getStorageAt", + params: [ + _, + "0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50", + "latest" + ] + }, + _options -> + {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"} + end) + |> expect(:json_rpc, fn %{ + id: 0, + method: "eth_getStorageAt", + params: [ + _, + "0x7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c3", + "latest" + ] + }, + _options -> + {:ok, "0x0000000000000000000000000000000000000000000000000000000000000001"} + end) + end + + def get_eip1967_implementation_error_response do + EthereumJSONRPC.Mox + |> expect(:json_rpc, fn %{ + id: 0, + method: "eth_getStorageAt", + params: [ + _, + "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc", + "latest" + ] + }, + _options -> + {:error, "error"} + end) + |> mock_empty_beacon_storage_pointer_request() + |> mock_empty_oz_storage_pointer_request() + |> mock_empty_eip_1822_storage_pointer_request() + end + + defp mock_empty_beacon_storage_pointer_request(mox) do + expect(mox, :json_rpc, fn %{ + id: 0, + method: "eth_getStorageAt", + params: [ + _, + "0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50", + "latest" + ] + }, + _options -> + {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"} + end) + end + + defp mock_empty_eip_1822_storage_pointer_request(mox) do + expect(mox, :json_rpc, fn %{ + id: 0, + method: "eth_getStorageAt", + params: [ + _, + "0xc5f16f0fcc639fa48a6947836d9850f504798523bf8c9a3a87d5876cf622bcf7", + "latest" + ] + }, + _options -> + {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"} + end) + end + + defp mock_empty_oz_storage_pointer_request(mox) do + expect(mox, :json_rpc, fn %{ + id: 0, + method: "eth_getStorageAt", + params: [ + _, + "0x7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c3", + "latest" + ] + }, + _options -> + {:ok, "0x0000000000000000000000000000000000000000000000000000000000000000"} + end) + end end diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs index 18c30bfd19e6..dadae9f1019e 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/token_controller_test.exs @@ -86,7 +86,10 @@ defmodule BlockScoutWeb.API.V2.TokenControllerTest do ) request = get(conn, "/api/v2/tokens/#{token.contract_address.hash}/counters") + assert json_response(request, 200) + Process.sleep(500) + request = get(conn, "/api/v2/tokens/#{token.contract_address.hash}/counters") assert response = json_response(request, 200) assert response["transfers_count"] == "3" @@ -532,6 +535,8 @@ defmodule BlockScoutWeb.API.V2.TokenControllerTest do tokens_ordered_by_holders_asc ) + :timer.sleep(200) + # by circulating_market_cap tokens_ordered_by_circulating_market_cap = Enum.sort(tokens, &(&1.circulating_market_cap <= &2.circulating_market_cap)) @@ -634,9 +639,15 @@ defmodule BlockScoutWeb.API.V2.TokenControllerTest do insert(:token, type: "ERC-1155") end + erc_404_tokens = + for _i <- 0..50 do + insert(:token, type: "ERC-404") + end + check_tokens_pagination(erc_20_tokens, conn, %{"type" => "ERC-20"}) check_tokens_pagination(erc_721_tokens |> Enum.reverse(), conn, %{"type" => "ERC-721"}) check_tokens_pagination(erc_1155_tokens |> Enum.reverse(), conn, %{"type" => "ERC-1155"}) + check_tokens_pagination(erc_404_tokens |> Enum.reverse(), conn, %{"type" => "ERC-404"}) end test "tokens are filtered by multiple type", %{conn: conn} do @@ -655,6 +666,11 @@ defmodule BlockScoutWeb.API.V2.TokenControllerTest do insert(:token, type: "ERC-1155") end + erc_404_tokens = + for _i <- 0..24 do + insert(:token, type: "ERC-404") + end + check_tokens_pagination( erc_721_tokens |> Kernel.++(erc_1155_tokens) |> Enum.reverse(), conn, @@ -670,6 +686,14 @@ defmodule BlockScoutWeb.API.V2.TokenControllerTest do "type" => "[erc-20,ERC-1155]" } ) + + check_tokens_pagination( + erc_404_tokens |> Enum.reverse() |> Kernel.++(erc_20_tokens), + conn, + %{ + "type" => "[erc-20,ERC-404]" + } + ) end test "sorting by fiat_value", %{conn: conn} do @@ -1001,7 +1025,7 @@ defmodule BlockScoutWeb.API.V2.TokenControllerTest do instance = insert(:token_instance, token_id: 0, token_contract_address_hash: token.contract_address_hash) - transfer = + _transfer = insert(:token_transfer, token_contract_address: token.contract_address, transaction: transaction, @@ -1039,6 +1063,27 @@ defmodule BlockScoutWeb.API.V2.TokenControllerTest do "token" => %{"address" => ^token_address, "name" => ^token_name, "type" => ^token_type} } = json_response(request, 200) end + + # https://github.com/blockscout/blockscout/issues/9906 + test "regression for #9906", %{conn: conn} do + token = insert(:token, type: "ERC-721") + + instance = + insert(:token_instance, + token_id: 0, + token_contract_address_hash: token.contract_address_hash, + metadata: %{ + "image_url" => "ipfs://QmTQBtvkCQKnxbUejwYHrs2G74JR2qFwxPUqRb3BQ6BM3S/gm%20gm%20feelin%20blue%204k.png" + } + ) + + request = get(conn, "/api/v2/tokens/#{token.contract_address.hash}/instances/0") + + assert %{ + "image_url" => + "https://ipfs.io/ipfs/QmTQBtvkCQKnxbUejwYHrs2G74JR2qFwxPUqRb3BQ6BM3S/gm%20gm%20feelin%20blue%204k.png" + } = json_response(request, 200) + end end describe "/tokens/{address_hash}/instances/{token_id}/transfers" do @@ -1118,6 +1163,68 @@ defmodule BlockScoutWeb.API.V2.TokenControllerTest do check_paginated_response(response, response_2nd_page, transfers_0 ++ transfers_1) end + test "check that pagination works for 404 tokens", %{conn: conn} do + token = insert(:token, type: "ERC-404") + + for _ <- 0..50 do + insert(:token_instance, token_id: 0) + end + + id = :rand.uniform(1_000_000) + + transaction = + :transaction + |> insert(input: "0xabcd010203040506") + |> with_block() + + insert(:token_instance, token_id: id, token_contract_address_hash: token.contract_address_hash) + + insert_list(100, :token_transfer, + token_contract_address: token.contract_address, + transaction: transaction, + token_ids: [id + 1], + token_type: "ERC-404", + amounts: [1] + ) + + transfers_0 = + insert_list(26, :token_transfer, + token_contract_address: token.contract_address, + transaction: transaction, + token_ids: [id, id + 1], + token_type: "ERC-404", + amounts: [1, 2] + ) + + transfers_1 = + for _ <- 26..50 do + transaction = + :transaction + |> insert(input: "0xabcd010203040506") + |> with_block() + + insert(:token_transfer, + token_contract_address: token.contract_address, + transaction: transaction, + token_ids: [id], + token_type: "ERC-404" + ) + end + + request = get(conn, "/api/v2/tokens/#{token.contract_address_hash}/instances/#{id}/transfers") + assert response = json_response(request, 200) + + request_2nd_page = + get( + conn, + "/api/v2/tokens/#{token.contract_address_hash}/instances/#{id}/transfers", + response["next_page_params"] + ) + + assert response_2nd_page = json_response(request_2nd_page, 200) + check_paginated_response(response, response_2nd_page, transfers_0 ++ transfers_1) + end + test "check that pagination works for 721 tokens", %{conn: conn} do token = insert(:token, type: "ERC-721") id = 0 diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs index 1f0e671812ff..7b3a9652bbf6 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/transaction_controller_test.exs @@ -8,13 +8,6 @@ defmodule BlockScoutWeb.API.V2.TransactionControllerTest do alias Explorer.Chain.{Address, InternalTransaction, Log, Token, TokenTransfer, Transaction} alias Explorer.Repo - @first_topic_hex_string_1 "0x99e7b0ba56da2819c37c047f0511fd2bf6c9b4e27b4a979a19d6da0f74be8155" - - defp topic(topic_hex_string) do - {:ok, topic} = Explorer.Chain.Hash.Full.cast(topic_hex_string) - topic - end - setup do Supervisor.terminate_child(Explorer.Supervisor, Explorer.Chain.Cache.TransactionsApiV2.child_id()) Supervisor.restart_child(Explorer.Supervisor, Explorer.Chain.Cache.TransactionsApiV2.child_id()) @@ -974,142 +967,139 @@ defmodule BlockScoutWeb.API.V2.TransactionControllerTest do end end - describe "stability fees" do - setup %{conn: conn} do - old_env = Application.get_env(:explorer, :chain_type) - - Application.put_env(:explorer, :chain_type, "stability") - - on_exit(fn -> - Application.put_env(:explorer, :chain_type, old_env) - end) + if Application.compile_env(:explorer, :chain_type) == :stability do + @first_topic_hex_string_1 "0x99e7b0ba56da2819c37c047f0511fd2bf6c9b4e27b4a979a19d6da0f74be8155" - %{conn: conn} + defp topic(topic_hex_string) do + {:ok, topic} = Explorer.Chain.Hash.Full.cast(topic_hex_string) + topic end - test "check stability fees", %{conn: conn} do - tx = insert(:transaction) |> with_block() + describe "stability fees" do + test "check stability fees", %{conn: conn} do + tx = insert(:transaction) |> with_block() - _log = - insert(:log, - transaction: tx, - index: 1, - block: tx.block, - block_number: tx.block_number, - first_topic: topic(@first_topic_hex_string_1), - data: - "0x000000000000000000000000dc2b93f3291030f3f7a6d9363ac37757f7ad5c4300000000000000000000000000000000000000000000000000002824369a100000000000000000000000000046b555cb3962bf9533c437cbd04a2f702dfdb999000000000000000000000000000000000000000000000000000014121b4d0800000000000000000000000000faf7a981360c2fab3a5ab7b3d6d8d0cf97a91eb9000000000000000000000000000000000000000000000000000014121b4d0800" - ) - - insert(:token, contract_address: build(:address, hash: "0xDc2B93f3291030F3F7a6D9363ac37757f7AD5C43")) - request = get(conn, "/api/v2/transactions") + _log = + insert(:log, + transaction: tx, + index: 1, + block: tx.block, + block_number: tx.block_number, + first_topic: topic(@first_topic_hex_string_1), + data: + "0x000000000000000000000000dc2b93f3291030f3f7a6d9363ac37757f7ad5c4300000000000000000000000000000000000000000000000000002824369a100000000000000000000000000046b555cb3962bf9533c437cbd04a2f702dfdb999000000000000000000000000000000000000000000000000000014121b4d0800000000000000000000000000faf7a981360c2fab3a5ab7b3d6d8d0cf97a91eb9000000000000000000000000000000000000000000000000000014121b4d0800" + ) - assert %{ - "items" => [ - %{ - "stability_fee" => %{ - "token" => %{"address" => "0xDc2B93f3291030F3F7a6D9363ac37757f7AD5C43"}, - "validator_address" => %{"hash" => "0x46B555CB3962bF9533c437cBD04A2f702dfdB999"}, - "dapp_address" => %{"hash" => "0xFAf7a981360c2FAb3a5Ab7b3D6d8D0Cf97a91Eb9"}, - "total_fee" => "44136000000000", - "dapp_fee" => "22068000000000", - "validator_fee" => "22068000000000" + insert(:token, contract_address: build(:address, hash: "0xDc2B93f3291030F3F7a6D9363ac37757f7AD5C43")) + request = get(conn, "/api/v2/transactions") + + assert %{ + "items" => [ + %{ + "stability_fee" => %{ + "token" => %{"address" => "0xDc2B93f3291030F3F7a6D9363ac37757f7AD5C43"}, + "validator_address" => %{"hash" => "0x46B555CB3962bF9533c437cBD04A2f702dfdB999"}, + "dapp_address" => %{"hash" => "0xFAf7a981360c2FAb3a5Ab7b3D6d8D0Cf97a91Eb9"}, + "total_fee" => "44136000000000", + "dapp_fee" => "22068000000000", + "validator_fee" => "22068000000000" + } } + ] + } = json_response(request, 200) + + request = get(conn, "/api/v2/transactions/#{to_string(tx.hash)}") + + assert %{ + "stability_fee" => %{ + "token" => %{"address" => "0xDc2B93f3291030F3F7a6D9363ac37757f7AD5C43"}, + "validator_address" => %{"hash" => "0x46B555CB3962bF9533c437cBD04A2f702dfdB999"}, + "dapp_address" => %{"hash" => "0xFAf7a981360c2FAb3a5Ab7b3D6d8D0Cf97a91Eb9"}, + "total_fee" => "44136000000000", + "dapp_fee" => "22068000000000", + "validator_fee" => "22068000000000" } - ] - } = json_response(request, 200) - - request = get(conn, "/api/v2/transactions/#{to_string(tx.hash)}") - - assert %{ - "stability_fee" => %{ - "token" => %{"address" => "0xDc2B93f3291030F3F7a6D9363ac37757f7AD5C43"}, - "validator_address" => %{"hash" => "0x46B555CB3962bF9533c437cBD04A2f702dfdB999"}, - "dapp_address" => %{"hash" => "0xFAf7a981360c2FAb3a5Ab7b3D6d8D0Cf97a91Eb9"}, - "total_fee" => "44136000000000", - "dapp_fee" => "22068000000000", - "validator_fee" => "22068000000000" - } - } = json_response(request, 200) - - request = get(conn, "/api/v2/addresses/#{to_string(tx.from_address_hash)}/transactions") - - assert %{ - "items" => [ - %{ - "stability_fee" => %{ - "token" => %{"address" => "0xDc2B93f3291030F3F7a6D9363ac37757f7AD5C43"}, - "validator_address" => %{"hash" => "0x46B555CB3962bF9533c437cBD04A2f702dfdB999"}, - "dapp_address" => %{"hash" => "0xFAf7a981360c2FAb3a5Ab7b3D6d8D0Cf97a91Eb9"}, - "total_fee" => "44136000000000", - "dapp_fee" => "22068000000000", - "validator_fee" => "22068000000000" + } = json_response(request, 200) + + request = get(conn, "/api/v2/addresses/#{to_string(tx.from_address_hash)}/transactions") + + assert %{ + "items" => [ + %{ + "stability_fee" => %{ + "token" => %{"address" => "0xDc2B93f3291030F3F7a6D9363ac37757f7AD5C43"}, + "validator_address" => %{"hash" => "0x46B555CB3962bF9533c437cBD04A2f702dfdB999"}, + "dapp_address" => %{"hash" => "0xFAf7a981360c2FAb3a5Ab7b3D6d8D0Cf97a91Eb9"}, + "total_fee" => "44136000000000", + "dapp_fee" => "22068000000000", + "validator_fee" => "22068000000000" + } } - } - ] - } = json_response(request, 200) - end + ] + } = json_response(request, 200) + end - test "check stability if token absent in DB", %{conn: conn} do - tx = insert(:transaction) |> with_block() + test "check stability if token absent in DB", %{conn: conn} do + tx = insert(:transaction) |> with_block() - _log = - insert(:log, - transaction: tx, - index: 1, - block: tx.block, - block_number: tx.block_number, - first_topic: topic(@first_topic_hex_string_1), - data: - "0x000000000000000000000000dc2b93f3291030f3f7a6d9363ac37757f7ad5c4300000000000000000000000000000000000000000000000000002824369a100000000000000000000000000046b555cb3962bf9533c437cbd04a2f702dfdb999000000000000000000000000000000000000000000000000000014121b4d0800000000000000000000000000faf7a981360c2fab3a5ab7b3d6d8d0cf97a91eb9000000000000000000000000000000000000000000000000000014121b4d0800" - ) - - request = get(conn, "/api/v2/transactions") + _log = + insert(:log, + transaction: tx, + index: 1, + block: tx.block, + block_number: tx.block_number, + first_topic: topic(@first_topic_hex_string_1), + data: + "0x000000000000000000000000dc2b93f3291030f3f7a6d9363ac37757f7ad5c4300000000000000000000000000000000000000000000000000002824369a100000000000000000000000000046b555cb3962bf9533c437cbd04a2f702dfdb999000000000000000000000000000000000000000000000000000014121b4d0800000000000000000000000000faf7a981360c2fab3a5ab7b3d6d8d0cf97a91eb9000000000000000000000000000000000000000000000000000014121b4d0800" + ) - assert %{ - "items" => [ - %{ - "stability_fee" => %{ - "token" => %{"address" => "0xDc2B93f3291030F3F7a6D9363ac37757f7AD5C43"}, - "validator_address" => %{"hash" => "0x46B555CB3962bF9533c437cBD04A2f702dfdB999"}, - "dapp_address" => %{"hash" => "0xFAf7a981360c2FAb3a5Ab7b3D6d8D0Cf97a91Eb9"}, - "total_fee" => "44136000000000", - "dapp_fee" => "22068000000000", - "validator_fee" => "22068000000000" + request = get(conn, "/api/v2/transactions") + + assert %{ + "items" => [ + %{ + "stability_fee" => %{ + "token" => %{"address" => "0xDc2B93f3291030F3F7a6D9363ac37757f7AD5C43"}, + "validator_address" => %{"hash" => "0x46B555CB3962bF9533c437cBD04A2f702dfdB999"}, + "dapp_address" => %{"hash" => "0xFAf7a981360c2FAb3a5Ab7b3D6d8D0Cf97a91Eb9"}, + "total_fee" => "44136000000000", + "dapp_fee" => "22068000000000", + "validator_fee" => "22068000000000" + } } + ] + } = json_response(request, 200) + + request = get(conn, "/api/v2/transactions/#{to_string(tx.hash)}") + + assert %{ + "stability_fee" => %{ + "token" => %{"address" => "0xDc2B93f3291030F3F7a6D9363ac37757f7AD5C43"}, + "validator_address" => %{"hash" => "0x46B555CB3962bF9533c437cBD04A2f702dfdB999"}, + "dapp_address" => %{"hash" => "0xFAf7a981360c2FAb3a5Ab7b3D6d8D0Cf97a91Eb9"}, + "total_fee" => "44136000000000", + "dapp_fee" => "22068000000000", + "validator_fee" => "22068000000000" } - ] - } = json_response(request, 200) - - request = get(conn, "/api/v2/transactions/#{to_string(tx.hash)}") - - assert %{ - "stability_fee" => %{ - "token" => %{"address" => "0xDc2B93f3291030F3F7a6D9363ac37757f7AD5C43"}, - "validator_address" => %{"hash" => "0x46B555CB3962bF9533c437cBD04A2f702dfdB999"}, - "dapp_address" => %{"hash" => "0xFAf7a981360c2FAb3a5Ab7b3D6d8D0Cf97a91Eb9"}, - "total_fee" => "44136000000000", - "dapp_fee" => "22068000000000", - "validator_fee" => "22068000000000" - } - } = json_response(request, 200) - - request = get(conn, "/api/v2/addresses/#{to_string(tx.from_address_hash)}/transactions") - - assert %{ - "items" => [ - %{ - "stability_fee" => %{ - "token" => %{"address" => "0xDc2B93f3291030F3F7a6D9363ac37757f7AD5C43"}, - "validator_address" => %{"hash" => "0x46B555CB3962bF9533c437cBD04A2f702dfdB999"}, - "dapp_address" => %{"hash" => "0xFAf7a981360c2FAb3a5Ab7b3D6d8D0Cf97a91Eb9"}, - "total_fee" => "44136000000000", - "dapp_fee" => "22068000000000", - "validator_fee" => "22068000000000" + } = json_response(request, 200) + + request = get(conn, "/api/v2/addresses/#{to_string(tx.from_address_hash)}/transactions") + + assert %{ + "items" => [ + %{ + "stability_fee" => %{ + "token" => %{"address" => "0xDc2B93f3291030F3F7a6D9363ac37757f7AD5C43"}, + "validator_address" => %{"hash" => "0x46B555CB3962bF9533c437cBD04A2f702dfdB999"}, + "dapp_address" => %{"hash" => "0xFAf7a981360c2FAb3a5Ab7b3D6d8D0Cf97a91Eb9"}, + "total_fee" => "44136000000000", + "dapp_fee" => "22068000000000", + "validator_fee" => "22068000000000" + } } - } - ] - } = json_response(request, 200) + ] + } = json_response(request, 200) + end end end diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/validator_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/validator_controller_test.exs new file mode 100644 index 000000000000..ac3f66320b1e --- /dev/null +++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/validator_controller_test.exs @@ -0,0 +1,205 @@ +defmodule BlockScoutWeb.API.V2.ValidatorControllerTest do + use BlockScoutWeb.ConnCase + + if Application.compile_env(:explorer, :chain_type) == :stability do + alias Explorer.Chain.Address + alias Explorer.Chain.Cache.StabilityValidatorsCounters + alias Explorer.Chain.Stability.Validator, as: ValidatorStability + + defp check_paginated_response(first_page_resp, second_page_resp, list) do + assert Enum.count(first_page_resp["items"]) == 50 + assert first_page_resp["next_page_params"] != nil + compare_item(Enum.at(list, 50), Enum.at(first_page_resp["items"], 0)) + compare_item(Enum.at(list, 1), Enum.at(first_page_resp["items"], 49)) + + assert Enum.count(second_page_resp["items"]) == 1 + assert second_page_resp["next_page_params"] == nil + compare_item(Enum.at(list, 0), Enum.at(second_page_resp["items"], 0)) + end + + defp compare_default_sorting_for_asc({validator_1, blocks_count_1}, {validator_2, blocks_count_2}) do + case { + compare(blocks_count_1, blocks_count_2), + compare( + Keyword.fetch!(ValidatorStability.state_enum(), validator_1.state), + Keyword.fetch!(ValidatorStability.state_enum(), validator_2.state) + ), + compare(validator_1.address_hash.bytes, validator_2.address_hash.bytes) + } do + {:lt, _, _} -> false + {:eq, :lt, _} -> false + {:eq, :eq, :lt} -> false + _ -> true + end + end + + defp compare_default_sorting_for_desc({validator_1, blocks_count_1}, {validator_2, blocks_count_2}) do + case { + compare(blocks_count_1, blocks_count_2), + compare( + Keyword.fetch!(ValidatorStability.state_enum(), validator_1.state), + Keyword.fetch!(ValidatorStability.state_enum(), validator_2.state) + ), + compare(validator_1.address_hash.bytes, validator_2.address_hash.bytes) + } do + {:gt, _, _} -> false + {:eq, :lt, _} -> false + {:eq, :eq, :lt} -> false + _ -> true + end + end + + defp compare_item(%ValidatorStability{} = validator, json) do + assert Address.checksum(validator.address_hash) == json["address"]["hash"] + assert to_string(validator.state) == json["state"] + end + + defp compare_item({%ValidatorStability{} = validator, count}, json) do + assert json["blocks_validated_count"] == count + 1 + assert compare_item(validator, json) + end + + defp compare(a, b) do + cond do + a < b -> :lt + a > b -> :gt + true -> :eq + end + end + + describe "/validators/stability" do + test "get paginated list of the validators", %{conn: conn} do + validators = + insert_list(51, :validator_stability) + |> Enum.sort_by( + fn validator -> + {Keyword.fetch!(ValidatorStability.state_enum(), validator.state), validator.address_hash.bytes} + end, + :desc + ) + + request = get(conn, "/api/v2/validators/stability") + assert response = json_response(request, 200) + + request_2nd_page = get(conn, "/api/v2/validators/stability", response["next_page_params"]) + assert response_2nd_page = json_response(request_2nd_page, 200) + + check_paginated_response(response, response_2nd_page, validators) + end + + test "sort by blocks_validated asc", %{conn: conn} do + validators = + for _ <- 0..50 do + validator = insert(:validator_stability) + blocks_count = Enum.random(0..50) + + _ = + for _ <- 0..blocks_count do + insert(:block, miner_hash: validator.address_hash, miner: nil) + end + + {validator, blocks_count} + end + |> Enum.sort(&compare_default_sorting_for_asc/2) + + init_params = %{"sort" => "blocks_validated", "order" => "asc"} + request = get(conn, "/api/v2/validators/stability", init_params) + assert response = json_response(request, 200) + + request_2nd_page = + get(conn, "/api/v2/validators/stability", Map.merge(init_params, response["next_page_params"])) + + assert response_2nd_page = json_response(request_2nd_page, 200) + + check_paginated_response(response, response_2nd_page, validators) + end + + test "sort by blocks_validated desc", %{conn: conn} do + validators = + for _ <- 0..50 do + validator = insert(:validator_stability) + blocks_count = Enum.random(0..50) + + _ = + for _ <- 0..blocks_count do + insert(:block, miner_hash: validator.address_hash, miner: nil) + end + + {validator, blocks_count} + end + |> Enum.sort(&compare_default_sorting_for_desc/2) + + init_params = %{"sort" => "blocks_validated", "order" => "desc"} + request = get(conn, "/api/v2/validators/stability", init_params) + assert response = json_response(request, 200) + + request_2nd_page = + get(conn, "/api/v2/validators/stability", Map.merge(init_params, response["next_page_params"])) + + assert response_2nd_page = json_response(request_2nd_page, 200) + + check_paginated_response(response, response_2nd_page, validators) + end + + test "state_filter=probation", %{conn: conn} do + insert_list(51, :validator_stability, state: Enum.random([:active, :inactive])) + + validators = + insert_list(51, :validator_stability, state: :probation) + |> Enum.sort_by( + fn validator -> + {Keyword.fetch!(ValidatorStability.state_enum(), validator.state), validator.address_hash.bytes} + end, + :desc + ) + + init_params = %{"state_filter" => "probation"} + + request = get(conn, "/api/v2/validators/stability", init_params) + assert response = json_response(request, 200) + + request_2nd_page = + get(conn, "/api/v2/validators/stability", Map.merge(init_params, response["next_page_params"])) + + assert response_2nd_page = json_response(request_2nd_page, 200) + + check_paginated_response(response, response_2nd_page, validators) + end + end + + describe "/validators/stability/counters" do + test "get counters", %{conn: conn} do + _validator_active1 = + insert(:validator_stability, state: :active, inserted_at: DateTime.add(DateTime.utc_now(), -2, :day)) + + _validator_active2 = insert(:validator_stability, state: :active) + _validator_active3 = insert(:validator_stability, state: :active) + + _validator_inactive1 = + insert(:validator_stability, state: :inactive, inserted_at: DateTime.add(DateTime.utc_now(), -2, :day)) + + _validator_inactive2 = insert(:validator_stability, state: :inactive) + _validator_inactive3 = insert(:validator_stability, state: :inactive) + + _validator_probation1 = + insert(:validator_stability, state: :probation, inserted_at: DateTime.add(DateTime.utc_now(), -2, :day)) + + _validator_probation2 = insert(:validator_stability, state: :probation) + _validator_probation3 = insert(:validator_stability, state: :probation) + + StabilityValidatorsCounters.consolidate() + :timer.sleep(500) + + percentage = (3 / 9 * 100) |> Float.floor(2) + request = get(conn, "/api/v2/validators/stability/counters") + + assert %{ + "active_validators_counter" => "3", + "active_validators_percentage" => ^percentage, + "new_validators_counter_24h" => "6", + "validators_counter" => "9" + } = json_response(request, 200) + end + end + end +end diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/verification_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/verification_controller_test.exs index bd471e8d771f..ddefb7e3b1c9 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/api/v2/verification_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/api/v2/verification_controller_test.exs @@ -7,6 +7,15 @@ defmodule BlockScoutWeb.API.V2.VerificationControllerTest do @moduletag timeout: :infinity + setup do + configuration = Application.get_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour) + Application.put_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour, enabled: false) + + on_exit(fn -> + Application.put_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour, configuration) + end) + end + describe "/api/v2/smart-contracts/verification/config" do test "get cfg", %{conn: conn} do request = get(conn, "/api/v2/smart-contracts/verification/config") diff --git a/apps/block_scout_web/test/block_scout_web/controllers/transaction_state_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/transaction_state_controller_test.exs index 15217a697e11..a652d15a7568 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/transaction_state_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/transaction_state_controller_test.exs @@ -9,7 +9,7 @@ defmodule BlockScoutWeb.TransactionStateControllerTest do alias Explorer.Chain.Wei alias Indexer.Fetcher.CoinBalance.Catchup, as: CoinBalanceCatchup alias Explorer.Counters.{AddressesCounter, AverageBlockTime} - alias Indexer.Fetcher.CoinBalanceOnDemand + alias Indexer.Fetcher.OnDemand.CoinBalance, as: CoinBalanceOnDemand setup :set_mox_global diff --git a/apps/block_scout_web/test/block_scout_web/features/address_contract_verification_test.exs b/apps/block_scout_web/test/block_scout_web/features/address_contract_verification_test.exs index 8ea3e7511892..bfad4cf065f8 100644 --- a/apps/block_scout_web/test/block_scout_web/features/address_contract_verification_test.exs +++ b/apps/block_scout_web/test/block_scout_web/features/address_contract_verification_test.exs @@ -8,8 +8,15 @@ defmodule BlockScoutWeb.AddressContractVerificationTest do setup do bypass = Bypass.open() + configuration = Application.get_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour) + Application.put_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour, enabled: false) + Application.put_env(:explorer, :solc_bin_api_url, "http://localhost:#{bypass.port}") + on_exit(fn -> + Application.put_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour, configuration) + end) + {:ok, bypass: bypass} end diff --git a/apps/block_scout_web/test/block_scout_web/schema/query/address_test.exs b/apps/block_scout_web/test/block_scout_web/graphql/schema/query/address_test.exs similarity index 98% rename from apps/block_scout_web/test/block_scout_web/schema/query/address_test.exs rename to apps/block_scout_web/test/block_scout_web/graphql/schema/query/address_test.exs index f4526bc31454..3b0c3fec22a0 100644 --- a/apps/block_scout_web/test/block_scout_web/schema/query/address_test.exs +++ b/apps/block_scout_web/test/block_scout_web/graphql/schema/query/address_test.exs @@ -1,4 +1,4 @@ -defmodule BlockScoutWeb.Schema.Query.AddressTest do +defmodule BlockScoutWeb.GraphQL.Schema.Query.AddressTest do use BlockScoutWeb.ConnCase describe "address field" do @@ -407,7 +407,9 @@ defmodule BlockScoutWeb.Schema.Query.AddressTest do variables = %{ "hash" => to_string(address.hash), - "first" => 67 + # Add +5 because of the increase in complexity limit. For more info, see + # https://github.com/blockscout/blockscout/pull/9630 + "first" => 67 + 5 } conn = post(conn, "/api/v1/graphql", query: query, variables: variables) diff --git a/apps/block_scout_web/test/block_scout_web/schema/query/addresses_test.exs b/apps/block_scout_web/test/block_scout_web/graphql/schema/query/addresses_test.exs similarity index 94% rename from apps/block_scout_web/test/block_scout_web/schema/query/addresses_test.exs rename to apps/block_scout_web/test/block_scout_web/graphql/schema/query/addresses_test.exs index e3ca744f4937..32bbc5fdd205 100644 --- a/apps/block_scout_web/test/block_scout_web/schema/query/addresses_test.exs +++ b/apps/block_scout_web/test/block_scout_web/graphql/schema/query/addresses_test.exs @@ -1,4 +1,4 @@ -defmodule BlockScoutWeb.Schema.Query.AddressesTest do +defmodule BlockScoutWeb.GraphQL.Schema.Query.AddressesTest do use BlockScoutWeb.ConnCase describe "addresses field" do @@ -157,10 +157,10 @@ defmodule BlockScoutWeb.Schema.Query.AddressesTest do end test "correlates complexity to size of 'hashes' argument", %{conn: conn} do - # max of 50 addresses with four fields of complexity 1 can be fetched - # per query: - # 50 * 4 = 200, which is equal to a max complexity of 200 - hashes = 51 |> build_list(:address) |> Enum.map(&to_string(&1.hash)) + # max of 53 addresses with four fields of complexity 1 can be fetched per + # query: 53 * 4 = 212, which is the upper bound before reaching the max + # complexity limit of 215 + hashes = 54 |> build_list(:address) |> Enum.map(&to_string(&1.hash)) query = """ query ($hashes: [AddressHash!]!) { diff --git a/apps/block_scout_web/test/block_scout_web/schema/query/block_test.exs b/apps/block_scout_web/test/block_scout_web/graphql/schema/query/block_test.exs similarity index 98% rename from apps/block_scout_web/test/block_scout_web/schema/query/block_test.exs rename to apps/block_scout_web/test/block_scout_web/graphql/schema/query/block_test.exs index 26c612b344ce..8f2f6badbbda 100644 --- a/apps/block_scout_web/test/block_scout_web/schema/query/block_test.exs +++ b/apps/block_scout_web/test/block_scout_web/graphql/schema/query/block_test.exs @@ -1,4 +1,4 @@ -defmodule BlockScoutWeb.Schema.Query.BlockTest do +defmodule BlockScoutWeb.GraphQL.Schema.Query.BlockTest do use BlockScoutWeb.ConnCase describe "block field" do diff --git a/apps/block_scout_web/test/block_scout_web/graphql/schema/query/introspection_test.exs b/apps/block_scout_web/test/block_scout_web/graphql/schema/query/introspection_test.exs new file mode 100644 index 000000000000..cdc7b8e318fe --- /dev/null +++ b/apps/block_scout_web/test/block_scout_web/graphql/schema/query/introspection_test.exs @@ -0,0 +1,120 @@ +defmodule BlockScoutWeb.Schema.Query.IntrospectionTest do + use BlockScoutWeb.ConnCase + + test "fetches schema", %{conn: conn} do + introspection_query = ~S""" + query IntrospectionQuery { + __schema { + queryType { + name + } + mutationType { + name + } + + types { + ...FullType + } + directives { + name + description + + locations + args { + ...InputValue + } + } + } + } + + fragment FullType on __Type { + kind + name + description + + fields(includeDeprecated: true) { + name + description + args { + ...InputValue + } + type { + ...TypeRef + } + isDeprecated + deprecationReason + } + inputFields { + ...InputValue + } + interfaces { + ...TypeRef + } + enumValues(includeDeprecated: true) { + name + description + isDeprecated + deprecationReason + } + possibleTypes { + ...TypeRef + } + } + + fragment InputValue on __InputValue { + name + description + type { + ...TypeRef + } + defaultValue + } + + fragment TypeRef on __Type { + kind + name + ofType { + kind + name + ofType { + kind + name + ofType { + kind + name + ofType { + kind + name + ofType { + kind + name + ofType { + kind + name + ofType { + kind + name + ofType { + kind + name + ofType { + kind + name + } + } + } + } + } + } + } + } + } + } + """ + + conn = get(conn, "/api/v1/graphql", query: introspection_query) + response = json_response(conn, 200) + + assert %{"data" => %{"__schema" => %{"directives" => _}}} = response + end +end diff --git a/apps/block_scout_web/test/block_scout_web/schema/query/node_test.exs b/apps/block_scout_web/test/block_scout_web/graphql/schema/query/node_test.exs similarity index 98% rename from apps/block_scout_web/test/block_scout_web/schema/query/node_test.exs rename to apps/block_scout_web/test/block_scout_web/graphql/schema/query/node_test.exs index 75e6aacd1ac6..05c38b5fdcd8 100644 --- a/apps/block_scout_web/test/block_scout_web/schema/query/node_test.exs +++ b/apps/block_scout_web/test/block_scout_web/graphql/schema/query/node_test.exs @@ -1,4 +1,4 @@ -defmodule BlockScoutWeb.Schema.Query.NodeTest do +defmodule BlockScoutWeb.GraphQL.Schema.Query.NodeTest do use BlockScoutWeb.ConnCase describe "node field" do diff --git a/apps/block_scout_web/test/block_scout_web/schema/query/token_transfers_test.exs b/apps/block_scout_web/test/block_scout_web/graphql/schema/query/token_transfers_test.exs similarity index 99% rename from apps/block_scout_web/test/block_scout_web/schema/query/token_transfers_test.exs rename to apps/block_scout_web/test/block_scout_web/graphql/schema/query/token_transfers_test.exs index d10a3fdcc639..4c0d1499b3e6 100644 --- a/apps/block_scout_web/test/block_scout_web/schema/query/token_transfers_test.exs +++ b/apps/block_scout_web/test/block_scout_web/graphql/schema/query/token_transfers_test.exs @@ -1,4 +1,4 @@ -defmodule BlockScoutWeb.Schema.Query.TokenTransfersTest do +defmodule BlockScoutWeb.GraphQL.Schema.Query.TokenTransfersTest do use BlockScoutWeb.ConnCase describe "token_transfers field" do diff --git a/apps/block_scout_web/test/block_scout_web/schema/query/transaction_test.exs b/apps/block_scout_web/test/block_scout_web/graphql/schema/query/transaction_test.exs similarity index 99% rename from apps/block_scout_web/test/block_scout_web/schema/query/transaction_test.exs rename to apps/block_scout_web/test/block_scout_web/graphql/schema/query/transaction_test.exs index 6212ca89a788..f13049bde761 100644 --- a/apps/block_scout_web/test/block_scout_web/schema/query/transaction_test.exs +++ b/apps/block_scout_web/test/block_scout_web/graphql/schema/query/transaction_test.exs @@ -1,4 +1,4 @@ -defmodule BlockScoutWeb.Schema.Query.TransactionTest do +defmodule BlockScoutWeb.GraphQL.Schema.Query.TransactionTest do use BlockScoutWeb.ConnCase describe "transaction field" do diff --git a/apps/block_scout_web/test/block_scout_web/schema/subscription/token_transfers_test.exs b/apps/block_scout_web/test/block_scout_web/graphql/schema/subscription/token_transfers_test.exs similarity index 98% rename from apps/block_scout_web/test/block_scout_web/schema/subscription/token_transfers_test.exs rename to apps/block_scout_web/test/block_scout_web/graphql/schema/subscription/token_transfers_test.exs index 4383457ae4cc..4ba16ec96ecd 100644 --- a/apps/block_scout_web/test/block_scout_web/schema/subscription/token_transfers_test.exs +++ b/apps/block_scout_web/test/block_scout_web/graphql/schema/subscription/token_transfers_test.exs @@ -1,4 +1,4 @@ -defmodule BlockScoutWeb.Schema.Subscription.TokenTransfersTest do +defmodule BlockScoutWeb.GraphQL.Schema.Subscription.TokenTransfersTest do use BlockScoutWeb.SubscriptionCase import Mox diff --git a/apps/block_scout_web/test/block_scout_web/views/api/v2/transaction_view_test.exs b/apps/block_scout_web/test/block_scout_web/views/api/v2/transaction_view_test.exs index a5aa2e63fa28..6b42d89a5f83 100644 --- a/apps/block_scout_web/test/block_scout_web/views/api/v2/transaction_view_test.exs +++ b/apps/block_scout_web/test/block_scout_web/views/api/v2/transaction_view_test.exs @@ -1,10 +1,7 @@ defmodule BlockScoutWeb.API.V2.TransactionViewTest do use BlockScoutWeb.ConnCase, async: true - import Mox - alias BlockScoutWeb.API.V2.TransactionView - alias Explorer.Repo describe "decode_logs/2" do test "doesn't use decoding candidate event with different 2nd, 3d or 4th topic" do diff --git a/apps/block_scout_web/test/block_scout_web/views/currency_helper_test.exs b/apps/block_scout_web/test/block_scout_web/views/currency_helper_test.exs index b0c87eb06f54..432d34eb02a1 100644 --- a/apps/block_scout_web/test/block_scout_web/views/currency_helper_test.exs +++ b/apps/block_scout_web/test/block_scout_web/views/currency_helper_test.exs @@ -61,24 +61,4 @@ defmodule BlockScoutWeb.CurrencyHelperTest do assert CurrencyHelper.format_integer_to_currency(9000) == "9,000" end end - - describe "divide_decimals/2" do - test "divide by the given decimal amount" do - result = CurrencyHelper.divide_decimals(Decimal.new(1000), Decimal.new(3)) - expected_result = Decimal.new(1) - assert Decimal.compare(result, expected_result) == :eq - end - - test "work when number of decimals is bigger than the number's digits" do - result = CurrencyHelper.divide_decimals(Decimal.new(1000), Decimal.new(5)) - expected_result = Decimal.from_float(0.01) - assert Decimal.compare(result, expected_result) == :eq - end - - test "return the same number when number of decimals is 0" do - result = CurrencyHelper.divide_decimals(Decimal.new(1000), Decimal.new(0)) - expected_result = Decimal.new(1000) - assert Decimal.compare(result, expected_result) == :eq - end - end end diff --git a/apps/block_scout_web/test/block_scout_web/views/transaction_view_test.exs b/apps/block_scout_web/test/block_scout_web/views/transaction_view_test.exs index dc2d5b93f836..653020462e8e 100644 --- a/apps/block_scout_web/test/block_scout_web/views/transaction_view_test.exs +++ b/apps/block_scout_web/test/block_scout_web/views/transaction_view_test.exs @@ -1,6 +1,8 @@ defmodule BlockScoutWeb.TransactionViewTest do use BlockScoutWeb.ConnCase, async: true + import Mox + alias Explorer.Chain.Wei alias Explorer.Repo alias BlockScoutWeb.{BlockView, TransactionView} @@ -286,4 +288,31 @@ defmodule BlockScoutWeb.TransactionViewTest do assert List.first(result.transfers).amount == nil end end + + describe "transaction_revert_reason/2" do + test "handles transactions with gas_price set to nil" do + transaction = insert(:transaction, gas_price: nil, error: "execution reverted") + + EthereumJSONRPC.Mox + |> expect(:json_rpc, fn %{ + id: 0, + method: "eth_call", + params: [ + %{gasPrice: "0x0"}, + "latest" + ] + }, + _options -> + {:error, + %{ + data: + "0x08c379a00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002b556e69737761705632526f757465723a20494e53554646494349454e545f4f55545055545f414d4f554e54000000000000000000000000000000000000000000" + }} + end) + + revert_reason = TransactionView.transaction_revert_reason(transaction, nil) + + assert revert_reason == {:error, :not_a_contract_call} + end + end end diff --git a/apps/block_scout_web/test/support/fixture/smart_contract/eth_bytecode_db_search_all_alliance_sources_partial_response.json b/apps/block_scout_web/test/support/fixture/smart_contract/eth_bytecode_db_search_all_alliance_sources_partial_response.json new file mode 100644 index 000000000000..ab9ba705ed1f --- /dev/null +++ b/apps/block_scout_web/test/support/fixture/smart_contract/eth_bytecode_db_search_all_alliance_sources_partial_response.json @@ -0,0 +1,43 @@ +{ + "ethBytecodeDbSources": [ + { + "fileName": "Test_eth.sol", + "contractName": "Test", + "compilerVersion": "v0.8.17+commit.8df45f5f", + "compilerSettings": "{\"libraries\":{\"Test.sol\":{}},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":true,\"runs\":199},\"outputSelection\":{\"*\":{\"\":[\"ast\"],\"*\":[\"abi\",\"evm.bytecode\",\"evm.deployedBytecode\",\"evm.methodIdentifiers\"]}}}", + "sourceType": "SOLIDITY", + "sourceFiles": { + "Test_eth.sol": "// SPDX-License-Identifier: MIT\r\n\r\npragma solidity 0.8.17;\r\n\r\ncontract Test {\r\n enum E {\r\n V1, V2, V3, V4\r\n }\r\n struct A {\r\n E a;\r\n uint256[] b;\r\n B[] c;\r\n }\r\n\r\n struct B {\r\n uint256 d;\r\n uint256 e;\r\n }\r\n\r\n function get(uint256 x) external pure returns (A memory) {\r\n uint256[] memory b = new uint256[](3);\r\n b[0] = 1;\r\n b[1] = 2;\r\n b[2] = 3;\r\n B[] memory c = new B[](3);\r\n c[0] = B(1, 2);\r\n c[1] = B(3, 4);\r\n c[2] = B(5, 6);\r\n return A(E.V3, b, c);\r\n }\r\n}" + }, + "abi": "[{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"x\",\"type\":\"uint256\"}],\"name\":\"get\",\"outputs\":[{\"components\":[{\"type\":\"uint8\"},{\"type\":\"uint256[]\"},{\"components\":[{\"type\":\"uint256\"},{\"type\":\"uint256\"}],\"type\":\"tuple[]\"}],\"internalType\":\"struct Test.A\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"pure\",\"type\":\"function\"}]", + "constructorArguments": "0x0000000000000000000000003e5c63644e683549055b9be8653de26e0b4cd36e", + "matchType": "FULL" + } + ], + "sourcifySources": [{ + "fileName": "Test.sol", + "contractName": "Test", + "compilerVersion": "v0.8.17+commit.8df45f5f", + "compilerSettings": "{\"libraries\":{\"\":{\"__CACHE_BREAKER__\":\"0x00000000d41867734bbee4c6863d9255b2b06ac1\"}},\"metadata\":{\"useLiteralContent\":true},\"optimizer\":{\"enabled\":true,\"runs\":200},\"outputSelection\":{\"*\":{\"*\":[\"abi\",\"evm.bytecode\",\"evm.deployedBytecode\",\"evm.methodIdentifiers\"]}}}", + "sourceType": "SOLIDITY", + "sourceFiles": { + "Test.sol": "// SPDX-License-Identifier: MIT\r\n\r\npragma solidity 0.8.17;\r\n\r\ncontract Test {\r\n enum E {\r\n V1, V2, V3, V4\r\n }\r\n struct A {\r\n E a;\r\n uint256[] b;\r\n B[] c;\r\n }\r\n\r\n struct B {\r\n uint256 d;\r\n uint256 e;\r\n }\r\n\r\n function get(uint256 x) external pure returns (A memory) {\r\n uint256[] memory b = new uint256[](3);\r\n b[0] = 1;\r\n b[1] = 2;\r\n b[2] = 3;\r\n B[] memory c = new B[](3);\r\n c[0] = B(1, 2);\r\n c[1] = B(3, 4);\r\n c[2] = B(5, 6);\r\n return A(E.V3, b, c);\r\n }\r\n}" + }, + "abi": "[{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"x\",\"type\":\"uint256\"}],\"name\":\"get\",\"outputs\":[{\"components\":[{\"type\":\"uint8\"},{\"type\":\"uint256[]\"},{\"components\":[{\"type\":\"uint256\"},{\"type\":\"uint256\"}],\"type\":\"tuple[]\"}],\"internalType\":\"struct Test.A\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"pure\",\"type\":\"function\"}]", + "constructorArguments": "0x0000000000000000000000003e5c63644e683549055b9be8653de26e0b4cd36e", + "matchType": "FULL" + }], + "allianceSources": [{ + "fileName": "Test_1.sol", + "contractName": "Test", + "compilerVersion": "v0.8.17+commit.8df45f5f", + "compilerSettings": "{\"libraries\":{\"\":{\"__CACHE_BREAKER__\":\"0x00000000d41867734bbee4c6863d9255b2b06ac1\"}},\"metadata\":{\"useLiteralContent\":true},\"optimizer\":{\"enabled\":true,\"runs\":200},\"outputSelection\":{\"*\":{\"*\":[\"abi\",\"evm.bytecode\",\"evm.deployedBytecode\",\"evm.methodIdentifiers\"]}}}", + "sourceType": "SOLIDITY", + "sourceFiles": { + "Test_1.sol": "// SPDX-License-Identifier: MIT\r\n\r\npragma solidity 0.8.17;\r\n\r\ncontract Test {\r\n enum E {\r\n V1, V2, V3, V4\r\n }\r\n struct A {\r\n E a;\r\n uint256[] b;\r\n B[] c;\r\n }\r\n\r\n struct B {\r\n uint256 d;\r\n uint256 e;\r\n }\r\n\r\n function get(uint256 x) external pure returns (A memory) {\r\n uint256[] memory b = new uint256[](3);\r\n b[0] = 1;\r\n b[1] = 2;\r\n b[2] = 3;\r\n B[] memory c = new B[](3);\r\n c[0] = B(1, 2);\r\n c[1] = B(3, 4);\r\n c[2] = B(5, 6);\r\n return A(E.V3, b, c);\r\n }\r\n}" + }, + "abi": "[{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"x\",\"type\":\"uint256\"}],\"name\":\"get\",\"outputs\":[{\"components\":[{\"type\":\"uint8\"},{\"type\":\"uint256[]\"},{\"components\":[{\"type\":\"uint256\"},{\"type\":\"uint256\"}],\"type\":\"tuple[]\"}],\"internalType\":\"struct Test.A\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"pure\",\"type\":\"function\"}]", + "constructorArguments": "0x0000000000000000000000003e5c63644e683549055b9be8653de26e0b4cd36e", + "matchType": "PARTIAL" + }] + } \ No newline at end of file diff --git a/apps/block_scout_web/test/support/fixture/smart_contract/eth_bytecode_db_search_all_alliance_sources_partial_response_eth_bdb_full.json b/apps/block_scout_web/test/support/fixture/smart_contract/eth_bytecode_db_search_all_alliance_sources_partial_response_eth_bdb_full.json new file mode 100644 index 000000000000..dba7a19eecc7 --- /dev/null +++ b/apps/block_scout_web/test/support/fixture/smart_contract/eth_bytecode_db_search_all_alliance_sources_partial_response_eth_bdb_full.json @@ -0,0 +1,43 @@ +{ + "ethBytecodeDbSources": [ + { + "fileName": "Test_eth.sol", + "contractName": "Test", + "compilerVersion": "v0.8.17+commit.8df45f5f", + "compilerSettings": "{\"libraries\":{\"\":{\"__CACHE_BREAKER__\":\"0x00000000d41867734bbee4c6863d9255b2b06ac1\"}},\"metadata\":{\"useLiteralContent\":true},\"optimizer\":{\"enabled\":true,\"runs\":200},\"outputSelection\":{\"*\":{\"*\":[\"abi\",\"evm.bytecode\",\"evm.deployedBytecode\",\"evm.methodIdentifiers\"]}}}", + "sourceType": "SOLIDITY", + "sourceFiles": { + "Test_eth.sol": "// SPDX-License-Identifier: MIT\r\n\r\npragma solidity 0.8.17;\r\n\r\ncontract Test {\r\n enum E {\r\n V1, V2, V3, V4\r\n }\r\n struct A {\r\n E a;\r\n uint256[] b;\r\n B[] c;\r\n }\r\n\r\n struct B {\r\n uint256 d;\r\n uint256 e;\r\n }\r\n\r\n function get(uint256 x) external pure returns (A memory) {\r\n uint256[] memory b = new uint256[](3);\r\n b[0] = 1;\r\n b[1] = 2;\r\n b[2] = 3;\r\n B[] memory c = new B[](3);\r\n c[0] = B(1, 2);\r\n c[1] = B(3, 4);\r\n c[2] = B(5, 6);\r\n return A(E.V3, b, c);\r\n }\r\n}" + }, + "abi": "[{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"x\",\"type\":\"uint256\"}],\"name\":\"get\",\"outputs\":[{\"components\":[{\"type\":\"uint8\"},{\"type\":\"uint256[]\"},{\"components\":[{\"type\":\"uint256\"},{\"type\":\"uint256\"}],\"type\":\"tuple[]\"}],\"internalType\":\"struct Test.A\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"pure\",\"type\":\"function\"}]", + "constructorArguments": "0x0000000000000000000000003e5c63644e683549055b9be8653de26e0b4cd36e", + "matchType": "FULL" + } + ], + "sourcifySources": [{ + "fileName": "Test.sol", + "contractName": "Test", + "compilerVersion": "v0.8.17+commit.8df45f5f", + "compilerSettings": "{\"libraries\":{\"\":{\"__CACHE_BREAKER__\":\"0x00000000d41867734bbee4c6863d9255b2b06ac1\"}},\"metadata\":{\"useLiteralContent\":true},\"optimizer\":{\"enabled\":true,\"runs\":200},\"outputSelection\":{\"*\":{\"*\":[\"abi\",\"evm.bytecode\",\"evm.deployedBytecode\",\"evm.methodIdentifiers\"]}}}", + "sourceType": "SOLIDITY", + "sourceFiles": { + "Test.sol": "// SPDX-License-Identifier: MIT\r\n\r\npragma solidity 0.8.17;\r\n\r\ncontract Test {\r\n enum E {\r\n V1, V2, V3, V4\r\n }\r\n struct A {\r\n E a;\r\n uint256[] b;\r\n B[] c;\r\n }\r\n\r\n struct B {\r\n uint256 d;\r\n uint256 e;\r\n }\r\n\r\n function get(uint256 x) external pure returns (A memory) {\r\n uint256[] memory b = new uint256[](3);\r\n b[0] = 1;\r\n b[1] = 2;\r\n b[2] = 3;\r\n B[] memory c = new B[](3);\r\n c[0] = B(1, 2);\r\n c[1] = B(3, 4);\r\n c[2] = B(5, 6);\r\n return A(E.V3, b, c);\r\n }\r\n}" + }, + "abi": "[{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"x\",\"type\":\"uint256\"}],\"name\":\"get\",\"outputs\":[{\"components\":[{\"type\":\"uint8\"},{\"type\":\"uint256[]\"},{\"components\":[{\"type\":\"uint256\"},{\"type\":\"uint256\"}],\"type\":\"tuple[]\"}],\"internalType\":\"struct Test.A\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"pure\",\"type\":\"function\"}]", + "constructorArguments": "0x0000000000000000000000003e5c63644e683549055b9be8653de26e0b4cd36e", + "matchType": "PARTIAL" + }], + "allianceSources": [{ + "fileName": "Test_1.sol", + "contractName": "Test", + "compilerVersion": "v0.8.17+commit.8df45f5f", + "compilerSettings": "{\"libraries\":{\"\":{\"__CACHE_BREAKER__\":\"0x00000000d41867734bbee4c6863d9255b2b06ac1\"}},\"metadata\":{\"useLiteralContent\":true},\"optimizer\":{\"enabled\":true,\"runs\":200},\"outputSelection\":{\"*\":{\"*\":[\"abi\",\"evm.bytecode\",\"evm.deployedBytecode\",\"evm.methodIdentifiers\"]}}}", + "sourceType": "SOLIDITY", + "sourceFiles": { + "Test_1.sol": "// SPDX-License-Identifier: MIT\r\n\r\npragma solidity 0.8.17;\r\n\r\ncontract Test {\r\n enum E {\r\n V1, V2, V3, V4\r\n }\r\n struct A {\r\n E a;\r\n uint256[] b;\r\n B[] c;\r\n }\r\n\r\n struct B {\r\n uint256 d;\r\n uint256 e;\r\n }\r\n\r\n function get(uint256 x) external pure returns (A memory) {\r\n uint256[] memory b = new uint256[](3);\r\n b[0] = 1;\r\n b[1] = 2;\r\n b[2] = 3;\r\n B[] memory c = new B[](3);\r\n c[0] = B(1, 2);\r\n c[1] = B(3, 4);\r\n c[2] = B(5, 6);\r\n return A(E.V3, b, c);\r\n }\r\n}" + }, + "abi": "[{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"x\",\"type\":\"uint256\"}],\"name\":\"get\",\"outputs\":[{\"components\":[{\"type\":\"uint8\"},{\"type\":\"uint256[]\"},{\"components\":[{\"type\":\"uint256\"},{\"type\":\"uint256\"}],\"type\":\"tuple[]\"}],\"internalType\":\"struct Test.A\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"pure\",\"type\":\"function\"}]", + "constructorArguments": "0x0000000000000000000000003e5c63644e683549055b9be8653de26e0b4cd36e", + "matchType": "PARTIAL" + }] + } \ No newline at end of file diff --git a/apps/block_scout_web/test/support/fixture/smart_contract/eth_bytecode_db_search_all_alliance_sources_response.json b/apps/block_scout_web/test/support/fixture/smart_contract/eth_bytecode_db_search_all_alliance_sources_response.json new file mode 100644 index 000000000000..97ae920c2b05 --- /dev/null +++ b/apps/block_scout_web/test/support/fixture/smart_contract/eth_bytecode_db_search_all_alliance_sources_response.json @@ -0,0 +1,43 @@ +{ + "ethBytecodeDbSources": [ + { + "fileName": "Test_eth.sol", + "contractName": "Test", + "compilerVersion": "v0.8.17+commit.8df45f5f", + "compilerSettings": "{\"libraries\":{\"Test.sol\":{}},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":true,\"runs\":199},\"outputSelection\":{\"*\":{\"\":[\"ast\"],\"*\":[\"abi\",\"evm.bytecode\",\"evm.deployedBytecode\",\"evm.methodIdentifiers\"]}}}", + "sourceType": "SOLIDITY", + "sourceFiles": { + "Test_eth.sol": "// SPDX-License-Identifier: MIT\r\n\r\npragma solidity 0.8.17;\r\n\r\ncontract Test {\r\n enum E {\r\n V1, V2, V3, V4\r\n }\r\n struct A {\r\n E a;\r\n uint256[] b;\r\n B[] c;\r\n }\r\n\r\n struct B {\r\n uint256 d;\r\n uint256 e;\r\n }\r\n\r\n function get(uint256 x) external pure returns (A memory) {\r\n uint256[] memory b = new uint256[](3);\r\n b[0] = 1;\r\n b[1] = 2;\r\n b[2] = 3;\r\n B[] memory c = new B[](3);\r\n c[0] = B(1, 2);\r\n c[1] = B(3, 4);\r\n c[2] = B(5, 6);\r\n return A(E.V3, b, c);\r\n }\r\n}" + }, + "abi": "[{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"x\",\"type\":\"uint256\"}],\"name\":\"get\",\"outputs\":[{\"components\":[{\"type\":\"uint8\"},{\"type\":\"uint256[]\"},{\"components\":[{\"type\":\"uint256\"},{\"type\":\"uint256\"}],\"type\":\"tuple[]\"}],\"internalType\":\"struct Test.A\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"pure\",\"type\":\"function\"}]", + "constructorArguments": "0x0000000000000000000000003e5c63644e683549055b9be8653de26e0b4cd36e", + "matchType": "PARTIAL" + } + ], + "sourcifySources": [{ + "fileName": "Test.sol", + "contractName": "Test", + "compilerVersion": "v0.8.17+commit.8df45f5f", + "compilerSettings": "{\"libraries\":{\"Test.sol\":{}},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":true,\"runs\":199},\"outputSelection\":{\"*\":{\"\":[\"ast\"],\"*\":[\"abi\",\"evm.bytecode\",\"evm.deployedBytecode\",\"evm.methodIdentifiers\"]}}}", + "sourceType": "SOLIDITY", + "sourceFiles": { + "Test.sol": "// SPDX-License-Identifier: MIT\r\n\r\npragma solidity 0.8.17;\r\n\r\ncontract Test {\r\n enum E {\r\n V1, V2, V3, V4\r\n }\r\n struct A {\r\n E a;\r\n uint256[] b;\r\n B[] c;\r\n }\r\n\r\n struct B {\r\n uint256 d;\r\n uint256 e;\r\n }\r\n\r\n function get(uint256 x) external pure returns (A memory) {\r\n uint256[] memory b = new uint256[](3);\r\n b[0] = 1;\r\n b[1] = 2;\r\n b[2] = 3;\r\n B[] memory c = new B[](3);\r\n c[0] = B(1, 2);\r\n c[1] = B(3, 4);\r\n c[2] = B(5, 6);\r\n return A(E.V3, b, c);\r\n }\r\n}" + }, + "abi": "[{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"x\",\"type\":\"uint256\"}],\"name\":\"get\",\"outputs\":[{\"components\":[{\"type\":\"uint8\"},{\"type\":\"uint256[]\"},{\"components\":[{\"type\":\"uint256\"},{\"type\":\"uint256\"}],\"type\":\"tuple[]\"}],\"internalType\":\"struct Test.A\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"pure\",\"type\":\"function\"}]", + "constructorArguments": "0x0000000000000000000000003e5c63644e683549055b9be8653de26e0b4cd36e", + "matchType": "PARTIAL" + }], + "allianceSources": [{ + "fileName": "Test_1.sol", + "contractName": "Test", + "compilerVersion": "v0.8.17+commit.8df45f5f", + "compilerSettings": "{\"libraries\":{\"\":{\"__CACHE_BREAKER__\":\"0x00000000d41867734bbee4c6863d9255b2b06ac1\"}},\"metadata\":{\"useLiteralContent\":true},\"optimizer\":{\"enabled\":true,\"runs\":200},\"outputSelection\":{\"*\":{\"*\":[\"abi\",\"evm.bytecode\",\"evm.deployedBytecode\",\"evm.methodIdentifiers\"]}}}", + "sourceType": "SOLIDITY", + "sourceFiles": { + "Test_1.sol": "// SPDX-License-Identifier: MIT\r\n\r\npragma solidity 0.8.17;\r\n\r\ncontract Test {\r\n enum E {\r\n V1, V2, V3, V4\r\n }\r\n struct A {\r\n E a;\r\n uint256[] b;\r\n B[] c;\r\n }\r\n\r\n struct B {\r\n uint256 d;\r\n uint256 e;\r\n }\r\n\r\n function get(uint256 x) external pure returns (A memory) {\r\n uint256[] memory b = new uint256[](3);\r\n b[0] = 1;\r\n b[1] = 2;\r\n b[2] = 3;\r\n B[] memory c = new B[](3);\r\n c[0] = B(1, 2);\r\n c[1] = B(3, 4);\r\n c[2] = B(5, 6);\r\n return A(E.V3, b, c);\r\n }\r\n}" + }, + "abi": "[{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"x\",\"type\":\"uint256\"}],\"name\":\"get\",\"outputs\":[{\"components\":[{\"type\":\"uint8\"},{\"type\":\"uint256[]\"},{\"components\":[{\"type\":\"uint256\"},{\"type\":\"uint256\"}],\"type\":\"tuple[]\"}],\"internalType\":\"struct Test.A\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"pure\",\"type\":\"function\"}]", + "constructorArguments": "0x0000000000000000000000003e5c63644e683549055b9be8653de26e0b4cd36e", + "matchType": "PARTIAL" + }] + } \ No newline at end of file diff --git a/apps/block_scout_web/test/support/fixture/smart_contract/eth_bytecode_db_search_all_sourcify_sources_response.json b/apps/block_scout_web/test/support/fixture/smart_contract/eth_bytecode_db_search_all_sourcify_sources_response.json index 8456169ebd33..17357bd7b896 100644 --- a/apps/block_scout_web/test/support/fixture/smart_contract/eth_bytecode_db_search_all_sourcify_sources_response.json +++ b/apps/block_scout_web/test/support/fixture/smart_contract/eth_bytecode_db_search_all_sourcify_sources_response.json @@ -7,7 +7,7 @@ "compilerSettings": "{\"libraries\":{\"Test.sol\":{}},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":true,\"runs\":199},\"outputSelection\":{\"*\":{\"\":[\"ast\"],\"*\":[\"abi\",\"evm.bytecode\",\"evm.deployedBytecode\",\"evm.methodIdentifiers\"]}}}", "sourceType": "SOLIDITY", "sourceFiles": { - "Test.sol": "// SPDX-License-Identifier: MIT\r\n\r\npragma solidity 0.8.17;\r\n\r\ncontract Test {\r\n enum E {\r\n V1, V2, V3, V4\r\n }\r\n struct A {\r\n E a;\r\n uint256[] b;\r\n B[] c;\r\n }\r\n\r\n struct B {\r\n uint256 d;\r\n uint256 e;\r\n }\r\n\r\n function get(uint256 x) external pure returns (A memory) {\r\n uint256[] memory b = new uint256[](3);\r\n b[0] = 1;\r\n b[1] = 2;\r\n b[2] = 3;\r\n B[] memory c = new B[](3);\r\n c[0] = B(1, 2);\r\n c[1] = B(3, 4);\r\n c[2] = B(5, 6);\r\n return A(E.V3, b, c);\r\n }\r\n}" + "Test_eth.sol": "// SPDX-License-Identifier: MIT\r\n\r\npragma solidity 0.8.17;\r\n\r\ncontract Test {\r\n enum E {\r\n V1, V2, V3, V4\r\n }\r\n struct A {\r\n E a;\r\n uint256[] b;\r\n B[] c;\r\n }\r\n\r\n struct B {\r\n uint256 d;\r\n uint256 e;\r\n }\r\n\r\n function get(uint256 x) external pure returns (A memory) {\r\n uint256[] memory b = new uint256[](3);\r\n b[0] = 1;\r\n b[1] = 2;\r\n b[2] = 3;\r\n B[] memory c = new B[](3);\r\n c[0] = B(1, 2);\r\n c[1] = B(3, 4);\r\n c[2] = B(5, 6);\r\n return A(E.V3, b, c);\r\n }\r\n}" }, "abi": "[{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"x\",\"type\":\"uint256\"}],\"name\":\"get\",\"outputs\":[{\"components\":[{\"type\":\"uint8\"},{\"type\":\"uint256[]\"},{\"components\":[{\"type\":\"uint256\"},{\"type\":\"uint256\"}],\"type\":\"tuple[]\"}],\"internalType\":\"struct Test.A\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"pure\",\"type\":\"function\"}]", "constructorArguments": "0x0000000000000000000000003e5c63644e683549055b9be8653de26e0b4cd36e", diff --git a/apps/block_scout_web/test/support/subscription_case.ex b/apps/block_scout_web/test/support/subscription_case.ex index 25065b9c91ba..3701e6e993a6 100644 --- a/apps/block_scout_web/test/support/subscription_case.ex +++ b/apps/block_scout_web/test/support/subscription_case.ex @@ -13,7 +13,7 @@ defmodule BlockScoutWeb.SubscriptionCase do quote do # Import conveniences for testing with channels use BlockScoutWeb.ChannelCase - use Absinthe.Phoenix.SubscriptionTest, schema: BlockScoutWeb.Schema + use Absinthe.Phoenix.SubscriptionTest, schema: BlockScoutWeb.GraphQL.Schema end end diff --git a/apps/block_scout_web/test/test_helper.exs b/apps/block_scout_web/test/test_helper.exs index c14efe9d6378..11003096da36 100644 --- a/apps/block_scout_web/test/test_helper.exs +++ b/apps/block_scout_web/test/test_helper.exs @@ -32,10 +32,11 @@ Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.RSK, :manual) Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.Shibarium, :manual) Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.Suave, :manual) Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.Beacon, :manual) +Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.Stability, :manual) Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.BridgedTokens, :manual) Ecto.Adapters.SQL.Sandbox.mode(Explorer.Repo.Filecoin, :manual) -Absinthe.Test.prime(BlockScoutWeb.Schema) +Absinthe.Test.prime(BlockScoutWeb.GraphQL.Schema) Mox.defmock(EthereumJSONRPC.Mox, for: EthereumJSONRPC.Transport) diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex index 3636d4ff4680..7cd5c6484279 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex @@ -172,10 +172,10 @@ defmodule EthereumJSONRPC do """ @spec execute_contract_functions([Contract.call()], [map()], json_rpc_named_arguments) :: [Contract.call_result()] def execute_contract_functions(functions, abi, json_rpc_named_arguments, leave_error_as_map \\ false) do - if Enum.count(functions) > 0 do - Contract.execute_contract_functions(functions, abi, json_rpc_named_arguments, leave_error_as_map) - else + if Enum.empty?(functions) do [] + else + Contract.execute_contract_functions(functions, abi, json_rpc_named_arguments, leave_error_as_map) end end @@ -329,6 +329,16 @@ defmodule EthereumJSONRPC do * `{:error, reason}` - other JSONRPC error. """ + @spec fetch_block_number_by_tag_op_version(tag(), json_rpc_named_arguments) :: + {:ok, non_neg_integer()} | {:error, reason :: :invalid_tag | :not_found | term()} + def fetch_block_number_by_tag_op_version(tag, json_rpc_named_arguments) + when tag in ~w(earliest latest pending safe) do + %{id: 0, tag: tag} + |> Block.ByTag.request() + |> json_rpc(json_rpc_named_arguments) + |> Block.ByTag.number_from_result() + end + @spec fetch_block_number_by_tag(tag(), json_rpc_named_arguments) :: {:ok, non_neg_integer()} | {:error, reason :: :invalid_tag | :not_found | term()} def fetch_block_number_by_tag(tag, json_rpc_named_arguments) when tag in ~w(earliest latest pending safe) do @@ -452,10 +462,10 @@ defmodule EthereumJSONRPC do end defp maybe_replace_url(url, _replace_url, EthereumJSONRPC.HTTP), do: url - defp maybe_replace_url(url, replace_url, _), do: EndpointAvailabilityObserver.maybe_replace_url(url, replace_url) + defp maybe_replace_url(url, replace_url, _), do: EndpointAvailabilityObserver.maybe_replace_url(url, replace_url, :ws) defp maybe_inc_error_count(_url, _arguments, EthereumJSONRPC.HTTP), do: :ok - defp maybe_inc_error_count(url, arguments, _), do: EndpointAvailabilityObserver.inc_error_count(url, arguments) + defp maybe_inc_error_count(url, arguments, _), do: EndpointAvailabilityObserver.inc_error_count(url, arguments, :ws) @doc """ Converts `t:quantity/0` to `t:non_neg_integer/0`. diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/arbitrum.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/arbitrum.ex deleted file mode 100644 index f18b247a579d..000000000000 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/arbitrum.ex +++ /dev/null @@ -1,47 +0,0 @@ -defmodule EthereumJSONRPC.Arbitrum do - @moduledoc """ - Ethereum JSONRPC methods that are only supported by [Arbitrum L2]https://github.com/OffchainLabs/arbitrum). - """ - - @behaviour EthereumJSONRPC.Variant - - @doc """ - Block reward contract beneficiary fetching is not supported currently for Arbitrum L2. - - To signal to the caller that fetching is not supported, `:ignore` is returned. - """ - @impl EthereumJSONRPC.Variant - def fetch_beneficiaries(_block_range, _json_rpc_named_arguments), do: :ignore - - @doc """ - Internal transaction fetching is not currently supported for Arbitrum L2. - - To signal to the caller that fetching is not supported, `:ignore` is returned. - """ - @impl EthereumJSONRPC.Variant - def fetch_internal_transactions(_transactions_params, _json_rpc_named_arguments), do: :ignore - - @doc """ - Internal transaction fetching is not currently supported for Arbitrum L2. - - To signal to the caller that fetching is not supported, `:ignore` is returned. - """ - @impl EthereumJSONRPC.Variant - def fetch_block_internal_transactions(_block_range, _json_rpc_named_arguments), do: :ignore - - @doc """ - Pending transaction fetching is not supported currently for Arbitrum L2. - - To signal to the caller that fetching is not supported, `:ignore` is returned. - """ - @impl EthereumJSONRPC.Variant - def fetch_pending_transactions(_json_rpc_named_arguments), do: :ignore - - @doc """ - Traces are not supported currently for Arbitrum L2. - - To signal to the caller that fetching is not supported, `:ignore` is returned. - """ - @impl EthereumJSONRPC.Variant - def fetch_first_trace(_transactions_params, _json_rpc_named_arguments), do: :ignore -end diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block.ex index 85eef70faf75..7269d403fbb3 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block.ex @@ -9,7 +9,7 @@ defmodule EthereumJSONRPC.Block do alias EthereumJSONRPC.{Transactions, Uncles, Withdrawals} case Application.compile_env(:explorer, :chain_type) do - "rsk" -> + :rsk -> @chain_type_fields quote( do: [ bitcoin_merged_mining_header: EthereumJSONRPC.data(), @@ -20,7 +20,7 @@ defmodule EthereumJSONRPC.Block do ] ) - "ethereum" -> + :ethereum -> @chain_type_fields quote( do: [ withdrawals_root: EthereumJSONRPC.hash(), @@ -94,14 +94,14 @@ defmodule EthereumJSONRPC.Block do `t:EthereumJSONRPC.hash/0`. * `"baseFeePerGas"` - `t:EthereumJSONRPC.quantity/0` of wei to denote amount of fee burnt per unit gas used. Introduced in [EIP-1559](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1559.md) #{case Application.compile_env(:explorer, :chain_type) do - "rsk" -> """ + :rsk -> """ * `"minimumGasPrice"` - `t:EthereumJSONRPC.quantity/0` of the minimum gas price for this block. * `"bitcoinMergedMiningHeader"` - `t:EthereumJSONRPC.data/0` of the Bitcoin merged mining header. * `"bitcoinMergedMiningCoinbaseTransaction"` - `t:EthereumJSONRPC.data/0` of the Bitcoin merged mining coinbase transaction. * `"bitcoinMergedMiningMerkleProof"` - `t:EthereumJSONRPC.data/0` of the Bitcoin merged mining merkle proof. * `"hashForMergedMining"` - `t:EthereumJSONRPC.data/0` of the hash for merged mining. """ - "ethereum" -> """ + :ethereum -> """ * `"withdrawalsRoot"` - `t:EthereumJSONRPC.hash/0` of the root of the withdrawals. * `"blobGasUsed"` - `t:EthereumJSONRPC.quantity/0` of the total amount of blob gas consumed by the transactions within the block. * `"excessBlobGas"` - `t:EthereumJSONRPC.quantity/0` of the running total of blob gas consumed in excess of the target, prior to the block. @@ -160,14 +160,14 @@ defmodule EthereumJSONRPC.Block do ...> "transactions" => [], ...> "transactionsRoot" => "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",\ #{case Application.compile_env(:explorer, :chain_type) do - "rsk" -> """ + :rsk -> """ "minimumGasPrice" => 345786,\ "bitcoinMergedMiningHeader" => "0x00006d20ffd048280094a6ea0851d854036aacaa25ee0f23f0040200000000000000000078d2638fe0b4477c54601e6449051afba8228e0a88ff06b0c91f091fd34d5da57487c76402610517372c2fe9",\ "bitcoinMergedMiningCoinbaseTransaction" => "0x00000000000000805bf0dc9203da49a3b4e3ec913806e43102cc07db991272dc8b7018da57eb5abe59a32d070000ffffffff03449a4d26000000001976a914536ffa992491508dca0354e52f32a3a7a679a53a88ac00000000000000002b6a2952534b424c4f434b3ad2508d21d28c8f89d495923c0758ec3f64bd6755b4ec416f5601312600542a400000000000000000266a24aa21a9ed4ae42ea6dca2687aaed665714bf58b055c4e11f2fb038605930d630b49ad7b9d00000000",\ "bitcoinMergedMiningMerkleProof" => "0x8e5a4ba74eb4eb2f9ad4cabc2913aeed380a5becf7cd4d513341617efb798002bd83a783c31c66a8a8f6cc56c071c2d471cb610e3dc13054b9d216021d8c7e9112f622564449ebedcedf7d4ccb6fe0ffac861b7ed1446c310813cdf712e1e6add28b1fe1c0ae5e916194ba4f285a9340aba41e91bf847bf31acf37a9623a04a2348a37ab9faa5908122db45596bbc03e9c3644b0d4589471c4ff30fc139f3ba50506e9136fa0df799b487494de3e2b3dec937338f1a2e18da057c1f60590a9723672a4355b9914b1d01af9f582d9e856f6e1744be00f268b0b01d559329f7e0685aa63ffeb7c28486d7462292021d1345cddbf7c920ca34bb7aa4c6cdbe068806e35d0db662e7fcda03cb4d779594638c62a1fdd7ec98d1fb6d240d853958abe57561d9b9d0465cf8b9d6ee3c58b0d8b07d6c4c5d8f348e43fe3c06011b6a0008db4e0b16c77ececc3981f9008201cea5939869d648e59a09bd2094b1196ff61126bffb626153deed2563e1745436247c94a85d2947756b606d67633781c99d7",\ "hashForMergedMining" => "0xd2508d21d28c8f89d495923c0758ec3f64bd6755b4ec416f5601312600542a40",\ """ - "ethereum" -> """ + :ethereum -> """ "withdrawalsRoot" => "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",\ "blobGasUsed" => 262144,\ "excessBlobGas" => 79429632,\ @@ -197,7 +197,7 @@ defmodule EthereumJSONRPC.Block do total_difficulty: 340282366920938463463374607431465668165, transactions_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",\ #{case Application.compile_env(:explorer, :chain_type) do - "rsk" -> """ + :rsk -> """ bitcoin_merged_mining_coinbase_transaction: "0x00000000000000805bf0dc9203da49a3b4e3ec913806e43102cc07db991272dc8b7018da57eb5abe59a32d070000ffffffff03449a4d26000000001976a914536ffa992491508dca0354e52f32a3a7a679a53a88ac00000000000000002b6a2952534b424c4f434b3ad2508d21d28c8f89d495923c0758ec3f64bd6755b4ec416f5601312600542a400000000000000000266a24aa21a9ed4ae42ea6dca2687aaed665714bf58b055c4e11f2fb038605930d630b49ad7b9d00000000",\ bitcoin_merged_mining_header: "0x00006d20ffd048280094a6ea0851d854036aacaa25ee0f23f0040200000000000000000078d2638fe0b4477c54601e6449051afba8228e0a88ff06b0c91f091fd34d5da57487c76402610517372c2fe9",\ @@ -205,7 +205,7 @@ defmodule EthereumJSONRPC.Block do hash_for_merged_mining: "0xd2508d21d28c8f89d495923c0758ec3f64bd6755b4ec416f5601312600542a40",\ minimum_gas_price: 345786,\ """ - "ethereum" -> """ + :ethereum -> """ withdrawals_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",\ blob_gas_used: 262144,\ excess_blob_gas: 79429632,\ @@ -261,14 +261,14 @@ defmodule EthereumJSONRPC.Block do total_difficulty: 1039309006117, transactions_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",\ #{case Application.compile_env(:explorer, :chain_type) do - "rsk" -> """ + :rsk -> """ bitcoin_merged_mining_coinbase_transaction: nil,\ bitcoin_merged_mining_header: nil,\ bitcoin_merged_mining_merkle_proof: nil,\ hash_for_merged_mining: nil,\ minimum_gas_price: nil,\ """ - "ethereum" -> """ + :ethereum -> """ withdrawals_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",\ blob_gas_used: 0,\ excess_blob_gas: 0,\ @@ -464,7 +464,7 @@ defmodule EthereumJSONRPC.Block do defp chain_type_fields(params, elixir) do case Application.get_env(:explorer, :chain_type) do - "rsk" -> + :rsk -> params |> Map.merge(%{ minimum_gas_price: Map.get(elixir, "minimumGasPrice"), @@ -474,7 +474,7 @@ defmodule EthereumJSONRPC.Block do hash_for_merged_mining: Map.get(elixir, "hashForMergedMining") }) - "ethereum" -> + :ethereum -> params |> Map.merge(%{ withdrawals_root: diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block/by_hash.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block/by_hash.ex index 07d1e48b4d1e..5a923a3a95b1 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block/by_hash.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/block/by_hash.ex @@ -3,9 +3,7 @@ defmodule EthereumJSONRPC.Block.ByHash do Block format as returned by [`eth_getBlockByHash`](https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_getblockbyhash) """ - @include_transactions true - - def request(%{id: id, hash: hash}) do - EthereumJSONRPC.request(%{id: id, method: "eth_getBlockByHash", params: [hash, @include_transactions]}) + def request(%{id: id, hash: hash}, hydrated \\ true) do + EthereumJSONRPC.request(%{id: id, method: "eth_getBlockByHash", params: [hash, hydrated]}) end end diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/blocks.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/blocks.ex index 76ffbe6b5cc4..bd0c00f6df6b 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/blocks.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/blocks.ex @@ -117,14 +117,14 @@ defmodule EthereumJSONRPC.Blocks do total_difficulty: 131072, transactions_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",\ #{case Application.compile_env(:explorer, :chain_type) do - "rsk" -> """ + :rsk -> """ bitcoin_merged_mining_coinbase_transaction: nil,\ bitcoin_merged_mining_header: nil,\ bitcoin_merged_mining_merkle_proof: nil,\ hash_for_merged_mining: nil,\ minimum_gas_price: nil,\ """ - "ethereum" -> """ + :ethereum -> """ withdrawals_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",\ blob_gas_used: 0,\ excess_blob_gas: 0,\ diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/contract.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/contract.ex index 729b218200ae..64ed49911d59 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/contract.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/contract.ex @@ -133,9 +133,13 @@ defmodule EthereumJSONRPC.Contract do defp convert_int_string_to_array_inner(arg) do arg - |> Enum.map(fn el -> - {int, _} = Integer.parse(el) - int + |> Enum.map(fn + el when is_integer(el) -> + el + + el -> + {int, _} = Integer.parse(el) + int end) end diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex index dc9b556892e3..be07754c18a6 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex @@ -41,11 +41,10 @@ defmodule EthereumJSONRPC.Geth do end end - defp correct_timeouts(json_rpc_named_arguments) do - debug_trace_transaction_timeout = - Application.get_env(:ethereum_jsonrpc, __MODULE__)[:debug_trace_transaction_timeout] + def correct_timeouts(json_rpc_named_arguments) do + debug_trace_timeout = Application.get_env(:ethereum_jsonrpc, __MODULE__)[:debug_trace_timeout] - case CommonHelper.parse_duration(debug_trace_transaction_timeout) do + case CommonHelper.parse_duration(debug_trace_timeout) do {:error, :invalid_format} -> json_rpc_named_arguments @@ -94,8 +93,14 @@ defmodule EthereumJSONRPC.Geth do blocks_responses |> EthereumJSONRPC.sanitize_responses(id_to_params) |> Enum.reduce([], fn - %{result: _result}, acc -> acc - %{error: error}, acc -> [error | acc] + %{result: result}, acc -> + Enum.reduce(result, acc, fn + %{"result" => _calls_result}, inner_acc -> inner_acc + %{"error" => error}, inner_acc -> [error | inner_acc] + end) + + %{error: error}, acc -> + [error | acc] end) |> case do [] -> :ok @@ -103,25 +108,30 @@ defmodule EthereumJSONRPC.Geth do end end - defp to_transactions_params(blocks_responses, id_to_params) do - Enum.reduce(blocks_responses, [], fn %{id: id, result: tx_result}, blocks_acc -> - extract_transactions_params(Map.fetch!(id_to_params, id), tx_result) ++ blocks_acc + def to_transactions_params(blocks_responses, id_to_params) do + blocks_responses + |> Enum.reduce({[], 0}, fn %{id: id, result: tx_result}, {blocks_acc, counter} -> + {transactions_params, _, new_counter} = + extract_transactions_params(Map.fetch!(id_to_params, id), tx_result, counter) + + {transactions_params ++ blocks_acc, new_counter} end) + |> elem(0) end - defp extract_transactions_params(block_number, tx_result) do - tx_result - |> Enum.reduce({[], 0}, fn %{"txHash" => tx_hash, "result" => calls_result}, {tx_acc, counter} -> + defp extract_transactions_params(block_number, tx_result, counter) do + Enum.reduce(tx_result, {[], 0, counter}, fn %{"txHash" => tx_hash, "result" => calls_result}, + {tx_acc, inner_counter, counter} -> { [ - {%{block_number: block_number, hash_data: tx_hash, transaction_index: counter, id: counter}, + {%{block_number: block_number, hash_data: tx_hash, transaction_index: inner_counter, id: counter}, %{id: counter, result: calls_result}} | tx_acc ], + inner_counter + 1, counter + 1 } end) - |> elem(0) end @doc """ @@ -132,7 +142,7 @@ defmodule EthereumJSONRPC.Geth do PendingTransaction.fetch_pending_transactions_geth(json_rpc_named_arguments) end - defp debug_trace_transaction_requests(id_to_params) when is_map(id_to_params) do + def debug_trace_transaction_requests(id_to_params) when is_map(id_to_params) do Enum.map(id_to_params, fn {id, %{hash_data: hash_data}} -> debug_trace_transaction_request(%{id: id, hash_data: hash_data}) end) @@ -147,21 +157,25 @@ defmodule EthereumJSONRPC.Geth do @tracer File.read!(@tracer_path) defp debug_trace_transaction_request(%{id: id, hash_data: hash_data}) do - debug_trace_transaction_timeout = - Application.get_env(:ethereum_jsonrpc, __MODULE__)[:debug_trace_transaction_timeout] + debug_trace_timeout = Application.get_env(:ethereum_jsonrpc, __MODULE__)[:debug_trace_timeout] request(%{ id: id, method: "debug_traceTransaction", - params: [hash_data, %{timeout: debug_trace_transaction_timeout} |> Map.merge(tracer_params())] + params: [hash_data, %{timeout: debug_trace_timeout} |> Map.merge(tracer_params())] }) end defp debug_trace_block_by_number_request({id, block_number}) do + debug_trace_timeout = Application.get_env(:ethereum_jsonrpc, __MODULE__)[:debug_trace_timeout] + request(%{ id: id, method: "debug_traceBlockByNumber", - params: [integer_to_quantity(block_number), tracer_params()] + params: [ + integer_to_quantity(block_number), + %{timeout: debug_trace_timeout} |> Map.merge(tracer_params()) + ] }) end @@ -353,7 +367,7 @@ defmodule EthereumJSONRPC.Geth do defp parse_call_tracer_calls({%{"type" => upcase_type, "from" => from} = call, index}, acc, trace_address, inner?) do case String.downcase(upcase_type) do - type when type in ~w(call callcode delegatecall staticcall create create2 selfdestruct revert stop) -> + type when type in ~w(call callcode delegatecall staticcall create create2 selfdestruct revert stop invalid) -> new_trace_address = [index | trace_address] formatted_call = diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth/call.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth/call.ex index c90c652db3f4..a76a0dd955ac 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth/call.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth/call.ex @@ -324,7 +324,7 @@ defmodule EthereumJSONRPC.Geth.Call do "transactionHash" => transaction_hash, "index" => index, "traceAddress" => trace_address, - "type" => "call" = type, + "type" => type, "callType" => call_type, "from" => from_address_hash, "to" => to_address_hash, @@ -333,14 +333,14 @@ defmodule EthereumJSONRPC.Geth.Call do "error" => error, "value" => value }) - when call_type in ~w(call callcode delegatecall) do + when type in ~w(call invalid) and call_type in ~w(call callcode delegatecall invalid) do %{ block_number: block_number, transaction_index: transaction_index, transaction_hash: transaction_hash, index: index, trace_address: trace_address, - type: type, + type: "call", call_type: call_type, from_address_hash: from_address_hash, to_address_hash: to_address_hash, @@ -357,7 +357,7 @@ defmodule EthereumJSONRPC.Geth.Call do "transactionHash" => transaction_hash, "index" => index, "traceAddress" => trace_address, - "type" => "call" = type, + "type" => type, "callType" => call_type, "from" => from_address_hash, "to" => to_address_hash, @@ -367,14 +367,14 @@ defmodule EthereumJSONRPC.Geth.Call do "output" => output, "value" => value }) - when call_type in ~w(call callcode delegatecall) do + when type in ~w(call invalid) and call_type in ~w(call callcode delegatecall invalid) do %{ block_number: block_number, transaction_index: transaction_index, transaction_hash: transaction_hash, index: index, trace_address: trace_address, - type: type, + type: "call", call_type: call_type, from_address_hash: from_address_hash, to_address_hash: to_address_hash, diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/http.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/http.ex index f7b607e77e8c..e1704d1068a8 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/http.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/http.ex @@ -23,7 +23,7 @@ defmodule EthereumJSONRPC.HTTP do def json_rpc(%{method: method} = request, options) when is_map(request) do json = encode_json(request) http = Keyword.fetch!(options, :http) - url = url(options, method) + {url_type, url} = url(options, method) http_options = Keyword.fetch!(options, :http_options) with {:ok, %{body: body, status_code: code}} <- http.json_rpc(url, json, headers(), http_options), @@ -33,7 +33,7 @@ defmodule EthereumJSONRPC.HTTP do else error -> named_arguments = [transport: __MODULE__, transport_options: Keyword.delete(options, :method_to_url)] - EndpointAvailabilityObserver.inc_error_count(url, named_arguments) + EndpointAvailabilityObserver.inc_error_count(url, named_arguments, url_type) error end end @@ -65,7 +65,7 @@ defmodule EthereumJSONRPC.HTTP do defp chunked_json_rpc([[%{method: method} | _] = batch | tail] = chunks, options, decoded_response_bodies) when is_list(tail) and is_list(decoded_response_bodies) do http = Keyword.fetch!(options, :http) - url = url(options, method) + {url_type, url} = url(options, method) http_options = Keyword.fetch!(options, :http_options) json = encode_json(batch) @@ -85,7 +85,7 @@ defmodule EthereumJSONRPC.HTTP do {:error, _} = error -> named_arguments = [transport: __MODULE__, transport_options: Keyword.delete(options, :method_to_url)] - EndpointAvailabilityObserver.inc_error_count(url, named_arguments) + EndpointAvailabilityObserver.inc_error_count(url, named_arguments, url_type) error end end @@ -203,12 +203,21 @@ defmodule EthereumJSONRPC.HTTP do with {:ok, method_to_url} <- Keyword.fetch(options, :method_to_url), {:ok, method_atom} <- to_existing_atom(method), {:ok, url} <- Keyword.fetch(method_to_url, method_atom) do - EndpointAvailabilityObserver.maybe_replace_url(url, options[:fallback_trace_url]) + {url_type, fallback_url} = + case method_atom do + :eth_call -> {:eth_call, options[:fallback_eth_call_url]} + _ -> {:trace, options[:fallback_trace_url]} + end + + {url_type, EndpointAvailabilityObserver.maybe_replace_url(url, fallback_url, url_type)} else _ -> - options - |> Keyword.fetch!(:url) - |> EndpointAvailabilityObserver.maybe_replace_url(options[:fallback_url]) + url = + options + |> Keyword.fetch!(:url) + |> EndpointAvailabilityObserver.maybe_replace_url(options[:fallback_url], :http) + + {:http, url} end end diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/log.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/log.ex index f3c6a88662c5..012ac0ec01e3 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/log.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/log.ex @@ -174,6 +174,11 @@ defmodule EthereumJSONRPC.Log do end end + # zkSync specific log fields + defp entry_to_elixir({key, _}) when key in ~w(l1BatchNumber logType) do + {nil, nil} + end + defp put_topics(params, topics) when is_map(params) and is_list(topics) do params |> Map.put(:first_topic, Enum.at(topics, 0)) diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/pending_transaction.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/pending_transaction.ex index 90de6961f18f..cfce452c8647 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/pending_transaction.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/pending_transaction.ex @@ -60,8 +60,18 @@ defmodule EthereumJSONRPC.PendingTransaction do @spec fetch_pending_transactions_besu(EthereumJSONRPC.json_rpc_named_arguments()) :: {:ok, [Transaction.params()]} | {:error, reason :: term} def fetch_pending_transactions_besu(json_rpc_named_arguments) do + # `txpool_besuPendingTransactions` required parameter `numResults` for number of maximum pending transaction to return. + # + # TODO: Remove fix value when hyperledger besu client change `numResults` from required to optional parameter. + # Current fix value set to `512` bonsai storage default value is 512. + # to handle pending transaction in Ethereum mainnet require more than 100000. + # reference: + # https://etherscan.io/chart/pendingtx + # https://besu.hyperledger.org/public-networks/reference/cli/options#bonsai-historical-block-limit + # + # https://besu.hyperledger.org/public-networks/reference/api#txpool_besupendingtransactions with {:ok, transactions} <- - %{id: 1, method: "txpool_besuTransactions", params: []} + %{id: 1, method: "txpool_besuPendingTransactions", params: [512]} |> request() |> json_rpc(json_rpc_named_arguments) do transactions_params = diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipt.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipt.ex index f82762f547a0..f81ca2e03c6e 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipt.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipt.ex @@ -76,10 +76,16 @@ defmodule EthereumJSONRPC.Receipt do transaction_hash: "0x3a3eb134e6792ce9403ea4188e5e79693de9e4c94e499db132be086400da79e6", transaction_index: 0,\ #{case Application.compile_env(:explorer, :chain_type) do - "ethereum" -> """ + :ethereum -> """ blob_gas_price: 0,\ blob_gas_used: 0\ """ + :optimism -> """ + l1_fee: 0,\ + l1_fee_scalar: 0,\ + l1_gas_price: 0,\ + l1_gas_used: 0\ + """ _ -> "" end} } @@ -116,16 +122,23 @@ defmodule EthereumJSONRPC.Receipt do transaction_hash: "0x5c504ed432cb51138bcf09aa5e8a410dd4a1e204ef84bfed1be16dfba1b22060", transaction_index: 0,\ #{case Application.compile_env(:explorer, :chain_type) do - "ethereum" -> """ + :ethereum -> """ blob_gas_price: 0,\ blob_gas_used: 0\ """ + :optimism -> """ + l1_fee: 0,\ + l1_fee_scalar: 0,\ + l1_gas_price: 0,\ + l1_gas_used: 0\ + """ _ -> "" end} } """ @spec elixir_to_params(elixir) :: %{ + optional(:gas_price) => non_neg_integer(), cumulative_gas_used: non_neg_integer, gas_used: non_neg_integer, created_contract_address_hash: String.t() | nil, @@ -158,17 +171,37 @@ defmodule EthereumJSONRPC.Receipt do transaction_hash: transaction_hash, transaction_index: transaction_index } + |> maybe_append_gas_price(elixir) end + defp maybe_append_gas_price(params, %{"effectiveGasPrice" => effective_gas_price}) do + if is_nil(effective_gas_price) do + params + else + Map.put(params, :gas_price, effective_gas_price) + end + end + + defp maybe_append_gas_price(params, _), do: params + defp chain_type_fields(params, elixir) do case Application.get_env(:explorer, :chain_type) do - "ethereum" -> + :ethereum -> params |> Map.merge(%{ blob_gas_price: Map.get(elixir, "blobGasPrice", 0), blob_gas_used: Map.get(elixir, "blobGasUsed", 0) }) + :optimism -> + params + |> Map.merge(%{ + l1_fee: Map.get(elixir, "l1Fee", 0), + l1_fee_scalar: Map.get(elixir, "l1FeeScalar", 0), + l1_gas_price: Map.get(elixir, "l1GasPrice", 0), + l1_gas_used: Map.get(elixir, "l1GasUsed", 0) + }) + _ -> params end @@ -287,11 +320,11 @@ defmodule EthereumJSONRPC.Receipt do # hash format # gas is passed in from the `t:EthereumJSONRPC.Transaction.params/0` to allow pre-Byzantium status to be derived defp entry_to_elixir({key, _} = entry) - when key in ~w(blockHash contractAddress from gas logsBloom root to transactionHash revertReason type effectiveGasPrice), + when key in ~w(blockHash contractAddress from gas logsBloom root to transactionHash revertReason type l1FeeScalar), do: {:ok, entry} defp entry_to_elixir({key, quantity}) - when key in ~w(blockNumber cumulativeGasUsed gasUsed transactionIndex blobGasUsed blobGasPrice) do + when key in ~w(blockNumber cumulativeGasUsed gasUsed transactionIndex blobGasUsed blobGasPrice l1Fee l1GasPrice l1GasUsed effectiveGasPrice) do result = if is_nil(quantity) do nil @@ -353,6 +386,12 @@ defmodule EthereumJSONRPC.Receipt do :ignore end + # zkSync specific transaction receipt fields + defp entry_to_elixir({key, _}) + when key in ~w(l1BatchNumber l1BatchTxIndex l2ToL1Logs) do + :ignore + end + defp entry_to_elixir({key, value}) do {:error, {:unknown_key, %{key: key, value: value}}} end diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipts.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipts.ex index 7ceb79b872ed..73683fda3fc6 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipts.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/receipts.ex @@ -101,10 +101,16 @@ defmodule EthereumJSONRPC.Receipts do transaction_hash: "0x53bd884872de3e488692881baeec262e7b95234d3965248c39fe992fffd433e5", transaction_index: 0,\ #{case Application.compile_env(:explorer, :chain_type) do - "ethereum" -> """ + :ethereum -> """ blob_gas_price: 0,\ blob_gas_used: 0\ """ + :optimism -> """ + l1_fee: 0,\ + l1_fee_scalar: 0,\ + l1_gas_price: 0,\ + l1_gas_used: 0\ + """ _ -> "" end} } diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex index 03cd3a52b8ce..482d0af67114 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex @@ -12,7 +12,7 @@ defmodule EthereumJSONRPC.Transaction do alias EthereumJSONRPC case Application.compile_env(:explorer, :chain_type) do - "ethereum" -> + :ethereum -> @chain_type_fields quote( do: [ max_fee_per_blob_gas: non_neg_integer(), @@ -20,7 +20,15 @@ defmodule EthereumJSONRPC.Transaction do ] ) - "suave" -> + :optimism -> + @chain_type_fields quote( + do: [ + l1_tx_origin: EthereumJSONRPC.hash(), + l1_block_number: non_neg_integer() + ] + ) + + :suave -> @chain_type_fields quote( do: [ execution_node_hash: EthereumJSONRPC.address(), @@ -76,11 +84,15 @@ defmodule EthereumJSONRPC.Transaction do * `"maxFeePerGas"` - `t:EthereumJSONRPC.quantity/0` of wei to denote max fee per unit of gas used. Introduced in [EIP-1559](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1559.md) * `"type"` - `t:EthereumJSONRPC.quantity/0` denotes transaction type. Introduced in [EIP-1559](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1559.md) #{case Application.compile_env(:explorer, :chain_type) do - "ethereum" -> """ + :ethereum -> """ * `"maxFeePerBlobGas"` - `t:EthereumJSONRPC.quantity/0` of wei to denote max fee per unit of blob gas used. Introduced in [EIP-4844](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-4844.md) * `"blobVersionedHashes"` - `t:list/0` of `t:EthereumJSONRPC.hash/0` of included data blobs hashes. Introduced in [EIP-4844](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-4844.md) """ - "suave" -> """ + :optimism -> """ + * `"l1TxOrigin"` - . + * `"l1BlockNumber"` - . + """ + :suave -> """ * `"executionNode"` - `t:EthereumJSONRPC.address/0` of execution node (used by Suave). * `"requestRecord"` - map of wrapped transaction data (used by Suave). """ @@ -131,6 +143,7 @@ defmodule EthereumJSONRPC.Transaction do ...> "s" => 31606574786494953692291101914709926755545765281581808821704454381804773090106, ...> "to" => "0x5df9b87991262f6ba471f09758cde1c0fc1de734", ...> "transactionIndex" => 0, + ...> "type" => 2, ...> "v" => 28, ...> "value" => 31337 ...> } @@ -148,11 +161,49 @@ defmodule EthereumJSONRPC.Transaction do r: 61965845294689009770156372156374760022787886965323743865986648153755601564112, s: 31606574786494953692291101914709926755545765281581808821704454381804773090106, to_address_hash: "0x5df9b87991262f6ba471f09758cde1c0fc1de734", + type: 2, v: 28, value: 31337, transaction_index: 0 } + iex> EthereumJSONRPC.Transaction.elixir_to_params( + ...> %{ + ...> "blockHash" => "0x4e3a3754410177e6937ef1f84bba68ea139e8d1a2258c5f85db9f1cd715a1bdd", + ...> "blockNumber" => 46147, + ...> "from" => "0xa1e4380a3b1f749673e270229993ee55f35663b4", + ...> "gas" => 21000, + ...> "hash" => "0x5c504ed432cb51138bcf09aa5e8a410dd4a1e204ef84bfed1be16dfba1b22060", + ...> "input" => "0x", + ...> "nonce" => 0, + ...> "r" => 61965845294689009770156372156374760022787886965323743865986648153755601564112, + ...> "s" => 31606574786494953692291101914709926755545765281581808821704454381804773090106, + ...> "to" => "0x5df9b87991262f6ba471f09758cde1c0fc1de734", + ...> "transactionIndex" => 0, + ...> "type" => 2, + ...> "v" => 28, + ...> "value" => 31337 + ...> } + ...> ) + %{ + block_hash: "0x4e3a3754410177e6937ef1f84bba68ea139e8d1a2258c5f85db9f1cd715a1bdd", + block_number: 46147, + from_address_hash: "0xa1e4380a3b1f749673e270229993ee55f35663b4", + gas: 21000, + hash: "0x5c504ed432cb51138bcf09aa5e8a410dd4a1e204ef84bfed1be16dfba1b22060", + index: 0, + input: "0x", + nonce: 0, + r: 61965845294689009770156372156374760022787886965323743865986648153755601564112, + s: 31606574786494953692291101914709926755545765281581808821704454381804773090106, + to_address_hash: "0x5df9b87991262f6ba471f09758cde1c0fc1de734", + type: 2, + v: 28, + value: 31337, + transaction_index: 0, + gas_price: 0 + } + Erigon `elixir` from txpool_content method can be converted to `params`. iex> EthereumJSONRPC.Transaction.elixir_to_params( @@ -213,11 +264,8 @@ defmodule EthereumJSONRPC.Transaction do "hash" => hash, "input" => input, "nonce" => nonce, - "r" => r, - "s" => s, "to" => to_address_hash, "transactionIndex" => index, - "v" => v, "value" => value, "type" => type, "maxPriorityFeePerGas" => max_priority_fee_per_gas, @@ -234,10 +282,7 @@ defmodule EthereumJSONRPC.Transaction do index: index, input: input, nonce: nonce, - r: r, - s: s, to_address_hash: to_address_hash, - v: v, value: value, transaction_index: index, type: type, @@ -247,7 +292,10 @@ defmodule EthereumJSONRPC.Transaction do put_if_present(transaction, result, [ {"creates", :created_contract_address_hash}, - {"block_timestamp", :block_timestamp} + {"block_timestamp", :block_timestamp}, + {"r", :r}, + {"s", :s}, + {"v", :v} ]) end @@ -262,11 +310,8 @@ defmodule EthereumJSONRPC.Transaction do "hash" => hash, "input" => input, "nonce" => nonce, - "r" => r, - "s" => s, "to" => to_address_hash, "transactionIndex" => index, - "v" => v, "value" => value, "type" => type, "maxPriorityFeePerGas" => max_priority_fee_per_gas, @@ -283,10 +328,7 @@ defmodule EthereumJSONRPC.Transaction do index: index, input: input, nonce: nonce, - r: r, - s: s, to_address_hash: to_address_hash, - v: v, value: value, transaction_index: index, type: type, @@ -296,10 +338,14 @@ defmodule EthereumJSONRPC.Transaction do put_if_present(transaction, result, [ {"creates", :created_contract_address_hash}, - {"block_timestamp", :block_timestamp} + {"block_timestamp", :block_timestamp}, + {"r", :r}, + {"s", :s}, + {"v", :v} ]) end + # for legacy txs without maxPriorityFeePerGas and maxFeePerGas def do_elixir_to_params( %{ "blockHash" => block_hash, @@ -310,11 +356,8 @@ defmodule EthereumJSONRPC.Transaction do "hash" => hash, "input" => input, "nonce" => nonce, - "r" => r, - "s" => s, "to" => to_address_hash, "transactionIndex" => index, - "v" => v, "value" => value, "type" => type } = transaction @@ -329,10 +372,7 @@ defmodule EthereumJSONRPC.Transaction do index: index, input: input, nonce: nonce, - r: r, - s: s, to_address_hash: to_address_hash, - v: v, value: value, transaction_index: index, type: type @@ -340,10 +380,14 @@ defmodule EthereumJSONRPC.Transaction do put_if_present(transaction, result, [ {"creates", :created_contract_address_hash}, - {"block_timestamp", :block_timestamp} + {"block_timestamp", :block_timestamp}, + {"r", :r}, + {"s", :s}, + {"v", :v} ]) end + # for legacy txs without type, maxPriorityFeePerGas and maxFeePerGas def do_elixir_to_params( %{ "blockHash" => block_hash, @@ -354,11 +398,8 @@ defmodule EthereumJSONRPC.Transaction do "hash" => hash, "input" => input, "nonce" => nonce, - "r" => r, - "s" => s, "to" => to_address_hash, "transactionIndex" => index, - "v" => v, "value" => value } = transaction ) do @@ -372,29 +413,78 @@ defmodule EthereumJSONRPC.Transaction do index: index, input: input, nonce: nonce, - r: r, - s: s, to_address_hash: to_address_hash, - v: v, value: value, transaction_index: index } put_if_present(transaction, result, [ {"creates", :created_contract_address_hash}, - {"block_timestamp", :block_timestamp} + {"block_timestamp", :block_timestamp}, + {"r", :r}, + {"s", :s}, + {"v", :v} + ]) + end + + # for txs without gasPrice, maxPriorityFeePerGas and maxFeePerGas + def do_elixir_to_params( + %{ + "blockHash" => block_hash, + "blockNumber" => block_number, + "from" => from_address_hash, + "gas" => gas, + "hash" => hash, + "input" => input, + "nonce" => nonce, + "to" => to_address_hash, + "transactionIndex" => index, + "type" => type, + "value" => value + } = transaction + ) do + result = %{ + block_hash: block_hash, + block_number: block_number, + from_address_hash: from_address_hash, + gas: gas, + gas_price: 0, + hash: hash, + index: index, + input: input, + nonce: nonce, + to_address_hash: to_address_hash, + value: value, + transaction_index: index, + type: type + } + + put_if_present(transaction, result, [ + {"creates", :created_contract_address_hash}, + {"block_timestamp", :block_timestamp}, + {"r", :r}, + {"s", :s}, + {"v", :v} ]) end defp chain_type_fields(params, elixir) do case Application.get_env(:explorer, :chain_type) do - "ethereum" -> + :ethereum -> put_if_present(elixir, params, [ {"blobVersionedHashes", :blob_versioned_hashes}, {"maxFeePerBlobGas", :max_fee_per_blob_gas} ]) - "suave" -> + :optimism -> + # we need to put blobVersionedHashes for Indexer.Fetcher.Optimism.TxnBatch module + put_if_present(elixir, params, [ + {"l1TxOrigin", :l1_tx_origin}, + {"l1BlockNumber", :l1_block_number}, + {"blobVersionedHashes", :blob_versioned_hashes} + ]) + + :suave -> wrapped = Map.get(elixir, "requestRecord") if is_nil(wrapped) do @@ -552,7 +642,8 @@ defmodule EthereumJSONRPC.Transaction do end # quantity or nil for pending - defp entry_to_elixir({key, quantity_or_nil}) when key in ~w(blockNumber transactionIndex) do + defp entry_to_elixir({key, quantity_or_nil}) + when key in ~w(blockNumber transactionIndex l1TxOrigin l1BlockNumber) do elixir = case quantity_or_nil do nil -> nil @@ -570,6 +661,11 @@ defmodule EthereumJSONRPC.Transaction do end end + # ZkSync fields + defp entry_to_elixir({key, _}) when key in ~w(l1BatchNumber l1BatchTxIndex) do + {:ignore, :ignore} + end + defp entry_to_elixir(_) do {nil, nil} end diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transport.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transport.ex index dc7f1839a6b7..829f5816d3f8 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transport.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transport.ex @@ -84,7 +84,7 @@ defmodule EthereumJSONRPC.Transport do * `{:ok, result}` - `result` is the `/result` from JSONRPC response object of format `%{"id" => ..., "result" => result}`. - * `{:error, reason}` - `reason` is the the `/error` from JSONRPC response object of format + * `{:error, reason}` - `reason` is the `/error` from JSONRPC response object of format `%{"id" => ..., "error" => reason}`. The transport can also give any `term()` for `reason` if a more specific reason is possible. diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/utility/endpoint_availability_checker.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/utility/endpoint_availability_checker.ex index 527f8a0c35f7..45f2f687d867 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/utility/endpoint_availability_checker.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/utility/endpoint_availability_checker.ex @@ -5,6 +5,8 @@ defmodule EthereumJSONRPC.Utility.EndpointAvailabilityChecker do use GenServer + require Logger + alias EthereumJSONRPC.Utility.EndpointAvailabilityObserver @check_interval :timer.seconds(1) @@ -19,24 +21,27 @@ defmodule EthereumJSONRPC.Utility.EndpointAvailabilityChecker do {:ok, %{unavailable_endpoints_arguments: []}} end - def add_endpoint(json_rpc_named_arguments) do - GenServer.cast(__MODULE__, {:add_endpoint, json_rpc_named_arguments}) + def add_endpoint(json_rpc_named_arguments, url_type) do + GenServer.cast(__MODULE__, {:add_endpoint, json_rpc_named_arguments, url_type}) end - def handle_cast({:add_endpoint, named_arguments}, %{unavailable_endpoints_arguments: unavailable} = state) do - {:noreply, %{state | unavailable_endpoints_arguments: [named_arguments | unavailable]}} + def handle_cast({:add_endpoint, named_arguments, url_type}, %{unavailable_endpoints_arguments: unavailable} = state) do + {:noreply, %{state | unavailable_endpoints_arguments: [{named_arguments, url_type} | unavailable]}} end def handle_info(:check, %{unavailable_endpoints_arguments: unavailable_endpoints_arguments} = state) do new_unavailable_endpoints = - Enum.reduce(unavailable_endpoints_arguments, [], fn json_rpc_named_arguments, acc -> + Enum.reduce(unavailable_endpoints_arguments, [], fn {json_rpc_named_arguments, url_type}, acc -> case fetch_latest_block_number(json_rpc_named_arguments) do {:ok, _number} -> - EndpointAvailabilityObserver.enable_endpoint(json_rpc_named_arguments[:transport_options][:url]) + url = json_rpc_named_arguments[:transport_options][:url] + + EndpointAvailabilityObserver.enable_endpoint(url, url_type) + log_url_available(url, url_type, json_rpc_named_arguments) acc _ -> - [json_rpc_named_arguments | acc] + [{json_rpc_named_arguments, url_type} | acc] end end) @@ -45,6 +50,15 @@ defmodule EthereumJSONRPC.Utility.EndpointAvailabilityChecker do {:noreply, %{state | unavailable_endpoints_arguments: new_unavailable_endpoints}} end + defp log_url_available(url, url_type, json_rpc_named_arguments) do + message_extra = + if EndpointAvailabilityObserver.fallback_url_set?(url_type, json_rpc_named_arguments), + do: ", switching back to it", + else: "" + + Logger.info("URL #{inspect(url)} is available now#{message_extra}") + end + defp fetch_latest_block_number(json_rpc_named_arguments) do {_, arguments_without_fallback} = pop_in(json_rpc_named_arguments, [:transport_options, :fallback_url]) diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/utility/endpoint_availability_observer.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/utility/endpoint_availability_observer.ex index ae4d2d1f2bbe..fe768190b144 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/utility/endpoint_availability_observer.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/utility/endpoint_availability_observer.ex @@ -5,6 +5,8 @@ defmodule EthereumJSONRPC.Utility.EndpointAvailabilityObserver do use GenServer + require Logger + alias EthereumJSONRPC.Utility.EndpointAvailabilityChecker @max_error_count 3 @@ -18,72 +20,118 @@ defmodule EthereumJSONRPC.Utility.EndpointAvailabilityObserver do def init(_) do schedule_next_cleaning() - {:ok, %{error_counts: %{}, unavailable_endpoints: []}} + {:ok, %{error_counts: %{}, unavailable_endpoints: %{ws: [], trace: [], http: [], eth_call: []}}} end - def inc_error_count(url, json_rpc_named_arguments) do - GenServer.cast(__MODULE__, {:inc_error_count, url, json_rpc_named_arguments}) + def inc_error_count(url, json_rpc_named_arguments, url_type) do + GenServer.cast(__MODULE__, {:inc_error_count, url, json_rpc_named_arguments, url_type}) end - def check_endpoint(url) do - GenServer.call(__MODULE__, {:check_endpoint, url}) + def check_endpoint(url, url_type) do + GenServer.call(__MODULE__, {:check_endpoint, url, url_type}) end - def maybe_replace_url(url, replace_url) do - case check_endpoint(url) do + def maybe_replace_url(url, replace_url, url_type) do + case check_endpoint(url, url_type) do :ok -> url :unavailable -> replace_url || url end end - def enable_endpoint(url) do - GenServer.cast(__MODULE__, {:enable_endpoint, url}) + def enable_endpoint(url, url_type) do + GenServer.cast(__MODULE__, {:enable_endpoint, url, url_type}) end - def handle_call({:check_endpoint, url}, _from, %{unavailable_endpoints: unavailable_endpoints} = state) do - result = if url in unavailable_endpoints, do: :unavailable, else: :ok + def handle_call({:check_endpoint, url, url_type}, _from, %{unavailable_endpoints: unavailable_endpoints} = state) do + result = if url in unavailable_endpoints[url_type], do: :unavailable, else: :ok {:reply, result, state} end - def handle_cast({:inc_error_count, url, json_rpc_named_arguments}, %{error_counts: error_counts} = state) do - current_count = error_counts[url][:count] - unavailable_endpoints = state.unavailable_endpoints - + def handle_cast({:inc_error_count, url, json_rpc_named_arguments, url_type}, state) do new_state = - cond do - url in unavailable_endpoints -> - state - - is_nil(current_count) -> - %{state | error_counts: Map.put(error_counts, url, %{count: 1, last_occasion: now()})} - - current_count + 1 >= @max_error_count -> - EndpointAvailabilityChecker.add_endpoint(put_in(json_rpc_named_arguments[:transport_options][:url], url)) - %{state | error_counts: Map.delete(error_counts, url), unavailable_endpoints: [url | unavailable_endpoints]} - - true -> - %{state | error_counts: Map.put(error_counts, url, %{count: current_count + 1, last_occasion: now()})} - end + if json_rpc_named_arguments[:api?], + do: state, + else: do_increase_error_counts(url, json_rpc_named_arguments, url_type, state) {:noreply, new_state} end - def handle_cast({:enable_endpoint, url}, %{unavailable_endpoints: unavailable_endpoints} = state) do - {:noreply, %{state | unavailable_endpoints: unavailable_endpoints -- [url]}} + def handle_cast({:enable_endpoint, url, url_type}, %{unavailable_endpoints: unavailable_endpoints} = state) do + {:noreply, + %{state | unavailable_endpoints: %{unavailable_endpoints | url_type => unavailable_endpoints[url_type] -- [url]}}} end def handle_info(:clear_old_records, %{error_counts: error_counts} = state) do - new_error_counts = - Enum.reduce(error_counts, %{}, fn {url, %{last_occasion: last_occasion} = record}, acc -> - if now() - last_occasion > @window_duration, do: acc, else: Map.put(acc, url, record) - end) + new_error_counts = Enum.reduce(error_counts, %{}, &do_clear_old_records/2) schedule_next_cleaning() {:noreply, %{state | error_counts: new_error_counts}} end + defp do_clear_old_records({url, counts_by_types}, acc) do + counts_by_types + |> Enum.reduce(%{}, fn {type, %{last_occasion: last_occasion} = record}, acc -> + if now() - last_occasion > @window_duration, do: acc, else: Map.put(acc, type, record) + end) + |> case do + empty_map when empty_map == %{} -> acc + non_empty_map -> Map.put(acc, url, non_empty_map) + end + end + + defp do_increase_error_counts(url, json_rpc_named_arguments, url_type, %{error_counts: error_counts} = state) do + current_count = error_counts[url][url_type][:count] + unavailable_endpoints = state.unavailable_endpoints[url_type] + + cond do + url in unavailable_endpoints -> + state + + is_nil(current_count) -> + %{state | error_counts: Map.put(error_counts, url, %{url_type => %{count: 1, last_occasion: now()}})} + + current_count + 1 >= @max_error_count -> + EndpointAvailabilityChecker.add_endpoint( + put_in(json_rpc_named_arguments[:transport_options][:url], url), + url_type + ) + + log_url_unavailable(url, url_type, json_rpc_named_arguments) + + %{ + state + | error_counts: Map.put(error_counts, url, Map.delete(error_counts[url], url_type)), + unavailable_endpoints: %{state.unavailable_endpoints | url_type => [url | unavailable_endpoints]} + } + + true -> + %{ + state + | error_counts: Map.put(error_counts, url, %{url_type => %{count: current_count + 1, last_occasion: now()}}) + } + end + end + + defp log_url_unavailable(url, url_type, json_rpc_named_arguments) do + fallback_url_message = + if fallback_url_set?(url_type, json_rpc_named_arguments), + do: "switching to fallback #{url_type} url", + else: "and no fallback is set" + + Logger.warning("URL #{inspect(url)} is unavailable, #{fallback_url_message}") + end + + def fallback_url_set?(url_type, json_rpc_named_arguments) do + case url_type do + :http -> not is_nil(json_rpc_named_arguments[:transport_options][:fallback_url]) + :trace -> not is_nil(json_rpc_named_arguments[:transport_options][:fallback_trace_url]) + :eth_call -> not is_nil(json_rpc_named_arguments[:transport_options][:fallback_eth_call_url]) + _ -> false + end + end + defp schedule_next_cleaning do Process.send_after(self(), :clear_old_records, @cleaning_interval) end diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/utility/ranges_helper.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/utility/ranges_helper.ex index f7220b044d0b..f53a8b14f13e 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/utility/ranges_helper.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/utility/ranges_helper.ex @@ -107,6 +107,27 @@ defmodule EthereumJSONRPC.Utility.RangesHelper do ) end + @doc """ + Converts initial ranges to ranges with size less or equal to the given size + """ + @spec split([Range.t()], integer) :: [Range.t()] + def split(ranges, size) do + ranges + |> Enum.reduce([], fn from..to = range, acc -> + range_size = Range.size(range) + + if range_size > size do + Enum.reduce(Range.new(0, range_size - 1, size), acc, fn iterator, inner_acc -> + start_from = from - iterator + [Range.new(start_from, max(start_from - size + 1, to), -1) | inner_acc] + end) + else + [range | acc] + end + end) + |> Enum.reverse() + end + defp parse_integer(string) do case Integer.parse(string) do {number, ""} -> number diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/variant.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/variant.ex index a88216876cda..9cf459e5c230 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/variant.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/variant.ex @@ -118,13 +118,15 @@ defmodule EthereumJSONRPC.Variant do # credo:disable-for-next-line defp get_default_variant do case Application.get_env(:explorer, :chain_type) do - "polygon_zkevm" -> "geth" - "zetachain" -> "geth" - "shibarium" -> "geth" - "stability" -> "geth" - "zksync" -> "geth" - "rsk" -> "rsk" - "filecoin" -> "filecoin" + :optimism -> "geth" + :polygon_zkevm -> "geth" + :zetachain -> "geth" + :shibarium -> "geth" + :stability -> "geth" + :zksync -> "geth" + :arbitrum -> "geth" + :rsk -> "rsk" + :filecoin -> "filecoin" _ -> "nethermind" end end diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/web_socket.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/web_socket.ex index 43c890603290..cb89d0bb05fb 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/web_socket.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/web_socket.ex @@ -53,7 +53,7 @@ defmodule EthereumJSONRPC.WebSocket do * `{:ok, result}` - `result` is the `/result` from JSONRPC response object of format `%{"id" => ..., "result" => result}`. - * `{:error, reason}` - `reason` is the the `/error` from JSONRPC response object of format + * `{:error, reason}` - `reason` is the `/error` from JSONRPC response object of format `%{"id" => ..., "error" => reason}`. The transport can also give any `term()` for `reason` if a more specific reason is possible. diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/web_socket/web_socket_client.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/web_socket/web_socket_client.ex index 37b4249a8c5c..875519aa2e57 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/web_socket/web_socket_client.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/web_socket/web_socket_client.ex @@ -14,6 +14,8 @@ defmodule EthereumJSONRPC.WebSocket.WebSocketClient do @behaviour :websocket_client @behaviour WebSocket + @reconnect_interval :timer.minutes(1) + @enforce_keys ~w(url)a defstruct connected: false, request_id_to_registration: %{}, @@ -139,7 +141,7 @@ defmodule EthereumJSONRPC.WebSocket.WebSocketClient do def ondisconnect(_reason, %__MODULE__{request_id_to_registration: request_id_to_registration} = state) do final_state = Enum.reduce(request_id_to_registration, state, &disconnect_request_id_registration/2) - {:reconnect, %__MODULE__{final_state | connected: false}} + {:reconnect, @reconnect_interval, %__MODULE__{final_state | connected: false}} end @impl :websocket_client diff --git a/apps/ethereum_jsonrpc/mix.exs b/apps/ethereum_jsonrpc/mix.exs index c6dafe238226..2c9a7b27f4cc 100644 --- a/apps/ethereum_jsonrpc/mix.exs +++ b/apps/ethereum_jsonrpc/mix.exs @@ -23,7 +23,7 @@ defmodule EthereumJsonrpc.MixProject do dialyzer: :test ], start_permanent: Mix.env() == :prod, - version: "6.2.0" + version: "6.5.0" ] end diff --git a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/block_test.exs b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/block_test.exs index 100ed3756e3e..edb7c5351702 100644 --- a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/block_test.exs +++ b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/block_test.exs @@ -55,7 +55,7 @@ defmodule EthereumJSONRPC.BlockTest do transactions_root: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", uncles: [] } - |> (&if(Application.get_env(:explorer, :chain_type) == "rsk", + |> (&if(Application.get_env(:explorer, :chain_type) == :rsk, do: Map.merge( &1, @@ -69,7 +69,7 @@ defmodule EthereumJSONRPC.BlockTest do ), else: &1 )).() - |> (&if(Application.get_env(:explorer, :chain_type) == "ethereum", + |> (&if(Application.get_env(:explorer, :chain_type) == :ethereum, do: Map.merge( &1, diff --git a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/filecoin_test.exs b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/filecoin_test.exs index 3e6d46dd8d5c..122c428a8f97 100644 --- a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/filecoin_test.exs +++ b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/filecoin_test.exs @@ -12,7 +12,7 @@ defmodule EthereumJSONRPC.FilecoinTest do initial_env = Application.get_all_env(:ethereum_jsonrpc) old_env = Application.get_env(:explorer, :chain_type) - Application.put_env(:explorer, :chain_type, "filecoin") + Application.put_env(:explorer, :chain_type, :filecoin) on_exit(fn -> Application.put_all_env([{:ethereum_jsonrpc, initial_env}]) diff --git a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/geth_test.exs b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/geth_test.exs index cc22f8baf483..61195d8c3234 100644 --- a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/geth_test.exs +++ b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/geth_test.exs @@ -47,7 +47,7 @@ defmodule EthereumJSONRPC.GethTest do ]} end) - Application.put_env(:ethereum_jsonrpc, Geth, tracer: "js", debug_trace_transaction_timeout: "5s") + Application.put_env(:ethereum_jsonrpc, Geth, tracer: "js", debug_trace_timeout: "5s") assert {:ok, [ @@ -357,11 +357,11 @@ defmodule EthereumJSONRPC.GethTest do ]} end) - Application.put_env(:ethereum_jsonrpc, Geth, tracer: "call_tracer", debug_trace_transaction_timeout: "5s") + Application.put_env(:ethereum_jsonrpc, Geth, tracer: "call_tracer", debug_trace_timeout: "5s") call_tracer_internal_txs = Geth.fetch_internal_transactions([transaction_params], json_rpc_named_arguments) - Application.put_env(:ethereum_jsonrpc, Geth, tracer: "js", debug_trace_transaction_timeout: "5s") + Application.put_env(:ethereum_jsonrpc, Geth, tracer: "js", debug_trace_timeout: "5s") assert call_tracer_internal_txs == Geth.fetch_internal_transactions([transaction_params], json_rpc_named_arguments) @@ -429,11 +429,11 @@ defmodule EthereumJSONRPC.GethTest do ]} end) - Application.put_env(:ethereum_jsonrpc, Geth, tracer: "call_tracer", debug_trace_transaction_timeout: "5s") + Application.put_env(:ethereum_jsonrpc, Geth, tracer: "call_tracer", debug_trace_timeout: "5s") call_tracer_internal_txs = Geth.fetch_internal_transactions([transaction_params], json_rpc_named_arguments) - Application.put_env(:ethereum_jsonrpc, Geth, tracer: "js", debug_trace_transaction_timeout: "5s") + Application.put_env(:ethereum_jsonrpc, Geth, tracer: "js", debug_trace_timeout: "5s") assert call_tracer_internal_txs == Geth.fetch_internal_transactions([transaction_params], json_rpc_named_arguments) @@ -469,7 +469,7 @@ defmodule EthereumJSONRPC.GethTest do ]} end) - Application.put_env(:ethereum_jsonrpc, Geth, tracer: "call_tracer", debug_trace_transaction_timeout: "5s") + Application.put_env(:ethereum_jsonrpc, Geth, tracer: "call_tracer", debug_trace_timeout: "5s") assert {:ok, [ @@ -522,7 +522,7 @@ defmodule EthereumJSONRPC.GethTest do ]} end) - Application.put_env(:ethereum_jsonrpc, Geth, tracer: "call_tracer", debug_trace_transaction_timeout: "5s") + Application.put_env(:ethereum_jsonrpc, Geth, tracer: "call_tracer", debug_trace_timeout: "5s") uppercase_result = Geth.fetch_internal_transactions([transaction_params], json_rpc_named_arguments) @@ -601,7 +601,7 @@ defmodule EthereumJSONRPC.GethTest do ]} end) - Application.put_env(:ethereum_jsonrpc, Geth, tracer: "call_tracer", debug_trace_transaction_timeout: "5s") + Application.put_env(:ethereum_jsonrpc, Geth, tracer: "call_tracer", debug_trace_timeout: "5s") assert {:ok, [ @@ -642,6 +642,160 @@ defmodule EthereumJSONRPC.GethTest do ]} = Geth.fetch_block_internal_transactions([block_number], json_rpc_named_arguments) end + test "works for multiple blocks request", %{json_rpc_named_arguments: json_rpc_named_arguments} do + block_number_1 = 3_287_375 + block_number_2 = 3_287_376 + block_quantity_1 = EthereumJSONRPC.integer_to_quantity(block_number_1) + block_quantity_2 = EthereumJSONRPC.integer_to_quantity(block_number_2) + transaction_hash_1 = "0x32b17f27ddb546eab3c4c33f31eb22c1cb992d4ccc50dae26922805b717efe5c" + transaction_hash_2 = "0x32b17f27ddb546eab3c4c33f31eb22c1cb992d4ccc50dae26922805b717efe5b" + + expect(EthereumJSONRPC.Mox, :json_rpc, fn + [ + %{id: id_1, params: [^block_quantity_1, %{"tracer" => "callTracer"}]}, + %{id: id_2, params: [^block_quantity_2, %{"tracer" => "callTracer"}]} + ], + _ -> + {:ok, + [ + %{ + id: id_1, + result: [ + %{ + "result" => %{ + "calls" => [ + %{ + "from" => "0x4200000000000000000000000000000000000015", + "gas" => "0xe9a3c", + "gasUsed" => "0x4a28", + "input" => + "0x015d8eb900000000000000000000000000000000000000000000000000000000009cb0d80000000000000000000000000000000000000000000000000000000065898738000000000000000000000000000000000000000000000000000000000000001b65f7961a6893850c1f001edeaa0aa4f1fb36b67eee61a8623f8f4da81be25c0000000000000000000000000000000000000000000000000000000000000000050000000000000000000000007431310e026b69bfc676c0013e12a1a11411eec9000000000000000000000000000000000000000000000000000000000000083400000000000000000000000000000000000000000000000000000000000f4240", + "to" => "0x6df83a19647a398d48e77a6835f4a28eb7e2f7c0", + "type" => "DELEGATECALL", + "value" => "0x0" + } + ], + "from" => "0xdeaddeaddeaddeaddeaddeaddeaddeaddead0001", + "gas" => "0xf4240", + "gasUsed" => "0xb6f9", + "input" => + "0x015d8eb900000000000000000000000000000000000000000000000000000000009cb0d80000000000000000000000000000000000000000000000000000000065898738000000000000000000000000000000000000000000000000000000000000001b65f7961a6893850c1f001edeaa0aa4f1fb36b67eee61a8623f8f4da81be25c0000000000000000000000000000000000000000000000000000000000000000050000000000000000000000007431310e026b69bfc676c0013e12a1a11411eec9000000000000000000000000000000000000000000000000000000000000083400000000000000000000000000000000000000000000000000000000000f4240", + "to" => "0x4200000000000000000000000000000000000015", + "type" => "CALL", + "value" => "0x0" + }, + "txHash" => transaction_hash_1 + } + ] + }, + %{ + id: id_2, + result: [ + %{ + "result" => %{ + "calls" => [ + %{ + "from" => "0x4200000000000000000000000000000000000015", + "gas" => "0xe9a3c", + "gasUsed" => "0x4a28", + "input" => + "0x015d8eb900000000000000000000000000000000000000000000000000000000009cb0d80000000000000000000000000000000000000000000000000000000065898738000000000000000000000000000000000000000000000000000000000000001b65f7961a6893850c1f001edeaa0aa4f1fb36b67eee61a8623f8f4da81be25c0000000000000000000000000000000000000000000000000000000000000000050000000000000000000000007431310e026b69bfc676c0013e12a1a11411eec9000000000000000000000000000000000000000000000000000000000000083400000000000000000000000000000000000000000000000000000000000f4240", + "to" => "0x6df83a19647a398d48e77a6835f4a28eb7e2f7c0", + "type" => "DELEGATECALL", + "value" => "0x0" + } + ], + "from" => "0xdeaddeaddeaddeaddeaddeaddeaddeaddead0001", + "gas" => "0xf4240", + "gasUsed" => "0xb6f9", + "input" => + "0x015d8eb900000000000000000000000000000000000000000000000000000000009cb0d80000000000000000000000000000000000000000000000000000000065898738000000000000000000000000000000000000000000000000000000000000001b65f7961a6893850c1f001edeaa0aa4f1fb36b67eee61a8623f8f4da81be25c0000000000000000000000000000000000000000000000000000000000000000050000000000000000000000007431310e026b69bfc676c0013e12a1a11411eec9000000000000000000000000000000000000000000000000000000000000083400000000000000000000000000000000000000000000000000000000000f4240", + "to" => "0x4200000000000000000000000000000000000015", + "type" => "CALL", + "value" => "0x0" + }, + "txHash" => transaction_hash_2 + } + ] + } + ]} + end) + + Application.put_env(:ethereum_jsonrpc, Geth, tracer: "call_tracer", debug_trace_timeout: "5s") + + assert {:ok, + [ + %{ + block_number: ^block_number_1, + call_type: "call", + from_address_hash: "0xdeaddeaddeaddeaddeaddeaddeaddeaddead0001", + gas: 1_000_000, + gas_used: 46841, + index: 0, + input: + "0x015d8eb900000000000000000000000000000000000000000000000000000000009cb0d80000000000000000000000000000000000000000000000000000000065898738000000000000000000000000000000000000000000000000000000000000001b65f7961a6893850c1f001edeaa0aa4f1fb36b67eee61a8623f8f4da81be25c0000000000000000000000000000000000000000000000000000000000000000050000000000000000000000007431310e026b69bfc676c0013e12a1a11411eec9000000000000000000000000000000000000000000000000000000000000083400000000000000000000000000000000000000000000000000000000000f4240", + output: "0x", + to_address_hash: "0x4200000000000000000000000000000000000015", + trace_address: [], + transaction_hash: ^transaction_hash_1, + transaction_index: 0, + type: "call", + value: 0 + }, + %{ + block_number: ^block_number_1, + call_type: "delegatecall", + from_address_hash: "0x4200000000000000000000000000000000000015", + gas: 956_988, + gas_used: 18984, + index: 1, + input: + "0x015d8eb900000000000000000000000000000000000000000000000000000000009cb0d80000000000000000000000000000000000000000000000000000000065898738000000000000000000000000000000000000000000000000000000000000001b65f7961a6893850c1f001edeaa0aa4f1fb36b67eee61a8623f8f4da81be25c0000000000000000000000000000000000000000000000000000000000000000050000000000000000000000007431310e026b69bfc676c0013e12a1a11411eec9000000000000000000000000000000000000000000000000000000000000083400000000000000000000000000000000000000000000000000000000000f4240", + output: "0x", + to_address_hash: "0x6df83a19647a398d48e77a6835f4a28eb7e2f7c0", + trace_address: [0], + transaction_hash: ^transaction_hash_1, + transaction_index: 0, + type: "call", + value: 0 + }, + %{ + block_number: ^block_number_2, + call_type: "call", + from_address_hash: "0xdeaddeaddeaddeaddeaddeaddeaddeaddead0001", + gas: 1_000_000, + gas_used: 46841, + index: 0, + input: + "0x015d8eb900000000000000000000000000000000000000000000000000000000009cb0d80000000000000000000000000000000000000000000000000000000065898738000000000000000000000000000000000000000000000000000000000000001b65f7961a6893850c1f001edeaa0aa4f1fb36b67eee61a8623f8f4da81be25c0000000000000000000000000000000000000000000000000000000000000000050000000000000000000000007431310e026b69bfc676c0013e12a1a11411eec9000000000000000000000000000000000000000000000000000000000000083400000000000000000000000000000000000000000000000000000000000f4240", + output: "0x", + to_address_hash: "0x4200000000000000000000000000000000000015", + trace_address: [], + transaction_hash: ^transaction_hash_2, + transaction_index: 0, + type: "call", + value: 0 + }, + %{ + block_number: ^block_number_2, + call_type: "delegatecall", + from_address_hash: "0x4200000000000000000000000000000000000015", + gas: 956_988, + gas_used: 18984, + index: 1, + input: + "0x015d8eb900000000000000000000000000000000000000000000000000000000009cb0d80000000000000000000000000000000000000000000000000000000065898738000000000000000000000000000000000000000000000000000000000000001b65f7961a6893850c1f001edeaa0aa4f1fb36b67eee61a8623f8f4da81be25c0000000000000000000000000000000000000000000000000000000000000000050000000000000000000000007431310e026b69bfc676c0013e12a1a11411eec9000000000000000000000000000000000000000000000000000000000000083400000000000000000000000000000000000000000000000000000000000f4240", + output: "0x", + to_address_hash: "0x6df83a19647a398d48e77a6835f4a28eb7e2f7c0", + trace_address: [0], + transaction_hash: ^transaction_hash_2, + transaction_index: 0, + type: "call", + value: 0 + } + ]} = Geth.fetch_block_internal_transactions([block_number_1, block_number_2], json_rpc_named_arguments) + end + test "result is the same as fetch_internal_transactions/2", %{json_rpc_named_arguments: json_rpc_named_arguments} do block_number = 3_287_375 block_quantity = EthereumJSONRPC.integer_to_quantity(block_number) @@ -714,7 +868,7 @@ defmodule EthereumJSONRPC.GethTest do ]} end) - Application.put_env(:ethereum_jsonrpc, Geth, tracer: "call_tracer", debug_trace_transaction_timeout: "5s") + Application.put_env(:ethereum_jsonrpc, Geth, tracer: "call_tracer", debug_trace_timeout: "5s") assert Geth.fetch_block_internal_transactions([block_number], json_rpc_named_arguments) == Geth.fetch_internal_transactions( diff --git a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/web_socket/web_socket_client_test.exs b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/web_socket/web_socket_client_test.exs index 20934b29e98f..51bbcc598f74 100644 --- a/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/web_socket/web_socket_client_test.exs +++ b/apps/ethereum_jsonrpc/test/ethereum_jsonrpc/web_socket/web_socket_client_test.exs @@ -10,7 +10,7 @@ defmodule EthereumJSONRPC.WebSocket.WebSocketClientTest do setup :example_state test "reconnects", %{state: state} do - assert {:reconnect, _} = WebSocketClient.ondisconnect({:closed, :remote}, state) + assert {:reconnect, _, _} = WebSocketClient.ondisconnect({:closed, :remote}, state) end test "treats in-progress unsubscribes as successful", %{state: state} do @@ -23,7 +23,7 @@ defmodule EthereumJSONRPC.WebSocket.WebSocketClientTest do state = put_registration(state, registration) - assert {_, disconnected_state} = WebSocketClient.ondisconnect({:closed, :remote}, state) + assert {_, _, disconnected_state} = WebSocketClient.ondisconnect({:closed, :remote}, state) assert Enum.empty?(disconnected_state.request_id_to_registration) assert Enum.empty?(disconnected_state.subscription_id_to_subscription_reference) @@ -36,7 +36,7 @@ defmodule EthereumJSONRPC.WebSocket.WebSocketClientTest do test "keeps :json_rpc requests for re-requesting on reconnect", %{state: state} do state = put_registration(state, %{type: :json_rpc, method: "eth_getBlockByNumber", params: [1, true]}) - assert {_, disconnected_state} = WebSocketClient.ondisconnect({:closed, :remote}, state) + assert {_, _, disconnected_state} = WebSocketClient.ondisconnect({:closed, :remote}, state) assert Enum.count(disconnected_state.request_id_to_registration) == 1 end @@ -44,7 +44,7 @@ defmodule EthereumJSONRPC.WebSocket.WebSocketClientTest do test "keeps :subscribe requests for re-requesting on reconnect", %{state: state} do state = put_registration(state, %{type: :subscribe}) - assert {_, disconnected_state} = WebSocketClient.ondisconnect({:closed, :remote}, state) + assert {_, _, disconnected_state} = WebSocketClient.ondisconnect({:closed, :remote}, state) assert Enum.count(disconnected_state.request_id_to_registration) == 1 end diff --git a/apps/explorer/config/config.exs b/apps/explorer/config/config.exs index dcc12a69bde8..ca7095c15b63 100644 --- a/apps/explorer/config/config.exs +++ b/apps/explorer/config/config.exs @@ -76,6 +76,11 @@ config :explorer, Explorer.Chain.Cache.WithdrawalsSum, enable_consolidation: true, update_interval_in_milliseconds: update_interval_in_milliseconds_default +config :explorer, Explorer.Chain.Cache.StabilityValidatorsCounters, + enabled: true, + enable_consolidation: true, + update_interval_in_milliseconds: update_interval_in_milliseconds_default + config :explorer, Explorer.Chain.Cache.TransactionActionTokensData, enabled: true config :explorer, Explorer.Chain.Cache.TransactionActionUniswapPools, enabled: true @@ -129,6 +134,8 @@ config :explorer, Explorer.Integrations.EctoLogger, query_time_ms_threshold: :ti config :explorer, Explorer.Tags.AddressTag.Cataloger, enabled: true +config :explorer, Explorer.SmartContract.CertifiedSmartContractCataloger, enabled: true + config :explorer, Explorer.Repo, migration_timestamps: [type: :utc_datetime_usec] config :explorer, Explorer.Tracer, diff --git a/apps/explorer/config/dev.exs b/apps/explorer/config/dev.exs index a56a52620b6e..a387ee24220c 100644 --- a/apps/explorer/config/dev.exs +++ b/apps/explorer/config/dev.exs @@ -11,12 +11,18 @@ config :explorer, Explorer.Repo.Replica1, timeout: :timer.seconds(80) # Configure Account database config :explorer, Explorer.Repo.Account, timeout: :timer.seconds(80) +# Configure Optimism database +config :explorer, Explorer.Repo.Optimism, timeout: :timer.seconds(80) + # Configure Polygon Edge database config :explorer, Explorer.Repo.PolygonEdge, timeout: :timer.seconds(80) # Configure Polygon zkEVM database config :explorer, Explorer.Repo.PolygonZkevm, timeout: :timer.seconds(80) +# Configure ZkSync database +config :explorer, Explorer.Repo.ZkSync, timeout: :timer.seconds(80) + config :explorer, Explorer.Repo.RSK, timeout: :timer.seconds(80) config :explorer, Explorer.Repo.Shibarium, timeout: :timer.seconds(80) @@ -29,6 +35,8 @@ config :explorer, Explorer.Repo.BridgedTokens, timeout: :timer.seconds(80) config :explorer, Explorer.Repo.Filecoin, timeout: :timer.seconds(80) +config :explorer, Explorer.Repo.Stability, timeout: :timer.seconds(80) + config :explorer, Explorer.Tracer, env: "dev", disabled?: true config :logger, :explorer, diff --git a/apps/explorer/config/dev/arbitrum.exs b/apps/explorer/config/dev/arbitrum.exs deleted file mode 100644 index dafcd640fe4c..000000000000 --- a/apps/explorer/config/dev/arbitrum.exs +++ /dev/null @@ -1,31 +0,0 @@ -import Config - -~w(config config_helper.exs) -|> Path.join() -|> Code.eval_file() - -hackney_opts = ConfigHelper.hackney_options() -timeout = ConfigHelper.timeout(1) - -config :explorer, - json_rpc_named_arguments: [ - transport: EthereumJSONRPC.HTTP, - transport_options: [ - http: EthereumJSONRPC.HTTP.HTTPoison, - url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || "http://localhost:8545", - fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"), - method_to_url: [ - eth_call: ConfigHelper.eth_call_url("http://localhost:8545") - ], - http_options: [recv_timeout: timeout, timeout: timeout, hackney: hackney_opts] - ], - variant: EthereumJSONRPC.Arbitrum - ], - subscribe_named_arguments: [ - transport: EthereumJSONRPC.WebSocket, - transport_options: [ - web_socket: EthereumJSONRPC.WebSocket.WebSocketClient, - url: System.get_env("ETHEREUM_JSONRPC_WS_URL") - ], - variant: EthereumJSONRPC.Arbitrum - ] diff --git a/apps/explorer/config/dev/besu.exs b/apps/explorer/config/dev/besu.exs index 22c0382163e3..9b32da34d7b0 100644 --- a/apps/explorer/config/dev/besu.exs +++ b/apps/explorer/config/dev/besu.exs @@ -15,6 +15,7 @@ config :explorer, url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || "http://localhost:8545", fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"), fallback_trace_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_TRACE_URL"), + fallback_eth_call_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_ETH_CALL_URL"), method_to_url: [ eth_call: ConfigHelper.eth_call_url("http://localhost:8545"), eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545", diff --git a/apps/explorer/config/dev/erigon.exs b/apps/explorer/config/dev/erigon.exs index 163f526996f6..5304055919e5 100644 --- a/apps/explorer/config/dev/erigon.exs +++ b/apps/explorer/config/dev/erigon.exs @@ -15,6 +15,7 @@ config :explorer, url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || "http://localhost:8545", fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"), fallback_trace_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_TRACE_URL"), + fallback_eth_call_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_ETH_CALL_URL"), method_to_url: [ eth_call: ConfigHelper.eth_call_url("http://localhost:8545"), eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545", diff --git a/apps/explorer/config/dev/filecoin.exs b/apps/explorer/config/dev/filecoin.exs index 68991f7b6910..ea75c71dc462 100644 --- a/apps/explorer/config/dev/filecoin.exs +++ b/apps/explorer/config/dev/filecoin.exs @@ -15,6 +15,7 @@ config :explorer, url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || "http://localhost:1234/rpc/v1", fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"), fallback_trace_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_TRACE_URL"), + fallback_eth_call_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_ETH_CALL_URL"), method_to_url: [ eth_call: ConfigHelper.eth_call_url("http://localhost:1234/rpc/v1"), trace_block: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:1234/rpc/v1" diff --git a/apps/explorer/config/dev/ganache.exs b/apps/explorer/config/dev/ganache.exs index f7ddd7cbe37f..ae03df000e59 100644 --- a/apps/explorer/config/dev/ganache.exs +++ b/apps/explorer/config/dev/ganache.exs @@ -14,6 +14,7 @@ config :explorer, http: EthereumJSONRPC.HTTP.HTTPoison, url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || "http://localhost:7545", fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"), + fallback_eth_call_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_ETH_CALL_URL"), method_to_url: [ eth_call: ConfigHelper.eth_call_url("http://localhost:7545") ], diff --git a/apps/explorer/config/dev/geth.exs b/apps/explorer/config/dev/geth.exs index 97d2ca3afdab..9d9a166f6329 100644 --- a/apps/explorer/config/dev/geth.exs +++ b/apps/explorer/config/dev/geth.exs @@ -15,6 +15,7 @@ config :explorer, url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || "http://localhost:8545", fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"), fallback_trace_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_TRACE_URL"), + fallback_eth_call_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_ETH_CALL_URL"), method_to_url: [ eth_call: ConfigHelper.eth_call_url("http://localhost:8545"), debug_traceTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545", diff --git a/apps/explorer/config/dev/nethermind.exs b/apps/explorer/config/dev/nethermind.exs index 2553a16db492..95ce54a92406 100644 --- a/apps/explorer/config/dev/nethermind.exs +++ b/apps/explorer/config/dev/nethermind.exs @@ -15,6 +15,7 @@ config :explorer, url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || "http://localhost:8545", fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"), fallback_trace_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_TRACE_URL"), + fallback_eth_call_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_ETH_CALL_URL"), method_to_url: [ eth_call: ConfigHelper.eth_call_url("http://localhost:8545"), eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545", diff --git a/apps/explorer/config/dev/rsk.exs b/apps/explorer/config/dev/rsk.exs index 699584ea0324..74cb6d98f095 100644 --- a/apps/explorer/config/dev/rsk.exs +++ b/apps/explorer/config/dev/rsk.exs @@ -15,6 +15,7 @@ config :explorer, url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || "http://localhost:8545", fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"), fallback_trace_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_TRACE_URL"), + fallback_eth_call_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_ETH_CALL_URL"), method_to_url: [ eth_call: ConfigHelper.eth_call_url("http://localhost:8545"), eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545", diff --git a/apps/explorer/config/prod.exs b/apps/explorer/config/prod.exs index 68279e1bac3a..27fa8cad9575 100644 --- a/apps/explorer/config/prod.exs +++ b/apps/explorer/config/prod.exs @@ -16,6 +16,10 @@ config :explorer, Explorer.Repo.Account, prepare: :unnamed, timeout: :timer.seconds(60) +config :explorer, Explorer.Repo.Optimism, + prepare: :unnamed, + timeout: :timer.seconds(60) + config :explorer, Explorer.Repo.PolygonEdge, prepare: :unnamed, timeout: :timer.seconds(60) @@ -24,6 +28,10 @@ config :explorer, Explorer.Repo.PolygonZkevm, prepare: :unnamed, timeout: :timer.seconds(60) +config :explorer, Explorer.Repo.ZkSync, + prepare: :unnamed, + timeout: :timer.seconds(60) + config :explorer, Explorer.Repo.RSK, prepare: :unnamed, timeout: :timer.seconds(60) @@ -48,6 +56,10 @@ config :explorer, Explorer.Repo.Filecoin, prepare: :unnamed, timeout: :timer.seconds(60) +config :explorer, Explorer.Repo.Stability, + prepare: :unnamed, + timeout: :timer.seconds(60) + config :explorer, Explorer.Tracer, env: "production", disabled?: true config :logger, :explorer, diff --git a/apps/explorer/config/prod/arbitrum.exs b/apps/explorer/config/prod/arbitrum.exs deleted file mode 100644 index 5f45a1a071db..000000000000 --- a/apps/explorer/config/prod/arbitrum.exs +++ /dev/null @@ -1,31 +0,0 @@ -import Config - -~w(config config_helper.exs) -|> Path.join() -|> Code.eval_file() - -hackney_opts = ConfigHelper.hackney_options() -timeout = ConfigHelper.timeout(1) - -config :explorer, - json_rpc_named_arguments: [ - transport: EthereumJSONRPC.HTTP, - transport_options: [ - http: EthereumJSONRPC.HTTP.HTTPoison, - url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL"), - fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"), - method_to_url: [ - eth_call: ConfigHelper.eth_call_url() - ], - http_options: [recv_timeout: timeout, timeout: timeout, hackney: hackney_opts] - ], - variant: EthereumJSONRPC.Arbitrum - ], - subscribe_named_arguments: [ - transport: EthereumJSONRPC.WebSocket, - transport_options: [ - web_socket: EthereumJSONRPC.WebSocket.WebSocketClient, - url: System.get_env("ETHEREUM_JSONRPC_WS_URL") - ], - variant: EthereumJSONRPC.Arbitrum - ] diff --git a/apps/explorer/config/prod/besu.exs b/apps/explorer/config/prod/besu.exs index a486b5c6dcda..cb641e7244ec 100644 --- a/apps/explorer/config/prod/besu.exs +++ b/apps/explorer/config/prod/besu.exs @@ -15,6 +15,7 @@ config :explorer, url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL"), fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"), fallback_trace_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_TRACE_URL"), + fallback_eth_call_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_ETH_CALL_URL"), method_to_url: [ eth_call: ConfigHelper.eth_call_url(), eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"), diff --git a/apps/explorer/config/prod/erigon.exs b/apps/explorer/config/prod/erigon.exs index 1ca954c1ef41..e574b5564663 100644 --- a/apps/explorer/config/prod/erigon.exs +++ b/apps/explorer/config/prod/erigon.exs @@ -15,6 +15,7 @@ config :explorer, url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL"), fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"), fallback_trace_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_TRACE_URL"), + fallback_eth_call_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_ETH_CALL_URL"), method_to_url: [ eth_call: ConfigHelper.eth_call_url(), eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"), diff --git a/apps/explorer/config/prod/filecoin.exs b/apps/explorer/config/prod/filecoin.exs index d48af23462de..00c056dbe6dd 100644 --- a/apps/explorer/config/prod/filecoin.exs +++ b/apps/explorer/config/prod/filecoin.exs @@ -15,6 +15,7 @@ config :explorer, url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL"), fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"), fallback_trace_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_TRACE_URL"), + fallback_eth_call_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_ETH_CALL_URL"), method_to_url: [ eth_call: ConfigHelper.eth_call_url(), trace_block: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") diff --git a/apps/explorer/config/prod/ganache.exs b/apps/explorer/config/prod/ganache.exs index 0956e4133c06..7a0581452b3a 100644 --- a/apps/explorer/config/prod/ganache.exs +++ b/apps/explorer/config/prod/ganache.exs @@ -14,6 +14,7 @@ config :explorer, http: EthereumJSONRPC.HTTP.HTTPoison, url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL"), fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"), + fallback_eth_call_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_ETH_CALL_URL"), method_to_url: [ eth_call: ConfigHelper.eth_call_url() ], diff --git a/apps/explorer/config/prod/geth.exs b/apps/explorer/config/prod/geth.exs index 6080d6f7ca44..90a1a7bb3e80 100644 --- a/apps/explorer/config/prod/geth.exs +++ b/apps/explorer/config/prod/geth.exs @@ -15,6 +15,7 @@ config :explorer, url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL"), fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"), fallback_trace_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_TRACE_URL"), + fallback_eth_call_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_ETH_CALL_URL"), method_to_url: [ eth_call: ConfigHelper.eth_call_url(), debug_traceTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"), diff --git a/apps/explorer/config/prod/nethermind.exs b/apps/explorer/config/prod/nethermind.exs index bf5a0440865e..a599d352ab41 100644 --- a/apps/explorer/config/prod/nethermind.exs +++ b/apps/explorer/config/prod/nethermind.exs @@ -15,6 +15,7 @@ config :explorer, url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL"), fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"), fallback_trace_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_TRACE_URL"), + fallback_eth_call_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_ETH_CALL_URL"), method_to_url: [ eth_call: ConfigHelper.eth_call_url(), eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"), diff --git a/apps/explorer/config/prod/rsk.exs b/apps/explorer/config/prod/rsk.exs index 35120eec2c71..ce19c3138079 100644 --- a/apps/explorer/config/prod/rsk.exs +++ b/apps/explorer/config/prod/rsk.exs @@ -15,6 +15,7 @@ config :explorer, url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL"), fallback_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_HTTP_URL"), fallback_trace_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_TRACE_URL"), + fallback_eth_call_url: System.get_env("ETHEREUM_JSONRPC_FALLBACK_ETH_CALL_URL"), method_to_url: [ eth_call: ConfigHelper.eth_call_url(), eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"), diff --git a/apps/explorer/config/runtime/test.exs b/apps/explorer/config/runtime/test.exs index 27e34b729c45..d9cfc1a821b6 100644 --- a/apps/explorer/config/runtime/test.exs +++ b/apps/explorer/config/runtime/test.exs @@ -18,6 +18,9 @@ config :explorer, Explorer.Chain.Transaction.History.Historian, enabled: false config :explorer, Explorer.Market.History.Historian, enabled: false config :explorer, Explorer.Counters.AddressesCounter, enabled: false, enable_consolidation: false +config :explorer, Explorer.Counters.LastOutputRootSizeCounter, enabled: false, enable_consolidation: false +config :explorer, Explorer.Counters.Transactions24hStats, enabled: false, enable_consolidation: false +config :explorer, Explorer.Counters.FreshPendingTransactionsCounter, enabled: false, enable_consolidation: false config :explorer, Explorer.Chain.Cache.ContractsCounter, enabled: false, enable_consolidation: false config :explorer, Explorer.Chain.Cache.NewContractsCounter, enabled: false, enable_consolidation: false config :explorer, Explorer.Chain.Cache.VerifiedContractsCounter, enabled: false, enable_consolidation: false diff --git a/apps/explorer/config/test.exs b/apps/explorer/config/test.exs index b1e58b464bb7..9ace0f12c261 100644 --- a/apps/explorer/config/test.exs +++ b/apps/explorer/config/test.exs @@ -45,13 +45,16 @@ config :explorer, Explorer.Repo.Account, for repo <- [ Explorer.Repo.Beacon, + Explorer.Repo.Optimism, Explorer.Repo.PolygonEdge, Explorer.Repo.PolygonZkevm, + Explorer.Repo.ZkSync, Explorer.Repo.RSK, Explorer.Repo.Shibarium, Explorer.Repo.Suave, Explorer.Repo.BridgedTokens, - Explorer.Repo.Filecoin + Explorer.Repo.Filecoin, + Explorer.Repo.Stability ] do config :explorer, repo, database: "explorer_test", diff --git a/apps/explorer/config/test/arbitrum.exs b/apps/explorer/config/test/arbitrum.exs deleted file mode 100644 index 2bb92bef1248..000000000000 --- a/apps/explorer/config/test/arbitrum.exs +++ /dev/null @@ -1,13 +0,0 @@ -import Config - -config :explorer, - json_rpc_named_arguments: [ - transport: EthereumJSONRPC.Mox, - transport_options: [], - variant: EthereumJSONRPC.Arbitrum - ], - subscribe_named_arguments: [ - transport: EthereumJSONRPC.Mox, - transport_options: [], - variant: EthereumJSONRPC.Arbitrum - ] diff --git a/apps/explorer/lib/explorer/access_helper.ex b/apps/explorer/lib/explorer/access_helper.ex index 36fc758b62b1..a0794046cdd0 100644 --- a/apps/explorer/lib/explorer/access_helper.ex +++ b/apps/explorer/lib/explorer/access_helper.ex @@ -7,7 +7,9 @@ defmodule Explorer.AccessHelper do restricted_list_var = Application.get_env(:explorer, :restricted_list) restricted_list = (restricted_list_var && String.split(restricted_list_var, ",")) || [] - if Enum.count(restricted_list) > 0 do + if Enum.empty?(restricted_list) do + {:ok, false} + else formatted_restricted_list = restricted_list |> Enum.map(fn addr -> @@ -24,8 +26,6 @@ defmodule Explorer.AccessHelper do correct_key = key && key == Application.get_env(:explorer, :restricted_list_key) if address_restricted && !correct_key, do: {:restricted_access, true}, else: {:ok, false} - else - {:ok, false} end end end diff --git a/apps/explorer/lib/explorer/account/custom_abi.ex b/apps/explorer/lib/explorer/account/custom_abi.ex index 5784c8586a45..3a5429766e16 100644 --- a/apps/explorer/lib/explorer/account/custom_abi.ex +++ b/apps/explorer/lib/explorer/account/custom_abi.ex @@ -100,7 +100,7 @@ defmodule Explorer.Account.CustomABI do defp check_is_abi_valid?(%{abi: abi} = custom_abi, given_abi) when is_list(abi) do with true <- length(abi) > 0, filtered_abi <- filter_abi(abi), - true <- Enum.count(filtered_abi) > 0 do + false <- Enum.empty?(filtered_abi) do Map.put(custom_abi, :abi, filtered_abi) else _ -> diff --git a/apps/explorer/lib/explorer/account/notifier/email.ex b/apps/explorer/lib/explorer/account/notifier/email.ex index 713e5c3f1beb..6e8639e058e2 100644 --- a/apps/explorer/lib/explorer/account/notifier/email.ex +++ b/apps/explorer/lib/explorer/account/notifier/email.ex @@ -59,6 +59,9 @@ defmodule Explorer.Account.Notifier.Email do "ERC-1155" -> "Token ID: " <> subject <> " of " + + "ERC-404" -> + "Token ID: " <> subject <> " of " end end diff --git a/apps/explorer/lib/explorer/account/notifier/notify.ex b/apps/explorer/lib/explorer/account/notifier/notify.ex index 47adfc1b2c0c..3ad9e041c297 100644 --- a/apps/explorer/lib/explorer/account/notifier/notify.ex +++ b/apps/explorer/lib/explorer/account/notifier/notify.ex @@ -140,6 +140,7 @@ defmodule Explorer.Account.Notifier.Notify do end end + # credo:disable-for-next-line defp watched?(%WatchlistAddress{} = address, %{type: type}, direction) do case {type, direction} do {"COIN", :incoming} -> address.watch_coin_input @@ -150,6 +151,8 @@ defmodule Explorer.Account.Notifier.Notify do {"ERC-721", :outgoing} -> address.watch_erc_721_output {"ERC-1155", :incoming} -> address.watch_erc_1155_input {"ERC-1155", :outgoing} -> address.watch_erc_1155_output + {"ERC-404", :incoming} -> address.watch_erc_404_input + {"ERC-404", :outgoing} -> address.watch_erc_404_output end end diff --git a/apps/explorer/lib/explorer/account/notifier/summary.ex b/apps/explorer/lib/explorer/account/notifier/summary.ex index c38e40107c52..568c9773ea73 100644 --- a/apps/explorer/lib/explorer/account/notifier/summary.ex +++ b/apps/explorer/lib/explorer/account/notifier/summary.ex @@ -10,6 +10,8 @@ defmodule Explorer.Account.Notifier.Summary do alias Explorer.{Chain, Repo} alias Explorer.Chain.{Transaction, Wei} + @unknown "Unknown" + defstruct [ :transaction_hash, :from_address_hash, @@ -69,9 +71,9 @@ defmodule Explorer.Account.Notifier.Summary do ) end - def fetch_summary(%Chain.Transaction{block_number: nil}), do: :nothing + defp fetch_summary(%Chain.Transaction{block_number: nil}), do: :nothing - def fetch_summary(%Chain.Transaction{created_contract_address_hash: nil} = transaction) do + defp fetch_summary(%Chain.Transaction{created_contract_address_hash: nil} = transaction) do %Summary{ transaction_hash: transaction.hash, method: method(transaction), @@ -86,7 +88,7 @@ defmodule Explorer.Account.Notifier.Summary do } end - def fetch_summary(%Chain.Transaction{to_address_hash: nil} = transaction) do + defp fetch_summary(%Chain.Transaction{to_address_hash: nil} = transaction) do %Summary{ transaction_hash: transaction.hash, method: "contract_creation", @@ -101,14 +103,14 @@ defmodule Explorer.Account.Notifier.Summary do } end - def fetch_summary(_), do: :nothing + defp fetch_summary(_), do: :nothing - def fetch_summary(%Chain.Transaction{block_number: nil}, _), do: :nothing + defp fetch_summary(%Chain.Transaction{block_number: nil}, _), do: :nothing - def fetch_summary( - %Chain.Transaction{} = transaction, - %Chain.TokenTransfer{} = transfer - ) do + defp fetch_summary( + %Chain.Transaction{} = transaction, + %Chain.TokenTransfer{} = transfer + ) do case transfer.token.type do "ERC-20" -> %Summary{ @@ -120,7 +122,7 @@ defmodule Explorer.Account.Notifier.Summary do amount: amount(transfer), subject: transfer.token.type, tx_fee: fee(transaction), - name: transfer.token.name, + name: token_name(transfer), type: transfer.token.type } @@ -134,7 +136,7 @@ defmodule Explorer.Account.Notifier.Summary do block_number: transfer.block_number, subject: to_string(transfer.token_ids && List.first(transfer.token_ids)), tx_fee: fee(transaction), - name: transfer.token.name, + name: token_name(transfer), type: transfer.token.type } @@ -148,15 +150,31 @@ defmodule Explorer.Account.Notifier.Summary do block_number: transfer.block_number, subject: token_ids(transfer), tx_fee: fee(transaction), - name: transfer.token.name, + name: token_name(transfer), + type: transfer.token.type + } + + "ERC-404" -> + token_ids_string = token_ids(transfer) + + %Summary{ + amount: amount(transfer), + transaction_hash: transaction.hash, + method: method(transfer), + from_address_hash: transfer.from_address_hash, + to_address_hash: transfer.to_address_hash, + block_number: transfer.block_number, + subject: if(token_ids_string == "", do: transfer.token.type, else: token_ids_string), + tx_fee: fee(transaction), + name: token_name(transfer), type: transfer.token.type } end end - def fetch_summary(_, _), do: :nothing + defp fetch_summary(_, _), do: :nothing - def method(%{from_address_hash: from, to_address_hash: to}) do + defp method(%{from_address_hash: from, to_address_hash: to}) do {:ok, burn_address} = format_address(burn_address_hash_string()) cond do @@ -166,17 +184,17 @@ defmodule Explorer.Account.Notifier.Summary do end end - def format_address(address_hash_string) do + defp format_address(address_hash_string) do Chain.string_to_address_hash(address_hash_string) end - def amount(%Chain.Transaction{} = transaction) do + defp amount(%Chain.Transaction{} = transaction) do Wei.to(transaction.value, :ether) end - def amount(%Chain.TokenTransfer{amount: amount}) when is_nil(amount), do: nil + defp amount(%Chain.TokenTransfer{amount: amount}) when is_nil(amount), do: nil - def amount(%Chain.TokenTransfer{amount: amount} = transfer) do + defp amount(%Chain.TokenTransfer{amount: amount} = transfer) do decimals = Decimal.new( Integer.pow( @@ -191,20 +209,21 @@ defmodule Explorer.Account.Notifier.Summary do ) end - def token_ids(%Chain.TokenTransfer{token_ids: nil}), do: "" + defp token_ids(%Chain.TokenTransfer{token_ids: nil}), do: "" - def token_ids(%Chain.TokenTransfer{token_ids: token_ids}) do + defp token_ids(%Chain.TokenTransfer{token_ids: token_ids}) do Enum.map_join(token_ids, ", ", fn id -> to_string(id) end) end - def token_decimals(%Chain.TokenTransfer{} = transfer) do - transfer.token.decimals || Decimal.new(1) + defp token_name(%Chain.TokenTransfer{} = transfer) do + transfer.token.name || @unknown end - def type(%Chain.Transaction{}), do: :coin - def type(%Chain.InternalTransaction{}), do: :coin + defp token_decimals(%Chain.TokenTransfer{} = transfer) do + transfer.token.decimals || Decimal.new(0) + end - def fee(%Chain.Transaction{} = transaction) do + defp fee(%Chain.Transaction{} = transaction) do {_, fee} = Transaction.fee(transaction, :gwei) fee end diff --git a/apps/explorer/lib/explorer/account/tag_address.ex b/apps/explorer/lib/explorer/account/tag_address.ex index 6750e8a47f21..27d559a208ea 100644 --- a/apps/explorer/lib/explorer/account/tag_address.ex +++ b/apps/explorer/lib/explorer/account/tag_address.ex @@ -99,12 +99,18 @@ defmodule Explorer.Account.TagAddress do def get_tags_address_by_identity_id(id, options) when not is_nil(id) do paging_options = Keyword.get(options, :paging_options, Chain.default_paging_options()) - id - |> tags_address_by_identity_id_query() - |> order_by([tag], desc: tag.id) - |> page_address_tags(paging_options) - |> limit(^paging_options.page_size) - |> Repo.account_repo().all() + case paging_options do + %PagingOptions{key: {0}} -> + [] + + _ -> + id + |> tags_address_by_identity_id_query() + |> order_by([tag], desc: tag.id) + |> page_address_tags(paging_options) + |> limit(^paging_options.page_size) + |> Repo.account_repo().all() + end end def get_tags_address_by_identity_id(_, _), do: [] diff --git a/apps/explorer/lib/explorer/account/tag_transaction.ex b/apps/explorer/lib/explorer/account/tag_transaction.ex index f2c51672710d..2b576b933a17 100644 --- a/apps/explorer/lib/explorer/account/tag_transaction.ex +++ b/apps/explorer/lib/explorer/account/tag_transaction.ex @@ -98,12 +98,18 @@ defmodule Explorer.Account.TagTransaction do def get_tags_transaction_by_identity_id(id, options) when not is_nil(id) do paging_options = Keyword.get(options, :paging_options, Chain.default_paging_options()) - id - |> tags_transaction_by_identity_id_query() - |> order_by([tag], desc: tag.id) - |> page_transaction_tags(paging_options) - |> limit(^paging_options.page_size) - |> Repo.account_repo().all() + case paging_options do + %PagingOptions{key: {0}} -> + [] + + _ -> + id + |> tags_transaction_by_identity_id_query() + |> order_by([tag], desc: tag.id) + |> page_transaction_tags(paging_options) + |> limit(^paging_options.page_size) + |> Repo.account_repo().all() + end end def get_tags_transaction_by_identity_id(_, _), do: [] diff --git a/apps/explorer/lib/explorer/account/watchlist_address.ex b/apps/explorer/lib/explorer/account/watchlist_address.ex index 86c0923704b4..ee87c0352933 100644 --- a/apps/explorer/lib/explorer/account/watchlist_address.ex +++ b/apps/explorer/lib/explorer/account/watchlist_address.ex @@ -30,6 +30,8 @@ defmodule Explorer.Account.WatchlistAddress do field(:watch_erc_721_output, :boolean, default: true, null: false) field(:watch_erc_1155_input, :boolean, default: true, null: false) field(:watch_erc_1155_output, :boolean, default: true, null: false) + field(:watch_erc_404_input, :boolean, default: true, null: false) + field(:watch_erc_404_output, :boolean, default: true, null: false) field(:notify_email, :boolean, default: true, null: false) field(:notify_epns, :boolean) field(:notify_feed, :boolean) @@ -43,7 +45,7 @@ defmodule Explorer.Account.WatchlistAddress do timestamps() end - @attrs ~w(name address_hash watch_coin_input watch_coin_output watch_erc_20_input watch_erc_20_output watch_erc_721_input watch_erc_721_output watch_erc_1155_input watch_erc_1155_output notify_email notify_epns notify_feed notify_inapp watchlist_id)a + @attrs ~w(name address_hash watch_coin_input watch_coin_output watch_erc_20_input watch_erc_20_output watch_erc_721_input watch_erc_721_output watch_erc_1155_input watch_erc_1155_output watch_erc_404_input watch_erc_404_output notify_email notify_epns notify_feed notify_inapp watchlist_id)a def changeset do %__MODULE__{} @@ -131,12 +133,18 @@ defmodule Explorer.Account.WatchlistAddress do def get_watchlist_addresses_by_watchlist_id(watchlist_id, options) when not is_nil(watchlist_id) do paging_options = Keyword.get(options, :paging_options, Chain.default_paging_options()) - watchlist_id - |> watchlist_addresses_by_watchlist_id_query() - |> order_by([wla], desc: wla.id) - |> page_watchlist_address(paging_options) - |> limit(^paging_options.page_size) - |> Repo.account_repo().all() + case paging_options do + %PagingOptions{key: {0}} -> + [] + + _ -> + watchlist_id + |> watchlist_addresses_by_watchlist_id_query() + |> order_by([wla], desc: wla.id) + |> page_watchlist_address(paging_options) + |> limit(^paging_options.page_size) + |> Repo.account_repo().all() + end end def get_watchlist_addresses_by_watchlist_id(_, _), do: [] diff --git a/apps/explorer/lib/explorer/application.ex b/apps/explorer/lib/explorer/application.ex index 713b1f51d98b..3b1c32cfeb77 100644 --- a/apps/explorer/lib/explorer/application.ex +++ b/apps/explorer/lib/explorer/application.ex @@ -118,20 +118,26 @@ defmodule Explorer.Application do configure(Explorer.Counters.BlockBurntFeeCounter), configure(Explorer.Counters.BlockPriorityFeeCounter), configure(Explorer.Counters.AverageBlockTime), + configure(Explorer.Counters.LastOutputRootSizeCounter), + configure(Explorer.Counters.FreshPendingTransactionsCounter), + configure(Explorer.Counters.Transactions24hStats), configure(Explorer.Validator.MetadataProcessor), configure(Explorer.Tags.AddressTag.Cataloger), + configure(Explorer.SmartContract.CertifiedSmartContractCataloger), configure(MinMissingBlockNumber), configure(Explorer.Chain.Fetcher.CheckBytecodeMatchingOnDemand), configure(Explorer.Chain.Fetcher.FetchValidatorInfoOnDemand), configure(Explorer.TokenInstanceOwnerAddressMigration.Supervisor), sc_microservice_configure(Explorer.Chain.Fetcher.LookUpSmartContractSourcesOnDemand), configure(Explorer.Chain.Cache.RootstockLockedBTC), + configure(Explorer.Chain.Cache.OptimismFinalizationPeriod), configure(Explorer.Migrator.TransactionsDenormalization), configure(Explorer.Migrator.AddressCurrentTokenBalanceTokenType), configure(Explorer.Migrator.AddressTokenBalanceTokenType), configure(Explorer.Migrator.SanitizeMissingBlockRanges), configure(Explorer.Migrator.SanitizeIncorrectNFTTokenTransfers), - configure(Explorer.Migrator.TokenTransferTokenType) + configure(Explorer.Migrator.TokenTransferTokenType), + configure_chain_type_dependent_process(Explorer.Chain.Cache.StabilityValidatorsCounters, :stability) ] |> List.flatten() @@ -142,13 +148,16 @@ defmodule Explorer.Application do if Mix.env() == :test do [ Explorer.Repo.Beacon, + Explorer.Repo.Optimism, Explorer.Repo.PolygonEdge, Explorer.Repo.PolygonZkevm, + Explorer.Repo.ZkSync, Explorer.Repo.RSK, Explorer.Repo.Shibarium, Explorer.Repo.Suave, Explorer.Repo.BridgedTokens, - Explorer.Repo.Filecoin + Explorer.Repo.Filecoin, + Explorer.Repo.Stability ] else [] @@ -175,6 +184,14 @@ defmodule Explorer.Application do end end + defp configure_chain_type_dependent_process(process, chain_type) do + if Application.get_env(:explorer, :chain_type) == chain_type do + process + else + [] + end + end + defp sc_microservice_configure(process) do if Application.get_env(:explorer, Explorer.SmartContract.RustVerifierInterfaceBehaviour)[:eth_bytecode_db?] do process diff --git a/apps/explorer/lib/explorer/application/constants.ex b/apps/explorer/lib/explorer/application/constants.ex index 7dee1bbdae76..09787b9e18c7 100644 --- a/apps/explorer/lib/explorer/application/constants.ex +++ b/apps/explorer/lib/explorer/application/constants.ex @@ -30,18 +30,59 @@ defmodule Explorer.Application.Constants do |> validate_required(@required_attrs) end - def get_constant_by_key(key, options) do + @doc """ + Reads constant row from the database by constant's key. + """ + @spec get_constant_by_key(binary(), list()) :: Ecto.Schema.t() | term() | nil + def get_constant_by_key(key, options \\ []) do + __MODULE__ + |> where([constant], constant.key == ^key) + |> Chain.select_repo(options).one() + end + + @doc """ + Reads constant value from the database by constant's key. + """ + @spec get_constant_value(binary(), list()) :: binary() | nil + def get_constant_value(key, options \\ []) do __MODULE__ |> where([constant], constant.key == ^key) + |> select([constant], constant.value) |> Chain.select_repo(options).one() end + @doc """ + Sets or updates a value of the specified constant by its key. + """ + @spec set_constant_value(binary(), binary()) :: Ecto.Schema.t() + def set_constant_value(key, value) do + existing_value = Repo.get(__MODULE__, key) + + if existing_value do + existing_value + |> changeset(%{value: value}) + |> Repo.update!() + else + %{key: key, value: value} + |> changeset() + |> Repo.insert!() + end + end + + @doc """ + For usage in Explorer.Chain.Fetcher.FetchValidatorInfoOnDemand + """ + @spec insert_keys_manager_contract_address(binary()) :: Ecto.Schema.t() def insert_keys_manager_contract_address(value) do %{key: @keys_manager_contract_address_key, value: value} |> changeset() |> Repo.insert!() end + @doc """ + For usage in Explorer.Chain.Fetcher.FetchValidatorInfoOnDemand and Explorer.Chain.Block.Reward + """ + @spec get_keys_manager_contract_address(list()) :: %__MODULE__{} | nil def get_keys_manager_contract_address(options \\ []) do get_constant_by_key(@keys_manager_contract_address_key, options) end @@ -51,17 +92,7 @@ defmodule Explorer.Application.Constants do """ @spec insert_last_processed_token_address_hash(Hash.Address.t()) :: Ecto.Schema.t() def insert_last_processed_token_address_hash(address_hash) do - existing_value = Repo.get(__MODULE__, @last_processed_erc_721_token) - - if existing_value do - existing_value - |> changeset(%{value: to_string(address_hash)}) - |> Repo.update!() - else - %{key: @last_processed_erc_721_token, value: to_string(address_hash)} - |> changeset() - |> Repo.insert!() - end + set_constant_value(@last_processed_erc_721_token, to_string(address_hash)) end @doc """ diff --git a/apps/explorer/lib/explorer/bloom_filter.ex b/apps/explorer/lib/explorer/bloom_filter.ex new file mode 100644 index 000000000000..a5b636207a9a --- /dev/null +++ b/apps/explorer/lib/explorer/bloom_filter.ex @@ -0,0 +1,78 @@ +defmodule Explorer.BloomFilter do + @moduledoc """ + Eth Bloom filter realization. Reference: https://github.com/NethermindEth/nethermind/blob/d61c78af6de2d0a89bd4efd6bfed62cb6b774f59/src/Nethermind/Nethermind.Core/Bloom.cs + """ + import Bitwise + + alias Explorer.BloomFilter + alias Explorer.Chain.Log + + @bloom_byte_length 256 + @bloom_bit_length 8 * @bloom_byte_length + + defstruct filter: <<0::2048>> + + @doc """ + Computes bloom filter from list of logs + """ + @spec logs_bloom([Log.t()]) :: <<_::2048>> + def logs_bloom(logs) do + logs + |> Enum.reduce(%BloomFilter{}, fn log, acc -> + topics = + Enum.reject( + [log.first_topic, log.second_topic, log.third_topic, log.fourth_topic], + &is_nil/1 + ) + + acc_new = + acc + |> add(log.address_hash.bytes) + + Enum.reduce(topics, acc_new, fn topic, acc -> add(acc, topic.bytes) end) + end) + |> Map.get(:filter) + end + + defp add(%BloomFilter{filter: filter} = bloom, element) do + {i1, i2, i3} = get_extract(element) + + new_filter = + filter + |> set_index(i1) + |> set_index(i2) + |> set_index(i3) + + %BloomFilter{bloom | filter: new_filter} + end + + defp hash_function(data), do: ExKeccak.hash_256(data) + + defp set_index(filter, index) do + byte_position = div(index, 8) + shift = rem(index, 8) + + byte = :binary.at(filter, byte_position) + value = set_bit(byte, shift) + + <<%= for {line, number} <- raw_traces_with_lines(@internal_transactions) do %><%= line %><% end %>> <> bytes_after + end + + defp page_txn_batches(query, %PagingOptions{key: nil}), do: query + + defp page_txn_batches(query, %PagingOptions{key: {block_number}}) do + from(tb in query, where: tb.l2_block_number < ^block_number) + end +end diff --git a/apps/explorer/lib/explorer/chain/optimism/withdrawal.ex b/apps/explorer/lib/explorer/chain/optimism/withdrawal.ex new file mode 100644 index 000000000000..dad0dac1168c --- /dev/null +++ b/apps/explorer/lib/explorer/chain/optimism/withdrawal.ex @@ -0,0 +1,317 @@ +defmodule Explorer.Chain.Optimism.Withdrawal do + @moduledoc "Models Optimism withdrawal." + + use Explorer.Schema + + import Explorer.Chain, only: [select_repo: 1] + + alias Explorer.Application.Constants + alias Explorer.Chain.{Block, Hash, Transaction} + alias Explorer.Chain.Cache.OptimismFinalizationPeriod + alias Explorer.Chain.Optimism.{DisputeGame, OutputRoot, WithdrawalEvent} + alias Explorer.{Helper, PagingOptions, Repo} + + @default_paging_options %PagingOptions{page_size: 50} + + @game_status_defender_wins 2 + + @withdrawal_status_waiting_for_state_root "Waiting for state root" + @withdrawal_status_ready_to_prove "Ready to prove" + @withdrawal_status_waiting_to_resolve "Waiting a game to resolve" + @withdrawal_status_in_challenge "In challenge period" + @withdrawal_status_ready_for_relay "Ready for relay" + @withdrawal_status_proven "Proven" + @withdrawal_status_relayed "Relayed" + + @dispute_game_finality_delay_seconds "optimism_dispute_game_finality_delay_seconds" + @proof_maturity_delay_seconds "optimism_proof_maturity_delay_seconds" + + @required_attrs ~w(msg_nonce hash l2_transaction_hash l2_block_number)a + + @type t :: %__MODULE__{ + msg_nonce: Decimal.t(), + hash: Hash.t(), + l2_transaction_hash: Hash.t(), + l2_block_number: non_neg_integer() + } + + @primary_key false + schema "op_withdrawals" do + field(:msg_nonce, :decimal, primary_key: true) + field(:hash, Hash.Full) + field(:l2_transaction_hash, Hash.Full) + field(:l2_block_number, :integer) + + timestamps() + end + + def changeset(%__MODULE__{} = withdrawals, attrs \\ %{}) do + withdrawals + |> cast(attrs, @required_attrs) + |> validate_required(@required_attrs) + end + + @doc """ + Lists `t:Explorer.Chain.Optimism.Withdrawal.t/0`'s' in descending order based on message nonce. + + """ + @spec list :: [__MODULE__.t()] + def list(options \\ []) do + paging_options = Keyword.get(options, :paging_options, @default_paging_options) + + case paging_options do + %PagingOptions{key: {0}} -> + [] + + _ -> + base_query = + from(w in __MODULE__, + order_by: [desc: w.msg_nonce], + left_join: l2_tx in Transaction, + on: w.l2_transaction_hash == l2_tx.hash, + left_join: l2_block in Block, + on: w.l2_block_number == l2_block.number, + left_join: we in WithdrawalEvent, + on: we.withdrawal_hash == w.hash and we.l1_event_type == :WithdrawalFinalized, + select: %{ + msg_nonce: w.msg_nonce, + hash: w.hash, + l2_block_number: w.l2_block_number, + l2_timestamp: l2_block.timestamp, + l2_transaction_hash: w.l2_transaction_hash, + l1_transaction_hash: we.l1_transaction_hash, + from: l2_tx.from_address_hash + } + ) + + base_query + |> page_optimism_withdrawals(paging_options) + |> limit(^paging_options.page_size) + |> select_repo(options).all() + end + end + + defp page_optimism_withdrawals(query, %PagingOptions{key: nil}), do: query + + defp page_optimism_withdrawals(query, %PagingOptions{key: {nonce}}) do + from(w in query, where: w.msg_nonce < ^nonce) + end + + @doc """ + Gets withdrawal statuses for Optimism Withdrawal transaction. + For each withdrawal associated with this transaction, + returns the status and the corresponding L1 transaction hash if the status is `Relayed`. + """ + @spec transaction_statuses(Hash.t()) :: [{non_neg_integer(), String.t(), Hash.t() | nil}] + def transaction_statuses(l2_transaction_hash) do + query = + from(w in __MODULE__, + where: w.l2_transaction_hash == ^l2_transaction_hash, + left_join: l2_block in Block, + on: w.l2_block_number == l2_block.number and l2_block.consensus == true, + left_join: we in WithdrawalEvent, + on: we.withdrawal_hash == w.hash and we.l1_event_type == :WithdrawalFinalized, + select: %{ + hash: w.hash, + l2_block_number: w.l2_block_number, + l1_transaction_hash: we.l1_transaction_hash, + msg_nonce: w.msg_nonce + } + ) + + query + |> Repo.replica().all() + |> Enum.map(fn w -> + msg_nonce = + Bitwise.band( + Decimal.to_integer(w.msg_nonce), + 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF + ) + + {status, _} = status(w) + {msg_nonce, status, w.l1_transaction_hash} + end) + end + + @spec status(map(), list() | nil) :: {String.t(), DateTime.t() | nil} + @doc """ + Gets Optimism Withdrawal status and remaining time to unlock (when the status is `In challenge period`). + """ + def status(w, respected_games \\ nil) + + def status(w, respected_games) when is_nil(w.l1_transaction_hash) do + proven_event = proven_event_by_hash(w.hash) + + respected_games = + if is_nil(respected_games) do + respected_games() + else + respected_games + end + + if is_nil(proven_event) do + cond do + appropriate_games_found(w.l2_block_number, respected_games) -> + {@withdrawal_status_ready_to_prove, nil} + + appropriate_root_found(w.l2_block_number) -> + {@withdrawal_status_ready_to_prove, nil} + + true -> + {@withdrawal_status_waiting_for_state_root, nil} + end + else + handle_proven_status(proven_event, respected_games) + end + end + + def status(_w, _respected_games) do + {@withdrawal_status_relayed, nil} + end + + @doc """ + Returns the list of games which type is equal to the current respected game type + received from OptimismPortal contract. + """ + @spec respected_games() :: list() + def respected_games do + case Helper.parse_integer(Constants.get_constant_value("optimism_respected_game_type")) do + nil -> + [] + + game_type -> + query = + from(g in DisputeGame, + where: g.game_type == ^game_type, + order_by: [desc: g.index], + limit: 100 + ) + + Repo.all(query, timeout: :infinity) + end + end + + @doc """ + Returns a name of the dispute_game_finality_delay_seconds constant. + """ + @spec dispute_game_finality_delay_seconds_constant() :: binary() + def dispute_game_finality_delay_seconds_constant do + @dispute_game_finality_delay_seconds + end + + @doc """ + Returns a name of the proof_maturity_delay_seconds constant. + """ + @spec proof_maturity_delay_seconds_constant() :: binary() + def proof_maturity_delay_seconds_constant do + @proof_maturity_delay_seconds + end + + defp appropriate_games_found(withdrawal_l2_block_number, respected_games) do + respected_games + |> Enum.any?(fn game -> + [l2_block_number] = Helper.decode_data(game.extra_data, [{:uint, 256}]) + withdrawal_l2_block_number <= l2_block_number + end) + end + + defp appropriate_root_found(withdrawal_l2_block_number) do + last_root_l2_block_number = + Repo.replica().one( + from(root in OutputRoot, + select: root.l2_block_number, + order_by: [desc: root.l2_output_index], + limit: 1 + ) + ) || 0 + + withdrawal_l2_block_number <= last_root_l2_block_number + end + + defp game_by_index(game_index) do + if not is_nil(game_index) do + Repo.replica().one( + from( + g in DisputeGame, + select: %{created_at: g.created_at, resolved_at: g.resolved_at, status: g.status}, + where: g.index == ^game_index + ) + ) + end + end + + defp handle_proven_status({l1_timestamp, game_index}, respected_games) do + game = game_by_index(game_index) + + cond do + is_nil(game_index) and not Enum.empty?(respected_games) -> + # here we cannot exactly determine the status `Waiting a game to resolve` or + # `Ready for relay` or `In challenge period` + # as we don't know the game index. In this case we display the `Proven` status + {@withdrawal_status_proven, nil} + + is_nil(game) or DateTime.compare(l1_timestamp, game.created_at) == :lt -> + # the old status determining approach + pre_fault_proofs_status(l1_timestamp) + + true -> + # the new status determining approach + post_fault_proofs_status(l1_timestamp, game) + end + end + + defp proven_event_by_hash(withdrawal_hash) do + Repo.replica().one( + from( + we in WithdrawalEvent, + select: {we.l1_timestamp, we.game_index}, + where: we.withdrawal_hash == ^withdrawal_hash and we.l1_event_type == :WithdrawalProven + ) + ) + end + + defp pre_fault_proofs_status(l1_timestamp) do + challenge_period = + case OptimismFinalizationPeriod.get_period() do + nil -> 604_800 + period -> period + end + + if DateTime.compare(l1_timestamp, DateTime.add(DateTime.utc_now(), -challenge_period)) == :lt do + {@withdrawal_status_ready_for_relay, nil} + else + {@withdrawal_status_in_challenge, DateTime.add(l1_timestamp, challenge_period)} + end + end + + defp post_fault_proofs_status(l1_timestamp, game) do + if game.status != @game_status_defender_wins do + # the game status is not DEFENDER_WINS + {@withdrawal_status_waiting_to_resolve, nil} + else + dispute_game_finality_delay_seconds = + Helper.parse_integer(Constants.get_constant_value(@dispute_game_finality_delay_seconds)) + + proof_maturity_delay_seconds = Helper.parse_integer(Constants.get_constant_value(@proof_maturity_delay_seconds)) + + false = is_nil(dispute_game_finality_delay_seconds) + false = is_nil(proof_maturity_delay_seconds) + + finality_delayed = DateTime.add(game.resolved_at, dispute_game_finality_delay_seconds) + proof_delayed = DateTime.add(l1_timestamp, proof_maturity_delay_seconds) + + now = DateTime.utc_now() + + if DateTime.compare(now, finality_delayed) == :lt or DateTime.compare(now, finality_delayed) == :eq or + DateTime.compare(now, proof_delayed) == :lt or DateTime.compare(now, proof_delayed) == :eq do + seconds_left1 = max(DateTime.diff(finality_delayed, now), 0) + seconds_left2 = max(DateTime.diff(proof_delayed, now), 0) + seconds_left = max(seconds_left1, seconds_left2) + + {@withdrawal_status_in_challenge, DateTime.add(now, seconds_left)} + else + {@withdrawal_status_ready_for_relay, nil} + end + end + end +end diff --git a/apps/explorer/lib/explorer/chain/optimism/withdrawal_event.ex b/apps/explorer/lib/explorer/chain/optimism/withdrawal_event.ex new file mode 100644 index 000000000000..3210916fcfe2 --- /dev/null +++ b/apps/explorer/lib/explorer/chain/optimism/withdrawal_event.ex @@ -0,0 +1,37 @@ +defmodule Explorer.Chain.Optimism.WithdrawalEvent do + @moduledoc "Models Optimism withdrawal event." + + use Explorer.Schema + + alias Explorer.Chain.Hash + + @required_attrs ~w(withdrawal_hash l1_event_type l1_timestamp l1_transaction_hash l1_block_number)a + @optional_attrs ~w(game_index)a + + @type t :: %__MODULE__{ + withdrawal_hash: Hash.t(), + l1_event_type: String.t(), + l1_timestamp: DateTime.t(), + l1_transaction_hash: Hash.t(), + l1_block_number: non_neg_integer(), + game_index: non_neg_integer() | nil + } + + @primary_key false + schema "op_withdrawal_events" do + field(:withdrawal_hash, Hash.Full, primary_key: true) + field(:l1_event_type, Ecto.Enum, values: [:WithdrawalProven, :WithdrawalFinalized], primary_key: true) + field(:l1_timestamp, :utc_datetime_usec) + field(:l1_transaction_hash, Hash.Full) + field(:l1_block_number, :integer) + field(:game_index, :integer) + + timestamps() + end + + def changeset(%__MODULE__{} = withdrawal_events, attrs \\ %{}) do + withdrawal_events + |> cast(attrs, @required_attrs ++ @optional_attrs) + |> validate_required(@required_attrs) + end +end diff --git a/apps/explorer/lib/explorer/chain/polygon_edge/reader.ex b/apps/explorer/lib/explorer/chain/polygon_edge/reader.ex index 9d8d7dbf4bb5..7f27ccf6048e 100644 --- a/apps/explorer/lib/explorer/chain/polygon_edge/reader.ex +++ b/apps/explorer/lib/explorer/chain/polygon_edge/reader.ex @@ -17,27 +17,33 @@ defmodule Explorer.Chain.PolygonEdge.Reader do def deposits(options \\ []) do paging_options = Keyword.get(options, :paging_options, default_paging_options()) - base_query = - from( - de in DepositExecute, - inner_join: d in Deposit, - on: d.msg_id == de.msg_id and not is_nil(d.l1_timestamp), - select: %{ - msg_id: de.msg_id, - from: d.from, - to: d.to, - l1_transaction_hash: d.l1_transaction_hash, - l1_timestamp: d.l1_timestamp, - success: de.success, - l2_transaction_hash: de.l2_transaction_hash - }, - order_by: [desc: de.msg_id] - ) - - base_query - |> page_deposits_or_withdrawals(paging_options) - |> limit(^paging_options.page_size) - |> select_repo(options).all() + case paging_options do + %PagingOptions{key: {0}} -> + [] + + _ -> + base_query = + from( + de in DepositExecute, + inner_join: d in Deposit, + on: d.msg_id == de.msg_id and not is_nil(d.l1_timestamp), + select: %{ + msg_id: de.msg_id, + from: d.from, + to: d.to, + l1_transaction_hash: d.l1_transaction_hash, + l1_timestamp: d.l1_timestamp, + success: de.success, + l2_transaction_hash: de.l2_transaction_hash + }, + order_by: [desc: de.msg_id] + ) + + base_query + |> page_deposits_or_withdrawals(paging_options) + |> limit(^paging_options.page_size) + |> select_repo(options).all() + end end @spec deposits_count(list()) :: term() | nil @@ -56,30 +62,36 @@ defmodule Explorer.Chain.PolygonEdge.Reader do def withdrawals(options \\ []) do paging_options = Keyword.get(options, :paging_options, default_paging_options()) - base_query = - from( - w in Withdrawal, - left_join: we in WithdrawalExit, - on: we.msg_id == w.msg_id, - left_join: b in Block, - on: b.number == w.l2_block_number and b.consensus == true, - select: %{ - msg_id: w.msg_id, - from: w.from, - to: w.to, - l2_transaction_hash: w.l2_transaction_hash, - l2_timestamp: b.timestamp, - success: we.success, - l1_transaction_hash: we.l1_transaction_hash - }, - where: not is_nil(w.from), - order_by: [desc: w.msg_id] - ) - - base_query - |> page_deposits_or_withdrawals(paging_options) - |> limit(^paging_options.page_size) - |> select_repo(options).all() + case paging_options do + %PagingOptions{key: 0} -> + [] + + _ -> + base_query = + from( + w in Withdrawal, + left_join: we in WithdrawalExit, + on: we.msg_id == w.msg_id, + left_join: b in Block, + on: b.number == w.l2_block_number and b.consensus == true, + select: %{ + msg_id: w.msg_id, + from: w.from, + to: w.to, + l2_transaction_hash: w.l2_transaction_hash, + l2_timestamp: b.timestamp, + success: we.success, + l1_transaction_hash: we.l1_transaction_hash + }, + where: not is_nil(w.from), + order_by: [desc: w.msg_id] + ) + + base_query + |> page_deposits_or_withdrawals(paging_options) + |> limit(^paging_options.page_size) + |> select_repo(options).all() + end end @spec withdrawals_count(list()) :: term() | nil diff --git a/apps/explorer/lib/explorer/chain/polygon_zkevm/reader.ex b/apps/explorer/lib/explorer/chain/polygon_zkevm/reader.ex index 60a8d2b8ed8f..2e5daf818497 100644 --- a/apps/explorer/lib/explorer/chain/polygon_zkevm/reader.ex +++ b/apps/explorer/lib/explorer/chain/polygon_zkevm/reader.ex @@ -69,10 +69,16 @@ defmodule Explorer.Chain.PolygonZkevm.Reader do else paging_options = Keyword.get(options, :paging_options, Chain.default_paging_options()) - base_query - |> Chain.join_associations(necessity_by_association) - |> page_batches(paging_options) - |> limit(^paging_options.page_size) + case paging_options do + %PagingOptions{key: {0}} -> + [] + + _ -> + base_query + |> Chain.join_associations(necessity_by_association) + |> page_batches(paging_options) + |> limit(^paging_options.page_size) + end end select_repo(options).all(query) @@ -239,20 +245,26 @@ defmodule Explorer.Chain.PolygonZkevm.Reader do def deposits(options \\ []) do paging_options = Keyword.get(options, :paging_options, Chain.default_paging_options()) - base_query = - from( - b in Bridge, - left_join: t1 in assoc(b, :l1_token), - left_join: t2 in assoc(b, :l2_token), - where: b.type == :deposit and not is_nil(b.l1_transaction_hash), - preload: [l1_token: t1, l2_token: t2], - order_by: [desc: b.index] - ) + case paging_options do + %PagingOptions{key: {0}} -> + [] + + _ -> + base_query = + from( + b in Bridge, + left_join: t1 in assoc(b, :l1_token), + left_join: t2 in assoc(b, :l2_token), + where: b.type == :deposit and not is_nil(b.l1_transaction_hash), + preload: [l1_token: t1, l2_token: t2], + order_by: [desc: b.index] + ) - base_query - |> page_deposits_or_withdrawals(paging_options) - |> limit(^paging_options.page_size) - |> select_repo(options).all() + base_query + |> page_deposits_or_withdrawals(paging_options) + |> limit(^paging_options.page_size) + |> select_repo(options).all() + end end @doc """ @@ -277,20 +289,26 @@ defmodule Explorer.Chain.PolygonZkevm.Reader do def withdrawals(options \\ []) do paging_options = Keyword.get(options, :paging_options, Chain.default_paging_options()) - base_query = - from( - b in Bridge, - left_join: t1 in assoc(b, :l1_token), - left_join: t2 in assoc(b, :l2_token), - where: b.type == :withdrawal and not is_nil(b.l2_transaction_hash), - preload: [l1_token: t1, l2_token: t2], - order_by: [desc: b.index] - ) + case paging_options do + %PagingOptions{key: {0}} -> + [] + + _ -> + base_query = + from( + b in Bridge, + left_join: t1 in assoc(b, :l1_token), + left_join: t2 in assoc(b, :l2_token), + where: b.type == :withdrawal and not is_nil(b.l2_transaction_hash), + preload: [l1_token: t1, l2_token: t2], + order_by: [desc: b.index] + ) - base_query - |> page_deposits_or_withdrawals(paging_options) - |> limit(^paging_options.page_size) - |> select_repo(options).all() + base_query + |> page_deposits_or_withdrawals(paging_options) + |> limit(^paging_options.page_size) + |> select_repo(options).all() + end end @doc """ @@ -307,6 +325,18 @@ defmodule Explorer.Chain.PolygonZkevm.Reader do select_repo(options).aggregate(query, :count, timeout: :infinity) end + @doc """ + Filters token decimals value (cannot be greater than 0xFF). + """ + @spec sanitize_decimals(non_neg_integer()) :: non_neg_integer() + def sanitize_decimals(decimals) do + if decimals > 0xFF do + 0 + else + decimals + end + end + defp page_batches(query, %PagingOptions{key: nil}), do: query defp page_batches(query, %PagingOptions{key: {number}}) do diff --git a/apps/explorer/lib/explorer/chain/polygon_zkevm/transaction_batch.ex b/apps/explorer/lib/explorer/chain/polygon_zkevm/transaction_batch.ex index b602ff092254..92ca1dd21527 100644 --- a/apps/explorer/lib/explorer/chain/polygon_zkevm/transaction_batch.ex +++ b/apps/explorer/lib/explorer/chain/polygon_zkevm/transaction_batch.ex @@ -6,9 +6,9 @@ defmodule Explorer.Chain.PolygonZkevm.TransactionBatch do alias Explorer.Chain.Hash alias Explorer.Chain.PolygonZkevm.{BatchTransaction, LifecycleTransaction} - @optional_attrs ~w(sequence_id verify_id)a + @optional_attrs ~w(timestamp sequence_id verify_id)a - @required_attrs ~w(number timestamp l2_transactions_count global_exit_root acc_input_hash state_root)a + @required_attrs ~w(number l2_transactions_count global_exit_root acc_input_hash state_root)a @primary_key false typed_schema "polygon_zkevm_transaction_batches" do diff --git a/apps/explorer/lib/explorer/chain/search.ex b/apps/explorer/lib/explorer/chain/search.ex index ce64b8d0d2fd..953bed3007ee 100644 --- a/apps/explorer/lib/explorer/chain/search.ex +++ b/apps/explorer/lib/explorer/chain/search.ex @@ -47,6 +47,7 @@ defmodule Explorer.Chain.Search do from(items in subquery(query), order_by: [ desc: items.priority, + desc_nulls_last: items.certified, desc_nulls_last: items.circulating_market_cap, desc_nulls_last: items.exchange_rate, desc_nulls_last: items.is_verified_via_admin_panel, @@ -77,7 +78,7 @@ defmodule Explorer.Chain.Search do ens_result = (ens_task && await_ens_task(ens_task)) || [] - result ++ ens_result + ens_result ++ result end def base_joint_query(string, term) do @@ -117,7 +118,7 @@ defmodule Explorer.Chain.Search do tx_block_query end - if Application.get_env(:explorer, :chain_type) == "ethereum" do + if Application.get_env(:explorer, :chain_type) == :ethereum do blob_query = search_blob_query(string) tx_block_op_query @@ -203,7 +204,7 @@ defmodule Explorer.Chain.Search do end blob_result = - if valid_full_hash?(search_query) && Application.get_env(:explorer, :chain_type) == "ethereum" do + if valid_full_hash?(search_query) && Application.get_env(:explorer, :chain_type) == :ethereum do search_query |> search_blob_query() |> select_repo(options).all() @@ -242,7 +243,7 @@ defmodule Explorer.Chain.Search do blocks_result, ens_result ] - |> Enum.filter(fn list -> Enum.count(list) > 0 end) + |> Enum.filter(fn list -> not Enum.empty?(list) end) |> Enum.sort_by(fn list -> Enum.count(list) end, :asc) to_take = @@ -257,6 +258,7 @@ defmodule Explorer.Chain.Search do |> compose_result_checksummed_address_hash() |> format_timestamp() end) + |> Enum.sort_by(fn item -> item.priority end, :desc) _ -> [] @@ -324,6 +326,7 @@ defmodule Explorer.Chain.Search do |> Map.put(:icon_url, dynamic([token, _], token.icon_url)) |> Map.put(:token_type, dynamic([token, _], token.type)) |> Map.put(:verified, dynamic([_, smart_contract], not is_nil(smart_contract))) + |> Map.put(:certified, dynamic([_, smart_contract], smart_contract.certified)) |> Map.put(:exchange_rate, dynamic([token, _], token.fiat_value)) |> Map.put(:total_supply, dynamic([token, _], token.total_supply)) |> Map.put(:circulating_market_cap, dynamic([token, _], token.circulating_market_cap)) @@ -355,6 +358,7 @@ defmodule Explorer.Chain.Search do |> Map.put(:type, "contract") |> Map.put(:name, dynamic([smart_contract, _], smart_contract.name)) |> Map.put(:inserted_at, dynamic([_, address], address.inserted_at)) + |> Map.put(:certified, dynamic([smart_contract, _], smart_contract.certified)) |> Map.put(:verified, true) from(smart_contract in SmartContract, @@ -590,32 +594,50 @@ defmodule Explorer.Chain.Search do end defp search_ens_name(search_query, options) do - trimmed_query = String.trim(search_query) - - with true <- Regex.match?(~r/\w+\.\w+/, trimmed_query), - result when is_map(result) <- ens_domain_name_lookup(search_query) do + if result = search_ens_name_in_bens(search_query) do [ result[:address_hash] |> search_address_query() |> select_repo(options).all() |> merge_address_search_result_with_ens_info(result) ] + else + [] + end + end + + @doc """ + Try to resolve ENS domain via BENS + """ + @spec search_ens_name_in_bens(binary()) :: + nil | %{address_hash: binary(), expiry_date: any(), name: any(), names_count: non_neg_integer()} + def search_ens_name_in_bens(search_query) do + trimmed_query = String.trim(search_query) + + with true <- Regex.match?(~r/\w+\.\w+/, trimmed_query), + %{address_hash: _address_hash} = result <- ens_domain_name_lookup(search_query) do + result else _ -> - [] + nil end end defp merge_address_search_result_with_ens_info([], ens_info) do search_fields() |> Map.put(:address_hash, ens_info[:address_hash]) - |> Map.put(:type, "address") + |> Map.put(:type, "ens_domain") |> Map.put(:ens_info, ens_info) |> Map.put(:timestamp, nil) + |> Map.put(:priority, 2) end defp merge_address_search_result_with_ens_info([address], ens_info) do - Map.put(address |> compose_result_checksummed_address_hash(), :ens_info, ens_info) + address + |> compose_result_checksummed_address_hash() + |> Map.put(:type, "ens_domain") + |> Map.put(:ens_info, ens_info) + |> Map.put(:priority, 2) end defp search_fields do @@ -635,6 +657,7 @@ defmodule Explorer.Chain.Search do token_type: nil, timestamp: dynamic([_, _], type(^nil, :utc_datetime_usec)), verified: nil, + certified: nil, exchange_rate: nil, total_supply: nil, circulating_market_cap: nil, diff --git a/apps/explorer/lib/explorer/chain/shibarium/bridge.ex b/apps/explorer/lib/explorer/chain/shibarium/bridge.ex index ee03ebcd2503..374bf2ae8d37 100644 --- a/apps/explorer/lib/explorer/chain/shibarium/bridge.ex +++ b/apps/explorer/lib/explorer/chain/shibarium/bridge.ex @@ -19,7 +19,7 @@ defmodule Explorer.Chain.Shibarium.Bridge do @typedoc """ * `user_address` - address of the user that initiated operation * `user` - foreign key of `user_address` - * `amount_or_id` - amount of the operation or NTF id (in case of ERC-721 token) + * `amount_or_id` - amount of the operation or NFT id (in case of ERC-721 token) * `erc1155_ids` - an array of ERC-1155 token ids (when batch ERC-1155 token transfer) * `erc1155_amounts` - an array of corresponding ERC-1155 token amounts (when batch ERC-1155 token transfer) * `l1_transaction_hash` - transaction hash for L1 side diff --git a/apps/explorer/lib/explorer/chain/shibarium/reader.ex b/apps/explorer/lib/explorer/chain/shibarium/reader.ex index f452c5dced7f..59700c757549 100644 --- a/apps/explorer/lib/explorer/chain/shibarium/reader.ex +++ b/apps/explorer/lib/explorer/chain/shibarium/reader.ex @@ -19,24 +19,30 @@ defmodule Explorer.Chain.Shibarium.Reader do def deposits(options \\ []) do paging_options = Keyword.get(options, :paging_options, default_paging_options()) - base_query = - from( - sb in Bridge, - where: sb.operation_type == :deposit and not is_nil(sb.l1_block_number) and not is_nil(sb.l2_block_number), - select: %{ - l1_block_number: sb.l1_block_number, - l1_transaction_hash: sb.l1_transaction_hash, - l2_transaction_hash: sb.l2_transaction_hash, - user: sb.user, - timestamp: sb.timestamp - }, - order_by: [desc: sb.l1_block_number] - ) - - base_query - |> page_deposits(paging_options) - |> limit(^paging_options.page_size) - |> select_repo(options).all() + case paging_options do + %PagingOptions{key: {0}} -> + [] + + _ -> + base_query = + from( + sb in Bridge, + where: sb.operation_type == :deposit and not is_nil(sb.l1_block_number) and not is_nil(sb.l2_block_number), + select: %{ + l1_block_number: sb.l1_block_number, + l1_transaction_hash: sb.l1_transaction_hash, + l2_transaction_hash: sb.l2_transaction_hash, + user: sb.user, + timestamp: sb.timestamp + }, + order_by: [desc: sb.l1_block_number] + ) + + base_query + |> page_deposits(paging_options) + |> limit(^paging_options.page_size) + |> select_repo(options).all() + end end @doc """ @@ -60,24 +66,31 @@ defmodule Explorer.Chain.Shibarium.Reader do def withdrawals(options \\ []) do paging_options = Keyword.get(options, :paging_options, default_paging_options()) - base_query = - from( - sb in Bridge, - where: sb.operation_type == :withdrawal and not is_nil(sb.l1_block_number) and not is_nil(sb.l2_block_number), - select: %{ - l2_block_number: sb.l2_block_number, - l2_transaction_hash: sb.l2_transaction_hash, - l1_transaction_hash: sb.l1_transaction_hash, - user: sb.user, - timestamp: sb.timestamp - }, - order_by: [desc: sb.l2_block_number] - ) - - base_query - |> page_withdrawals(paging_options) - |> limit(^paging_options.page_size) - |> select_repo(options).all() + case paging_options do + %PagingOptions{key: 0} -> + [] + + _ -> + base_query = + from( + sb in Bridge, + where: + sb.operation_type == :withdrawal and not is_nil(sb.l1_block_number) and not is_nil(sb.l2_block_number), + select: %{ + l2_block_number: sb.l2_block_number, + l2_transaction_hash: sb.l2_transaction_hash, + l1_transaction_hash: sb.l1_transaction_hash, + user: sb.user, + timestamp: sb.timestamp + }, + order_by: [desc: sb.l2_block_number] + ) + + base_query + |> page_withdrawals(paging_options) + |> limit(^paging_options.page_size) + |> select_repo(options).all() + end end @doc """ diff --git a/apps/explorer/lib/explorer/chain/smart_contract.ex b/apps/explorer/lib/explorer/chain/smart_contract.ex index 7d5ba48d0c96..c29d9f7363ed 100644 --- a/apps/explorer/lib/explorer/chain/smart_contract.ex +++ b/apps/explorer/lib/explorer/chain/smart_contract.ex @@ -41,9 +41,7 @@ defmodule Explorer.Chain.SmartContract do @burn_address_hash_string "0x0000000000000000000000000000000000000000" @burn_address_hash_string_32 "0x0000000000000000000000000000000000000000000000000000000000000000" - defguard is_burn_signature(term) when term in ["0x", "0x0", @burn_address_hash_string_32] - defguard is_burn_signature_or_nil(term) when is_burn_signature(term) or term == nil - defguard is_burn_signature_extended(term) when is_burn_signature(term) or term == @burn_address_hash_string + defguard is_burn_signature(term) when term in ["0x", "0x0", @burn_address_hash_string, @burn_address_hash_string_32] @doc """ Returns burn address hash @@ -265,6 +263,8 @@ defmodule Explorer.Chain.SmartContract do * `abi` - The [JSON ABI specification](https://solidity.readthedocs.io/en/develop/abi-spec.html#json) for this contract. * `verified_via_sourcify` - whether contract verified through Sourcify utility or not. + * `verified_via_eth_bytecode_db` - whether contract automatically verified via eth-bytecode-db or not. + * `verified_via_verifier_alliance` - whether contract automatically verified via Verifier Alliance or not. * `partially_verified` - whether contract verified using partial matched source code or not. * `is_vyper_contract` - boolean flag, determines if contract is Vyper or not * `file_path` - show the filename or path to the file of the contract source file @@ -277,7 +277,7 @@ defmodule Explorer.Chain.SmartContract do * `implementation_address_hash` - address hash of the proxy's implementation if any * `autodetect_constructor_args` - field was added for storing user's choice * `is_yul` - field was added for storing user's choice - * `verified_via_eth_bytecode_db` - whether contract automatically verified via eth-bytecode-db or not. + * `certified` - boolean flag, which can be set for set of smart-contracts via runtime env variable to prioritize those smart-contracts in the search. """ typed_schema "smart_contracts" do field(:name, :string, null: false) @@ -290,6 +290,8 @@ defmodule Explorer.Chain.SmartContract do embeds_many(:external_libraries, ExternalLibrary, on_replace: :delete) field(:abi, {:array, :map}) field(:verified_via_sourcify, :boolean) + field(:verified_via_eth_bytecode_db, :boolean) + field(:verified_via_verifier_alliance, :boolean) field(:partially_verified, :boolean) field(:file_path, :string) field(:is_vyper_contract, :boolean) @@ -303,8 +305,8 @@ defmodule Explorer.Chain.SmartContract do field(:autodetect_constructor_args, :boolean, virtual: true) field(:is_yul, :boolean, virtual: true) field(:metadata_from_verified_twin, :boolean, virtual: true) - field(:verified_via_eth_bytecode_db, :boolean) field(:license_type, Ecto.Enum, values: @license_enum, default: :none) + field(:certified, :boolean) has_many( :decompiled_smart_contracts, @@ -346,6 +348,8 @@ defmodule Explorer.Chain.SmartContract do :evm_version, :optimization_runs, :verified_via_sourcify, + :verified_via_eth_bytecode_db, + :verified_via_verifier_alliance, :partially_verified, :file_path, :is_vyper_contract, @@ -356,8 +360,8 @@ defmodule Explorer.Chain.SmartContract do :compiler_settings, :implementation_address_hash, :implementation_fetched_at, - :verified_via_eth_bytecode_db, - :license_type + :license_type, + :certified ]) |> validate_required([ :name, @@ -390,6 +394,8 @@ defmodule Explorer.Chain.SmartContract do :optimization_runs, :constructor_arguments, :verified_via_sourcify, + :verified_via_eth_bytecode_db, + :verified_via_verifier_alliance, :partially_verified, :file_path, :is_vyper_contract, @@ -398,8 +404,8 @@ defmodule Explorer.Chain.SmartContract do :contract_code_md5, :implementation_name, :autodetect_constructor_args, - :verified_via_eth_bytecode_db, - :license_type + :license_type, + :certified ]) |> (&if(verification_with_files?, do: &1, @@ -594,7 +600,7 @@ defmodule Explorer.Chain.SmartContract do def save_implementation_data(nil, _, _, _), do: {nil, nil} def save_implementation_data(empty_address_hash_string, proxy_address_hash, metadata_from_verified_twin, options) - when is_burn_signature_extended(empty_address_hash_string) do + when is_burn_signature(empty_address_hash_string) do if is_nil(metadata_from_verified_twin) or !metadata_from_verified_twin do proxy_address_hash |> address_hash_to_smart_contract_without_twin(options) @@ -676,7 +682,9 @@ defmodule Explorer.Chain.SmartContract do from( tx in Transaction, where: tx.created_contract_address_hash == ^address_hash, - where: tx.status == ^1 + where: tx.status == ^1, + order_by: [desc: tx.block_number], + limit: ^1 ) tx = @@ -1275,6 +1283,26 @@ defmodule Explorer.Chain.SmartContract do end end + @doc """ + Sets smart-contract certified flag + """ + @spec set_smart_contracts_certified_flag(list()) :: + {:ok, []} | {:error, String.t()} + def set_smart_contracts_certified_flag([]), do: {:ok, []} + + def set_smart_contracts_certified_flag(address_hashes) do + query = + from( + contract in __MODULE__, + where: contract.address_hash in ^address_hashes + ) + + case Repo.update_all(query, set: [certified: true]) do + {1, _} -> {:ok, []} + _ -> {:error, "There was an error in setting certified flag."} + end + end + defp check_verified_with_full_match(address_hash, options) do smart_contract = address_hash_to_smart_contract_without_twin(address_hash, options) diff --git a/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex b/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex index 845f8f6e08e8..672b17ddd65b 100644 --- a/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex +++ b/apps/explorer/lib/explorer/chain/smart_contract/proxy.ex @@ -13,7 +13,7 @@ defmodule Explorer.Chain.SmartContract.Proxy do string_to_address_hash: 1 ] - import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0, is_burn_signature_or_nil: 1] + import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0, is_burn_signature: 1] # supported signatures: # 5c60da1b = keccak256(implementation()) @@ -146,11 +146,11 @@ defmodule Explorer.Chain.SmartContract.Proxy do json_rpc_named_arguments ) do {:ok, empty_address_hash_string} - when is_burn_signature_or_nil(empty_address_hash_string) -> + when is_burn_signature(empty_address_hash_string) -> nil - {:ok, implementation_logic_address_hash_string} -> - implementation_logic_address_hash_string + {:ok, "0x" <> storage_value} -> + extract_address_hex_from_storage_pointer(storage_value) _ -> nil @@ -289,4 +289,14 @@ defmodule Explorer.Chain.SmartContract.Proxy do Map.get(input, "name") == name end) end + + @doc """ + Decodes 20 bytes address hex from smart-contract storage pointer value + """ + @spec extract_address_hex_from_storage_pointer(binary) :: binary + def extract_address_hex_from_storage_pointer(storage_value) when is_binary(storage_value) do + address_hex = storage_value |> String.slice(-40, 40) |> String.pad_leading(40, ["0"]) + + "0x" <> address_hex + end end diff --git a/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1967.ex b/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1967.ex index 5cc06c75ed9e..24549c96a132 100644 --- a/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1967.ex +++ b/apps/explorer/lib/explorer/chain/smart_contract/proxy/eip_1967.ex @@ -7,7 +7,7 @@ defmodule Explorer.Chain.SmartContract.Proxy.EIP1967 do alias Explorer.Chain.SmartContract.Proxy alias Explorer.Chain.SmartContract.Proxy.Basic - import Explorer.Chain.SmartContract, only: [is_burn_signature_or_nil: 1] + import Explorer.Chain.SmartContract, only: [is_burn_signature: 1] # supported signatures: # 5c60da1b = keccak256(implementation()) @@ -65,31 +65,38 @@ defmodule Explorer.Chain.SmartContract.Proxy.EIP1967 do } ] - case Contract.eth_get_storage_at_request( - proxy_address_hash, - storage_slot_beacon_contract_address, - nil, - json_rpc_named_arguments - ) do - {:ok, empty_address} - when is_burn_signature_or_nil(empty_address) -> - nil + beacon_contract_address = + case Contract.eth_get_storage_at_request( + proxy_address_hash, + storage_slot_beacon_contract_address, + nil, + json_rpc_named_arguments + ) do + {:ok, empty_address} + when is_burn_signature(empty_address) -> + nil - {:ok, beacon_contract_address} -> - case @implementation_signature - |> Basic.get_implementation_address_hash_string( - beacon_contract_address, - implementation_method_abi - ) do - < > = binary_part(decoded, 0, 1) + content = binary_part(decoded, 1, byte_size(decoded) - 1) + + new_batch_acc = + cond do + version == 0 -> + handle_v0_batch(content, id, l1_timestamp, batch_acc) + + version <= 2 -> + # parsing the span batch + handle_v1_batch(content, id, l1_timestamp, genesis_block_l2, batch_acc) + + true -> + Logger.error("Unsupported batch version ##{version}") + :error + end + + if byte_size(new_remainder) > 0 and new_batch_acc != :error do + {:cont, {new_remainder, new_batch_acc}} + else + {:halt, new_batch_acc} + end + rescue + _ -> {:halt, :error} + end + end) + + if batches == :error do + :error + else + batches = Enum.reverse(batches) + + numbers_by_hashes = + batches + |> Stream.filter(&Map.has_key?(&1, :parent_hash)) + |> Enum.map(fn batch -> batch.parent_hash end) + |> get_block_numbers_by_hashes(json_rpc_named_arguments_l2) + + Enum.map(batches, &parent_hash_to_l2_block_number(&1, numbers_by_hashes)) + end + end + + defp handle_v0_batch(content, frame_sequence_id, l1_timestamp, batch_acc) do + content_decoded = ExRLP.decode(content) + + batch = %{ + parent_hash: Enum.at(content_decoded, 0), + frame_sequence_id: frame_sequence_id, + l1_timestamp: l1_timestamp + } + + [batch | batch_acc] + end + + defp handle_v1_batch(content, frame_sequence_id, l1_timestamp, genesis_block_l2, batch_acc) do + {rel_timestamp, content_remainder} = LEB128.decode(content) + + # skip l1_origin_num + {_l1_origin_num, checks_and_payload} = LEB128.decode(content_remainder) + + # skip `parent_check` and `l1_origin_check` fields (20 bytes each) + # and read the block count + {block_count, _} = + checks_and_payload + |> binary_part(40, byte_size(checks_and_payload) - 40) + |> LEB128.decode() + + # the first and last L2 blocks in the span + span_start = div(rel_timestamp, @op_chain_block_time) + genesis_block_l2 + span_end = span_start + block_count - 1 + + cond do + rem(rel_timestamp, @op_chain_block_time) != 0 -> + Logger.error("rel_timestamp is not divisible by #{@op_chain_block_time}. We ignore the span batch.") + batch_acc + + block_count <= 0 -> + Logger.error("Empty span batch found. We ignore it.") + batch_acc + + true -> + span_start..span_end + |> Enum.reduce(batch_acc, fn l2_block_number, batch_acc -> + [ + %{ + l2_block_number: l2_block_number, + frame_sequence_id: frame_sequence_id, + l1_timestamp: l1_timestamp + } + | batch_acc + ] + end) + end + end + + defp parent_hash_to_l2_block_number(batch, numbers_by_hashes) do + if Map.has_key?(batch, :parent_hash) do + number = Map.get(numbers_by_hashes, batch.parent_hash) + + batch + |> Map.put(:l2_block_number, number + 1) + |> Map.delete(:parent_hash) + else + batch + end + end + + defp remove_duplicates(batches, sequences) do + unique_batches = + batches + |> Enum.sort(fn b1, b2 -> + b1.l2_block_number < b2.l2_block_number or + (b1.l2_block_number == b2.l2_block_number and b1.l1_timestamp < b2.l1_timestamp) + end) + |> Enum.reduce(%{}, fn b, acc -> + Map.put(acc, b.l2_block_number, Map.delete(b, :l1_timestamp)) + end) + |> Map.values() + + unique_sequences = + if Enum.empty?(sequences) do + [] + else + sequences + |> Enum.reverse() + |> Enum.filter(fn seq -> + Enum.any?(unique_batches, fn batch -> batch.frame_sequence_id == seq.id end) + end) + end + + {unique_batches, unique_sequences} + end + + defp txs_filter(transactions_params, batch_submitter, batch_inbox) do + transactions_params + |> Enum.filter(fn t -> + from_address_hash = Map.get(t, :from_address_hash) + to_address_hash = Map.get(t, :to_address_hash) + + if is_nil(from_address_hash) or is_nil(to_address_hash) do + false + else + String.downcase(from_address_hash) == batch_submitter and String.downcase(to_address_hash) == batch_inbox + end + end) + end + + defp zlib_decompress(bytes) do + z = :zlib.open() + :zlib.inflateInit(z) + + uncompressed_bytes = + try do + zlib_inflate(z, bytes) + rescue + _ -> <<>> + end + + try do + :zlib.inflateEnd(z) + rescue + _ -> nil + end + + :zlib.close(z) + + uncompressed_bytes + end + + defp zlib_inflate_handler(z, {:continue, [uncompressed_bytes]}, acc) do + zlib_inflate(z, [], acc <> uncompressed_bytes) + end + + defp zlib_inflate_handler(_z, {:finished, [uncompressed_bytes]}, acc) do + acc <> uncompressed_bytes + end + + defp zlib_inflate_handler(_z, {:finished, []}, acc) do + acc + end + + defp zlib_inflate(z, compressed_bytes, acc \\ <<>>) do + result = :zlib.safeInflate(z, compressed_bytes) + zlib_inflate_handler(z, result, acc) + end +end diff --git a/apps/indexer/lib/indexer/fetcher/optimism/withdrawal.ex b/apps/indexer/lib/indexer/fetcher/optimism/withdrawal.ex new file mode 100644 index 000000000000..d993111efb9b --- /dev/null +++ b/apps/indexer/lib/indexer/fetcher/optimism/withdrawal.ex @@ -0,0 +1,370 @@ +defmodule Indexer.Fetcher.Optimism.Withdrawal do + @moduledoc """ + Fills op_withdrawals DB table. + """ + + use GenServer + use Indexer.Fetcher + + require Logger + + import Ecto.Query + + import EthereumJSONRPC, only: [quantity_to_integer: 1] + import Explorer.Helper, only: [decode_data: 2, parse_integer: 1] + + alias Explorer.{Chain, Repo} + alias Explorer.Chain.Log + alias Explorer.Chain.Optimism.Withdrawal, as: OptimismWithdrawal + alias Indexer.Fetcher.Optimism + alias Indexer.Helper + + @fetcher_name :optimism_withdrawals + + # 32-byte signature of the event MessagePassed(uint256 indexed nonce, address indexed sender, address indexed target, uint256 value, uint256 gasLimit, bytes data, bytes32 withdrawalHash) + @message_passed_event "0x02a52367d10742d8032712c1bb8e0144ff1ec5ffda1ed7d70bb05a2744955054" + + def child_spec(start_link_arguments) do + spec = %{ + id: __MODULE__, + start: {__MODULE__, :start_link, start_link_arguments}, + restart: :transient, + type: :worker + } + + Supervisor.child_spec(spec, []) + end + + def start_link(args, gen_server_options \\ []) do + GenServer.start_link(__MODULE__, args, Keyword.put_new(gen_server_options, :name, __MODULE__)) + end + + @impl GenServer + def init(args) do + json_rpc_named_arguments = args[:json_rpc_named_arguments] + {:ok, %{}, {:continue, json_rpc_named_arguments}} + end + + @impl GenServer + def handle_continue(json_rpc_named_arguments, state) do + Logger.metadata(fetcher: @fetcher_name) + + env = Application.get_all_env(:indexer)[__MODULE__] + + with {:start_block_l2_undefined, false} <- {:start_block_l2_undefined, is_nil(env[:start_block_l2])}, + {:message_passer_valid, true} <- {:message_passer_valid, Helper.address_correct?(env[:message_passer])}, + start_block_l2 = parse_integer(env[:start_block_l2]), + false <- is_nil(start_block_l2), + true <- start_block_l2 > 0, + {last_l2_block_number, last_l2_transaction_hash} <- get_last_l2_item(), + {safe_block, safe_block_is_latest} = Optimism.get_safe_block(json_rpc_named_arguments), + {:start_block_l2_valid, true} <- + {:start_block_l2_valid, + (start_block_l2 <= last_l2_block_number || last_l2_block_number == 0) && start_block_l2 <= safe_block}, + {:ok, last_l2_tx} <- Optimism.get_transaction_by_hash(last_l2_transaction_hash, json_rpc_named_arguments), + {:l2_tx_not_found, false} <- {:l2_tx_not_found, !is_nil(last_l2_transaction_hash) && is_nil(last_l2_tx)} do + Process.send(self(), :continue, []) + + {:noreply, + %{ + start_block: max(start_block_l2, last_l2_block_number), + start_block_l2: start_block_l2, + safe_block: safe_block, + safe_block_is_latest: safe_block_is_latest, + message_passer: env[:message_passer], + json_rpc_named_arguments: json_rpc_named_arguments + }} + else + {:start_block_l2_undefined, true} -> + # the process shouldn't start if the start block is not defined + {:stop, :normal, state} + + {:message_passer_valid, false} -> + Logger.error("L2ToL1MessagePasser contract address is invalid or not defined.") + {:stop, :normal, state} + + {:start_block_l2_valid, false} -> + Logger.error("Invalid L2 Start Block value. Please, check the value and op_withdrawals table.") + {:stop, :normal, state} + + {:error, error_data} -> + Logger.error("Cannot get last L2 transaction from RPC by its hash due to RPC error: #{inspect(error_data)}") + + {:stop, :normal, state} + + {:l2_tx_not_found, true} -> + Logger.error( + "Cannot find last L2 transaction from RPC by its hash. Probably, there was a reorg on L2 chain. Please, check op_withdrawals table." + ) + + {:stop, :normal, state} + + _ -> + Logger.error("Withdrawals L2 Start Block is invalid or zero.") + {:stop, :normal, state} + end + end + + @impl GenServer + def handle_info( + :continue, + %{ + start_block_l2: start_block_l2, + message_passer: message_passer, + json_rpc_named_arguments: json_rpc_named_arguments + } = state + ) do + fill_msg_nonce_gaps(start_block_l2, message_passer, json_rpc_named_arguments) + Process.send(self(), :find_new_events, []) + {:noreply, state} + end + + @impl GenServer + def handle_info( + :find_new_events, + %{ + start_block: start_block, + safe_block: safe_block, + safe_block_is_latest: safe_block_is_latest, + message_passer: message_passer, + json_rpc_named_arguments: json_rpc_named_arguments + } = state + ) do + # find and fill all events between start_block and "safe" block + # the "safe" block can be "latest" (when safe_block_is_latest == true) + fill_block_range(start_block, safe_block, message_passer, json_rpc_named_arguments) + + if not safe_block_is_latest do + # find and fill all events between "safe" and "latest" block (excluding "safe") + {:ok, latest_block} = Optimism.get_block_number_by_tag("latest", json_rpc_named_arguments) + fill_block_range(safe_block + 1, latest_block, message_passer, json_rpc_named_arguments) + end + + {:stop, :normal, state} + end + + @impl GenServer + def handle_info({ref, _result}, state) do + Process.demonitor(ref, [:flush]) + {:noreply, state} + end + + def remove(starting_block) do + Repo.delete_all(from(w in OptimismWithdrawal, where: w.l2_block_number >= ^starting_block)) + end + + def event_to_withdrawal(second_topic, data, l2_transaction_hash, l2_block_number) do + [_value, _gas_limit, _data, hash] = decode_data(data, [{:uint, 256}, {:uint, 256}, :bytes, {:bytes, 32}]) + + msg_nonce = + second_topic + |> Helper.log_topic_to_string() + |> quantity_to_integer() + |> Decimal.new() + + %{ + msg_nonce: msg_nonce, + hash: hash, + l2_transaction_hash: l2_transaction_hash, + l2_block_number: quantity_to_integer(l2_block_number) + } + end + + defp msg_nonce_gap_starts(nonce_max) do + Repo.all( + from(w in OptimismWithdrawal, + select: w.l2_block_number, + order_by: w.msg_nonce, + where: + fragment( + "NOT EXISTS (SELECT msg_nonce FROM op_withdrawals WHERE msg_nonce = (? + 1)) AND msg_nonce != ?", + w.msg_nonce, + ^nonce_max + ) + ) + ) + end + + defp msg_nonce_gap_ends(nonce_min) do + Repo.all( + from(w in OptimismWithdrawal, + select: w.l2_block_number, + order_by: w.msg_nonce, + where: + fragment( + "NOT EXISTS (SELECT msg_nonce FROM op_withdrawals WHERE msg_nonce = (? - 1)) AND msg_nonce != ?", + w.msg_nonce, + ^nonce_min + ) + ) + ) + end + + defp find_and_save_withdrawals( + scan_db, + message_passer, + block_start, + block_end, + json_rpc_named_arguments + ) do + withdrawals = + if scan_db do + query = + from(log in Log, + select: {log.second_topic, log.data, log.transaction_hash, log.block_number}, + where: + log.first_topic == ^@message_passed_event and log.address_hash == ^message_passer and + log.block_number >= ^block_start and log.block_number <= ^block_end + ) + + query + |> Repo.all(timeout: :infinity) + |> Enum.map(fn {second_topic, data, l2_transaction_hash, l2_block_number} -> + event_to_withdrawal(second_topic, data, l2_transaction_hash, l2_block_number) + end) + else + {:ok, result} = + Optimism.get_logs( + block_start, + block_end, + message_passer, + @message_passed_event, + json_rpc_named_arguments, + 3 + ) + + Enum.map(result, fn event -> + event_to_withdrawal( + Enum.at(event["topics"], 1), + event["data"], + event["transactionHash"], + event["blockNumber"] + ) + end) + end + + {:ok, _} = + Chain.import(%{ + optimism_withdrawals: %{params: withdrawals}, + timeout: :infinity + }) + + Enum.count(withdrawals) + end + + defp fill_block_range(l2_block_start, l2_block_end, message_passer, json_rpc_named_arguments, scan_db) do + chunks_number = + if scan_db do + 1 + else + ceil((l2_block_end - l2_block_start + 1) / Optimism.get_logs_range_size()) + end + + chunk_range = Range.new(0, max(chunks_number - 1, 0), 1) + + Enum.reduce(chunk_range, 0, fn current_chunk, withdrawals_count_acc -> + chunk_start = l2_block_start + Optimism.get_logs_range_size() * current_chunk + + chunk_end = + if scan_db do + l2_block_end + else + min(chunk_start + Optimism.get_logs_range_size() - 1, l2_block_end) + end + + Helper.log_blocks_chunk_handling(chunk_start, chunk_end, l2_block_start, l2_block_end, nil, :L2) + + withdrawals_count = + find_and_save_withdrawals( + scan_db, + message_passer, + chunk_start, + chunk_end, + json_rpc_named_arguments + ) + + Helper.log_blocks_chunk_handling( + chunk_start, + chunk_end, + l2_block_start, + l2_block_end, + "#{withdrawals_count} MessagePassed event(s)", + :L2 + ) + + withdrawals_count_acc + withdrawals_count + end) + end + + defp fill_block_range(start_block, end_block, message_passer, json_rpc_named_arguments) do + if start_block <= end_block do + fill_block_range(start_block, end_block, message_passer, json_rpc_named_arguments, true) + fill_msg_nonce_gaps(start_block, message_passer, json_rpc_named_arguments, false) + {last_l2_block_number, _} = get_last_l2_item() + + fill_block_range( + max(start_block, last_l2_block_number), + end_block, + message_passer, + json_rpc_named_arguments, + false + ) + end + end + + defp fill_msg_nonce_gaps(start_block_l2, message_passer, json_rpc_named_arguments, scan_db \\ true) do + nonce_min = Repo.aggregate(OptimismWithdrawal, :min, :msg_nonce) + nonce_max = Repo.aggregate(OptimismWithdrawal, :max, :msg_nonce) + + with true <- !is_nil(nonce_min) and !is_nil(nonce_max), + starts = msg_nonce_gap_starts(nonce_max), + ends = msg_nonce_gap_ends(nonce_min), + min_block_l2 = l2_block_number_by_msg_nonce(nonce_min), + {new_starts, new_ends} = + if(start_block_l2 < min_block_l2, + do: {[start_block_l2 | starts], [min_block_l2 | ends]}, + else: {starts, ends} + ), + true <- Enum.count(new_starts) == Enum.count(new_ends) do + new_starts + |> Enum.zip(new_ends) + |> Enum.each(fn {l2_block_start, l2_block_end} -> + withdrawals_count = + fill_block_range(l2_block_start, l2_block_end, message_passer, json_rpc_named_arguments, scan_db) + + if withdrawals_count > 0 do + log_fill_msg_nonce_gaps(scan_db, l2_block_start, l2_block_end, withdrawals_count) + end + end) + + if scan_db do + fill_msg_nonce_gaps(start_block_l2, message_passer, json_rpc_named_arguments, false) + end + end + end + + defp get_last_l2_item do + query = + from(w in OptimismWithdrawal, + select: {w.l2_block_number, w.l2_transaction_hash}, + order_by: [desc: w.msg_nonce], + limit: 1 + ) + + query + |> Repo.one() + |> Kernel.||({0, nil}) + end + + defp log_fill_msg_nonce_gaps(scan_db, l2_block_start, l2_block_end, withdrawals_count) do + find_place = if scan_db, do: "in DB", else: "through RPC" + + Logger.info( + "Filled gaps between L2 blocks #{l2_block_start} and #{l2_block_end}. #{withdrawals_count} event(s) were found #{find_place} and written to op_withdrawals table." + ) + end + + defp l2_block_number_by_msg_nonce(nonce) do + Repo.one(from(w in OptimismWithdrawal, select: w.l2_block_number, where: w.msg_nonce == ^nonce)) + end +end diff --git a/apps/indexer/lib/indexer/fetcher/optimism/withdrawal_event.ex b/apps/indexer/lib/indexer/fetcher/optimism/withdrawal_event.ex new file mode 100644 index 000000000000..2da5504c2925 --- /dev/null +++ b/apps/indexer/lib/indexer/fetcher/optimism/withdrawal_event.ex @@ -0,0 +1,281 @@ +defmodule Indexer.Fetcher.Optimism.WithdrawalEvent do + @moduledoc """ + Fills op_withdrawal_events DB table. + """ + + use GenServer + use Indexer.Fetcher + + require Logger + + import Ecto.Query + + import EthereumJSONRPC, only: [quantity_to_integer: 1] + + alias EthereumJSONRPC.Block.ByNumber + alias EthereumJSONRPC.Blocks + alias Explorer.{Chain, Repo} + alias Explorer.Chain.Optimism.WithdrawalEvent + alias Indexer.Fetcher.{Optimism, RollupL1ReorgMonitor} + alias Indexer.Helper + + @fetcher_name :optimism_withdrawal_events + + # 32-byte signature of the event WithdrawalProven(bytes32 indexed withdrawalHash, address indexed from, address indexed to) + @withdrawal_proven_event "0x67a6208cfcc0801d50f6cbe764733f4fddf66ac0b04442061a8a8c0cb6b63f62" + + # 32-byte signature of the event WithdrawalFinalized(bytes32 indexed withdrawalHash, bool success) + @withdrawal_finalized_event "0xdb5c7652857aa163daadd670e116628fb42e869d8ac4251ef8971d9e5727df1b" + + def child_spec(start_link_arguments) do + spec = %{ + id: __MODULE__, + start: {__MODULE__, :start_link, start_link_arguments}, + restart: :transient, + type: :worker + } + + Supervisor.child_spec(spec, []) + end + + def start_link(args, gen_server_options \\ []) do + GenServer.start_link(__MODULE__, args, Keyword.put_new(gen_server_options, :name, __MODULE__)) + end + + @impl GenServer + def init(_args) do + {:ok, %{}, {:continue, :ok}} + end + + @impl GenServer + def handle_continue(:ok, _state) do + Logger.metadata(fetcher: @fetcher_name) + + env = Application.get_all_env(:indexer)[__MODULE__] + optimism_l1_portal = Application.get_all_env(:indexer)[Indexer.Fetcher.Optimism][:optimism_l1_portal] + + Optimism.init_continue(env, optimism_l1_portal, __MODULE__) + end + + @impl GenServer + def handle_info( + :continue, + %{ + contract_address: optimism_portal, + block_check_interval: block_check_interval, + start_block: start_block, + end_block: end_block, + json_rpc_named_arguments: json_rpc_named_arguments + } = state + ) do + # credo:disable-for-next-line + time_before = Timex.now() + + chunks_number = ceil((end_block - start_block + 1) / Optimism.get_logs_range_size()) + chunk_range = Range.new(0, max(chunks_number - 1, 0), 1) + + last_written_block = + chunk_range + |> Enum.reduce_while(start_block - 1, fn current_chunk, _ -> + chunk_start = start_block + Optimism.get_logs_range_size() * current_chunk + chunk_end = min(chunk_start + Optimism.get_logs_range_size() - 1, end_block) + + if chunk_end >= chunk_start do + Helper.log_blocks_chunk_handling(chunk_start, chunk_end, start_block, end_block, nil, :L1) + + {:ok, result} = + Optimism.get_logs( + chunk_start, + chunk_end, + optimism_portal, + [@withdrawal_proven_event, @withdrawal_finalized_event], + json_rpc_named_arguments, + Helper.infinite_retries_number() + ) + + withdrawal_events = prepare_events(result, json_rpc_named_arguments) + + {:ok, _} = + Chain.import(%{ + optimism_withdrawal_events: %{params: withdrawal_events}, + timeout: :infinity + }) + + Helper.log_blocks_chunk_handling( + chunk_start, + chunk_end, + start_block, + end_block, + "#{Enum.count(withdrawal_events)} WithdrawalProven/WithdrawalFinalized event(s)", + :L1 + ) + end + + reorg_block = RollupL1ReorgMonitor.reorg_block_pop(__MODULE__) + + if !is_nil(reorg_block) && reorg_block > 0 do + {deleted_count, _} = Repo.delete_all(from(we in WithdrawalEvent, where: we.l1_block_number >= ^reorg_block)) + + log_deleted_rows_count(reorg_block, deleted_count) + + {:halt, if(reorg_block <= chunk_end, do: reorg_block - 1, else: chunk_end)} + else + {:cont, chunk_end} + end + end) + + new_start_block = last_written_block + 1 + + {:ok, new_end_block} = + Optimism.get_block_number_by_tag("latest", json_rpc_named_arguments, Helper.infinite_retries_number()) + + delay = + if new_end_block == last_written_block do + # there is no new block, so wait for some time to let the chain issue the new block + max(block_check_interval - Timex.diff(Timex.now(), time_before, :milliseconds), 0) + else + 0 + end + + Process.send_after(self(), :continue, delay) + + {:noreply, %{state | start_block: new_start_block, end_block: new_end_block}} + end + + @impl GenServer + def handle_info({ref, _result}, state) do + Process.demonitor(ref, [:flush]) + {:noreply, state} + end + + defp log_deleted_rows_count(reorg_block, count) do + if count > 0 do + Logger.warning( + "As L1 reorg was detected, all rows with l1_block_number >= #{reorg_block} were removed from the op_withdrawal_events table. Number of removed rows: #{count}." + ) + end + end + + defp get_transaction_input_by_hash(blocks, tx_hashes) do + Enum.reduce(blocks, %{}, fn block, acc -> + block + |> Map.get("transactions", []) + |> Enum.filter(fn tx -> + Enum.member?(tx_hashes, tx["hash"]) + end) + |> Enum.map(fn tx -> + {tx["hash"], tx["input"]} + end) + |> Enum.into(%{}) + |> Map.merge(acc) + end) + end + + defp prepare_events(events, json_rpc_named_arguments) do + blocks = + events + |> get_blocks_by_events(json_rpc_named_arguments, Helper.infinite_retries_number()) + + tx_hashes = + events + |> Enum.reduce([], fn event, acc -> + if Enum.at(event["topics"], 0) == @withdrawal_proven_event do + [event["transactionHash"] | acc] + else + acc + end + end) + + input_by_hash = get_transaction_input_by_hash(blocks, tx_hashes) + + timestamps = + blocks + |> Enum.reduce(%{}, fn block, acc -> + block_number = quantity_to_integer(Map.get(block, "number")) + {:ok, timestamp} = DateTime.from_unix(quantity_to_integer(Map.get(block, "timestamp"))) + Map.put(acc, block_number, timestamp) + end) + + Enum.map(events, fn event -> + tx_hash = event["transactionHash"] + + {l1_event_type, game_index} = + if Enum.at(event["topics"], 0) == @withdrawal_proven_event do + game_index = + input_by_hash + |> Map.get(tx_hash) + |> input_to_game_index() + + {"WithdrawalProven", game_index} + else + {"WithdrawalFinalized", nil} + end + + l1_block_number = quantity_to_integer(event["blockNumber"]) + + %{ + withdrawal_hash: Enum.at(event["topics"], 1), + l1_event_type: l1_event_type, + l1_timestamp: Map.get(timestamps, l1_block_number), + l1_transaction_hash: tx_hash, + l1_block_number: l1_block_number, + game_index: game_index + } + end) + end + + def get_last_l1_item do + query = + from(we in WithdrawalEvent, + select: {we.l1_block_number, we.l1_transaction_hash}, + order_by: [desc: we.l1_timestamp], + limit: 1 + ) + + query + |> Repo.one() + |> Kernel.||({0, nil}) + end + + defp get_blocks_by_events(events, json_rpc_named_arguments, retries) do + request = + events + |> Enum.reduce(%{}, fn event, acc -> + Map.put(acc, event["blockNumber"], 0) + end) + |> Stream.map(fn {block_number, _} -> %{number: block_number} end) + |> Stream.with_index() + |> Enum.into(%{}, fn {params, id} -> {id, params} end) + |> Blocks.requests(&ByNumber.request(&1, true, false)) + + error_message = &"Cannot fetch blocks with batch request. Error: #{inspect(&1)}. Request: #{inspect(request)}" + + case Optimism.repeated_request(request, error_message, json_rpc_named_arguments, retries) do + {:ok, results} -> Enum.map(results, fn %{result: result} -> result end) + {:error, _} -> [] + end + end + + defp input_to_game_index(input) do + method_signature = String.slice(input, 0..9) + + if method_signature == "0x4870496f" do + # the signature of `proveWithdrawalTransaction(tuple _tx, uint256 _disputeGameIndex, tuple _outputRootProof, bytes[] _withdrawalProof)` method + + # to get (slice) `_disputeGameIndex` from the tx input, we need to know its offset in the input string (represented as 0x...): + # offset = 10 symbols of signature (incl. `0x` prefix) + 64 symbols (representing 32 bytes) of the `_tx` tuple offset, totally is 74 + game_index_offset = String.length(method_signature) + 32 * 2 + game_index_length = 32 * 2 + + game_index_range_start = game_index_offset + game_index_range_end = game_index_range_start + game_index_length - 1 + + {game_index, ""} = + input + |> String.slice(game_index_range_start..game_index_range_end) + |> Integer.parse(16) + + game_index + end + end +end diff --git a/apps/indexer/lib/indexer/fetcher/pending_transaction.ex b/apps/indexer/lib/indexer/fetcher/pending_transaction.ex index 946ce0ea28a9..7ac5628efbec 100644 --- a/apps/indexer/lib/indexer/fetcher/pending_transaction.ex +++ b/apps/indexer/lib/indexer/fetcher/pending_transaction.ex @@ -166,7 +166,7 @@ defmodule Indexer.Fetcher.PendingTransaction do defp import_chunk(transactions_params) do addresses_params = Addresses.extract_addresses(%{transactions: transactions_params}, pending: true) - # There's no need to queue up fetching the address balance since theses are pending transactions and cannot have + # There's no need to queue up fetching the address balance since these are pending transactions and cannot have # affected the address balance yet since address balance is a balance at a given block and these transactions are # blockless. case Chain.import(%{ diff --git a/apps/indexer/lib/indexer/fetcher/polygon_edge.ex b/apps/indexer/lib/indexer/fetcher/polygon_edge.ex index ee1fe71ddb62..00196467bac8 100644 --- a/apps/indexer/lib/indexer/fetcher/polygon_edge.ex +++ b/apps/indexer/lib/indexer/fetcher/polygon_edge.ex @@ -67,7 +67,11 @@ defmodule Indexer.Fetcher.PolygonEdge do {:start_block_l1_valid, start_block_l1 <= last_l1_block_number || last_l1_block_number == 0}, json_rpc_named_arguments = json_rpc_named_arguments(polygon_edge_l1_rpc), {:ok, last_l1_tx} <- - Helper.get_transaction_by_hash(last_l1_transaction_hash, json_rpc_named_arguments, 100_000_000), + Helper.get_transaction_by_hash( + last_l1_transaction_hash, + json_rpc_named_arguments, + Helper.infinite_retries_number() + ), {:l1_tx_not_found, false} <- {:l1_tx_not_found, !is_nil(last_l1_transaction_hash) && is_nil(last_l1_tx)}, {:ok, block_check_interval, last_safe_block} <- Helper.get_block_check_interval(json_rpc_named_arguments) do @@ -144,7 +148,11 @@ defmodule Indexer.Fetcher.PolygonEdge do {:start_block_l2_valid, (start_block_l2 <= last_l2_block_number || last_l2_block_number == 0) && start_block_l2 <= safe_block}, {:ok, last_l2_tx} <- - Helper.get_transaction_by_hash(last_l2_transaction_hash, json_rpc_named_arguments, 100_000_000), + Helper.get_transaction_by_hash( + last_l2_transaction_hash, + json_rpc_named_arguments, + Helper.infinite_retries_number() + ), {:l2_tx_not_found, false} <- {:l2_tx_not_found, !is_nil(last_l2_transaction_hash) && is_nil(last_l2_tx)} do Process.send(pid, :continue, []) @@ -217,7 +225,7 @@ defmodule Indexer.Fetcher.PolygonEdge do chunk_end = min(chunk_start + eth_get_logs_range_size - 1, end_block) if chunk_end >= chunk_start do - Helper.log_blocks_chunk_handling(chunk_start, chunk_end, start_block, end_block, nil, "L1") + Helper.log_blocks_chunk_handling(chunk_start, chunk_end, start_block, end_block, nil, :L1) {:ok, result} = get_logs( @@ -226,7 +234,7 @@ defmodule Indexer.Fetcher.PolygonEdge do contract_address, event_signature, json_rpc_named_arguments, - 100_000_000 + Helper.infinite_retries_number() ) {events, event_name} = @@ -240,7 +248,7 @@ defmodule Indexer.Fetcher.PolygonEdge do start_block, end_block, "#{Enum.count(events)} #{event_name} event(s)", - "L1" + :L1 ) end @@ -248,7 +256,9 @@ defmodule Indexer.Fetcher.PolygonEdge do end) new_start_block = last_written_block + 1 - {:ok, new_end_block} = Helper.get_block_number_by_tag("latest", json_rpc_named_arguments, 100_000_000) + + {:ok, new_end_block} = + Helper.get_block_number_by_tag("latest", json_rpc_named_arguments, Helper.infinite_retries_number()) delay = if new_end_block == last_written_block do @@ -298,7 +308,7 @@ defmodule Indexer.Fetcher.PolygonEdge do min(chunk_start + eth_get_logs_range_size - 1, l2_block_end) end - Helper.log_blocks_chunk_handling(chunk_start, chunk_end, l2_block_start, l2_block_end, nil, "L2") + Helper.log_blocks_chunk_handling(chunk_start, chunk_end, l2_block_start, l2_block_end, nil, :L2) count = calling_module.find_and_save_entities( @@ -322,36 +332,38 @@ defmodule Indexer.Fetcher.PolygonEdge do l2_block_start, l2_block_end, "#{count} #{event_name} event(s)", - "L2" + :L2 ) count_acc + count end) end - @spec fill_block_range(integer(), integer(), {module(), module()}, binary(), list()) :: integer() + @spec fill_block_range(integer(), integer(), {module(), module()}, binary(), list()) :: any() def fill_block_range(start_block, end_block, {module, table}, contract_address, json_rpc_named_arguments) do - fill_block_range(start_block, end_block, module, contract_address, json_rpc_named_arguments, true) - - fill_msg_id_gaps( - start_block, - table, - module, - contract_address, - json_rpc_named_arguments, - false - ) + if start_block <= end_block do + fill_block_range(start_block, end_block, module, contract_address, json_rpc_named_arguments, true) - {last_l2_block_number, _} = get_last_l2_item(table) + fill_msg_id_gaps( + start_block, + table, + module, + contract_address, + json_rpc_named_arguments, + false + ) - fill_block_range( - max(start_block, last_l2_block_number), - end_block, - module, - contract_address, - json_rpc_named_arguments, - false - ) + {last_l2_block_number, _} = get_last_l2_item(table) + + fill_block_range( + max(start_block, last_l2_block_number), + end_block, + module, + contract_address, + json_rpc_named_arguments, + false + ) + end end @spec fill_msg_id_gaps(integer(), module(), module(), binary(), list(), boolean()) :: no_return() @@ -488,7 +500,9 @@ defmodule Indexer.Fetcher.PolygonEdge do {safe_block, false} {:error, :not_found} -> - {:ok, latest_block} = Helper.get_block_number_by_tag("latest", json_rpc_named_arguments, 100_000_000) + {:ok, latest_block} = + Helper.get_block_number_by_tag("latest", json_rpc_named_arguments, Helper.infinite_retries_number()) + {latest_block, true} end end @@ -573,7 +587,7 @@ defmodule Indexer.Fetcher.PolygonEdge do defp import_events(events, calling_module) do # here we explicitly check CHAIN_TYPE as Dialyzer throws an error otherwise {import_data, event_name} = - case System.get_env("CHAIN_TYPE") == "polygon_edge" && calling_module do + case Application.get_env(:explorer, :chain_type) == :polygon_edge && calling_module do Deposit -> {%{polygon_edge_deposits: %{params: events}, timeout: :infinity}, "StateSynced"} diff --git a/apps/indexer/lib/indexer/fetcher/polygon_edge/deposit.ex b/apps/indexer/lib/indexer/fetcher/polygon_edge/deposit.ex index 642e1951cacc..556acfd892a6 100644 --- a/apps/indexer/lib/indexer/fetcher/polygon_edge/deposit.ex +++ b/apps/indexer/lib/indexer/fetcher/polygon_edge/deposit.ex @@ -18,6 +18,7 @@ defmodule Indexer.Fetcher.PolygonEdge.Deposit do alias EthereumJSONRPC.Blocks alias Explorer.Chain.PolygonEdge.Deposit alias Indexer.Fetcher.PolygonEdge + alias Indexer.Helper @fetcher_name :polygon_edge_deposit @@ -123,7 +124,7 @@ defmodule Indexer.Fetcher.PolygonEdge.Deposit do defp get_timestamps_by_events(events, json_rpc_named_arguments) do events - |> get_blocks_by_events(json_rpc_named_arguments, 100_000_000) + |> get_blocks_by_events(json_rpc_named_arguments, Helper.infinite_retries_number()) |> Enum.reduce(%{}, fn block, acc -> block_number = quantity_to_integer(Map.get(block, "number")) {:ok, timestamp} = DateTime.from_unix(quantity_to_integer(Map.get(block, "timestamp"))) diff --git a/apps/indexer/lib/indexer/fetcher/polygon_edge/deposit_execute.ex b/apps/indexer/lib/indexer/fetcher/polygon_edge/deposit_execute.ex index 82a8a2d7ed2f..c7167748369f 100644 --- a/apps/indexer/lib/indexer/fetcher/polygon_edge/deposit_execute.ex +++ b/apps/indexer/lib/indexer/fetcher/polygon_edge/deposit_execute.ex @@ -105,7 +105,8 @@ defmodule Indexer.Fetcher.PolygonEdge.DepositExecute do if not safe_block_is_latest do # find and fill all events between "safe" and "latest" block (excluding "safe") - {:ok, latest_block} = Helper.get_block_number_by_tag("latest", json_rpc_named_arguments, 100_000_000) + {:ok, latest_block} = + Helper.get_block_number_by_tag("latest", json_rpc_named_arguments, Helper.infinite_retries_number()) fill_block_range( safe_block + 1, @@ -181,7 +182,7 @@ defmodule Indexer.Fetcher.PolygonEdge.DepositExecute do state_receiver, @state_sync_result_event, json_rpc_named_arguments, - 100_000_000 + Helper.infinite_retries_number() ) Enum.map(result, fn event -> @@ -196,7 +197,7 @@ defmodule Indexer.Fetcher.PolygonEdge.DepositExecute do # here we explicitly check CHAIN_TYPE as Dialyzer throws an error otherwise import_options = - if System.get_env("CHAIN_TYPE") == "polygon_edge" do + if Application.get_env(:explorer, :chain_type) == :polygon_edge do %{ polygon_edge_deposit_executes: %{params: executes}, timeout: :infinity diff --git a/apps/indexer/lib/indexer/fetcher/polygon_edge/withdrawal.ex b/apps/indexer/lib/indexer/fetcher/polygon_edge/withdrawal.ex index c952d51618f2..c629b1df3343 100644 --- a/apps/indexer/lib/indexer/fetcher/polygon_edge/withdrawal.ex +++ b/apps/indexer/lib/indexer/fetcher/polygon_edge/withdrawal.ex @@ -110,7 +110,8 @@ defmodule Indexer.Fetcher.PolygonEdge.Withdrawal do if not safe_block_is_latest do # find and fill all events between "safe" and "latest" block (excluding "safe") - {:ok, latest_block} = Helper.get_block_number_by_tag("latest", json_rpc_named_arguments, 100_000_000) + {:ok, latest_block} = + Helper.get_block_number_by_tag("latest", json_rpc_named_arguments, Helper.infinite_retries_number()) fill_block_range( safe_block + 1, @@ -196,7 +197,7 @@ defmodule Indexer.Fetcher.PolygonEdge.Withdrawal do state_sender, @l2_state_synced_event, json_rpc_named_arguments, - 100_000_000 + Helper.infinite_retries_number() ) Enum.map(result, fn event -> @@ -211,7 +212,7 @@ defmodule Indexer.Fetcher.PolygonEdge.Withdrawal do # here we explicitly check CHAIN_TYPE as Dialyzer throws an error otherwise import_options = - if System.get_env("CHAIN_TYPE") == "polygon_edge" do + if Application.get_env(:explorer, :chain_type) == :polygon_edge do %{ polygon_edge_withdrawals: %{params: withdrawals}, timeout: :infinity diff --git a/apps/indexer/lib/indexer/fetcher/polygon_zkevm/bridge.ex b/apps/indexer/lib/indexer/fetcher/polygon_zkevm/bridge.ex index b38807a5d5b4..17c77dc98b5b 100644 --- a/apps/indexer/lib/indexer/fetcher/polygon_zkevm/bridge.ex +++ b/apps/indexer/lib/indexer/fetcher/polygon_zkevm/bridge.ex @@ -30,8 +30,12 @@ defmodule Indexer.Fetcher.PolygonZkevm.Bridge do @bridge_event_params [{:uint, 8}, {:uint, 32}, :address, {:uint, 32}, :address, {:uint, 256}, :bytes, {:uint, 32}] # 32-byte signature of the event ClaimEvent(uint32 index, uint32 originNetwork, address originAddress, address destinationAddress, uint256 amount) - @claim_event "0x25308c93ceeed162da955b3f7ce3e3f93606579e40fb92029faa9efe27545983" - @claim_event_params [{:uint, 32}, {:uint, 32}, :address, :address, {:uint, 256}] + @claim_event_v1 "0x25308c93ceeed162da955b3f7ce3e3f93606579e40fb92029faa9efe27545983" + @claim_event_v1_params [{:uint, 32}, {:uint, 32}, :address, :address, {:uint, 256}] + + # 32-byte signature of the event ClaimEvent(uint256 globalIndex, uint32 originNetwork, address originAddress, address destinationAddress, uint256 amount) + @claim_event_v2 "0x1df3f2a973a00d6635911755c260704e95e8a5876997546798770f76396fda4d" + @claim_event_v2_params [{:uint, 256}, {:uint, 32}, :address, :address, {:uint, 256}] @symbol_method_selector "95d89b41" @decimals_method_selector "313ce567" @@ -65,7 +69,7 @@ defmodule Indexer.Fetcher.PolygonZkevm.Bridge do def filter_bridge_events(events, bridge_contract) do Enum.filter(events, fn event -> Helper.address_hash_to_string(event.address_hash, true) == bridge_contract and - Enum.member?([@bridge_event, @claim_event], Helper.log_topic_to_string(event.first_topic)) + Enum.member?([@bridge_event, @claim_event_v1, @claim_event_v2], Helper.log_topic_to_string(event.first_topic)) end) end @@ -80,7 +84,7 @@ defmodule Indexer.Fetcher.PolygonZkevm.Bridge do chunk_start, chunk_end, bridge_contract, - [[@bridge_event, @claim_event]], + [[@bridge_event, @claim_event_v1, @claim_event_v2]], json_rpc_named_arguments ) @@ -134,60 +138,82 @@ defmodule Indexer.Fetcher.PolygonZkevm.Bridge do Converts the list of zkEVM bridge events to the list of operations preparing them for importing to the database. """ - @spec prepare_operations(list(), list() | nil, list(), map() | nil) :: list() - def prepare_operations(events, json_rpc_named_arguments, json_rpc_named_arguments_l1, block_to_timestamp \\ nil) do + @spec prepare_operations( + list(), + non_neg_integer(), + non_neg_integer(), + non_neg_integer() | nil, + non_neg_integer(), + list() | nil, + list(), + map() | nil + ) :: + list() + def prepare_operations( + events, + rollup_network_id_l1, + rollup_network_id_l2, + rollup_index_l1, + rollup_index_l2, + json_rpc_named_arguments, + json_rpc_named_arguments_l1, + block_to_timestamp \\ nil + ) do + is_l1 = json_rpc_named_arguments == json_rpc_named_arguments_l1 + + events = filter_events(events, is_l1, rollup_network_id_l1, rollup_network_id_l2, rollup_index_l1, rollup_index_l2) + {block_to_timestamp, token_address_to_id} = if is_nil(block_to_timestamp) do + # this function is called by the catchup indexer, + # so here we can use RPC calls as it's not so critical for delays as in realtime bridge_events = Enum.filter(events, fn event -> event.first_topic == @bridge_event end) - - l1_token_addresses = - bridge_events - |> Enum.reduce(%MapSet{}, fn event, acc -> - case bridge_event_parse(event) do - {{nil, _}, _, _} -> acc - {{token_address, nil}, _, _} -> MapSet.put(acc, token_address) - end - end) - |> MapSet.to_list() + l1_token_addresses = l1_token_addresses_from_bridge_events(bridge_events, rollup_network_id_l2) { blocks_to_timestamps(bridge_events, json_rpc_named_arguments), token_addresses_to_ids(l1_token_addresses, json_rpc_named_arguments_l1) } else - # this is called in realtime + # this function is called in realtime by the transformer, + # so we don't use RPC calls to avoid delays and fetch token data + # in a separate fetcher {block_to_timestamp, %{}} end - Enum.map(events, fn event -> + events + |> Enum.map(fn event -> {index, l1_token_id, l1_token_address, l2_token_address, amount, block_number, block_timestamp} = - if event.first_topic == @bridge_event do - { - {l1_token_address, l2_token_address}, - amount, - deposit_count - } = bridge_event_parse(event) - - l1_token_id = Map.get(token_address_to_id, l1_token_address) - block_number = quantity_to_integer(event.block_number) - block_timestamp = Map.get(block_to_timestamp, block_number) - - # credo:disable-for-lines:2 Credo.Check.Refactor.Nesting - l1_token_address = - if is_nil(l1_token_id) do - l1_token_address - end - - {deposit_count, l1_token_id, l1_token_address, l2_token_address, amount, block_number, block_timestamp} - else - [index, _origin_network, _origin_address, _destination_address, amount] = - decode_data(event.data, @claim_event_params) - - {index, nil, nil, nil, amount, nil, nil} + case event.first_topic do + @bridge_event -> + { + {l1_token_address, l2_token_address}, + amount, + deposit_count, + _destination_network + } = bridge_event_parse(event, rollup_network_id_l2) + + l1_token_id = Map.get(token_address_to_id, l1_token_address) + block_number = quantity_to_integer(event.block_number) + block_timestamp = Map.get(block_to_timestamp, block_number) + + # credo:disable-for-lines:2 Credo.Check.Refactor.Nesting + l1_token_address = + if is_nil(l1_token_id) do + l1_token_address + end + + {deposit_count, l1_token_id, l1_token_address, l2_token_address, amount, block_number, block_timestamp} + + @claim_event_v1 -> + {index, amount} = claim_event_v1_parse(event) + {index, nil, nil, nil, amount, nil, nil} + + @claim_event_v2 -> + {_mainnet_bit, _rollup_idx, index, _origin_network, amount} = claim_event_v2_parse(event) + {index, nil, nil, nil, amount, nil, nil} end - is_l1 = json_rpc_named_arguments == json_rpc_named_arguments_l1 - result = %{ type: operation_type(event.first_topic, is_l1), index: index, @@ -221,19 +247,98 @@ defmodule Indexer.Fetcher.PolygonZkevm.Bridge do end) end - defp bridge_event_parse(event) do + defp bridge_event_parse(event, rollup_network_id_l2) do [ leaf_type, origin_network, origin_address, - _destination_network, + destination_network, _destination_address, amount, _metadata, deposit_count ] = decode_data(event.data, @bridge_event_params) - {token_address_by_origin_address(origin_address, origin_network, leaf_type), amount, deposit_count} + {token_address_by_origin_address(origin_address, origin_network, leaf_type, rollup_network_id_l2), amount, + deposit_count, destination_network} + end + + defp claim_event_v1_parse(event) do + [index, _origin_network, _origin_address, _destination_address, amount] = + decode_data(event.data, @claim_event_v1_params) + + {index, amount} + end + + defp claim_event_v2_parse(event) do + [global_index, origin_network, _origin_address, _destination_address, amount] = + decode_data(event.data, @claim_event_v2_params) + + mainnet_bit = Bitwise.band(Bitwise.bsr(global_index, 64), 1) + + bitmask_4bytes = 0xFFFFFFFF + + rollup_index = Bitwise.band(Bitwise.bsr(global_index, 32), bitmask_4bytes) + + index = Bitwise.band(global_index, bitmask_4bytes) + + {mainnet_bit, rollup_index, index, origin_network, amount} + end + + defp filter_events(events, is_l1, rollup_network_id_l1, rollup_network_id_l2, rollup_index_l1, rollup_index_l2) do + Enum.filter(events, fn event -> + case {event.first_topic, is_l1} do + {@bridge_event, true} -> filter_bridge_event_l1(event, rollup_network_id_l2) + {@bridge_event, false} -> filter_bridge_event_l2(event, rollup_network_id_l1, rollup_network_id_l2) + {@claim_event_v2, true} -> filter_claim_event_l1(event, rollup_index_l2) + {@claim_event_v2, false} -> filter_claim_event_l2(event, rollup_network_id_l1, rollup_index_l1) + _ -> true + end + end) + end + + defp filter_bridge_event_l1(event, rollup_network_id_l2) do + {_, _, _, destination_network} = bridge_event_parse(event, rollup_network_id_l2) + # skip the Deposit event if it's for another rollup + destination_network == rollup_network_id_l2 + end + + defp filter_bridge_event_l2(event, rollup_network_id_l1, rollup_network_id_l2) do + {_, _, _, destination_network} = bridge_event_parse(event, rollup_network_id_l2) + # skip the Withdrawal event if it's for another L1 chain + destination_network == rollup_network_id_l1 + end + + defp filter_claim_event_l1(event, rollup_index_l2) do + {mainnet_bit, rollup_idx, _index, _origin_network, _amount} = claim_event_v2_parse(event) + + if mainnet_bit != 0 do + Logger.error( + "L1 ClaimEvent has non-zero mainnet bit in the transaction #{event.transaction_hash}. This event will be ignored." + ) + end + + # skip the Withdrawal event if it's for another rollup or the source network is Ethereum Mainnet + rollup_idx == rollup_index_l2 and mainnet_bit == 0 + end + + defp filter_claim_event_l2(event, rollup_network_id_l1, rollup_index_l1) do + {mainnet_bit, rollup_idx, _index, origin_network, _amount} = claim_event_v2_parse(event) + + # skip the Deposit event if it's from another L1 chain + (mainnet_bit == 1 and rollup_network_id_l1 == 0) or + (mainnet_bit == 0 and (rollup_idx == rollup_index_l1 or origin_network == rollup_network_id_l1)) + end + + defp l1_token_addresses_from_bridge_events(events, rollup_network_id_l2) do + events + |> Enum.reduce(%MapSet{}, fn event, acc -> + case bridge_event_parse(event, rollup_network_id_l2) do + {{nil, _}, _, _, _} -> acc + {{token_address, nil}, _, _, _} -> MapSet.put(acc, token_address) + end + end) + |> MapSet.to_list() end defp operation_type(first_topic, is_l1) do @@ -291,11 +396,11 @@ defmodule Indexer.Fetcher.PolygonZkevm.Bridge do |> Map.merge(tokens_inserted_outside) end - defp token_address_by_origin_address(origin_address, origin_network, leaf_type) do - with true <- leaf_type != 1 and origin_network <= 1, + defp token_address_by_origin_address(origin_address, origin_network, leaf_type, rollup_network_id_l2) do + with true <- leaf_type != 1, token_address = "0x" <> Base.encode16(origin_address, case: :lower), true <- token_address != burn_address_hash_string() do - if origin_network == 0 do + if origin_network != rollup_network_id_l2 do # this is L1 address {token_address, nil} else @@ -352,7 +457,7 @@ defmodule Indexer.Fetcher.PolygonZkevm.Bridge do {responses, error_messages} = read_contracts_with_retries(requests, @erc20_abi, json_rpc_named_arguments, 3) - if !Enum.empty?(error_messages) or Enum.count(requests) != Enum.count(responses) do + if not Enum.empty?(error_messages) or Enum.count(requests) != Enum.count(responses) do Logger.warning( "Cannot read symbol and decimals of an ERC-20 token contract. Error messages: #{Enum.join(error_messages, ", ")}. Addresses: #{Enum.join(token_addresses, ", ")}" ) @@ -392,7 +497,7 @@ defmodule Indexer.Fetcher.PolygonZkevm.Bridge do if atomized_key(request.method_id) == :symbol do Map.put(data, :symbol, response) else - Map.put(data, :decimals, response) + Map.put(data, :decimals, Reader.sanitize_decimals(response)) end end diff --git a/apps/indexer/lib/indexer/fetcher/polygon_zkevm/bridge_l1.ex b/apps/indexer/lib/indexer/fetcher/polygon_zkevm/bridge_l1.ex index cd7fe24344f8..6e01b28d4379 100644 --- a/apps/indexer/lib/indexer/fetcher/polygon_zkevm/bridge_l1.ex +++ b/apps/indexer/lib/indexer/fetcher/polygon_zkevm/bridge_l1.ex @@ -12,7 +12,7 @@ defmodule Indexer.Fetcher.PolygonZkevm.BridgeL1 do import Explorer.Helper, only: [parse_integer: 1] import Indexer.Fetcher.PolygonZkevm.Bridge, - only: [get_logs_all: 3, import_operations: 1, prepare_operations: 3] + only: [get_logs_all: 3, import_operations: 1, prepare_operations: 7] alias Explorer.Chain.PolygonZkevm.{Bridge, Reader} alias Explorer.Repo @@ -53,11 +53,18 @@ defmodule Indexer.Fetcher.PolygonZkevm.BridgeL1 do @impl GenServer def handle_info(:init_with_delay, _state) do env = Application.get_all_env(:indexer)[__MODULE__] + env_l2 = Application.get_all_env(:indexer)[Indexer.Fetcher.PolygonZkevm.BridgeL2] with {:start_block_undefined, false} <- {:start_block_undefined, is_nil(env[:start_block])}, {:reorg_monitor_started, true} <- {:reorg_monitor_started, !is_nil(Process.whereis(RollupL1ReorgMonitor))}, rpc = env[:rpc], {:rpc_undefined, false} <- {:rpc_undefined, is_nil(rpc)}, + {:rollup_network_id_l1_is_valid, true} <- + {:rollup_network_id_l1_is_valid, !is_nil(env[:rollup_network_id_l1]) and env[:rollup_network_id_l1] >= 0}, + {:rollup_network_id_l2_is_valid, true} <- + {:rollup_network_id_l2_is_valid, + !is_nil(env_l2[:rollup_network_id_l2]) and env_l2[:rollup_network_id_l2] > 0}, + {:rollup_index_l2_undefined, false} <- {:rollup_index_l2_undefined, is_nil(env_l2[:rollup_index_l2])}, {:bridge_contract_address_is_valid, true} <- {:bridge_contract_address_is_valid, Helper.address_correct?(env[:bridge_contract])}, start_block = parse_integer(env[:start_block]), @@ -80,7 +87,11 @@ defmodule Indexer.Fetcher.PolygonZkevm.BridgeL1 do bridge_contract: env[:bridge_contract], json_rpc_named_arguments: json_rpc_named_arguments, end_block: safe_block, - start_block: max(start_block, last_l1_block_number) + start_block: max(start_block, last_l1_block_number), + rollup_network_id_l1: env[:rollup_network_id_l1], + rollup_network_id_l2: env_l2[:rollup_network_id_l2], + rollup_index_l1: env[:rollup_index_l1], + rollup_index_l2: env_l2[:rollup_index_l2] }} else {:start_block_undefined, true} -> @@ -95,6 +106,27 @@ defmodule Indexer.Fetcher.PolygonZkevm.BridgeL1 do Logger.error("L1 RPC URL is not defined.") {:stop, :normal, %{}} + {:rollup_network_id_l1_is_valid, false} -> + Logger.error( + "Invalid network ID for L1. Please, check INDEXER_POLYGON_ZKEVM_L1_BRIDGE_NETWORK_ID env variable." + ) + + {:stop, :normal, %{}} + + {:rollup_network_id_l2_is_valid, false} -> + Logger.error( + "Invalid network ID for L2. Please, check INDEXER_POLYGON_ZKEVM_L2_BRIDGE_NETWORK_ID env variable." + ) + + {:stop, :normal, %{}} + + {:rollup_index_l2_undefined, true} -> + Logger.error( + "Rollup index is undefined for L2. Please, check INDEXER_POLYGON_ZKEVM_L2_BRIDGE_ROLLUP_INDEX env variable." + ) + + {:stop, :normal, %{}} + {:bridge_contract_address_is_valid, false} -> Logger.error("PolygonZkEVMBridge contract address is invalid or not defined.") {:stop, :normal, %{}} @@ -133,7 +165,11 @@ defmodule Indexer.Fetcher.PolygonZkevm.BridgeL1 do block_check_interval: block_check_interval, start_block: start_block, end_block: end_block, - json_rpc_named_arguments: json_rpc_named_arguments + json_rpc_named_arguments: json_rpc_named_arguments, + rollup_network_id_l1: rollup_network_id_l1, + rollup_network_id_l2: rollup_network_id_l2, + rollup_index_l1: rollup_index_l1, + rollup_index_l2: rollup_index_l2 } = state ) do time_before = Timex.now() @@ -146,12 +182,19 @@ defmodule Indexer.Fetcher.PolygonZkevm.BridgeL1 do chunk_end = List.last(current_chunk) if chunk_start <= chunk_end do - Helper.log_blocks_chunk_handling(chunk_start, chunk_end, start_block, end_block, nil, "L1") + Helper.log_blocks_chunk_handling(chunk_start, chunk_end, start_block, end_block, nil, :L1) operations = {chunk_start, chunk_end} |> get_logs_all(bridge_contract, json_rpc_named_arguments) - |> prepare_operations(json_rpc_named_arguments, json_rpc_named_arguments) + |> prepare_operations( + rollup_network_id_l1, + rollup_network_id_l2, + rollup_index_l1, + rollup_index_l2, + json_rpc_named_arguments, + json_rpc_named_arguments + ) import_operations(operations) @@ -161,7 +204,7 @@ defmodule Indexer.Fetcher.PolygonZkevm.BridgeL1 do start_block, end_block, "#{Enum.count(operations)} L1 operation(s)", - "L1" + :L1 ) end diff --git a/apps/indexer/lib/indexer/fetcher/polygon_zkevm/bridge_l2.ex b/apps/indexer/lib/indexer/fetcher/polygon_zkevm/bridge_l2.ex index f8d7695cd91a..66bdba42d4a2 100644 --- a/apps/indexer/lib/indexer/fetcher/polygon_zkevm/bridge_l2.ex +++ b/apps/indexer/lib/indexer/fetcher/polygon_zkevm/bridge_l2.ex @@ -12,10 +12,11 @@ defmodule Indexer.Fetcher.PolygonZkevm.BridgeL2 do import Explorer.Helper, only: [parse_integer: 1] import Indexer.Fetcher.PolygonZkevm.Bridge, - only: [get_logs_all: 3, import_operations: 1, prepare_operations: 3] + only: [get_logs_all: 3, import_operations: 1, prepare_operations: 7] alias Explorer.Chain.PolygonZkevm.{Bridge, Reader} alias Explorer.Repo + alias Indexer.Fetcher.PolygonZkevm.BridgeL1 alias Indexer.Helper @eth_get_logs_range_size 1000 @@ -53,10 +54,17 @@ defmodule Indexer.Fetcher.PolygonZkevm.BridgeL2 do @impl GenServer def handle_info(:init_with_delay, %{json_rpc_named_arguments: json_rpc_named_arguments} = state) do env = Application.get_all_env(:indexer)[__MODULE__] + env_l1 = Application.get_all_env(:indexer)[BridgeL1] with {:start_block_undefined, false} <- {:start_block_undefined, is_nil(env[:start_block])}, - rpc_l1 = Application.get_all_env(:indexer)[Indexer.Fetcher.PolygonZkevm.BridgeL1][:rpc], + rpc_l1 = env_l1[:rpc], {:rpc_l1_undefined, false} <- {:rpc_l1_undefined, is_nil(rpc_l1)}, + {:rollup_network_id_l1_is_valid, true} <- + {:rollup_network_id_l1_is_valid, + !is_nil(env_l1[:rollup_network_id_l1]) and env_l1[:rollup_network_id_l1] >= 0}, + {:rollup_network_id_l2_is_valid, true} <- + {:rollup_network_id_l2_is_valid, !is_nil(env[:rollup_network_id_l2]) and env[:rollup_network_id_l2] > 0}, + {:rollup_index_l2_undefined, false} <- {:rollup_index_l2_undefined, is_nil(env[:rollup_index_l2])}, {:bridge_contract_address_is_valid, true} <- {:bridge_contract_address_is_valid, Helper.address_correct?(env[:bridge_contract])}, start_block = parse_integer(env[:start_block]), @@ -77,7 +85,11 @@ defmodule Indexer.Fetcher.PolygonZkevm.BridgeL2 do json_rpc_named_arguments: json_rpc_named_arguments, json_rpc_named_arguments_l1: Helper.json_rpc_named_arguments(rpc_l1), end_block: latest_block, - start_block: max(start_block, last_l2_block_number) + start_block: max(start_block, last_l2_block_number), + rollup_network_id_l1: env_l1[:rollup_network_id_l1], + rollup_network_id_l2: env[:rollup_network_id_l2], + rollup_index_l1: env_l1[:rollup_index_l1], + rollup_index_l2: env[:rollup_index_l2] }} else {:start_block_undefined, true} -> @@ -88,6 +100,27 @@ defmodule Indexer.Fetcher.PolygonZkevm.BridgeL2 do Logger.error("L1 RPC URL is not defined.") {:stop, :normal, state} + {:rollup_network_id_l1_is_valid, false} -> + Logger.error( + "Invalid network ID for L1. Please, check INDEXER_POLYGON_ZKEVM_L1_BRIDGE_NETWORK_ID env variable." + ) + + {:stop, :normal, %{}} + + {:rollup_network_id_l2_is_valid, false} -> + Logger.error( + "Invalid network ID for L2. Please, check INDEXER_POLYGON_ZKEVM_L2_BRIDGE_NETWORK_ID env variable." + ) + + {:stop, :normal, %{}} + + {:rollup_index_l2_undefined, true} -> + Logger.error( + "Rollup index is undefined for L2. Please, check INDEXER_POLYGON_ZKEVM_L2_BRIDGE_ROLLUP_INDEX env variable." + ) + + {:stop, :normal, %{}} + {:bridge_contract_address_is_valid, false} -> Logger.error("PolygonZkEVMBridge contract address is invalid or not defined.") {:stop, :normal, state} @@ -124,7 +157,11 @@ defmodule Indexer.Fetcher.PolygonZkevm.BridgeL2 do start_block: start_block, end_block: end_block, json_rpc_named_arguments: json_rpc_named_arguments, - json_rpc_named_arguments_l1: json_rpc_named_arguments_l1 + json_rpc_named_arguments_l1: json_rpc_named_arguments_l1, + rollup_network_id_l1: rollup_network_id_l1, + rollup_network_id_l2: rollup_network_id_l2, + rollup_index_l1: rollup_index_l1, + rollup_index_l2: rollup_index_l2 } = state ) do start_block..end_block @@ -134,12 +171,19 @@ defmodule Indexer.Fetcher.PolygonZkevm.BridgeL2 do chunk_end = List.last(current_chunk) if chunk_start <= chunk_end do - Helper.log_blocks_chunk_handling(chunk_start, chunk_end, start_block, end_block, nil, "L2") + Helper.log_blocks_chunk_handling(chunk_start, chunk_end, start_block, end_block, nil, :L2) operations = {chunk_start, chunk_end} |> get_logs_all(bridge_contract, json_rpc_named_arguments) - |> prepare_operations(json_rpc_named_arguments, json_rpc_named_arguments_l1) + |> prepare_operations( + rollup_network_id_l1, + rollup_network_id_l2, + rollup_index_l1, + rollup_index_l2, + json_rpc_named_arguments, + json_rpc_named_arguments_l1 + ) import_operations(operations) @@ -149,7 +193,7 @@ defmodule Indexer.Fetcher.PolygonZkevm.BridgeL2 do start_block, end_block, "#{Enum.count(operations)} L2 operation(s)", - "L2" + :L2 ) end end) diff --git a/apps/indexer/lib/indexer/fetcher/polygon_zkevm/transaction_batch.ex b/apps/indexer/lib/indexer/fetcher/polygon_zkevm/transaction_batch.ex index 278682628fe8..834fca842b9b 100644 --- a/apps/indexer/lib/indexer/fetcher/polygon_zkevm/transaction_batch.ex +++ b/apps/indexer/lib/indexer/fetcher/polygon_zkevm/transaction_batch.ex @@ -155,6 +155,7 @@ defmodule Indexer.Fetcher.PolygonZkevm.TransactionBatch do end defp fetch_and_save_batches(batch_start, batch_end, json_rpc_named_arguments) do + # For every batch from batch_start to batch_end request the batch info requests = batch_start |> Range.new(batch_end, 1) @@ -171,6 +172,7 @@ defmodule Indexer.Fetcher.PolygonZkevm.TransactionBatch do {:ok, responses} = Helper.repeated_call(&json_rpc/2, [requests, json_rpc_named_arguments], error_message, 3) + # For every batch info extract batches' L1 sequence tx and L1 verify tx {sequence_hashes, verify_hashes} = responses |> Enum.reduce({[], []}, fn res, {sequences, verifies} = _acc -> @@ -194,8 +196,10 @@ defmodule Indexer.Fetcher.PolygonZkevm.TransactionBatch do {sequences, verifies} end) + # All L1 transactions in one list without repetition l1_tx_hashes = Enum.uniq(sequence_hashes ++ verify_hashes) + # Receive all IDs for L1 txs hash_to_id = l1_tx_hashes |> Reader.lifecycle_transactions() @@ -203,28 +207,39 @@ defmodule Indexer.Fetcher.PolygonZkevm.TransactionBatch do Map.put(acc, hash.bytes, id) end) + # For every batch build batch representation, collect associated L1 and L2 transactions {batches_to_import, l2_txs_to_import, l1_txs_to_import, _, _} = responses |> Enum.reduce({[], [], [], Reader.next_id(), hash_to_id}, fn res, {batches, l2_txs, l1_txs, next_id, hash_to_id} = _acc -> number = quantity_to_integer(Map.get(res.result, "number")) - {:ok, timestamp} = DateTime.from_unix(quantity_to_integer(Map.get(res.result, "timestamp"))) + + # the timestamp is undefined for unfinalized batches + timestamp = + case DateTime.from_unix(quantity_to_integer(Map.get(res.result, "timestamp", 0xFFFFFFFFFFFFFFFF))) do + {:ok, ts} -> ts + _ -> nil + end + l2_transaction_hashes = Map.get(res.result, "transactions") global_exit_root = Map.get(res.result, "globalExitRoot") acc_input_hash = Map.get(res.result, "accInputHash") state_root = Map.get(res.result, "stateRoot") + # Get ID for sequence transaction (new ID if the batch is just sequenced) {sequence_id, l1_txs, next_id, hash_to_id} = res.result |> get_tx_hash("sendSequencesTxHash") |> handle_tx_hash(hash_to_id, next_id, l1_txs, false) + # Get ID for verify transaction (new ID if the batch is just verified) {verify_id, l1_txs, next_id, hash_to_id} = res.result |> get_tx_hash("verifyBatchTxHash") |> handle_tx_hash(hash_to_id, next_id, l1_txs, true) + # Associate every transaction from batch with the batch number l2_txs_append = l2_transaction_hashes |> Kernel.||([]) @@ -249,6 +264,7 @@ defmodule Indexer.Fetcher.PolygonZkevm.TransactionBatch do {[batch | batches], l2_txs ++ l2_txs_append, l1_txs, next_id, hash_to_id} end) + # Update batches list, L1 transactions list and L2 transaction list {:ok, _} = Chain.import(%{ polygon_zkevm_lifecycle_transactions: %{params: l1_txs_to_import}, @@ -260,6 +276,7 @@ defmodule Indexer.Fetcher.PolygonZkevm.TransactionBatch do confirmed_batches = Enum.filter(batches_to_import, fn batch -> not is_nil(batch.sequence_id) and batch.sequence_id > 0 end) + # Publish update for open batches Views in BS app with the new confirmed batches if not Enum.empty?(confirmed_batches) do Publisher.broadcast([{:zkevm_confirmed_batches, confirmed_batches}], :realtime) end diff --git a/apps/indexer/lib/indexer/fetcher/rollup_l1_reorg_monitor.ex b/apps/indexer/lib/indexer/fetcher/rollup_l1_reorg_monitor.ex index b9a5e8e4ec67..5da08bf1d717 100644 --- a/apps/indexer/lib/indexer/fetcher/rollup_l1_reorg_monitor.ex +++ b/apps/indexer/lib/indexer/fetcher/rollup_l1_reorg_monitor.ex @@ -32,6 +32,9 @@ defmodule Indexer.Fetcher.RollupL1ReorgMonitor do Logger.metadata(fetcher: @fetcher_name) modules_can_use_reorg_monitor = [ + Indexer.Fetcher.Optimism.OutputRoot, + Indexer.Fetcher.Optimism.TxnBatch, + Indexer.Fetcher.Optimism.WithdrawalEvent, Indexer.Fetcher.PolygonEdge.Deposit, Indexer.Fetcher.PolygonEdge.WithdrawalExit, Indexer.Fetcher.PolygonZkevm.BridgeL1, @@ -56,14 +59,27 @@ defmodule Indexer.Fetcher.RollupL1ReorgMonitor do module_using_reorg_monitor = Enum.at(modules_using_reorg_monitor, 0) l1_rpc = - if Enum.member?( - [Indexer.Fetcher.PolygonEdge.Deposit, Indexer.Fetcher.PolygonEdge.WithdrawalExit], - module_using_reorg_monitor - ) do - # there can be more than one PolygonEdge.* modules, so we get the common L1 RPC URL for them from Indexer.Fetcher.PolygonEdge - Application.get_all_env(:indexer)[Indexer.Fetcher.PolygonEdge][:polygon_edge_l1_rpc] - else - Application.get_all_env(:indexer)[module_using_reorg_monitor][:rpc] + cond do + Enum.member?( + [Indexer.Fetcher.PolygonEdge.Deposit, Indexer.Fetcher.PolygonEdge.WithdrawalExit], + module_using_reorg_monitor + ) -> + # there can be more than one PolygonEdge.* modules, so we get the common L1 RPC URL for them from Indexer.Fetcher.PolygonEdge + Application.get_all_env(:indexer)[Indexer.Fetcher.PolygonEdge][:polygon_edge_l1_rpc] + + Enum.member?( + [ + Indexer.Fetcher.Optimism.OutputRoot, + Indexer.Fetcher.Optimism.TxnBatch, + Indexer.Fetcher.Optimism.WithdrawalEvent + ], + module_using_reorg_monitor + ) -> + # there can be more than one Optimism.* modules, so we get the common L1 RPC URL for them from Indexer.Fetcher.Optimism + Application.get_all_env(:indexer)[Indexer.Fetcher.Optimism][:optimism_l1_rpc] + + true -> + Application.get_all_env(:indexer)[module_using_reorg_monitor][:rpc] end json_rpc_named_arguments = Helper.json_rpc_named_arguments(l1_rpc) diff --git a/apps/indexer/lib/indexer/fetcher/shibarium/l1.ex b/apps/indexer/lib/indexer/fetcher/shibarium/l1.ex index 76ed302099de..4a3889dd2a4d 100644 --- a/apps/indexer/lib/indexer/fetcher/shibarium/l1.ex +++ b/apps/indexer/lib/indexer/fetcher/shibarium/l1.ex @@ -243,7 +243,7 @@ defmodule Indexer.Fetcher.Shibarium.L1 do chunk_end = List.last(current_chunk) if chunk_start <= chunk_end do - Helper.log_blocks_chunk_handling(chunk_start, chunk_end, start_block, end_block, nil, "L1") + Helper.log_blocks_chunk_handling(chunk_start, chunk_end, start_block, end_block, nil, :L1) operations = {chunk_start, chunk_end} @@ -278,7 +278,7 @@ defmodule Indexer.Fetcher.Shibarium.L1 do start_block, end_block, "#{Enum.count(operations)} L1 operation(s)", - "L1" + :L1 ) end @@ -293,7 +293,9 @@ defmodule Indexer.Fetcher.Shibarium.L1 do end) new_start_block = last_written_block + 1 - {:ok, new_end_block} = Helper.get_block_number_by_tag("latest", json_rpc_named_arguments, 100_000_000) + + {:ok, new_end_block} = + Helper.get_block_number_by_tag("latest", json_rpc_named_arguments, Helper.infinite_retries_number()) delay = if new_end_block == last_written_block do @@ -352,7 +354,7 @@ defmodule Indexer.Fetcher.Shibarium.L1 do |> Kernel.||({0, nil}) end - defp get_logs(from_block, to_block, address, topics, json_rpc_named_arguments, retries \\ 100_000_000) do + defp get_logs(from_block, to_block, address, topics, json_rpc_named_arguments, retries) do processed_from_block = integer_to_quantity(from_block) processed_to_block = integer_to_quantity(to_block) @@ -402,7 +404,8 @@ defmodule Indexer.Fetcher.Shibarium.L1 do @exited_ether_event ] ], - json_rpc_named_arguments + json_rpc_named_arguments, + Helper.infinite_retries_number() ) contract_addresses = @@ -421,7 +424,8 @@ defmodule Indexer.Fetcher.Shibarium.L1 do @transfer_event, contract_addresses ], - json_rpc_named_arguments + json_rpc_named_arguments, + Helper.infinite_retries_number() ) {:ok, unknown_erc1155_tokens_result} = @@ -437,7 +441,8 @@ defmodule Indexer.Fetcher.Shibarium.L1 do nil, pad_address_hash(erc1155_predicate_proxy) ], - json_rpc_named_arguments + json_rpc_named_arguments, + Helper.infinite_retries_number() ) end @@ -552,7 +557,7 @@ defmodule Indexer.Fetcher.Shibarium.L1 do timestamps = events |> filter_deposit_events() - |> Helper.get_blocks_by_events(json_rpc_named_arguments, 100_000_000) + |> Helper.get_blocks_by_events(json_rpc_named_arguments, Helper.infinite_retries_number()) |> Enum.reduce(%{}, fn block, acc -> block_number = quantity_to_integer(Map.get(block, "number")) {:ok, timestamp} = DateTime.from_unix(quantity_to_integer(Map.get(block, "timestamp"))) diff --git a/apps/indexer/lib/indexer/fetcher/shibarium/l2.ex b/apps/indexer/lib/indexer/fetcher/shibarium/l2.ex index 41512c464944..b85e4b558694 100644 --- a/apps/indexer/lib/indexer/fetcher/shibarium/l2.ex +++ b/apps/indexer/lib/indexer/fetcher/shibarium/l2.ex @@ -174,7 +174,7 @@ defmodule Indexer.Fetcher.Shibarium.L2 do chunk_start = List.first(current_chunk) chunk_end = List.last(current_chunk) - Helper.log_blocks_chunk_handling(chunk_start, chunk_end, start_block, end_block, nil, "L2") + Helper.log_blocks_chunk_handling(chunk_start, chunk_end, start_block, end_block, nil, :L2) operations = chunk_start..chunk_end @@ -201,7 +201,7 @@ defmodule Indexer.Fetcher.Shibarium.L2 do start_block, end_block, "#{Enum.count(operations)} L2 operation(s)", - "L2" + :L2 ) end) @@ -316,7 +316,7 @@ defmodule Indexer.Fetcher.Shibarium.L2 do end defp get_logs_all(block_range, child_chain, bone_withdraw, json_rpc_named_arguments) do - blocks = get_blocks_by_range(block_range, json_rpc_named_arguments, 100_000_000) + blocks = get_blocks_by_range(block_range, json_rpc_named_arguments, Helper.infinite_retries_number()) deposit_logs = get_deposit_logs_from_receipts(blocks, child_chain, json_rpc_named_arguments) @@ -355,7 +355,7 @@ defmodule Indexer.Fetcher.Shibarium.L2 do end) |> Enum.chunk_every(@eth_get_logs_range_size) |> Enum.reduce([], fn hashes, acc -> - acc ++ get_receipt_logs(hashes, json_rpc_named_arguments, 100_000_000) + acc ++ get_receipt_logs(hashes, json_rpc_named_arguments, Helper.infinite_retries_number()) end) |> filter_deposit_events(child_chain) end @@ -376,7 +376,7 @@ defmodule Indexer.Fetcher.Shibarium.L2 do end) |> Enum.chunk_every(@eth_get_logs_range_size) |> Enum.reduce([], fn hashes, acc -> - acc ++ get_receipt_logs(hashes, json_rpc_named_arguments, 100_000_000) + acc ++ get_receipt_logs(hashes, json_rpc_named_arguments, Helper.infinite_retries_number()) end) |> filter_withdrawal_events(bone_withdraw) end diff --git a/apps/indexer/lib/indexer/fetcher/stability/validator.ex b/apps/indexer/lib/indexer/fetcher/stability/validator.ex new file mode 100644 index 000000000000..70851e8d8a20 --- /dev/null +++ b/apps/indexer/lib/indexer/fetcher/stability/validator.ex @@ -0,0 +1,70 @@ +defmodule Indexer.Fetcher.Stability.Validator do + @moduledoc """ + GenServer responsible for updating the list of stability validators in the database. + """ + use GenServer + + alias Explorer.Chain.Hash.Address, as: AddressHash + alias Explorer.Chain.Stability.Validator, as: ValidatorStability + + def start_link(_) do + GenServer.start_link(__MODULE__, [], name: __MODULE__) + end + + def init(state) do + GenServer.cast(__MODULE__, :update_validators_list) + + {:ok, state} + end + + def handle_cast(:update_validators_list, state) do + validators_from_db = ValidatorStability.get_all_validators() + + case ValidatorStability.fetch_validators_lists() do + %{active: active_validator_addresses_list, all: validator_addresses_list} -> + validators_map = Enum.reduce(validator_addresses_list, %{}, fn address, map -> Map.put(map, address, true) end) + + active_validators_map = + Enum.reduce(active_validator_addresses_list, %{}, fn address, map -> Map.put(map, address, true) end) + + address_hashes_to_drop_from_db = + Enum.flat_map(validators_from_db, fn validator -> + (is_nil(validators_map[validator.address_hash.bytes]) && [validator.address_hash]) || [] + end) + + grouped = + Enum.group_by(validator_addresses_list, fn validator_address -> active_validators_map[validator_address] end) + + inactive = + Enum.map(grouped[nil] || [], fn address_hash -> + {:ok, address_hash} = AddressHash.load(address_hash) + + %{address_hash: address_hash, state: :inactive} |> ValidatorStability.append_timestamps() + end) + + validators_to_missing_blocks_numbers = ValidatorStability.fetch_missing_blocks_numbers(grouped[true] || []) + + active = + Enum.map(grouped[true] || [], fn address_hash_init -> + {:ok, address_hash} = AddressHash.load(address_hash_init) + + %{ + address_hash: address_hash, + state: + ValidatorStability.missing_block_number_to_state( + validators_to_missing_blocks_numbers[address_hash_init] + ) + } + |> ValidatorStability.append_timestamps() + end) + + ValidatorStability.insert_validators(active ++ inactive) + ValidatorStability.delete_validators_by_address_hashes(address_hashes_to_drop_from_db) + + _ -> + nil + end + + {:noreply, state} + end +end diff --git a/apps/indexer/lib/indexer/fetcher/token.ex b/apps/indexer/lib/indexer/fetcher/token.ex index 9d4b0dd253f3..cf92773a5aff 100644 --- a/apps/indexer/lib/indexer/fetcher/token.ex +++ b/apps/indexer/lib/indexer/fetcher/token.ex @@ -51,9 +51,7 @@ defmodule Indexer.Fetcher.Token do @impl BufferedTask @decorate trace(name: "fetch", resource: "Indexer.Fetcher.Token.run/2", service: :indexer, tracer: Tracer) def run([token_contract_address], _json_rpc_named_arguments) do - options = [necessity_by_association: %{[contract_address: :smart_contract] => :optional}] - - case Chain.token_from_address_hash(token_contract_address, options) do + case Chain.token_from_address_hash(token_contract_address) do {:ok, %Token{} = token} -> catalog_token(token) end diff --git a/apps/indexer/lib/indexer/fetcher/token_instance/helper.ex b/apps/indexer/lib/indexer/fetcher/token_instance/helper.ex index 01dc381379db..898ac561a1a7 100644 --- a/apps/indexer/lib/indexer/fetcher/token_instance/helper.ex +++ b/apps/indexer/lib/indexer/fetcher/token_instance/helper.ex @@ -221,7 +221,8 @@ defmodule Indexer.Fetcher.TokenInstance.Helper do defp prepare_token_id(%Decimal{} = token_id), do: Decimal.to_integer(token_id) defp prepare_token_id(token_id), do: token_id - defp prepare_request("ERC-721", contract_address_hash_string, token_id, from_base_uri?) do + defp prepare_request(erc_721_404, contract_address_hash_string, token_id, from_base_uri?) + when erc_721_404 in ["ERC-404", "ERC-721"] do request = %{ contract_address: contract_address_hash_string, block_number: nil diff --git a/apps/indexer/lib/indexer/fetcher/token_instance/metadata_retriever.ex b/apps/indexer/lib/indexer/fetcher/token_instance/metadata_retriever.ex index a713282e4c55..adb40d338935 100644 --- a/apps/indexer/lib/indexer/fetcher/token_instance/metadata_retriever.ex +++ b/apps/indexer/lib/indexer/fetcher/token_instance/metadata_retriever.ex @@ -1,17 +1,17 @@ defmodule Indexer.Fetcher.TokenInstance.MetadataRetriever do @moduledoc """ - Fetches ERC-721 & ERC-1155 token instance metadata. + Fetches ERC-721/ERC-1155/ERC-404 token instance metadata. """ require Logger alias Explorer.Helper, as: ExplorerHelper - alias Explorer.SmartContract.Reader alias HTTPoison.{Error, Response} @no_uri_error "no uri" @vm_execution_error "VM execution error" @ipfs_protocol "ipfs://" + @invalid_base64_data "invalid data:application/json;base64" # https://eips.ethereum.org/EIPS/eip-1155#metadata @erc1155_token_id_placeholder "{id}" @@ -20,17 +20,48 @@ defmodule Indexer.Fetcher.TokenInstance.MetadataRetriever do @ignored_hosts ["localhost", "127.0.0.1", "0.0.0.0", "", nil] - defp ipfs_link do - link = + @spec ipfs_link(uid :: any()) :: String.t() + defp ipfs_link(uid) do + base_url = :indexer - |> Application.get_env(:ipfs_gateway_url) + |> Application.get_env(:ipfs) + |> Keyword.get(:gateway_url) |> String.trim_trailing("/") - link <> "/" + url = base_url <> "/" <> uid + + ipfs_params = Application.get_env(:indexer, :ipfs) + + if ipfs_params[:gateway_url_param_location] == :query do + gateway_url_param_key = ipfs_params[:gateway_url_param_key] + gateway_url_param_value = ipfs_params[:gateway_url_param_value] + + if gateway_url_param_key && gateway_url_param_value do + url <> "?#{gateway_url_param_key}=#{gateway_url_param_value}" + else + url + end + else + url + end end - def query_contract(contract_address_hash, contract_functions, abi) do - Reader.query_contract(contract_address_hash, abi, contract_functions, false) + @spec ipfs_headers() :: [{binary(), binary()}] + defp ipfs_headers do + ipfs_params = Application.get_env(:indexer, :ipfs) + + if ipfs_params[:gateway_url_param_location] == :header do + gateway_url_param_key = ipfs_params[:gateway_url_param_key] + gateway_url_param_value = ipfs_params[:gateway_url_param_value] + + if gateway_url_param_key && gateway_url_param_value do + [{gateway_url_param_key, gateway_url_param_value}] + else + [] + end + else + [] + end end @doc """ @@ -40,15 +71,17 @@ defmodule Indexer.Fetcher.TokenInstance.MetadataRetriever do {:error, binary} | {:error_code, any} | {:ok, %{metadata: any}} def fetch_json(uri, token_id \\ nil, hex_token_id \\ nil, from_base_uri? \\ false) - def fetch_json(uri, _token_id, _hex_token_id, _from_base_uri?) when uri in [{:ok, [""]}, {:ok, [""]}] do + def fetch_json({:ok, [""]}, _token_id, _hex_token_id, _from_base_uri?) do {:error, @no_uri_error} end def fetch_json(uri, token_id, hex_token_id, from_base_uri?) do - fetch_json_from_uri(uri, token_id, hex_token_id, from_base_uri?) + fetch_json_from_uri(uri, false, token_id, hex_token_id, from_base_uri?) end - defp fetch_json_from_uri({:error, error}, _token_id, _hex_token_id, _from_base_uri?) do + defp fetch_json_from_uri(_uri, _ipfs?, _token_id, _hex_token_id, _from_base_uri?) + + defp fetch_json_from_uri({:error, error}, _ipfs?, _token_id, _hex_token_id, _from_base_uri?) do error = to_string(error) if error =~ "execution reverted" or error =~ @vm_execution_error do @@ -62,9 +95,10 @@ defmodule Indexer.Fetcher.TokenInstance.MetadataRetriever do end # CIDv0 IPFS links # https://docs.ipfs.tech/concepts/content-addressing/#version-0-v0 - defp fetch_json_from_uri({:ok, ["Qm" <> _ = result]}, token_id, hex_token_id, from_base_uri?) do + defp fetch_json_from_uri({:ok, ["Qm" <> _ = result]}, _, token_id, hex_token_id, from_base_uri?) do if String.length(result) == 46 do - fetch_json_from_uri({:ok, [ipfs_link() <> result]}, token_id, hex_token_id, from_base_uri?) + ipfs? = true + fetch_json_from_uri({:ok, [ipfs_link(result)]}, ipfs?, token_id, hex_token_id, from_base_uri?) else Logger.warn(["Unknown metadata format result #{inspect(result)}."], fetcher: :token_instances) @@ -72,44 +106,52 @@ defmodule Indexer.Fetcher.TokenInstance.MetadataRetriever do end end - defp fetch_json_from_uri({:ok, ["'" <> token_uri]}, token_id, hex_token_id, from_base_uri?) do + defp fetch_json_from_uri({:ok, ["'" <> token_uri]}, ipfs?, token_id, hex_token_id, from_base_uri?) do token_uri = token_uri |> String.split("'") |> List.first() - fetch_metadata_inner(token_uri, token_id, hex_token_id, from_base_uri?) + fetch_metadata_inner(token_uri, ipfs?, token_id, hex_token_id, from_base_uri?) end - defp fetch_json_from_uri({:ok, ["http://" <> _ = token_uri]}, token_id, hex_token_id, from_base_uri?) do - fetch_metadata_inner(token_uri, token_id, hex_token_id, from_base_uri?) + defp fetch_json_from_uri({:ok, ["http://" <> _ = token_uri]}, ipfs?, token_id, hex_token_id, from_base_uri?) do + fetch_metadata_inner(token_uri, ipfs?, token_id, hex_token_id, from_base_uri?) end - defp fetch_json_from_uri({:ok, ["https://" <> _ = token_uri]}, token_id, hex_token_id, from_base_uri?) do - fetch_metadata_inner(token_uri, token_id, hex_token_id, from_base_uri?) + defp fetch_json_from_uri({:ok, ["https://" <> _ = token_uri]}, ipfs?, token_id, hex_token_id, from_base_uri?) do + fetch_metadata_inner(token_uri, ipfs?, token_id, hex_token_id, from_base_uri?) end - defp fetch_json_from_uri({:ok, ["data:application/json," <> json]}, token_id, hex_token_id, from_base_uri?) do - decoded_json = URI.decode(json) - - fetch_json_from_uri({:ok, [decoded_json]}, token_id, hex_token_id, from_base_uri?) - rescue - e -> - Logger.warn(["Unknown metadata format #{inspect(json)}.", Exception.format(:error, e, __STACKTRACE__)], - fetcher: :token_instances - ) + defp fetch_json_from_uri( + {:ok, [type = "data:application/json;utf8," <> json]}, + ipfs?, + token_id, + hex_token_id, + from_base_uri? + ) do + fetch_json_from_json_string(json, ipfs?, token_id, hex_token_id, from_base_uri?, type) + end - {:error, "invalid data:application/json"} + defp fetch_json_from_uri( + {:ok, [type = "data:application/json," <> json]}, + ipfs?, + token_id, + hex_token_id, + from_base_uri? + ) do + fetch_json_from_json_string(json, ipfs?, token_id, hex_token_id, from_base_uri?, type) end defp fetch_json_from_uri( {:ok, ["data:application/json;base64," <> base64_encoded_json]}, + ipfs?, token_id, hex_token_id, from_base_uri? ) do case Base.decode64(base64_encoded_json) do {:ok, base64_decoded} -> - fetch_json_from_uri({:ok, [base64_decoded]}, token_id, hex_token_id, from_base_uri?) + fetch_json_from_uri({:ok, [base64_decoded]}, ipfs?, token_id, hex_token_id, from_base_uri?) _ -> - {:error, "invalid data:application/json;base64"} + {:error, @invalid_base64_data} end rescue e -> @@ -121,22 +163,22 @@ defmodule Indexer.Fetcher.TokenInstance.MetadataRetriever do fetcher: :token_instances ) - {:error, "invalid data:application/json;base64"} + {:error, @invalid_base64_data} end - defp fetch_json_from_uri({:ok, ["#{@ipfs_protocol}ipfs/" <> right]}, _token_id, hex_token_id, _from_base_uri?) do + defp fetch_json_from_uri({:ok, ["#{@ipfs_protocol}ipfs/" <> right]}, _ipfs?, _token_id, hex_token_id, _from_base_uri?) do fetch_from_ipfs(right, hex_token_id) end - defp fetch_json_from_uri({:ok, ["ipfs/" <> right]}, _token_id, hex_token_id, _from_base_uri?) do + defp fetch_json_from_uri({:ok, ["ipfs/" <> right]}, _ipfs?, _token_id, hex_token_id, _from_base_uri?) do fetch_from_ipfs(right, hex_token_id) end - defp fetch_json_from_uri({:ok, [@ipfs_protocol <> right]}, _token_id, hex_token_id, _from_base_uri?) do + defp fetch_json_from_uri({:ok, [@ipfs_protocol <> right]}, _ipfs?, _token_id, hex_token_id, _from_base_uri?) do fetch_from_ipfs(right, hex_token_id) end - defp fetch_json_from_uri({:ok, [json]}, _token_id, hex_token_id, _from_base_uri?) do + defp fetch_json_from_uri({:ok, [json]}, _ipfs?, _token_id, hex_token_id, _from_base_uri?) do json = ExplorerHelper.decode_json(json) check_type(json, hex_token_id) @@ -149,22 +191,36 @@ defmodule Indexer.Fetcher.TokenInstance.MetadataRetriever do {:error, "invalid json"} end - defp fetch_json_from_uri(uri, _token_id, _hex_token_id, _from_base_uri?) do + defp fetch_json_from_uri(uri, _ipfs?, _token_id, _hex_token_id, _from_base_uri?) do Logger.warn(["Unknown metadata uri format #{inspect(uri)}."], fetcher: :token_instances) {:error, "unknown metadata uri format"} end + defp fetch_json_from_json_string(json, ipfs?, token_id, hex_token_id, from_base_uri?, type) do + decoded_json = URI.decode(json) + + fetch_json_from_uri({:ok, [decoded_json]}, ipfs?, token_id, hex_token_id, from_base_uri?) + rescue + e -> + Logger.warn(["Unknown metadata format #{inspect(json)}.", Exception.format(:error, e, __STACKTRACE__)], + fetcher: :token_instances + ) + + {:error, "invalid #{type}"} + end + defp fetch_from_ipfs(ipfs_uid, hex_token_id) do - ipfs_url = ipfs_link() <> ipfs_uid - fetch_metadata_inner(ipfs_url, nil, hex_token_id) + ipfs_url = ipfs_link(ipfs_uid) + ipfs? = true + fetch_metadata_inner(ipfs_url, ipfs?, nil, hex_token_id) end - defp fetch_metadata_inner(uri, token_id, hex_token_id, from_base_uri? \\ false) + defp fetch_metadata_inner(uri, ipfs?, token_id, hex_token_id, from_base_uri? \\ false) - defp fetch_metadata_inner(uri, token_id, hex_token_id, from_base_uri?) do + defp fetch_metadata_inner(uri, ipfs?, token_id, hex_token_id, from_base_uri?) do prepared_uri = substitute_token_id_to_token_uri(uri, token_id, hex_token_id, from_base_uri?) - fetch_metadata_from_uri(prepared_uri, hex_token_id) + fetch_metadata_from_uri(prepared_uri, ipfs?, hex_token_id) rescue e -> Logger.warn( @@ -175,29 +231,31 @@ defmodule Indexer.Fetcher.TokenInstance.MetadataRetriever do {:error, "preparation error"} end - def fetch_metadata_from_uri(uri, hex_token_id \\ nil) do + def fetch_metadata_from_uri(uri, ipfs?, hex_token_id \\ nil) do case Mix.env() != :test && URI.parse(uri) do %URI{host: host} when host in @ignored_hosts -> {:error, "ignored host #{host}"} _ -> - fetch_metadata_from_uri_inner(uri, hex_token_id) + fetch_metadata_from_uri_request(uri, hex_token_id, ipfs?) end end - def fetch_metadata_from_uri_inner(uri, hex_token_id) do - case Application.get_env(:explorer, :http_adapter).get(uri, [], + defp fetch_metadata_from_uri_request(uri, hex_token_id, ipfs?) do + headers = if ipfs?, do: ipfs_headers(), else: [] + + case Application.get_env(:explorer, :http_adapter).get(uri, headers, recv_timeout: 30_000, follow_redirect: true, hackney: [pool: :token_instance_fetcher] ) do - {:ok, %Response{body: body, status_code: 200, headers: headers}} -> - content_type = get_content_type_from_headers(headers) + {:ok, %Response{body: body, status_code: 200, headers: response_headers}} -> + content_type = get_content_type_from_headers(response_headers) check_content_type(content_type, uri, hex_token_id, body) {:ok, %Response{body: body, status_code: code}} -> - Logger.warn( + Logger.debug( ["Request to token uri: #{inspect(uri)} failed with code #{code}. Body:", inspect(body)], fetcher: :token_instances ) @@ -298,5 +356,11 @@ defmodule Indexer.Fetcher.TokenInstance.MetadataRetriever do Truncate error string to @max_error_length symbols """ @spec truncate_error(binary()) :: binary() - def truncate_error(error), do: String.slice(error, 0, @max_error_length) + def truncate_error(error) do + if String.length(error) > @max_error_length - 2 do + String.slice(error, 0, @max_error_length - 3) <> "..." + else + error + end + end end diff --git a/apps/indexer/lib/indexer/fetcher/token_updater.ex b/apps/indexer/lib/indexer/fetcher/token_updater.ex index 58c35c6246f0..3a7acba4fc8e 100644 --- a/apps/indexer/lib/indexer/fetcher/token_updater.ex +++ b/apps/indexer/lib/indexer/fetcher/token_updater.ex @@ -79,12 +79,10 @@ defmodule Indexer.Fetcher.TokenUpdater do @doc false def update_metadata(metadata_list) when is_list(metadata_list) do - options = [necessity_by_association: %{[contract_address: :smart_contract] => :optional}] - Enum.each(metadata_list, fn %{contract_address_hash: contract_address_hash} = metadata -> {:ok, hash} = Hash.Address.cast(contract_address_hash) - with {:ok, %Token{cataloged: true} = token} <- Chain.token_from_address_hash(hash, options) do + with {:ok, %Token{cataloged: true} = token} <- Chain.token_from_address_hash(hash) do update_metadata(token, metadata) end end) diff --git a/apps/indexer/lib/indexer/fetcher/transaction_action.ex b/apps/indexer/lib/indexer/fetcher/transaction_action.ex index 1d142aad502c..ac851b39992e 100644 --- a/apps/indexer/lib/indexer/fetcher/transaction_action.ex +++ b/apps/indexer/lib/indexer/fetcher/transaction_action.ex @@ -13,8 +13,9 @@ defmodule Indexer.Fetcher.TransactionAction do from: 2 ] + import Explorer.Helper, only: [parse_integer: 1] + alias Explorer.{Chain, Repo} - alias Explorer.Helper, as: ExplorerHelper alias Explorer.Chain.{Block, BlockNumberHelper, Log, TransactionAction} alias Indexer.Transform.{Addresses, TransactionActions} @@ -197,8 +198,8 @@ defmodule Indexer.Fetcher.TransactionAction do logger_metadata = Logger.metadata() Logger.metadata(fetcher: :transaction_action) - first_block = ExplorerHelper.parse_integer(first_block) - last_block = ExplorerHelper.parse_integer(last_block) + first_block = parse_integer(first_block) + last_block = parse_integer(last_block) return = if is_nil(first_block) or is_nil(last_block) or first_block <= 0 or last_block <= 0 or first_block > last_block do diff --git a/apps/indexer/lib/indexer/fetcher/zksync/batches_status_tracker.ex b/apps/indexer/lib/indexer/fetcher/zksync/batches_status_tracker.ex new file mode 100644 index 000000000000..74d7ec5b3bd8 --- /dev/null +++ b/apps/indexer/lib/indexer/fetcher/zksync/batches_status_tracker.ex @@ -0,0 +1,242 @@ +defmodule Indexer.Fetcher.ZkSync.BatchesStatusTracker do + @moduledoc """ + Updates batches statuses and imports historical batches to the `zksync_transaction_batches` table. + + Repetitiveness is supported by sending the following statuses every `recheck_interval` seconds: + - `:check_committed`: Discover batches committed to L1 + - `:check_proven`: Discover batches proven in L1 + - `:check_executed`: Discover batches executed on L1 + - `:recover_batches`: Recover missed batches found during the handling of the three previous messages + - `:check_historical`: Check if the imported batches chain does not start with Batch #0 + + The initial message is `:check_committed`. If it is discovered that updating batches + in the `zksync_transaction_batches` table is not possible because some are missing, + `:recover_batches` is sent. The next messages are `:check_proven` and `:check_executed`. + Both could result in sending `:recover_batches` as well. + + The logic ensures that every handler emits the `:recover_batches` message to return to + the previous "progressing" state. If `:recover_batches` is called during handling `:check_committed`, + it will be sent again after finishing batch recovery. Similar logic applies to `:check_proven` and + `:check_executed`. + + The last message in the loop is `:check_historical`. + + |---------------------------------------------------------------------------| + |-> check_committed -> check_proven -> check_executed -> check_historical ->| + | ^ | ^ | ^ + v | v | v | + recover_batches recover_batches recover_batches + + If a batch status change is discovered during handling of `check_committed`, `check_proven`, + or `check_executed` messages, the corresponding L1 transactions are imported and associated + with the batches. Rollup transactions and blocks are not re-associated since it is assumed + to be done by `Indexer.Fetcher.ZkSync.TransactionBatch` or during handling of + the `recover_batches` message. + + The `recover_batches` handler downloads batch information from RPC and sets its actual L1 state + by linking with L1 transactions. + + The `check_historical` message initiates the check if the tail of the batch chain is Batch 0. + If the tail is missing, batches are downloaded from RPC in chunks of `batches_max_range` in every + iteration. The batches are imported together with associated L1 transactions. + """ + + use GenServer + use Indexer.Fetcher + + require Logger + + # alias Explorer.Chain.Events.Publisher + # TODO: publish event when new committed batches appear + + alias Indexer.Fetcher.ZkSync.Discovery.Workers + alias Indexer.Fetcher.ZkSync.StatusTracking.{Committed, Executed, Proven} + + def child_spec(start_link_arguments) do + spec = %{ + id: __MODULE__, + start: {__MODULE__, :start_link, start_link_arguments}, + restart: :transient, + type: :worker + } + + Supervisor.child_spec(spec, []) + end + + def start_link(args, gen_server_options \\ []) do + GenServer.start_link(__MODULE__, args, Keyword.put_new(gen_server_options, :name, __MODULE__)) + end + + @impl GenServer + def init(args) do + Logger.metadata(fetcher: :zksync_batches_tracker) + + config_tracker = Application.get_all_env(:indexer)[Indexer.Fetcher.ZkSync.BatchesStatusTracker] + l1_rpc = config_tracker[:zksync_l1_rpc] + recheck_interval = config_tracker[:recheck_interval] + config_fetcher = Application.get_all_env(:indexer)[Indexer.Fetcher.ZkSync.TransactionBatch] + chunk_size = config_fetcher[:chunk_size] + batches_max_range = config_fetcher[:batches_max_range] + + Process.send(self(), :check_committed, []) + + {:ok, + %{ + config: %{ + json_l2_rpc_named_arguments: args[:json_rpc_named_arguments], + json_l1_rpc_named_arguments: [ + transport: EthereumJSONRPC.HTTP, + transport_options: [ + http: EthereumJSONRPC.HTTP.HTTPoison, + url: l1_rpc, + http_options: [ + recv_timeout: :timer.minutes(10), + timeout: :timer.minutes(10), + hackney: [pool: :ethereum_jsonrpc] + ] + ] + ], + recheck_interval: recheck_interval, + chunk_size: chunk_size, + batches_max_range: batches_max_range + }, + data: %{} + }} + end + + @impl GenServer + def handle_info({ref, _result}, state) do + Process.demonitor(ref, [:flush]) + {:noreply, state} + end + + # Handles the `:check_historical` message to download historical batches from RPC if necessary and + # import them to the `zksync_transaction_batches` table. The batches are imported together with L1 + # transactions associations, rollup blocks and transactions. + # Since it is the final handler in the loop, it schedules sending the `:check_committed` message + # to initiate the next iteration. The sending of the message is delayed, taking into account + # the time remaining after the previous handlers' execution. + # + # ## Parameters + # - `:check_historical`: the message triggering the handler + # - `state`: current state of the fetcher containing both the fetcher configuration + # and data re-used by different handlers. + # + # ## Returns + # - `{:noreply, new_state}` where `new_state` contains `data` empty + @impl GenServer + def handle_info(:check_historical, state) + when is_map(state) and is_map_key(state, :config) and is_map_key(state, :data) and + is_map_key(state.config, :recheck_interval) and is_map_key(state.config, :batches_max_range) and + is_map_key(state.config, :json_l2_rpc_named_arguments) and + is_map_key(state.config, :chunk_size) do + {handle_duration, _} = + :timer.tc(&Workers.batches_catchup/1, [ + %{ + batches_max_range: state.config.batches_max_range, + chunk_size: state.config.chunk_size, + json_rpc_named_arguments: state.config.json_l2_rpc_named_arguments + } + ]) + + Process.send_after( + self(), + :check_committed, + max(:timer.seconds(state.config.recheck_interval) - div(update_duration(state.data, handle_duration), 1000), 0) + ) + + {:noreply, %{state | data: %{}}} + end + + # Handles the `:recover_batches` message to download a set of batches from RPC and imports them + # to the `zksync_transaction_batches` table. It is expected that the message is sent from handlers updating + # batches statuses when they discover the absence of batches in the `zksync_transaction_batches` table. + # The batches are imported together with L1 transactions associations, rollup blocks, and transactions. + # + # ## Parameters + # - `:recover_batches`: the message triggering the handler + # - `state`: current state of the fetcher containing both the fetcher configuration + # and data related to the batches recovery: + # - `state.data.batches`: list of the batches to recover + # - `state.data.switched_from`: the message to send after the batch recovery + # + # ## Returns + # - `{:noreply, new_state}` where `new_state` contains updated `duration` of the iteration + @impl GenServer + def handle_info(:recover_batches, state) + when is_map(state) and is_map_key(state, :config) and is_map_key(state, :data) and + is_map_key(state.config, :json_l2_rpc_named_arguments) and is_map_key(state.config, :chunk_size) and + is_map_key(state.data, :batches) and is_map_key(state.data, :switched_from) do + {handle_duration, _} = + :timer.tc( + &Workers.get_full_batches_info_and_import/2, + [ + state.data.batches, + %{ + chunk_size: state.config.chunk_size, + json_rpc_named_arguments: state.config.json_l2_rpc_named_arguments + } + ] + ) + + Process.send(self(), state.data.switched_from, []) + + {:noreply, %{state | data: %{duration: update_duration(state.data, handle_duration)}}} + end + + # Handles `:check_committed`, `:check_proven`, and `:check_executed` messages to update the + # statuses of batches by associating L1 transactions with them. For different messages, it invokes + # different underlying functions due to different natures of discovering batches with changed status. + # Another reason why statuses are being tracked differently is the different pace of status changes: + # a batch is committed in a few minutes after sealing, proven in a few hours, and executed once in a day. + # Depending on the value returned from the underlying function, either a message (`:check_proven`, + # `:check_executed`, or `:check_historical`) to switch to the next status checker is sent, or a list + # of batches to recover is provided together with `:recover_batches`. + # + # ## Parameters + # - `input`: one of `:check_committed`, `:check_proven`, and `:check_executed` + # - `state`: the current state of the fetcher containing both the fetcher configuration + # and data reused by different handlers. + # + # ## Returns + # - `{:noreply, new_state}` where `new_state` contains the updated `duration` of the iteration, + # could also contain the list of batches to recover and the message to return back to + # the corresponding status update checker. + @impl GenServer + def handle_info(input, state) + when input in [:check_committed, :check_proven, :check_executed] do + {output, func} = + case input do + :check_committed -> {:check_proven, &Committed.look_for_batches_and_update/1} + :check_proven -> {:check_executed, &Proven.look_for_batches_and_update/1} + :check_executed -> {:check_historical, &Executed.look_for_batches_and_update/1} + end + + {handle_duration, result} = :timer.tc(func, [state.config]) + + {switch_to, state_data} = + case result do + :ok -> + {output, %{duration: update_duration(state.data, handle_duration)}} + + {:recovery_required, batches} -> + {:recover_batches, + %{ + switched_from: input, + batches: batches, + duration: update_duration(state.data, handle_duration) + }} + end + + Process.send(self(), switch_to, []) + {:noreply, %{state | data: state_data}} + end + + defp update_duration(data, cur_duration) do + if Map.has_key?(data, :duration) do + data.duration + cur_duration + else + cur_duration + end + end +end diff --git a/apps/indexer/lib/indexer/fetcher/zksync/discovery/batches_data.ex b/apps/indexer/lib/indexer/fetcher/zksync/discovery/batches_data.ex new file mode 100644 index 000000000000..75b514ba74d0 --- /dev/null +++ b/apps/indexer/lib/indexer/fetcher/zksync/discovery/batches_data.ex @@ -0,0 +1,413 @@ +defmodule Indexer.Fetcher.ZkSync.Discovery.BatchesData do + @moduledoc """ + Provides main functionality to extract data for batches and associated with them + rollup blocks, rollup and L1 transactions. + """ + + alias EthereumJSONRPC.Block.ByNumber + alias Indexer.Fetcher.ZkSync.Utils.Rpc + + import Indexer.Fetcher.ZkSync.Utils.Logging, only: [log_info: 1, log_details_chunk_handling: 4] + import EthereumJSONRPC, only: [quantity_to_integer: 1] + + @doc """ + Downloads batches, associates rollup blocks and transactions, and imports the results into the database. + Data is retrieved from the RPC endpoint in chunks of `chunk_size`. + + ## Parameters + - `batches`: Either a tuple of two integers, `start_batch_number` and `end_batch_number`, defining + the range of batches to receive, or a list of batch numbers, `batches_list`. + - `config`: Configuration containing `chunk_size` to limit the amount of data requested from the RPC endpoint, + and `json_rpc_named_arguments` defining parameters for the RPC connection. + + ## Returns + - `{batches_to_import, l2_blocks_to_import, l2_txs_to_import}` + where + - `batches_to_import` is a map of batches data + - `l2_blocks_to_import` is a list of blocks associated with batches by batch numbers + - `l2_txs_to_import` is a list of transactions associated with batches by batch numbers + """ + @spec extract_data_from_batches([integer()] | {integer(), integer()}, %{ + :chunk_size => pos_integer(), + :json_rpc_named_arguments => any(), + optional(any()) => any() + }) :: {map(), list(), list()} + def extract_data_from_batches(batches, config) + + def extract_data_from_batches({start_batch_number, end_batch_number}, config) + when is_integer(start_batch_number) and is_integer(end_batch_number) and + is_map(config) do + start_batch_number..end_batch_number + |> Enum.to_list() + |> do_extract_data_from_batches(config) + end + + def extract_data_from_batches(batches_list, config) + when is_list(batches_list) and + is_map(config) do + batches_list + |> do_extract_data_from_batches(config) + end + + defp do_extract_data_from_batches(batches_list, config) when is_list(batches_list) do + initial_batches_to_import = collect_batches_details(batches_list, config) + log_info("Collected details for #{length(Map.keys(initial_batches_to_import))} batches") + + batches_to_import = get_block_ranges(initial_batches_to_import, config) + + {l2_blocks_to_import, l2_txs_to_import} = get_l2_blocks_and_transactions(batches_to_import, config) + log_info("Linked #{length(l2_blocks_to_import)} L2 blocks and #{length(l2_txs_to_import)} L2 transactions") + + {batches_to_import, l2_blocks_to_import, l2_txs_to_import} + end + + @doc """ + Collects all unique L1 transactions from the given list of batches, including transactions + that change the status of a batch and their timestamps. + + **Note**: Every map describing an L1 transaction in the response is not ready for importing into + the database since it does not contain `:id` elements. + + ## Parameters + - `batches`: A list of maps describing batches. Each map is expected to define the following + elements: `commit_tx_hash`, `commit_timestamp`, `prove_tx_hash`, `prove_timestamp`, + `executed_tx_hash`, `executed_timestamp`. + + ## Returns + - `l1_txs`: A map where keys are L1 transaction hashes, and values are maps containing + transaction hashes and timestamps. + """ + @spec collect_l1_transactions(list()) :: map() + def collect_l1_transactions(batches) + when is_list(batches) do + l1_txs = + batches + |> Enum.reduce(%{}, fn batch, l1_txs -> + [ + %{hash: batch.commit_tx_hash, timestamp: batch.commit_timestamp}, + %{hash: batch.prove_tx_hash, timestamp: batch.prove_timestamp}, + %{hash: batch.executed_tx_hash, timestamp: batch.executed_timestamp} + ] + |> Enum.reduce(l1_txs, fn l1_tx, acc -> + # checks if l1_tx is not empty and adds to acc + add_l1_tx_to_list(acc, l1_tx) + end) + end) + + log_info("Collected #{length(Map.keys(l1_txs))} L1 hashes") + + l1_txs + end + + defp add_l1_tx_to_list(l1_txs, l1_tx) do + if l1_tx.hash != Rpc.get_binary_zero_hash() do + Map.put(l1_txs, l1_tx.hash, l1_tx) + else + l1_txs + end + end + + # Divides the list of batch numbers into chunks of size `chunk_size` to combine + # `zks_getL1BatchDetails` calls in one chunk together. To simplify further handling, + # each call is combined with the batch number in the JSON request identifier field. + # This allows parsing and associating every response with a particular batch, producing + # a list of maps describing the batches, ready for further handling. + # + # **Note**: The batches in the resulting map are not ready for importing into the DB. L1 transaction + # indices as well as the rollup blocks range must be added, and then batch descriptions + # must be pruned (see Indexer.Fetcher.ZkSync.Utils.Db.prune_json_batch/1). + # + # ## Parameters + # - `batches_list`: A list of batch numbers. + # - `config`: A map containing `chunk_size` specifying the number of `zks_getL1BatchDetails` in + # one HTTP request, and `json_rpc_named_arguments` describing parameters for + # RPC connection. + # + # ## Returns + # - `batches_details`: A map where keys are batch numbers, and values are maps produced + # after parsing responses of `zks_getL1BatchDetails` calls. + defp collect_batches_details( + batches_list, + %{json_rpc_named_arguments: json_rpc_named_arguments, chunk_size: chunk_size} = _config + ) + when is_list(batches_list) do + batches_list_length = length(batches_list) + + {batches_details, _} = + batches_list + |> Enum.chunk_every(chunk_size) + |> Enum.reduce({%{}, 0}, fn chunk, {details, a} -> + log_details_chunk_handling("Collecting details", chunk, a * chunk_size, batches_list_length) + + requests = + chunk + |> Enum.map(fn batch_number -> + EthereumJSONRPC.request(%{ + id: batch_number, + method: "zks_getL1BatchDetails", + params: [batch_number] + }) + end) + + details = + requests + |> Rpc.fetch_batches_details(json_rpc_named_arguments) + |> Enum.reduce( + details, + fn resp, details -> + Map.put(details, resp.id, Rpc.transform_batch_details_to_map(resp.result)) + end + ) + + {details, a + 1} + end) + + batches_details + end + + # Extends each batch description with the block numbers specifying the start and end of + # a range of blocks included in the batch. The block ranges are obtained through the RPC call + # `zks_getL1BatchBlockRange`. The calls are combined in chunks of `chunk_size`. To distinguish + # each call in the chunk, they are combined with the batch number in the JSON request + # identifier field. + # + # ## Parameters + # - `batches`: A map of batch descriptions. + # - `config`: A map containing `chunk_size`, specifying the number of `zks_getL1BatchBlockRange` + # in one HTTP request, and `json_rpc_named_arguments` describing parameters for + # RPC connection. + # + # ## Returns + # - `updated_batches`: A map of batch descriptions where each description is updated with + # a range (elements `:start_block` and `:end_block`) of rollup blocks included in the batch. + defp get_block_ranges( + batches, + %{json_rpc_named_arguments: json_rpc_named_arguments, chunk_size: chunk_size} = _config + ) + when is_map(batches) do + keys = Map.keys(batches) + batches_list_length = length(keys) + + {updated_batches, _} = + keys + |> Enum.chunk_every(chunk_size) + |> Enum.reduce({batches, 0}, fn batches_chunk, {batches_with_block_ranges, a} -> + log_details_chunk_handling("Collecting block ranges", batches_chunk, a * chunk_size, batches_list_length) + + {request_block_ranges_for_batches(batches_chunk, batches, batches_with_block_ranges, json_rpc_named_arguments), + a + 1} + end) + + updated_batches + end + + # For a given list of rollup batch numbers, this function builds a list of requests + # to `zks_getL1BatchBlockRange`, executes them, and extends the batches' descriptions with + # ranges of rollup blocks associated with each batch. + # + # ## Parameters + # - `batches_numbers`: A list with batch numbers. + # - `batches_src`: A list containing original batches descriptions. + # - `batches_dst`: A map with extended batch descriptions containing rollup block ranges. + # - `json_rpc_named_arguments`: Describes parameters for RPC connection. + # + # ## Returns + # - An updated version of `batches_dst` with new entities containing rollup block ranges. + defp request_block_ranges_for_batches(batches_numbers, batches_src, batches_dst, json_rpc_named_arguments) do + batches_numbers + |> Enum.reduce([], fn batch_number, requests -> + batch = Map.get(batches_src, batch_number) + # Prepare requests list to get blocks ranges + case is_nil(batch.start_block) or is_nil(batch.end_block) do + true -> + [ + EthereumJSONRPC.request(%{ + id: batch_number, + method: "zks_getL1BatchBlockRange", + params: [batch_number] + }) + | requests + ] + + false -> + requests + end + end) + |> Rpc.fetch_blocks_ranges(json_rpc_named_arguments) + |> Enum.reduce(batches_dst, fn resp, updated_batches -> + Map.update!(updated_batches, resp.id, fn batch -> + [start_block, end_block] = resp.result + + Map.merge(batch, %{ + start_block: quantity_to_integer(start_block), + end_block: quantity_to_integer(end_block) + }) + end) + end) + end + + # Unfolds the ranges of rollup blocks in each batch description, makes RPC `eth_getBlockByNumber` calls, + # and builds two lists: a list of rollup blocks associated with each batch and a list of rollup transactions + # associated with each batch. RPC calls are made in chunks of `chunk_size`. To distinguish + # each call in the chunk, they are combined with the block number in the JSON request + # identifier field. + # + # ## Parameters + # - `batches`: A map of batch descriptions. Each description must contain `start_block` and + # `end_block`, specifying the range of blocks associated with the batch. + # - `config`: A map containing `chunk_size`, specifying the number of `eth_getBlockByNumber` + # in one HTTP request, and `json_rpc_named_arguments` describing parameters for + # RPC connection. + # + # ## Returns + # - {l2_blocks_to_import, l2_txs_to_import}, where + # - `l2_blocks_to_import` contains a list of all rollup blocks with their associations with + # the provided batches. The association is a map with the block hash and the batch number. + # - `l2_txs_to_import` contains a list of all rollup transactions with their associations + # with the provided batches. The association is a map with the transaction hash and + # the batch number. + defp get_l2_blocks_and_transactions( + batches, + %{json_rpc_named_arguments: json_rpc_named_arguments, chunk_size: chunk_size} = _config + ) do + # Extracts the rollup block range for every batch, unfolds it and + # build chunks of `eth_getBlockByNumber` calls + {blocks_to_batches, chunked_requests, cur_chunk, cur_chunk_size} = + batches + |> Map.keys() + |> Enum.reduce({%{}, [], [], 0}, fn batch_number, cur_batch_acc -> + batch = Map.get(batches, batch_number) + + batch.start_block..batch.end_block + |> Enum.chunk_every(chunk_size) + |> Enum.reduce(cur_batch_acc, fn blocks_range, cur_chunk_acc -> + build_blocks_map_and_chunks_of_rpc_requests(batch_number, blocks_range, cur_chunk_acc, chunk_size) + end) + end) + + # After the last iteration of the reduce loop it is a valid case + # when the calls from the last chunk are not in the chunks list, + # so it is appended + finalized_chunked_requests = + if cur_chunk_size > 0 do + [cur_chunk | chunked_requests] + else + chunked_requests + end + + # The chunks requests are sent to the RPC node and parsed to + # extract rollup block hashes and rollup transactions. + {blocks_associations, l2_txs_to_import} = + finalized_chunked_requests + |> Enum.reduce({blocks_to_batches, []}, fn requests, {blocks, l2_txs} -> + requests + |> Rpc.fetch_blocks_details(json_rpc_named_arguments) + |> extract_block_hash_and_transactions_list(blocks, l2_txs) + end) + + # Check that amount of received transactions for a batch is correct + batches + |> Map.keys() + |> Enum.each(fn batch_number -> + batch = Map.get(batches, batch_number) + txs_in_batch = batch.l1_tx_count + batch.l2_tx_count + + ^txs_in_batch = + Enum.count(l2_txs_to_import, fn tx -> + tx.batch_number == batch_number + end) + end) + + {Map.values(blocks_associations), l2_txs_to_import} + end + + # For a given list of rollup block numbers, this function extends: + # - a map containing the linkage between rollup block numbers and batch numbers + # - a list of chunks of `eth_getBlockByNumber` requests + # - an uncompleted chunk of `eth_getBlockByNumber` requests + # + # ## Parameters + # - `batch_number`: The number of the batch to which the list of rollup blocks is linked. + # - `blocks_numbers`: A list of rollup block numbers. + # - `cur_chunk_acc`: The current state of the accumulator containing: + # - the current state of the map containing the linkage between rollup block numbers and batch numbers + # - the current state of the list of chunks of `eth_getBlockByNumber` requests + # - the current state of the uncompleted chunk of `eth_getBlockByNumber` requests + # - the size of the uncompleted chunk + # - `chunk_size`: The maximum size of the chunk of `eth_getBlockByNumber` requests + # + # ## Returns + # - {blocks_to_batches, chunked_requests, cur_chunk, cur_chunk_size}, where: + # - `blocks_to_batches`: An updated map with new blocks added. + # - `chunked_requests`: An updated list of lists of `eth_getBlockByNumber` requests. + # - `cur_chunk`: An uncompleted chunk of `eth_getBlockByNumber` requests or an empty list. + # - `cur_chunk_size`: The size of the uncompleted chunk. + defp build_blocks_map_and_chunks_of_rpc_requests(batch_number, blocks_numbers, cur_chunk_acc, chunk_size) do + blocks_numbers + |> Enum.reduce(cur_chunk_acc, fn block_number, {blocks_to_batches, chunked_requests, cur_chunk, cur_chunk_size} -> + blocks_to_batches = Map.put(blocks_to_batches, block_number, %{batch_number: batch_number}) + + cur_chunk = [ + ByNumber.request( + %{ + id: block_number, + number: block_number + }, + false + ) + | cur_chunk + ] + + if cur_chunk_size + 1 == chunk_size do + {blocks_to_batches, [cur_chunk | chunked_requests], [], 0} + else + {blocks_to_batches, chunked_requests, cur_chunk, cur_chunk_size + 1} + end + end) + end + + # Parses responses from `eth_getBlockByNumber` calls and extracts the block hash and the + # transactions lists. The block hash and transaction hashes are used to build associations + # with the corresponding batches by utilizing their numbers. + # + # This function is not part of the `Indexer.Fetcher.ZkSync.Utils.Rpc` module since the resulting + # lists are too specific for further import to the database. + # + # ## Parameters + # - `json_responses`: A list of responses to `eth_getBlockByNumber` calls. + # - `l2_blocks`: A map of accumulated associations between rollup blocks and batches. + # - `l2_txs`: A list of accumulated associations between rollup transactions and batches. + # + # ## Returns + # - {l2_blocks, l2_txs}, where + # - `l2_blocks`: Updated map of accumulated associations between rollup blocks and batches. + # - `l2_txs`: Updated list of accumulated associations between rollup transactions and batches. + defp extract_block_hash_and_transactions_list(json_responses, l2_blocks, l2_txs) do + json_responses + |> Enum.reduce({l2_blocks, l2_txs}, fn resp, {l2_blocks, l2_txs} -> + {block, l2_blocks} = + Map.get_and_update(l2_blocks, resp.id, fn block -> + {block, Map.put(block, :hash, Map.get(resp.result, "hash"))} + end) + + l2_txs = + case Map.get(resp.result, "transactions") do + nil -> + l2_txs + + new_txs -> + Enum.reduce(new_txs, l2_txs, fn l2_tx_hash, l2_txs -> + [ + %{ + batch_number: block.batch_number, + hash: l2_tx_hash + } + | l2_txs + ] + end) + end + + {l2_blocks, l2_txs} + end) + end +end diff --git a/apps/indexer/lib/indexer/fetcher/zksync/discovery/workers.ex b/apps/indexer/lib/indexer/fetcher/zksync/discovery/workers.ex new file mode 100644 index 000000000000..43ad89b7f124 --- /dev/null +++ b/apps/indexer/lib/indexer/fetcher/zksync/discovery/workers.ex @@ -0,0 +1,163 @@ +defmodule Indexer.Fetcher.ZkSync.Discovery.Workers do + @moduledoc """ + Provides functions to download a set of batches from RPC and import them to DB. + """ + + alias Indexer.Fetcher.ZkSync.Utils.Db + + import Indexer.Fetcher.ZkSync.Discovery.BatchesData, + only: [ + collect_l1_transactions: 1, + extract_data_from_batches: 2 + ] + + import Indexer.Fetcher.ZkSync.Utils.Logging, only: [log_info: 1] + + @doc """ + Downloads minimal batches data (batch, associated rollup blocks and transactions hashes) from RPC + and imports them to the DB. Data is retrieved from the RPC endpoint in chunks of `chunk_size`. + Import of associated L1 transactions does not happen, assuming that the batch import happens regularly + enough and last downloaded batches does not contain L1 associations anyway. + Later `Indexer.Fetcher.ZkSync.BatchesStatusTracker` will update any batch state changes and + import required L1 transactions. + + ## Parameters + - `start_batch_number`: The first batch in the range to download. + - `end_batch_number`: The last batch in the range to download. + - `config`: Configuration containing `chunk_size` to limit the amount of data requested from the RPC endpoint, + and `json_rpc_named_arguments` defining parameters for the RPC connection. + + ## Returns + - `:ok` + """ + @spec get_minimal_batches_info_and_import(non_neg_integer(), non_neg_integer(), %{ + :chunk_size => integer(), + :json_rpc_named_arguments => EthereumJSONRPC.json_rpc_named_arguments(), + optional(any()) => any() + }) :: :ok + def get_minimal_batches_info_and_import(start_batch_number, end_batch_number, config) + when is_integer(start_batch_number) and + is_integer(end_batch_number) and + (is_map(config) and is_map_key(config, :json_rpc_named_arguments) and + is_map_key(config, :chunk_size)) do + {batches_to_import, l2_blocks_to_import, l2_txs_to_import} = + extract_data_from_batches({start_batch_number, end_batch_number}, config) + + batches_list_to_import = + batches_to_import + |> Map.values() + |> Enum.reduce([], fn batch, batches_list -> + [Db.prune_json_batch(batch) | batches_list] + end) + + Db.import_to_db( + batches_list_to_import, + [], + l2_txs_to_import, + l2_blocks_to_import + ) + + :ok + end + + @doc """ + Downloads batches, associates L1 transactions, rollup blocks and transactions with the given list of batch numbers, + and imports the results into the database. Data is retrieved from the RPC endpoint in chunks of `chunk_size`. + + ## Parameters + - `batches_numbers_list`: List of batch numbers to be retrieved. + - `config`: Configuration containing `chunk_size` to limit the amount of data requested from the RPC endpoint, + and `json_rpc_named_arguments` defining parameters for the RPC connection. + + ## Returns + - `:ok` + """ + @spec get_full_batches_info_and_import([integer()], %{ + :chunk_size => integer(), + :json_rpc_named_arguments => EthereumJSONRPC.json_rpc_named_arguments(), + optional(any()) => any() + }) :: :ok + def get_full_batches_info_and_import(batches_numbers_list, config) + when is_list(batches_numbers_list) and + (is_map(config) and is_map_key(config, :json_rpc_named_arguments) and + is_map_key(config, :chunk_size)) do + # Collect batches and linked L2 blocks and transaction + {batches_to_import, l2_blocks_to_import, l2_txs_to_import} = extract_data_from_batches(batches_numbers_list, config) + + # Collect L1 transactions associated with batches + l1_txs = + batches_to_import + |> Map.values() + |> collect_l1_transactions() + |> Db.get_indices_for_l1_transactions() + + # Update batches with l1 transactions indices and prune unnecessary fields + batches_list_to_import = + batches_to_import + |> Map.values() + |> Enum.reduce([], fn batch, batches -> + [ + batch + |> Map.put(:commit_id, get_l1_tx_id_by_hash(l1_txs, batch.commit_tx_hash)) + |> Map.put(:prove_id, get_l1_tx_id_by_hash(l1_txs, batch.prove_tx_hash)) + |> Map.put(:execute_id, get_l1_tx_id_by_hash(l1_txs, batch.executed_tx_hash)) + |> Db.prune_json_batch() + | batches + ] + end) + + Db.import_to_db( + batches_list_to_import, + Map.values(l1_txs), + l2_txs_to_import, + l2_blocks_to_import + ) + + :ok + end + + @doc """ + Retrieves the minimal batch number from the database. If the minimum batch number is not zero, + downloads `batches_max_range` batches older than the retrieved batch, along with associated + L1 transactions, rollup blocks, and transactions, and imports everything to the database. + + ## Parameters + - `config`: Configuration containing `chunk_size` to limit the amount of data requested from + the RPC endpoint and `json_rpc_named_arguments` defining parameters for the + RPC connection, `batches_max_range` defines how many of older batches must be downloaded. + + ## Returns + - `:ok` + """ + @spec batches_catchup(%{ + :batches_max_range => integer(), + :chunk_size => integer(), + :json_rpc_named_arguments => EthereumJSONRPC.json_rpc_named_arguments(), + optional(any()) => any() + }) :: :ok + def batches_catchup(config) + when is_map(config) and is_map_key(config, :json_rpc_named_arguments) and + is_map_key(config, :batches_max_range) and + is_map_key(config, :chunk_size) do + oldest_batch_number = Db.get_earliest_batch_number() + + if not is_nil(oldest_batch_number) && oldest_batch_number > 0 do + log_info("The oldest batch number is not zero. Historical baches will be fetched.") + start_batch_number = max(0, oldest_batch_number - config.batches_max_range) + end_batch_number = oldest_batch_number - 1 + + start_batch_number..end_batch_number + |> Enum.to_list() + |> get_full_batches_info_and_import(config) + end + + :ok + end + + defp get_l1_tx_id_by_hash(l1_txs, hash) do + l1_txs + |> Map.get(hash) + |> Kernel.||(%{id: nil}) + |> Map.get(:id) + end +end diff --git a/apps/indexer/lib/indexer/fetcher/zksync/status_tracking/committed.ex b/apps/indexer/lib/indexer/fetcher/zksync/status_tracking/committed.ex new file mode 100644 index 000000000000..ed1a0464b63c --- /dev/null +++ b/apps/indexer/lib/indexer/fetcher/zksync/status_tracking/committed.ex @@ -0,0 +1,78 @@ +defmodule Indexer.Fetcher.ZkSync.StatusTracking.Committed do + @moduledoc """ + Functionality to discover committed batches + """ + + alias Indexer.Fetcher.ZkSync.Utils.{Db, Rpc} + + import Indexer.Fetcher.ZkSync.StatusTracking.CommonUtils, + only: [ + check_if_batch_status_changed: 3, + associate_and_import_or_prepare_for_recovery: 4 + ] + + import Indexer.Fetcher.ZkSync.Utils.Logging, only: [log_info: 1] + + # keccak256("BlockCommit(uint256,bytes32,bytes32)") + @block_commit_event "0x8f2916b2f2d78cc5890ead36c06c0f6d5d112c7e103589947e8e2f0d6eddb763" + + @doc """ + Checks if the oldest uncommitted batch in the database has the associated L1 commitment transaction + by requesting new batch details from RPC. If so, analyzes the `BlockCommit` event emitted by + the transaction to explore all the batches committed by it. For all discovered batches, it updates + the database with new associations, importing information about L1 transactions. + If it is found that some of the discovered batches are absent in the database, the function + interrupts and returns the list of batch numbers that can be attempted to be recovered. + + ## Parameters + - `config`: Configuration containing `json_l1_rpc_named_arguments` and + `json_l2_rpc_named_arguments` defining parameters for the RPC connections. + + ## Returns + - `:ok` if no new committed batches are found, or if all found batches and the corresponding L1 + transactions are imported successfully. + - `{:recovery_required, batches_to_recover}` if the absence of new committed batches is + discovered; `batches_to_recover` contains the list of batch numbers. + """ + @spec look_for_batches_and_update(%{ + :json_l1_rpc_named_arguments => EthereumJSONRPC.json_rpc_named_arguments(), + :json_l2_rpc_named_arguments => EthereumJSONRPC.json_rpc_named_arguments(), + optional(any()) => any() + }) :: :ok | {:recovery_required, list()} + def look_for_batches_and_update( + %{ + json_l1_rpc_named_arguments: json_l1_rpc_named_arguments, + json_l2_rpc_named_arguments: json_l2_rpc_named_arguments + } = _config + ) do + case Db.get_earliest_sealed_batch_number() do + nil -> + :ok + + expected_batch_number -> + log_info("Checking if the batch #{expected_batch_number} was committed") + + {next_action, tx_hash, l1_txs} = + check_if_batch_status_changed(expected_batch_number, :commit_tx, json_l2_rpc_named_arguments) + + case next_action do + :skip -> + :ok + + :look_for_batches -> + log_info("The batch #{expected_batch_number} looks like committed") + commit_tx_receipt = Rpc.fetch_tx_receipt_by_hash(tx_hash, json_l1_rpc_named_arguments) + batches_numbers_from_rpc = get_committed_batches_from_logs(commit_tx_receipt["logs"]) + + associate_and_import_or_prepare_for_recovery(batches_numbers_from_rpc, l1_txs, tx_hash, :commit_id) + end + end + end + + defp get_committed_batches_from_logs(logs) do + committed_batches = Rpc.filter_logs_and_extract_topic_at(logs, @block_commit_event, 1) + log_info("Discovered #{length(committed_batches)} committed batches in the commitment tx") + + committed_batches + end +end diff --git a/apps/indexer/lib/indexer/fetcher/zksync/status_tracking/common.ex b/apps/indexer/lib/indexer/fetcher/zksync/status_tracking/common.ex new file mode 100644 index 000000000000..0c8cccffc30d --- /dev/null +++ b/apps/indexer/lib/indexer/fetcher/zksync/status_tracking/common.ex @@ -0,0 +1,173 @@ +defmodule Indexer.Fetcher.ZkSync.StatusTracking.CommonUtils do + @moduledoc """ + Common functions for status changes trackers + """ + + alias Explorer.Chain.ZkSync.Reader + alias Indexer.Fetcher.ZkSync.Utils.{Db, Rpc} + import Indexer.Fetcher.ZkSync.Utils.Logging, only: [log_warning: 1] + + @doc """ + Fetches the details of the batch with the given number and checks if the representation of + the same batch in the database refers to the same commitment, proving, or executing transaction + depending on `tx_type`. If the transaction state changes, the new transaction is prepared for + import to the database. + + ## Parameters + - `batch_number`: the number of the batch to check L1 transaction state. + - `tx_type`: a type of the transaction to check, one of :commit_tx, :execute_tx, or :prove_tx. + - `json_l2_rpc_named_arguments`: parameters for the RPC connections. + + ## Returns + - `{:look_for_batches, l1_tx_hash, l1_txs}` where + - `l1_tx_hash` is the hash of the L1 transaction. + - `l1_txs` is a map containing the transaction hash as a key, and values are maps + with transaction hashes and transaction timestamps. + - `{:skip, "", %{}}` means the batch is not found in the database or the state of the transaction + in the batch representation is the same as the state of the transaction for the batch + received from RPC. + """ + @spec check_if_batch_status_changed( + binary() | non_neg_integer(), + :commit_tx | :execute_tx | :prove_tx, + EthereumJSONRPC.json_rpc_named_arguments() + ) :: {:look_for_batches, any(), any()} | {:skip, <<>>, %{}} + def check_if_batch_status_changed(batch_number, tx_type, json_l2_rpc_named_arguments) + when (is_binary(batch_number) or is_integer(batch_number)) and + tx_type in [:commit_tx, :prove_tx, :execute_tx] and + is_list(json_l2_rpc_named_arguments) do + batch_from_rpc = Rpc.fetch_batch_details_by_batch_number(batch_number, json_l2_rpc_named_arguments) + + status_changed_or_error = + case Reader.batch( + batch_number, + necessity_by_association: %{ + get_association(tx_type) => :optional + } + ) do + {:ok, batch_from_db} -> transactions_of_batch_changed?(batch_from_db, batch_from_rpc, tx_type) + {:error, :not_found} -> :error + end + + l1_tx = get_l1_tx_from_batch(batch_from_rpc, tx_type) + + if l1_tx.hash != Rpc.get_binary_zero_hash() and status_changed_or_error in [true, :error] do + l1_txs = Db.get_indices_for_l1_transactions(%{l1_tx.hash => l1_tx}) + + {:look_for_batches, l1_tx.hash, l1_txs} + else + {:skip, "", %{}} + end + end + + defp get_association(tx_type) do + case tx_type do + :commit_tx -> :commit_transaction + :prove_tx -> :prove_transaction + :execute_tx -> :execute_transaction + end + end + + defp transactions_of_batch_changed?(batch_db, batch_json, tx_type) do + tx_hash_json = + case tx_type do + :commit_tx -> batch_json.commit_tx_hash + :prove_tx -> batch_json.prove_tx_hash + :execute_tx -> batch_json.executed_tx_hash + end + + tx_hash_db = + case tx_type do + :commit_tx -> batch_db.commit_transaction + :prove_tx -> batch_db.prove_transaction + :execute_tx -> batch_db.execute_transaction + end + + tx_hash_db_bytes = + if is_nil(tx_hash_db) do + Rpc.get_binary_zero_hash() + else + tx_hash_db.hash.bytes + end + + tx_hash_json != tx_hash_db_bytes + end + + defp get_l1_tx_from_batch(batch_from_rpc, tx_type) do + case tx_type do + :commit_tx -> %{hash: batch_from_rpc.commit_tx_hash, timestamp: batch_from_rpc.commit_timestamp} + :prove_tx -> %{hash: batch_from_rpc.prove_tx_hash, timestamp: batch_from_rpc.prove_timestamp} + :execute_tx -> %{hash: batch_from_rpc.executed_tx_hash, timestamp: batch_from_rpc.executed_timestamp} + end + end + + @doc """ + Receives batches from the database, establishes an association between each batch and + the corresponding L1 transactions, and imports batches and L1 transactions into the database. + If the number of batches returned from the database does not match the requested batches, + the initial list of batch numbers is returned, assuming that they can be + used for the missed batch recovery procedure. + + ## Parameters + - `batches_numbers`: the list of batch numbers that must be updated. + - `l1_txs`: a map containing transaction hashes as keys, and values are maps + with transaction hashes and transaction timestamps of L1 transactions to import to the database. + - `tx_hash`: the hash of the L1 transaction to build an association with. + - `association_key`: the field in the batch description to build an association with L1 + transactions. + + ## Returns + - `:ok` if batches and the corresponding L1 transactions are imported successfully. + - `{:recovery_required, batches_to_recover}` if the absence of batches is discovered; + `batches_to_recover` contains the list of batch numbers. + """ + @spec associate_and_import_or_prepare_for_recovery([integer()], map(), binary(), :commit_id | :execute_id | :prove_id) :: + :ok | {:recovery_required, [integer()]} + def associate_and_import_or_prepare_for_recovery(batches_numbers, l1_txs, tx_hash, association_key) + when is_list(batches_numbers) and is_map(l1_txs) and is_binary(tx_hash) and + association_key in [:commit_id, :prove_id, :execute_id] do + case prepare_batches_to_import(batches_numbers, %{association_key => l1_txs[tx_hash][:id]}) do + {:error, batches_to_recover} -> + {:recovery_required, batches_to_recover} + + {:ok, batches_to_import} -> + Db.import_to_db(batches_to_import, Map.values(l1_txs)) + :ok + end + end + + # Receives batches from the database and merges each batch's data with the data provided + # in `map_to_update`. If the number of batches returned from the database does not match + # with the requested batches, the initial list of batch numbers is returned, assuming that they + # can be used for the missed batch recovery procedure. + # + # ## Parameters + # - `batches`: the list of batch numbers that must be updated. + # - `map_to_update`: a map containing new data that must be applied to all requested batches. + # + # ## Returns + # - `{:ok, batches_to_import}` where `batches_to_import` is the list of batches ready to import + # with updated data. + # - `{:error, batches}` where `batches` contains the input list of batch numbers. + defp prepare_batches_to_import(batches, map_to_update) do + batches_from_db = Reader.batches(batches, []) + + if length(batches_from_db) == length(batches) do + batches_to_import = + batches_from_db + |> Enum.reduce([], fn batch, batches -> + [ + batch + |> Rpc.transform_transaction_batch_to_map() + |> Map.merge(map_to_update) + | batches + ] + end) + + {:ok, batches_to_import} + else + log_warning("Lack of batches received from DB to update") + {:error, batches} + end + end +end diff --git a/apps/indexer/lib/indexer/fetcher/zksync/status_tracking/executed.ex b/apps/indexer/lib/indexer/fetcher/zksync/status_tracking/executed.ex new file mode 100644 index 000000000000..38d7db9d81a1 --- /dev/null +++ b/apps/indexer/lib/indexer/fetcher/zksync/status_tracking/executed.ex @@ -0,0 +1,78 @@ +defmodule Indexer.Fetcher.ZkSync.StatusTracking.Executed do + @moduledoc """ + Functionality to discover executed batches + """ + + alias Indexer.Fetcher.ZkSync.Utils.{Db, Rpc} + + import Indexer.Fetcher.ZkSync.StatusTracking.CommonUtils, + only: [ + check_if_batch_status_changed: 3, + associate_and_import_or_prepare_for_recovery: 4 + ] + + import Indexer.Fetcher.ZkSync.Utils.Logging, only: [log_info: 1] + + # keccak256("BlockExecution(uint256,bytes32,bytes32)") + @block_execution_event "0x2402307311a4d6604e4e7b4c8a15a7e1213edb39c16a31efa70afb06030d3165" + + @doc """ + Checks if the oldest unexecuted batch in the database has the associated L1 executing transaction + by requesting new batch details from RPC. If so, analyzes the `BlockExecution` event emitted by + the transaction to explore all the batches executed by it. For all discovered batches, it updates + the database with new associations, importing information about L1 transactions. + If it is found that some of the discovered batches are absent in the database, the function + interrupts and returns the list of batch numbers that can be attempted to be recovered. + + ## Parameters + - `config`: Configuration containing `json_l1_rpc_named_arguments` and + `json_l2_rpc_named_arguments` defining parameters for the RPC connections. + + ## Returns + - `:ok` if no new executed batches are found, or if all found batches and the corresponding L1 + transactions are imported successfully. + - `{:recovery_required, batches_to_recover}` if the absence of new executed batches is + discovered; `batches_to_recover` contains the list of batch numbers. + """ + @spec look_for_batches_and_update(%{ + :json_l1_rpc_named_arguments => EthereumJSONRPC.json_rpc_named_arguments(), + :json_l2_rpc_named_arguments => EthereumJSONRPC.json_rpc_named_arguments(), + optional(any()) => any() + }) :: :ok | {:recovery_required, list()} + def look_for_batches_and_update( + %{ + json_l1_rpc_named_arguments: json_l1_rpc_named_arguments, + json_l2_rpc_named_arguments: json_l2_rpc_named_arguments + } = _config + ) do + case Db.get_earliest_unexecuted_batch_number() do + nil -> + :ok + + expected_batch_number -> + log_info("Checking if the batch #{expected_batch_number} was executed") + + {next_action, tx_hash, l1_txs} = + check_if_batch_status_changed(expected_batch_number, :execute_tx, json_l2_rpc_named_arguments) + + case next_action do + :skip -> + :ok + + :look_for_batches -> + log_info("The batch #{expected_batch_number} looks like executed") + execute_tx_receipt = Rpc.fetch_tx_receipt_by_hash(tx_hash, json_l1_rpc_named_arguments) + batches_numbers_from_rpc = get_executed_batches_from_logs(execute_tx_receipt["logs"]) + + associate_and_import_or_prepare_for_recovery(batches_numbers_from_rpc, l1_txs, tx_hash, :execute_id) + end + end + end + + defp get_executed_batches_from_logs(logs) do + executed_batches = Rpc.filter_logs_and_extract_topic_at(logs, @block_execution_event, 1) + log_info("Discovered #{length(executed_batches)} executed batches in the executing tx") + + executed_batches + end +end diff --git a/apps/indexer/lib/indexer/fetcher/zksync/status_tracking/proven.ex b/apps/indexer/lib/indexer/fetcher/zksync/status_tracking/proven.ex new file mode 100644 index 000000000000..52165ef8f0eb --- /dev/null +++ b/apps/indexer/lib/indexer/fetcher/zksync/status_tracking/proven.ex @@ -0,0 +1,137 @@ +defmodule Indexer.Fetcher.ZkSync.StatusTracking.Proven do + @moduledoc """ + Functionality to discover proven batches + """ + + alias ABI.{FunctionSelector, TypeDecoder} + alias Indexer.Fetcher.ZkSync.Utils.{Db, Rpc} + + import Indexer.Fetcher.ZkSync.StatusTracking.CommonUtils, + only: [ + check_if_batch_status_changed: 3, + associate_and_import_or_prepare_for_recovery: 4 + ] + + import Indexer.Fetcher.ZkSync.Utils.Logging, only: [log_info: 1] + + @doc """ + Checks if the oldest unproven batch in the database has the associated L1 proving transaction + by requesting new batch details from RPC. If so, analyzes the calldata of the transaction + to explore all the batches proven by it. For all discovered batches, it updates + the database with new associations, importing information about L1 transactions. + If it is found that some of the discovered batches are absent in the database, the function + interrupts and returns the list of batch numbers that can be attempted to be recovered. + + ## Parameters + - `config`: Configuration containing `json_l1_rpc_named_arguments` and + `json_l2_rpc_named_arguments` defining parameters for the RPC connections. + + ## Returns + - `:ok` if no new proven batches are found, or if all found batches and the corresponding L1 + transactions are imported successfully. + - `{:recovery_required, batches_to_recover}` if the absence of new proven batches is + discovered; `batches_to_recover` contains the list of batch numbers. + """ + @spec look_for_batches_and_update(%{ + :json_l1_rpc_named_arguments => EthereumJSONRPC.json_rpc_named_arguments(), + :json_l2_rpc_named_arguments => EthereumJSONRPC.json_rpc_named_arguments(), + optional(any()) => any() + }) :: :ok | {:recovery_required, list()} + def look_for_batches_and_update( + %{ + json_l1_rpc_named_arguments: json_l1_rpc_named_arguments, + json_l2_rpc_named_arguments: json_l2_rpc_named_arguments + } = _config + ) do + case Db.get_earliest_unproven_batch_number() do + nil -> + :ok + + expected_batch_number -> + log_info("Checking if the batch #{expected_batch_number} was proven") + + {next_action, tx_hash, l1_txs} = + check_if_batch_status_changed(expected_batch_number, :prove_tx, json_l2_rpc_named_arguments) + + case next_action do + :skip -> + :ok + + :look_for_batches -> + log_info("The batch #{expected_batch_number} looks like proven") + prove_tx = Rpc.fetch_tx_by_hash(tx_hash, json_l1_rpc_named_arguments) + batches_numbers_from_rpc = get_proven_batches_from_calldata(prove_tx["input"]) + + associate_and_import_or_prepare_for_recovery(batches_numbers_from_rpc, l1_txs, tx_hash, :prove_id) + end + end + end + + defp get_proven_batches_from_calldata(calldata) do + "0x7f61885c" <> encoded_params = calldata + + # /// @param batchNumber Rollup batch number + # /// @param batchHash Hash of L2 batch + # /// @param indexRepeatedStorageChanges The serial number of the shortcut index that's used as a unique identifier for storage keys that were used twice or more + # /// @param numberOfLayer1Txs Number of priority operations to be processed + # /// @param priorityOperationsHash Hash of all priority operations from this batch + # /// @param l2LogsTreeRoot Root hash of tree that contains L2 -> L1 messages from this batch + # /// @param timestamp Rollup batch timestamp, have the same format as Ethereum batch constant + # /// @param commitment Verified input for the zkSync circuit + # struct StoredBatchInfo { + # uint64 batchNumber; + # bytes32 batchHash; + # uint64 indexRepeatedStorageChanges; + # uint256 numberOfLayer1Txs; + # bytes32 priorityOperationsHash; + # bytes32 l2LogsTreeRoot; + # uint256 timestamp; + # bytes32 commitment; + # } + # /// @notice Recursive proof input data (individual commitments are constructed onchain) + # struct ProofInput { + # uint256[] recursiveAggregationInput; + # uint256[] serializedProof; + # } + # proveBatches(StoredBatchInfo calldata _prevBatch, StoredBatchInfo[] calldata _committedBatches, ProofInput calldata _proof) + + # IO.inspect(FunctionSelector.decode("proveBatches((uint64,bytes32,uint64,uint256,bytes32,bytes32,uint256,bytes32),(uint64,bytes32,uint64,uint256,bytes32,bytes32,uint256,bytes32)[],(uint256[],uint256[]))")) + [_prev_batch, proven_batches, _proof] = + TypeDecoder.decode( + Base.decode16!(encoded_params, case: :lower), + %FunctionSelector{ + function: "proveBatches", + types: [ + tuple: [ + uint: 64, + bytes: 32, + uint: 64, + uint: 256, + bytes: 32, + bytes: 32, + uint: 256, + bytes: 32 + ], + array: + {:tuple, + [ + uint: 64, + bytes: 32, + uint: 64, + uint: 256, + bytes: 32, + bytes: 32, + uint: 256, + bytes: 32 + ]}, + tuple: [array: {:uint, 256}, array: {:uint, 256}] + ] + } + ) + + log_info("Discovered #{length(proven_batches)} proven batches in the prove tx") + + proven_batches + |> Enum.map(fn batch_info -> elem(batch_info, 0) end) + end +end diff --git a/apps/indexer/lib/indexer/fetcher/zksync/transaction_batch.ex b/apps/indexer/lib/indexer/fetcher/zksync/transaction_batch.ex new file mode 100644 index 000000000000..dac1b1d84304 --- /dev/null +++ b/apps/indexer/lib/indexer/fetcher/zksync/transaction_batch.ex @@ -0,0 +1,149 @@ +defmodule Indexer.Fetcher.ZkSync.TransactionBatch do + @moduledoc """ + Discovers new batches and populates the `zksync_transaction_batches` table. + + Repetitiveness is supported by sending a `:continue` message to itself every `recheck_interval` seconds. + + Each iteration compares the number of the last handled batch stored in the state with the + latest batch available on the RPC node. If the rollup progresses, all batches between the + last handled batch (exclusively) and the latest available batch (inclusively) are downloaded from RPC + in chunks of `chunk_size` and imported into the `zksync_transaction_batches` table. If the latest + available batch is too far from the last handled batch, only `batches_max_range` batches are downloaded. + """ + + use GenServer + use Indexer.Fetcher + + require Logger + + alias Explorer.Chain.ZkSync.Reader + alias Indexer.Fetcher.ZkSync.Discovery.Workers + alias Indexer.Fetcher.ZkSync.Utils.Rpc + + import Indexer.Fetcher.ZkSync.Utils.Logging, only: [log_info: 1] + + def child_spec(start_link_arguments) do + spec = %{ + id: __MODULE__, + start: {__MODULE__, :start_link, start_link_arguments}, + restart: :transient, + type: :worker + } + + Supervisor.child_spec(spec, []) + end + + def start_link(args, gen_server_options \\ []) do + GenServer.start_link(__MODULE__, args, Keyword.put_new(gen_server_options, :name, __MODULE__)) + end + + @impl GenServer + def init(args) do + Logger.metadata(fetcher: :zksync_transaction_batches) + + config = Application.get_all_env(:indexer)[Indexer.Fetcher.ZkSync.TransactionBatch] + chunk_size = config[:chunk_size] + recheck_interval = config[:recheck_interval] + batches_max_range = config[:batches_max_range] + + Process.send(self(), :init, []) + + {:ok, + %{ + config: %{ + chunk_size: chunk_size, + batches_max_range: batches_max_range, + json_rpc_named_arguments: args[:json_rpc_named_arguments], + recheck_interval: recheck_interval + }, + data: %{latest_handled_batch_number: 0} + }} + end + + @impl GenServer + def handle_info(:init, state) do + latest_handled_batch_number = + case Reader.latest_available_batch_number() do + nil -> + log_info("No batches found in DB. Will start with the latest batch available by RPC") + # The value received from RPC is decremented in order to not waste + # the first iteration of handling `:continue` message. + Rpc.fetch_latest_sealed_batch_number(state.config.json_rpc_named_arguments) - 1 + + latest_handled_batch_number -> + latest_handled_batch_number + end + + Process.send_after(self(), :continue, 2000) + + log_info("All batches including #{latest_handled_batch_number} are considered as handled") + + {:noreply, %{state | data: %{latest_handled_batch_number: latest_handled_batch_number}}} + end + + # Checks if the rollup progresses by comparing the recently stored batch + # with the latest batch received from RPC. If progress is detected, it downloads + # batches, builds their associations with rollup blocks and transactions, and + # imports the received data to the database. If the latest batch received from RPC + # is too far from the most recently stored batch, only `batches_max_range` batches + # are downloaded. All RPC calls to get batch details and receive transactions + # included in batches are made in chunks of `chunk_size`. + # + # After importing batch information, it schedules the next iteration by sending + # the `:continue` message. The sending of the message is delayed, taking into account + # the time remaining after downloading and importing processes. + # + # ## Parameters + # - `:continue`: The message triggering the handler. + # - `state`: The current state of the fetcher containing both the fetcher configuration + # and the latest handled batch number. + # + # ## Returns + # - `{:noreply, new_state}` where the latest handled batch number is updated with the largest + # of the batch numbers imported in the current iteration. + @impl GenServer + def handle_info( + :continue, + %{ + data: %{latest_handled_batch_number: latest_handled_batch_number}, + config: %{ + batches_max_range: batches_max_range, + json_rpc_named_arguments: json_rpc_named_arguments, + recheck_interval: recheck_interval, + chunk_size: _ + } + } = state + ) do + log_info("Checking for a new batch or batches") + + latest_sealed_batch_number = Rpc.fetch_latest_sealed_batch_number(json_rpc_named_arguments) + + {new_state, handle_duration} = + if latest_handled_batch_number < latest_sealed_batch_number do + start_batch_number = latest_handled_batch_number + 1 + end_batch_number = min(latest_sealed_batch_number, latest_handled_batch_number + batches_max_range) + + log_info("Handling the batch range #{start_batch_number}..#{end_batch_number}") + + {handle_duration, _} = + :timer.tc(&Workers.get_minimal_batches_info_and_import/3, [start_batch_number, end_batch_number, state.config]) + + { + %{state | data: %{latest_handled_batch_number: end_batch_number}}, + div(handle_duration, 1000) + } + else + {state, 0} + end + + Process.send_after(self(), :continue, max(:timer.seconds(recheck_interval) - handle_duration, 0)) + + {:noreply, new_state} + end + + @impl GenServer + def handle_info({ref, _result}, state) do + Process.demonitor(ref, [:flush]) + {:noreply, state} + end +end diff --git a/apps/indexer/lib/indexer/fetcher/zksync/utils/db.ex b/apps/indexer/lib/indexer/fetcher/zksync/utils/db.ex new file mode 100644 index 000000000000..12f7e51ba986 --- /dev/null +++ b/apps/indexer/lib/indexer/fetcher/zksync/utils/db.ex @@ -0,0 +1,204 @@ +defmodule Indexer.Fetcher.ZkSync.Utils.Db do + @moduledoc """ + Common functions to simplify DB routines for Indexer.Fetcher.ZkSync fetchers + """ + + alias Explorer.Chain + alias Explorer.Chain.ZkSync.Reader + import Indexer.Fetcher.ZkSync.Utils.Logging, only: [log_warning: 1, log_info: 1] + + @json_batch_fields_absent_in_db_batch [ + :commit_tx_hash, + :commit_timestamp, + :prove_tx_hash, + :prove_timestamp, + :executed_tx_hash, + :executed_timestamp + ] + + @doc """ + Deletes elements in the batch description map to prepare the batch for importing to + the database. + + ## Parameters + - `batch_with_json_fields`: a map describing a batch with elements that could remain + after downloading batch details from RPC. + + ## Returns + - A map describing the batch compatible with the database import operation. + """ + @spec prune_json_batch(map()) :: map() + def prune_json_batch(batch_with_json_fields) + when is_map(batch_with_json_fields) do + Map.drop(batch_with_json_fields, @json_batch_fields_absent_in_db_batch) + end + + @doc """ + Gets the oldest imported batch number. + + ## Parameters + - none + + ## Returns + - A batch number or `nil` if there are no batches in the database. + """ + @spec get_earliest_batch_number() :: nil | non_neg_integer() + def get_earliest_batch_number do + case Reader.oldest_available_batch_number() do + nil -> + log_warning("No batches found in DB") + nil + + value -> + value + end + end + + @doc """ + Gets the oldest imported batch number without an associated commitment L1 transaction. + + ## Parameters + - none + + ## Returns + - A batch number or `nil` in cases where there are no batches in the database or + all batches in the database are marked as committed. + """ + @spec get_earliest_sealed_batch_number() :: nil | non_neg_integer() + def get_earliest_sealed_batch_number do + case Reader.earliest_sealed_batch_number() do + nil -> + log_info("No uncommitted batches found in DB") + nil + + value -> + value + end + end + + @doc """ + Gets the oldest imported batch number without an associated proving L1 transaction. + + ## Parameters + - none + + ## Returns + - A batch number or `nil` in cases where there are no batches in the database or + all batches in the database are marked as proven. + """ + @spec get_earliest_unproven_batch_number() :: nil | non_neg_integer() + def get_earliest_unproven_batch_number do + case Reader.earliest_unproven_batch_number() do + nil -> + log_info("No unproven batches found in DB") + nil + + value -> + value + end + end + + @doc """ + Gets the oldest imported batch number without an associated executing L1 transaction. + + ## Parameters + - none + + ## Returns + - A batch number or `nil` in cases where there are no batches in the database or + all batches in the database are marked as executed. + """ + @spec get_earliest_unexecuted_batch_number() :: nil | non_neg_integer() + def get_earliest_unexecuted_batch_number do + case Reader.earliest_unexecuted_batch_number() do + nil -> + log_info("No not executed batches found in DB") + nil + + value -> + value + end + end + + @doc """ + Indexes L1 transactions provided in the input map. For transactions that + are already in the database, existing indices are taken. For new transactions, + the next available indices are assigned. + + ## Parameters + - `new_l1_txs`: A map of L1 transaction descriptions. The keys of the map are + transaction hashes. + + ## Returns + - `l1_txs`: A map of L1 transaction descriptions. Each element is extended with + the key `:id`, representing the index of the L1 transaction in the + `zksync_lifecycle_l1_transactions` table. + """ + @spec get_indices_for_l1_transactions(map()) :: any() + def get_indices_for_l1_transactions(new_l1_txs) + when is_map(new_l1_txs) do + # Get indices for l1 transactions previously handled + l1_txs = + new_l1_txs + |> Map.keys() + |> Reader.lifecycle_transactions() + |> Enum.reduce(new_l1_txs, fn {hash, id}, txs -> + {_, txs} = + Map.get_and_update!(txs, hash.bytes, fn l1_tx -> + {l1_tx, Map.put(l1_tx, :id, id)} + end) + + txs + end) + + # Get the next index for the first new transaction based + # on the indices existing in DB + l1_tx_next_id = Reader.next_id() + + # Assign new indices for the transactions which are not in + # the l1 transactions table yet + {updated_l1_txs, _} = + l1_txs + |> Map.keys() + |> Enum.reduce( + {l1_txs, l1_tx_next_id}, + fn hash, {txs, next_id} -> + tx = txs[hash] + id = Map.get(tx, :id) + + if is_nil(id) do + {Map.put(txs, hash, Map.put(tx, :id, next_id)), next_id + 1} + else + {txs, next_id} + end + end + ) + + updated_l1_txs + end + + @doc """ + Imports provided lists of batches and their associations with L1 transactions, rollup blocks, + and transactions to the database. + + ## Parameters + - `batches`: A list of maps with batch descriptions. + - `l1_txs`: A list of maps with L1 transaction descriptions. Optional. + - `l2_txs`: A list of maps with rollup transaction associations. Optional. + - `l2_blocks`: A list of maps with rollup block associations. Optional. + + ## Returns + n/a + """ + def import_to_db(batches, l1_txs \\ [], l2_txs \\ [], l2_blocks \\ []) + when is_list(batches) and is_list(l1_txs) and is_list(l2_txs) and is_list(l2_blocks) do + {:ok, _} = + Chain.import(%{ + zksync_lifecycle_transactions: %{params: l1_txs}, + zksync_transaction_batches: %{params: batches}, + zksync_batch_transactions: %{params: l2_txs}, + zksync_batch_blocks: %{params: l2_blocks}, + timeout: :infinity + }) + end +end diff --git a/apps/indexer/lib/indexer/fetcher/zksync/utils/logging.ex b/apps/indexer/lib/indexer/fetcher/zksync/utils/logging.ex new file mode 100644 index 000000000000..eb7fe6058797 --- /dev/null +++ b/apps/indexer/lib/indexer/fetcher/zksync/utils/logging.ex @@ -0,0 +1,143 @@ +defmodule Indexer.Fetcher.ZkSync.Utils.Logging do + @moduledoc """ + Common logging functions for Indexer.Fetcher.ZkSync fetchers + """ + require Logger + + @doc """ + A helper function to log a message with warning severity. Uses `Logger.warning` facility. + + ## Parameters + - `msg`: a message to log + + ## Returns + `:ok` + """ + @spec log_warning(any()) :: :ok + def log_warning(msg) do + Logger.warning(msg) + end + + @doc """ + A helper function to log a message with info severity. Uses `Logger.info` facility. + + ## Parameters + - `msg`: a message to log + + ## Returns + `:ok` + """ + @spec log_info(any()) :: :ok + def log_info(msg) do + Logger.info(msg) + end + + @doc """ + A helper function to log a message with error severity. Uses `Logger.error` facility. + + ## Parameters + - `msg`: a message to log + + ## Returns + `:ok` + """ + @spec log_error(any()) :: :ok + def log_error(msg) do + Logger.error(msg) + end + + @doc """ + A helper function to log progress when handling batches in chunks. + + ## Parameters + - `prefix`: A prefix for the logging message. + - `chunk`: A list of batch numbers in the current chunk. + - `current_progress`: The total number of batches handled up to this moment. + - `total`: The total number of batches across all chunks. + + ## Returns + `:ok` + + ## Examples: + - `log_details_chunk_handling("A message", [1, 2, 3], 0, 10)` produces + `A message for batches 1..3. Progress 30%` + - `log_details_chunk_handling("A message", [2], 1, 10)` produces + `A message for batch 2. Progress 20%` + - `log_details_chunk_handling("A message", [35], 0, 1)` produces + `A message for batch 35.` + - `log_details_chunk_handling("A message", [45, 50, 51, 52, 60], 1, 1)` produces + `A message for batches 45, 50..52, 60.` + """ + @spec log_details_chunk_handling(binary(), list(), non_neg_integer(), non_neg_integer()) :: :ok + def log_details_chunk_handling(prefix, chunk, current_progress, total) + when is_binary(prefix) and is_list(chunk) and (is_integer(current_progress) and current_progress >= 0) and + (is_integer(total) and total > 0) do + chunk_length = length(chunk) + + progress = + case chunk_length == total do + true -> + "" + + false -> + percentage = + (current_progress + chunk_length) + |> Decimal.div(total) + |> Decimal.mult(100) + |> Decimal.round(2) + |> Decimal.to_string() + + " Progress: #{percentage}%" + end + + if chunk_length == 1 do + log_info("#{prefix} for batch ##{Enum.at(chunk, 0)}.") + else + log_info("#{prefix} for batches #{Enum.join(shorten_numbers_list(chunk), ", ")}.#{progress}") + end + end + + # Transform list of numbers to the list of string where consequent values + # are combined to be displayed as a range. + # + # ## Parameters + # - `msg`: a message to log + # + # ## Returns + # `shorten_list` - resulting list after folding + # + # ## Examples: + # [1, 2, 3] => ["1..3"] + # [1, 3] => ["1", "3"] + # [1, 2] => ["1..2"] + # [1, 3, 4, 5] => ["1", "3..5"] + defp shorten_numbers_list(numbers_list) do + {shorten_list, _, _} = + numbers_list + |> Enum.sort() + |> Enum.reduce({[], nil, nil}, fn number, {shorten_list, prev_range_start, prev_number} -> + shorten_numbers_list_impl(number, shorten_list, prev_range_start, prev_number) + end) + |> then(fn {shorten_list, prev_range_start, prev_number} -> + shorten_numbers_list_impl(prev_number, shorten_list, prev_range_start, prev_number) + end) + + Enum.reverse(shorten_list) + end + + defp shorten_numbers_list_impl(number, shorten_list, prev_range_start, prev_number) do + cond do + is_nil(prev_number) -> + {[], number, number} + + prev_number + 1 != number and prev_range_start == prev_number -> + {["#{prev_range_start}" | shorten_list], number, number} + + prev_number + 1 != number -> + {["#{prev_range_start}..#{prev_number}" | shorten_list], number, number} + + true -> + {shorten_list, prev_range_start, number} + end + end +end diff --git a/apps/indexer/lib/indexer/fetcher/zksync/utils/rpc.ex b/apps/indexer/lib/indexer/fetcher/zksync/utils/rpc.ex new file mode 100644 index 000000000000..282d60b35146 --- /dev/null +++ b/apps/indexer/lib/indexer/fetcher/zksync/utils/rpc.ex @@ -0,0 +1,403 @@ +defmodule Indexer.Fetcher.ZkSync.Utils.Rpc do + @moduledoc """ + Common functions to handle RPC calls for Indexer.Fetcher.ZkSync fetchers + """ + + import EthereumJSONRPC, only: [json_rpc: 2, quantity_to_integer: 1] + import Indexer.Fetcher.ZkSync.Utils.Logging, only: [log_error: 1] + + @zero_hash "0000000000000000000000000000000000000000000000000000000000000000" + @zero_hash_binary <<0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0>> + + @rpc_resend_attempts 20 + + def get_zero_hash do + @zero_hash + end + + def get_binary_zero_hash do + @zero_hash_binary + end + + @doc """ + Filters out logs from a list of transactions logs where topic #0 is `topic_0` and + builds a list of values located at position `position` in such logs. + + ## Parameters + - `logs`: The list of transaction logs to filter logs with a specific topic. + - `topic_0`: The value of topic #0 in the required logs. + - `position`: The topic number to be extracted from the topic lists of every log + and appended to the resulting list. + + ## Returns + - A list of values extracted from the required transaction logs. + - An empty list if no logs with the specified topic are found. + """ + @spec filter_logs_and_extract_topic_at(maybe_improper_list(), binary(), integer()) :: list() + def filter_logs_and_extract_topic_at(logs, topic_0, position) + when is_list(logs) and + is_binary(topic_0) and + (is_integer(position) and position >= 0 and position <= 3) do + logs + |> Enum.reduce([], fn log_entity, result -> + topics = log_entity["topics"] + + if Enum.at(topics, 0) == topic_0 do + [quantity_to_integer(Enum.at(topics, position)) | result] + else + result + end + end) + end + + defp from_ts_to_datetime(time_ts) do + {_, unix_epoch_starts} = DateTime.from_unix(0) + + case is_nil(time_ts) or time_ts == 0 do + true -> + unix_epoch_starts + + false -> + case DateTime.from_unix(time_ts) do + {:ok, datetime} -> + datetime + + {:error, _} -> + unix_epoch_starts + end + end + end + + defp from_iso8601_to_datetime(time_string) do + case is_nil(time_string) do + true -> + from_ts_to_datetime(0) + + false -> + case DateTime.from_iso8601(time_string) do + {:ok, datetime, _} -> + datetime + + {:error, _} -> + from_ts_to_datetime(0) + end + end + end + + defp json_txid_to_hash(hash) do + case hash do + "0x" <> tx_hash -> tx_hash + nil -> @zero_hash + end + end + + defp strhash_to_byteshash(hash) do + hash + |> json_txid_to_hash() + |> Base.decode16!(case: :mixed) + end + + @doc """ + Transforms a map with batch data received from the `zks_getL1BatchDetails` call + into a map that can be used by Indexer.Fetcher.ZkSync fetchers for further handling. + All hexadecimal hashes are converted to their decoded binary representation, + Unix and ISO8601 timestamps are converted to DateTime objects. + + ## Parameters + - `json_response`: Raw data received from the JSON RPC call. + + ## Returns + - A map containing minimal information about the batch. `start_block` and `end_block` + elements are set to `nil`. + """ + @spec transform_batch_details_to_map(map()) :: map() + def transform_batch_details_to_map(json_response) + when is_map(json_response) do + %{ + "number" => {:number, :ok}, + "timestamp" => {:timestamp, :ts_to_datetime}, + "l1TxCount" => {:l1_tx_count, :ok}, + "l2TxCount" => {:l2_tx_count, :ok}, + "rootHash" => {:root_hash, :str_to_byteshash}, + "commitTxHash" => {:commit_tx_hash, :str_to_byteshash}, + "committedAt" => {:commit_timestamp, :iso8601_to_datetime}, + "proveTxHash" => {:prove_tx_hash, :str_to_byteshash}, + "provenAt" => {:prove_timestamp, :iso8601_to_datetime}, + "executeTxHash" => {:executed_tx_hash, :str_to_byteshash}, + "executedAt" => {:executed_timestamp, :iso8601_to_datetime}, + "l1GasPrice" => {:l1_gas_price, :ok}, + "l2FairGasPrice" => {:l2_fair_gas_price, :ok} + # :start_block added by request_block_ranges_by_rpc + # :end_block added by request_block_ranges_by_rpc + } + |> Enum.reduce(%{start_block: nil, end_block: nil}, fn {key, {key_atom, transform_type}}, batch_details_map -> + value_in_json_response = Map.get(json_response, key) + + Map.put( + batch_details_map, + key_atom, + case transform_type do + :iso8601_to_datetime -> from_iso8601_to_datetime(value_in_json_response) + :ts_to_datetime -> from_ts_to_datetime(value_in_json_response) + :str_to_txhash -> json_txid_to_hash(value_in_json_response) + :str_to_byteshash -> strhash_to_byteshash(value_in_json_response) + _ -> value_in_json_response + end + ) + end) + end + + @doc """ + Transforms a map with batch data received from the database into a map that + can be used by Indexer.Fetcher.ZkSync fetchers for further handling. + + ## Parameters + - `batch`: A map containing a batch description received from the database. + + ## Returns + - A map containing simplified representation of the batch. Compatible with + the database import operation. + """ + def transform_transaction_batch_to_map(batch) + when is_map(batch) do + %{ + number: batch.number, + timestamp: batch.timestamp, + l1_tx_count: batch.l1_tx_count, + l2_tx_count: batch.l2_tx_count, + root_hash: batch.root_hash.bytes, + l1_gas_price: batch.l1_gas_price, + l2_fair_gas_price: batch.l2_fair_gas_price, + start_block: batch.start_block, + end_block: batch.end_block, + commit_id: batch.commit_id, + prove_id: batch.prove_id, + execute_id: batch.execute_id + } + end + + @doc """ + Retrieves batch details from the RPC endpoint using the `zks_getL1BatchDetails` call. + + ## Parameters + - `batch_number`: The batch number or identifier. + - `json_rpc_named_arguments`: Configuration parameters for the JSON RPC connection. + + ## Returns + - A map containing minimal batch details. It includes `start_block` and `end_block` + elements, both set to `nil`. + """ + @spec fetch_batch_details_by_batch_number(binary() | non_neg_integer(), EthereumJSONRPC.json_rpc_named_arguments()) :: + map() + def fetch_batch_details_by_batch_number(batch_number, json_rpc_named_arguments) + when (is_integer(batch_number) or is_binary(batch_number)) and is_list(json_rpc_named_arguments) do + req = + EthereumJSONRPC.request(%{ + id: batch_number, + method: "zks_getL1BatchDetails", + params: [batch_number] + }) + + error_message = &"Cannot call zks_getL1BatchDetails. Error: #{inspect(&1)}" + + {:ok, resp} = repeated_call(&json_rpc/2, [req, json_rpc_named_arguments], error_message, @rpc_resend_attempts) + + transform_batch_details_to_map(resp) + end + + @doc """ + Fetches transaction details from the RPC endpoint using the `eth_getTransactionByHash` call. + + ## Parameters + - `raw_hash`: The hash of the Ethereum transaction. It can be provided as a decoded binary + or hexadecimal string. + - `json_rpc_named_arguments`: Configuration parameters for the JSON RPC connection. + + ## Returns + - A map containing details of the transaction. + """ + @spec fetch_tx_by_hash(binary(), EthereumJSONRPC.json_rpc_named_arguments()) :: map() + def fetch_tx_by_hash(raw_hash, json_rpc_named_arguments) + when is_binary(raw_hash) and is_list(json_rpc_named_arguments) do + hash = + case raw_hash do + "0x" <> _ -> raw_hash + _ -> "0x" <> Base.encode16(raw_hash) + end + + req = + EthereumJSONRPC.request(%{ + id: 0, + method: "eth_getTransactionByHash", + params: [hash] + }) + + error_message = &"Cannot call eth_getTransactionByHash for hash #{hash}. Error: #{inspect(&1)}" + + {:ok, resp} = repeated_call(&json_rpc/2, [req, json_rpc_named_arguments], error_message, @rpc_resend_attempts) + + resp + end + + @doc """ + Fetches the transaction receipt from the RPC endpoint using the `eth_getTransactionReceipt` call. + + ## Parameters + - `raw_hash`: The hash of the Ethereum transaction. It can be provided as a decoded binary + or hexadecimal string. + - `json_rpc_named_arguments`: Configuration parameters for the JSON RPC connection. + + ## Returns + - A map containing the receipt details of the transaction. + """ + @spec fetch_tx_receipt_by_hash(binary(), EthereumJSONRPC.json_rpc_named_arguments()) :: map() + def fetch_tx_receipt_by_hash(raw_hash, json_rpc_named_arguments) + when is_binary(raw_hash) and is_list(json_rpc_named_arguments) do + hash = + case raw_hash do + "0x" <> _ -> raw_hash + _ -> "0x" <> Base.encode16(raw_hash) + end + + req = + EthereumJSONRPC.request(%{ + id: 0, + method: "eth_getTransactionReceipt", + params: [hash] + }) + + error_message = &"Cannot call eth_getTransactionReceipt for hash #{hash}. Error: #{inspect(&1)}" + + {:ok, resp} = repeated_call(&json_rpc/2, [req, json_rpc_named_arguments], error_message, @rpc_resend_attempts) + + resp + end + + @doc """ + Fetches the latest sealed batch number from the RPC endpoint using the `zks_L1BatchNumber` call. + + ## Parameters + - `json_rpc_named_arguments`: Configuration parameters for the JSON RPC connection. + + ## Returns + - A non-negative integer representing the latest sealed batch number. + """ + @spec fetch_latest_sealed_batch_number(EthereumJSONRPC.json_rpc_named_arguments()) :: nil | non_neg_integer() + def fetch_latest_sealed_batch_number(json_rpc_named_arguments) + when is_list(json_rpc_named_arguments) do + req = EthereumJSONRPC.request(%{id: 0, method: "zks_L1BatchNumber", params: []}) + + error_message = &"Cannot call zks_L1BatchNumber. Error: #{inspect(&1)}" + + {:ok, resp} = repeated_call(&json_rpc/2, [req, json_rpc_named_arguments], error_message, @rpc_resend_attempts) + + quantity_to_integer(resp) + end + + @doc """ + Fetches block details using multiple `eth_getBlockByNumber` RPC calls. + + ## Parameters + - `requests_list`: A list of `EthereumJSONRPC.Transport.request()` representing multiple + `eth_getBlockByNumber` RPC calls for different block numbers. + - `json_rpc_named_arguments`: Configuration parameters for the JSON RPC connection. + + ## Returns + - A list of responses containing details of the requested blocks. + """ + @spec fetch_blocks_details([EthereumJSONRPC.Transport.request()], EthereumJSONRPC.json_rpc_named_arguments()) :: + list() + def fetch_blocks_details(requests_list, json_rpc_named_arguments) + + def fetch_blocks_details([], _) do + [] + end + + def fetch_blocks_details(requests_list, json_rpc_named_arguments) + when is_list(requests_list) and is_list(json_rpc_named_arguments) do + error_message = &"Cannot call eth_getBlockByNumber. Error: #{inspect(&1)}" + + {:ok, responses} = + repeated_call(&json_rpc/2, [requests_list, json_rpc_named_arguments], error_message, @rpc_resend_attempts) + + responses + end + + @doc """ + Fetches batches details using multiple `zks_getL1BatchDetails` RPC calls. + + ## Parameters + - `requests_list`: A list of `EthereumJSONRPC.Transport.request()` representing multiple + `zks_getL1BatchDetails` RPC calls for different block numbers. + - `json_rpc_named_arguments`: Configuration parameters for the JSON RPC connection. + + ## Returns + - A list of responses containing details of the requested batches. + """ + @spec fetch_batches_details([EthereumJSONRPC.Transport.request()], EthereumJSONRPC.json_rpc_named_arguments()) :: + list() + def fetch_batches_details(requests_list, json_rpc_named_arguments) + + def fetch_batches_details([], _) do + [] + end + + def fetch_batches_details(requests_list, json_rpc_named_arguments) + when is_list(requests_list) and is_list(json_rpc_named_arguments) do + error_message = &"Cannot call zks_getL1BatchDetails. Error: #{inspect(&1)}" + + {:ok, responses} = + repeated_call(&json_rpc/2, [requests_list, json_rpc_named_arguments], error_message, @rpc_resend_attempts) + + responses + end + + @doc """ + Fetches block ranges included in the specified batches by using multiple + `zks_getL1BatchBlockRange` RPC calls. + + ## Parameters + - `requests_list`: A list of `EthereumJSONRPC.Transport.request()` representing multiple + `zks_getL1BatchBlockRange` RPC calls for different batch numbers. + - `json_rpc_named_arguments`: Configuration parameters for the JSON RPC connection. + + ## Returns + - A list of responses containing block ranges associated with the requested batches. + """ + @spec fetch_blocks_ranges([EthereumJSONRPC.Transport.request()], EthereumJSONRPC.json_rpc_named_arguments()) :: + list() + def fetch_blocks_ranges(requests_list, json_rpc_named_arguments) + + def fetch_blocks_ranges([], _) do + [] + end + + def fetch_blocks_ranges(requests_list, json_rpc_named_arguments) + when is_list(requests_list) and is_list(json_rpc_named_arguments) do + error_message = &"Cannot call zks_getL1BatchBlockRange. Error: #{inspect(&1)}" + + {:ok, responses} = + repeated_call(&json_rpc/2, [requests_list, json_rpc_named_arguments], error_message, @rpc_resend_attempts) + + responses + end + + defp repeated_call(func, args, error_message, retries_left) do + case apply(func, args) do + {:ok, _} = res -> + res + + {:error, message} = err -> + retries_left = retries_left - 1 + + if retries_left <= 0 do + log_error(error_message.(message)) + err + else + log_error("#{error_message.(message)} Retrying...") + :timer.sleep(3000) + repeated_call(func, args, error_message, retries_left) + end + end + end +end diff --git a/apps/indexer/lib/indexer/helper.ex b/apps/indexer/lib/indexer/helper.ex index d8d3a650cb23..08552d626795 100644 --- a/apps/indexer/lib/indexer/helper.ex +++ b/apps/indexer/lib/indexer/helper.ex @@ -17,6 +17,8 @@ defmodule Indexer.Helper do alias EthereumJSONRPC.Blocks alias Explorer.Chain.Hash + @finite_retries_number 3 + @infinite_retries_number 100_000_000 @block_check_interval_range_size 100 @block_by_number_chunk_size 50 @@ -102,7 +104,7 @@ defmodule Indexer.Helper do Performs a specified number of retries (up to) if the first attempt returns error. """ @spec get_block_number_by_tag(binary(), list(), non_neg_integer()) :: {:ok, non_neg_integer()} | {:error, atom()} - def get_block_number_by_tag(tag, json_rpc_named_arguments, retries \\ 3) do + def get_block_number_by_tag(tag, json_rpc_named_arguments, retries \\ @finite_retries_number) do error_message = &"Cannot fetch #{tag} block number. Error: #{inspect(&1)}" repeated_call(&fetch_block_number_by_tag/2, [tag, json_rpc_named_arguments], error_message, retries) end @@ -112,7 +114,7 @@ defmodule Indexer.Helper do Performs a specified number of retries (up to) if the first attempt returns error. """ @spec get_transaction_by_hash(binary() | nil, list(), non_neg_integer()) :: {:ok, any()} | {:error, any()} - def get_transaction_by_hash(hash, json_rpc_named_arguments, retries_left \\ 3) + def get_transaction_by_hash(hash, json_rpc_named_arguments, retries_left \\ @finite_retries_number) def get_transaction_by_hash(hash, _json_rpc_named_arguments, _retries_left) when is_nil(hash), do: {:ok, nil} @@ -129,6 +131,10 @@ defmodule Indexer.Helper do repeated_call(&json_rpc/2, [req, json_rpc_named_arguments], error_message, retries) end + def infinite_retries_number do + @infinite_retries_number + end + @doc """ Forms JSON RPC named arguments for the given RPC URL. """ @@ -157,7 +163,7 @@ defmodule Indexer.Helper do non_neg_integer(), non_neg_integer(), binary() | nil, - binary() + :L1 | :L2 ) :: :ok def log_blocks_chunk_handling(chunk_start, chunk_end, start_block, end_block, items_count, layer) do is_start = is_nil(items_count) @@ -200,11 +206,11 @@ defmodule Indexer.Helper do @doc """ Calls the given function with the given arguments until it returns {:ok, any()} or the given attempts number is reached. - Pauses execution between invokes for 3 seconds. + Pauses execution between invokes for 3..1200 seconds (depending on the number of retries). """ @spec repeated_call((... -> any()), list(), (... -> any()), non_neg_integer()) :: - {:ok, any()} | {:error, binary() | atom()} - def repeated_call(func, args, error_message, retries_left) do + {:ok, any()} | {:error, binary() | atom() | map()} + def repeated_call(func, args, error_message, retries_left, retries_done \\ 0) do case apply(func, args) do {:ok, _} = res -> res @@ -217,8 +223,11 @@ defmodule Indexer.Helper do err else Logger.error("#{error_message.(message)} Retrying...") - :timer.sleep(3000) - repeated_call(func, args, error_message, retries_left) + + # wait up to 20 minutes + :timer.sleep(min(3000 * Integer.pow(2, retries_done), 1_200_000)) + + repeated_call(func, args, error_message, retries_left, retries_done + 1) end end end @@ -231,13 +240,7 @@ defmodule Indexer.Helper do def get_blocks_by_events(events, json_rpc_named_arguments, retries) do events |> Enum.reduce(%{}, fn event, acc -> - block_number = - if is_map(event) do - event.block_number - else - event["blockNumber"] - end - + block_number = Map.get(event, :block_number, event["blockNumber"]) Map.put(acc, block_number, 0) end) |> Stream.map(fn {block_number, _} -> %{number: block_number} end) @@ -266,7 +269,7 @@ defmodule Indexer.Helper do """ @spec get_block_timestamp_by_number(non_neg_integer(), list(), non_neg_integer()) :: {:ok, non_neg_integer()} | {:error, any()} - def get_block_timestamp_by_number(number, json_rpc_named_arguments, retries \\ 3) do + def get_block_timestamp_by_number(number, json_rpc_named_arguments, retries \\ @finite_retries_number) do func = &get_block_timestamp_by_number_inner/2 args = [number, json_rpc_named_arguments] error_message = &"Cannot fetch block ##{number} or its timestamp. Error: #{inspect(&1)}" diff --git a/apps/indexer/lib/indexer/memory/monitor.ex b/apps/indexer/lib/indexer/memory/monitor.ex index 704592f2d645..db6f69110c60 100644 --- a/apps/indexer/lib/indexer/memory/monitor.ex +++ b/apps/indexer/lib/indexer/memory/monitor.ex @@ -17,10 +17,13 @@ defmodule Indexer.Memory.Monitor do defstruct limit: 0, timer_interval: :timer.minutes(1), timer_reference: nil, - shrinkable_set: MapSet.new() + shrinkable_set: MapSet.new(), + shrunk?: false use GenServer + @expandable_memory_coefficient 0.4 + @doc """ Registers caller as `Indexer.Memory.Shrinkable`. """ @@ -65,14 +68,27 @@ defmodule Indexer.Memory.Monitor do def handle_info(:check, state) do total = :erlang.memory(:total) - if memory_limit() < total do - log_memory(%{limit: memory_limit(), total: total}) - shrink_or_log(state) - end + shrunk_state = + if memory_limit() < total do + log_memory(%{limit: memory_limit(), total: total}) + shrink_or_log(state) + %{state | shrunk?: true} + else + state + end + + final_state = + if state.shrunk? and total <= memory_limit() * @expandable_memory_coefficient do + log_expandable_memory(%{limit: memory_limit(), total: total}) + expand(state) + %{state | shrunk?: false} + else + shrunk_state + end flush(:check) - {:noreply, state} + {:noreply, final_state} end defp flush(message) do @@ -100,7 +116,20 @@ defmodule Indexer.Memory.Monitor do to_string(limit), " bytes (", to_string(div(100 * total, limit)), - "%) of memory limit used." + "%) of memory limit used, shrinking queues" + ] + end) + end + + defp log_expandable_memory(%{total: total, limit: limit}) do + Logger.info(fn -> + [ + to_string(total), + " / ", + to_string(limit), + " bytes (", + to_string(div(100 * total, limit)), + "%) of memory limit used, expanding queues" ] end) end @@ -164,6 +193,15 @@ defmodule Indexer.Memory.Monitor do end end + defp expand(%__MODULE__{} = state) do + state + |> shrinkable_memory_pairs() + |> Enum.each(fn {pid, _memory} -> + Logger.info(fn -> ["Expanding queue ", process(pid)] end) + Shrinkable.expand(pid) + end) + end + defp shrinkable_memory_pairs(%__MODULE__{shrinkable_set: shrinkable_set}) do shrinkable_set |> Enum.map(fn pid -> {pid, memory(pid)} end) diff --git a/apps/indexer/lib/indexer/memory/shrinkable.ex b/apps/indexer/lib/indexer/memory/shrinkable.ex index 71d5df38a7ad..274c72ace0db 100644 --- a/apps/indexer/lib/indexer/memory/shrinkable.ex +++ b/apps/indexer/lib/indexer/memory/shrinkable.ex @@ -22,4 +22,12 @@ defmodule Indexer.Memory.Shrinkable do def shrunk?(pid) when is_pid(pid) do GenServer.call(pid, :shrunk?) end + + @doc """ + Asks `pid` to expand its size + """ + @spec expand(pid()) :: :ok + def expand(pid) when is_pid(pid) do + GenServer.call(pid, :expand) + end end diff --git a/apps/indexer/lib/indexer/pending_transactions_sanitizer.ex b/apps/indexer/lib/indexer/pending_transactions_sanitizer.ex index 17de593bc01a..552d500aff5f 100644 --- a/apps/indexer/lib/indexer/pending_transactions_sanitizer.ex +++ b/apps/indexer/lib/indexer/pending_transactions_sanitizer.ex @@ -13,8 +13,7 @@ defmodule Indexer.PendingTransactionsSanitizer do alias Ecto.Changeset alias Explorer.{Chain, Repo} - alias Explorer.Chain.Import.Runner.Blocks - alias Explorer.Chain.Transaction + alias Explorer.Chain.{Block, Transaction} @interval :timer.hours(3) @@ -155,7 +154,7 @@ defmodule Indexer.PendingTransactionsSanitizer do defp invalidate_block(block, pending_tx, tx) do if block.consensus do - Blocks.invalidate_consensus_blocks([block.number]) + Block.set_refetch_needed(block.number) else tx_info = to_elixir(tx) diff --git a/apps/indexer/lib/indexer/supervisor.ex b/apps/indexer/lib/indexer/supervisor.ex index defc0e3bae22..8b56c378dd37 100644 --- a/apps/indexer/lib/indexer/supervisor.ex +++ b/apps/indexer/lib/indexer/supervisor.ex @@ -20,6 +20,7 @@ defmodule Indexer.Supervisor do alias Indexer.Block.Realtime, as: BlockRealtime alias Indexer.Fetcher.CoinBalance.Catchup, as: CoinBalanceCatchup alias Indexer.Fetcher.CoinBalance.Realtime, as: CoinBalanceRealtime + alias Indexer.Fetcher.Stability.Validator, as: ValidatorStability alias Indexer.Fetcher.TokenInstance.LegacySanitize, as: TokenInstanceLegacySanitize alias Indexer.Fetcher.TokenInstance.Realtime, as: TokenInstanceRealtime alias Indexer.Fetcher.TokenInstance.Retry, as: TokenInstanceRetry @@ -45,8 +46,10 @@ defmodule Indexer.Supervisor do Withdrawal } + alias Indexer.Fetcher.ZkSync.BatchesStatusTracker, as: ZkSyncBatchesStatusTracker + alias Indexer.Fetcher.ZkSync.TransactionBatch, as: ZkSyncTransactionBatch + alias Indexer.Temporary.{ - BlocksTransactionsMismatch, UncatalogedTokenTransfers, UnclesWithoutIndex } @@ -114,8 +117,6 @@ defmodule Indexer.Supervisor do # Async catchup fetchers {UncleBlock.Supervisor, [[block_fetcher: block_fetcher, memory_monitor: memory_monitor]]}, - {BlockReward.Supervisor, - [[json_rpc_named_arguments: json_rpc_named_arguments, memory_monitor: memory_monitor]]}, {InternalTransaction.Supervisor, [[json_rpc_named_arguments: json_rpc_named_arguments, memory_monitor: memory_monitor]]}, {CoinBalanceCatchup.Supervisor, @@ -138,6 +139,18 @@ defmodule Indexer.Supervisor do [[json_rpc_named_arguments: json_rpc_named_arguments, memory_monitor: memory_monitor]]}, {ReplacedTransaction.Supervisor, [[memory_monitor: memory_monitor]]}, {Indexer.Fetcher.RollupL1ReorgMonitor.Supervisor, [[memory_monitor: memory_monitor]]}, + configure( + Indexer.Fetcher.Optimism.TxnBatch.Supervisor, + [[memory_monitor: memory_monitor, json_rpc_named_arguments: json_rpc_named_arguments]] + ), + configure(Indexer.Fetcher.Optimism.OutputRoot.Supervisor, [[memory_monitor: memory_monitor]]), + configure(Indexer.Fetcher.Optimism.DisputeGame.Supervisor, [[memory_monitor: memory_monitor]]), + configure(Indexer.Fetcher.Optimism.Deposit.Supervisor, [[memory_monitor: memory_monitor]]), + configure( + Indexer.Fetcher.Optimism.Withdrawal.Supervisor, + [[memory_monitor: memory_monitor, json_rpc_named_arguments: json_rpc_named_arguments]] + ), + configure(Indexer.Fetcher.Optimism.WithdrawalEvent.Supervisor, [[memory_monitor: memory_monitor]]), configure(Indexer.Fetcher.PolygonEdge.Deposit.Supervisor, [[memory_monitor: memory_monitor]]), configure(Indexer.Fetcher.PolygonEdge.DepositExecute.Supervisor, [ [memory_monitor: memory_monitor, json_rpc_named_arguments: json_rpc_named_arguments] @@ -155,6 +168,12 @@ defmodule Indexer.Supervisor do configure(Indexer.Fetcher.PolygonZkevm.BridgeL2.Supervisor, [ [json_rpc_named_arguments: json_rpc_named_arguments, memory_monitor: memory_monitor] ]), + configure(ZkSyncTransactionBatch.Supervisor, [ + [json_rpc_named_arguments: json_rpc_named_arguments, memory_monitor: memory_monitor] + ]), + configure(ZkSyncBatchesStatusTracker.Supervisor, [ + [json_rpc_named_arguments: json_rpc_named_arguments, memory_monitor: memory_monitor] + ]), configure(Indexer.Fetcher.PolygonZkevm.TransactionBatch.Supervisor, [ [json_rpc_named_arguments: json_rpc_named_arguments, memory_monitor: memory_monitor] ]), @@ -169,8 +188,6 @@ defmodule Indexer.Supervisor do {UncatalogedTokenTransfers.Supervisor, [[]]}, {UnclesWithoutIndex.Supervisor, [[json_rpc_named_arguments: json_rpc_named_arguments, memory_monitor: memory_monitor]]}, - {BlocksTransactionsMismatch.Supervisor, - [[json_rpc_named_arguments: json_rpc_named_arguments, memory_monitor: memory_monitor]]}, {PendingOpsCleaner, [[], []]}, {PendingBlockOperationsSanitizer, [[]]}, {RootstockData.Supervisor, [[json_rpc_named_arguments: json_rpc_named_arguments]]}, @@ -191,7 +208,13 @@ defmodule Indexer.Supervisor do ] |> List.flatten() - all_fetchers = maybe_add_bridged_tokens_fetchers(basic_fetchers) + all_fetchers = + basic_fetchers + |> maybe_add_bridged_tokens_fetchers() + |> add_chain_type_dependent_fetchers() + |> maybe_add_block_reward_fetcher( + {BlockReward.Supervisor, [[json_rpc_named_arguments: json_rpc_named_arguments, memory_monitor: memory_monitor]]} + ) Supervisor.init( all_fetchers, @@ -216,6 +239,36 @@ defmodule Indexer.Supervisor do end end + @variants_with_implemented_fetch_beneficiaries [ + EthereumJSONRPC.Besu, + EthereumJSONRPC.Erigon, + EthereumJSONRPC.Nethermind + ] + + defp maybe_add_block_reward_fetcher( + fetchers, + {_, [[json_rpc_named_arguments: json_rpc_named_arguments, memory_monitor: _memory_monitor]]} = params + ) do + case Keyword.fetch(json_rpc_named_arguments, :variant) do + {:ok, ignored_variant} when ignored_variant not in @variants_with_implemented_fetch_beneficiaries -> + Application.put_env(:indexer, Indexer.Fetcher.BlockReward.Supervisor, disabled?: true) + fetchers + + _ -> + [params | fetchers] + end + end + + defp add_chain_type_dependent_fetchers(fetchers) do + case Application.get_env(:explorer, :chain_type) do + :stability -> + [{ValidatorStability, []} | fetchers] + + _ -> + fetchers + end + end + defp configure(process, opts) do if Application.get_env(:indexer, process)[:enabled] do [{process, opts}] diff --git a/apps/indexer/lib/indexer/temporary/blocks_transactions_mismatch.ex b/apps/indexer/lib/indexer/temporary/blocks_transactions_mismatch.ex deleted file mode 100644 index fd7e1907313c..000000000000 --- a/apps/indexer/lib/indexer/temporary/blocks_transactions_mismatch.ex +++ /dev/null @@ -1,147 +0,0 @@ -defmodule Indexer.Temporary.BlocksTransactionsMismatch do - @moduledoc """ - Fetches `consensus` `t:Explorer.Chain.Block.t/0` and compares their transaction - number against a node, to revoke `consensus` on mismatch. - - This is meant to fix incorrectly stored transactions that happened as a result - of a race condition due to the asynchronicity of indexer's components. - """ - - use Indexer.Fetcher - - require Logger - - import Ecto.Query - - alias EthereumJSONRPC.Blocks - alias Explorer.{Chain, Repo} - alias Explorer.Chain.Block - alias Explorer.Utility.MissingRangesManipulator - alias Indexer.BufferedTask - - @behaviour BufferedTask - - @defaults [ - flush_interval: :timer.seconds(3), - max_batch_size: 50, - max_concurrency: 1, - task_supervisor: Indexer.Temporary.BlocksTransactionsMismatch.TaskSupervisor, - metadata: [fetcher: :blocks_transactions_mismatch] - ] - - @doc false - # credo:disable-for-next-line Credo.Check.Design.DuplicatedCode - def child_spec([init_options, gen_server_options]) when is_list(init_options) do - {state, mergeable_init_options} = Keyword.pop(init_options, :json_rpc_named_arguments) - - unless state do - raise ArgumentError, - ":json_rpc_named_arguments must be provided to `#{__MODULE__}.child_spec " <> - "to allow for json_rpc calls when running." - end - - merged_init_options = - @defaults - |> Keyword.merge(mergeable_init_options) - |> Keyword.put(:state, state) - - Supervisor.child_spec({BufferedTask, [{__MODULE__, merged_init_options}, gen_server_options]}, id: __MODULE__) - end - - @impl BufferedTask - def init(initial, reducer, _) do - query = - from(block in Block, - left_join: transactions in assoc(block, :transactions), - where: block.consensus == true and block.refetch_needed, - group_by: block.hash, - select: {block.hash, count(transactions.hash)} - ) - - {:ok, final} = - query - |> Chain.add_fetcher_limit(true) - |> Repo.stream_reduce(initial, &reducer.(&1, &2)) - - final - end - - @impl BufferedTask - def run(blocks_data, json_rpc_named_arguments) do - hashes = Enum.map(blocks_data, fn {hash, _trans_num} -> hash end) - - Logger.debug("fetching") - - case EthereumJSONRPC.fetch_blocks_by_hash(hashes, json_rpc_named_arguments) do - {:ok, blocks} -> - run_blocks(blocks, blocks_data) - - {:error, reason} -> - Logger.error(fn -> ["failed to fetch: ", inspect(reason)] end) - {:retry, blocks_data} - end - end - - defp run_blocks(%Blocks{blocks_params: []}, blocks_data), do: {:retry, blocks_data} - - defp run_blocks( - %Blocks{transactions_params: transactions_params, blocks_params: blocks_params}, - blocks_data - ) do - blocks_with_transactions_map = - transactions_params - |> Enum.group_by(&Map.fetch!(&1, :block_hash)) - |> Map.new(fn {block_hash, trans_lst} -> {block_hash, Enum.count(trans_lst)} end) - - found_blocks_map = - blocks_params - |> Map.new(&{Map.fetch!(&1, :hash), 0}) - |> Map.merge(blocks_with_transactions_map) - - {found_blocks_data, missing_blocks_data} = - Enum.split_with(blocks_data, fn {hash, _trans_num} -> - Map.has_key?(found_blocks_map, to_string(hash)) - end) - - {matching_blocks_data, unmatching_blocks_data} = - Enum.split_with(found_blocks_data, fn {hash, trans_num} -> - found_blocks_map[to_string(hash)] == trans_num - end) - - unless Enum.empty?(matching_blocks_data) do - matching_blocks_data - |> Enum.map(fn {hash, _trans_num} -> hash end) - |> update_in_order(refetch_needed: false) - end - - unless Enum.empty?(unmatching_blocks_data) do - {_, updated_numbers} = - unmatching_blocks_data - |> Enum.map(fn {hash, _trans_num} -> hash end) - |> update_in_order(refetch_needed: false, consensus: false) - - MissingRangesManipulator.add_ranges_by_block_numbers(updated_numbers) - end - - if Enum.empty?(missing_blocks_data) do - :ok - else - {:retry, missing_blocks_data} - end - end - - defp update_in_order(hashes, fields_to_set) do - query = - from(block in Block, - where: block.hash in ^hashes, - # Enforce Block ShareLocks order (see docs: sharelocks.md) - order_by: [asc: block.hash], - lock: "FOR NO KEY UPDATE" - ) - - Repo.update_all( - from(b in Block, join: s in subquery(query), on: b.hash == s.hash, select: b.number), - set: fields_to_set - ) - end -end diff --git a/apps/indexer/lib/indexer/temporary/uncataloged_token_transfers.ex b/apps/indexer/lib/indexer/temporary/uncataloged_token_transfers.ex index d048a3331172..53664810aa77 100644 --- a/apps/indexer/lib/indexer/temporary/uncataloged_token_transfers.ex +++ b/apps/indexer/lib/indexer/temporary/uncataloged_token_transfers.ex @@ -13,7 +13,7 @@ defmodule Indexer.Temporary.UncatalogedTokenTransfers do require Logger alias Explorer.Chain.TokenTransfer - alias Indexer.Block.Catchup.Fetcher + alias Explorer.Utility.MissingRangesManipulator alias Indexer.Temporary.UncatalogedTokenTransfers def child_spec([init_arguments]) do @@ -94,6 +94,11 @@ defmodule Indexer.Temporary.UncatalogedTokenTransfers do end defp async_push_front(block_numbers) do - Task.Supervisor.async_nolink(UncatalogedTokenTransfers.TaskSupervisor, Fetcher, :push_front, [block_numbers]) + Task.Supervisor.async_nolink( + UncatalogedTokenTransfers.TaskSupervisor, + MissingRangesManipulator, + :add_ranges_by_block_numbers, + [block_numbers] + ) end end diff --git a/apps/indexer/lib/indexer/token_balances.ex b/apps/indexer/lib/indexer/token_balances.ex index e53347f90ba9..066cddbac24b 100644 --- a/apps/indexer/lib/indexer/token_balances.ex +++ b/apps/indexer/lib/indexer/token_balances.ex @@ -13,7 +13,7 @@ defmodule Indexer.TokenBalances do alias Indexer.Fetcher.TokenBalance alias Indexer.Tracer - @erc1155_balance_function_abi [ + @nft_balance_function_abi [ %{ "constant" => true, "inputs" => [%{"name" => "_owner", "type" => "address"}, %{"name" => "_id", "type" => "uint256"}], @@ -39,7 +39,7 @@ defmodule Indexer.TokenBalances do * `address_hash` - The address_hash that we want to know the balance. * `block_number` - The block number that the address_hash has the balance. * `token_type` - type of the token that balance belongs to - * `token_id` - token id for ERC-1155 tokens + * `token_id` - token id for ERC-1155/ERC-404 tokens """ def fetch_token_balances_from_blockchain([]), do: {:ok, []} @@ -47,39 +47,39 @@ defmodule Indexer.TokenBalances do def fetch_token_balances_from_blockchain(token_balances) do Logger.debug("fetching token balances", count: Enum.count(token_balances)) - regular_token_balances = + ft_token_balances = token_balances - |> Enum.filter(fn request -> - if Map.has_key?(request, :token_type) do - request.token_type !== "ERC-1155" + |> Enum.filter(fn token_balance -> + if Map.has_key?(token_balance, :token_type) do + token_balance.token_type !== "ERC-1155" && !(token_balance.token_type == "ERC-404" && token_balance.token_id) else true end end) - erc1155_token_balances = + nft_token_balances = token_balances - |> Enum.filter(fn request -> - if Map.has_key?(request, :token_type) do - request.token_type == "ERC-1155" + |> Enum.filter(fn token_balance -> + if Map.has_key?(token_balance, :token_type) do + token_balance.token_type == "ERC-1155" || (token_balance.token_type == "ERC-404" && token_balance.token_id) else false end end) - requested_regular_token_balances = - regular_token_balances + requested_ft_token_balances = + ft_token_balances |> BalanceReader.get_balances_of() - |> Stream.zip(regular_token_balances) + |> Stream.zip(ft_token_balances) |> Enum.map(fn {result, token_balance} -> set_token_balance_value(result, token_balance) end) - requested_erc1155_token_balances = - erc1155_token_balances - |> BalanceReader.get_balances_of_with_abi(@erc1155_balance_function_abi) - |> Stream.zip(erc1155_token_balances) + requested_nft_token_balances = + nft_token_balances + |> BalanceReader.get_balances_of_with_abi(@nft_balance_function_abi) + |> Stream.zip(nft_token_balances) |> Enum.map(fn {result, token_balance} -> set_token_balance_value(result, token_balance) end) - requested_token_balances = requested_regular_token_balances ++ requested_erc1155_token_balances + requested_token_balances = requested_ft_token_balances ++ requested_nft_token_balances fetched_token_balances = Enum.filter(requested_token_balances, &ignore_request_with_errors/1) requested_token_balances diff --git a/apps/indexer/lib/indexer/transform/address_token_balances.ex b/apps/indexer/lib/indexer/transform/address_token_balances.ex index 291783f6a2ba..288757d313c4 100644 --- a/apps/indexer/lib/indexer/transform/address_token_balances.ex +++ b/apps/indexer/lib/indexer/transform/address_token_balances.ex @@ -17,12 +17,15 @@ defmodule Indexer.Transform.AddressTokenBalances do to_address_hash: to_address_hash, token_contract_address_hash: token_contract_address_hash, token_ids: token_ids, - token_type: token_type + token: %{type: token_type} }, acc when is_integer(block_number) and is_binary(from_address_hash) and is_binary(to_address_hash) and is_binary(token_contract_address_hash) -> - Enum.reduce(token_ids || [nil], acc, fn id, sub_acc -> + sanitized_token_ids = + if is_nil(token_ids) || (is_list(token_ids) && Enum.empty?(token_ids)), do: [nil], else: token_ids + + Enum.reduce(sanitized_token_ids, acc, fn id, sub_acc -> sub_acc |> add_token_balance_address(from_address_hash, token_contract_address_hash, id, token_type, block_number) |> add_token_balance_address(to_address_hash, token_contract_address_hash, id, token_type, block_number) diff --git a/apps/indexer/lib/indexer/transform/addresses.ex b/apps/indexer/lib/indexer/transform/addresses.ex index 543352d123e9..af645ba34457 100644 --- a/apps/indexer/lib/indexer/transform/addresses.ex +++ b/apps/indexer/lib/indexer/transform/addresses.ex @@ -48,6 +48,8 @@ defmodule Indexer.Transform.Addresses do } """ + alias Indexer.Helper + @entity_to_address_map %{ address_coin_balances: [ [ @@ -506,7 +508,7 @@ defmodule Indexer.Transform.Addresses do end defp find_tx_action_addresses(block_number, value, accumulator) when is_binary(value) do - if is_address?(value) do + if Helper.address_correct?(value) do [%{:fetched_coin_balance_block_number => block_number, :hash => value} | accumulator] else accumulator @@ -599,8 +601,4 @@ defmodule Indexer.Transform.Addresses do defp max_nil_last(first_integer, second_integer) when is_integer(first_integer) and is_integer(second_integer), do: max(first_integer, second_integer) - - defp is_address?(value) when is_binary(value) do - String.match?(value, ~r/^0x[[:xdigit:]]{40}$/i) - end end diff --git a/apps/indexer/lib/indexer/transform/optimism/withdrawals.ex b/apps/indexer/lib/indexer/transform/optimism/withdrawals.ex new file mode 100644 index 000000000000..eca8d19e7a87 --- /dev/null +++ b/apps/indexer/lib/indexer/transform/optimism/withdrawals.ex @@ -0,0 +1,49 @@ +defmodule Indexer.Transform.Optimism.Withdrawals do + @moduledoc """ + Helper functions for transforming data for Optimism withdrawals. + """ + + require Logger + + alias Indexer.Fetcher.Optimism.Withdrawal, as: OptimismWithdrawal + alias Indexer.Helper + + # 32-byte signature of the event MessagePassed(uint256 indexed nonce, address indexed sender, address indexed target, uint256 value, uint256 gasLimit, bytes data, bytes32 withdrawalHash) + @message_passed_event "0x02a52367d10742d8032712c1bb8e0144ff1ec5ffda1ed7d70bb05a2744955054" + + @doc """ + Returns a list of withdrawals given a list of logs. + """ + def parse(logs) do + prev_metadata = Logger.metadata() + Logger.metadata(fetcher: :optimism_withdrawals_realtime) + + items = + with false <- is_nil(Application.get_env(:indexer, OptimismWithdrawal)[:start_block_l2]), + message_passer = Application.get_env(:indexer, OptimismWithdrawal)[:message_passer], + true <- Helper.address_correct?(message_passer) do + message_passer = String.downcase(message_passer) + + logs + |> Enum.filter(fn log -> + !is_nil(log.first_topic) && String.downcase(log.first_topic) == @message_passed_event && + String.downcase(Helper.address_hash_to_string(log.address_hash)) == message_passer + end) + |> Enum.map(fn log -> + Logger.info("Withdrawal message found, nonce: #{log.second_topic}.") + OptimismWithdrawal.event_to_withdrawal(log.second_topic, log.data, log.transaction_hash, log.block_number) + end) + else + true -> + [] + + false -> + Logger.error("L2ToL1MessagePasser contract address is incorrect. Cannot use #{__MODULE__} for parsing logs.") + [] + end + + Logger.reset_metadata(prev_metadata) + + items + end +end diff --git a/apps/indexer/lib/indexer/transform/polygon_zkevm/bridge.ex b/apps/indexer/lib/indexer/transform/polygon_zkevm/bridge.ex index 441e6950d132..ba14abac1031 100644 --- a/apps/indexer/lib/indexer/transform/polygon_zkevm/bridge.ex +++ b/apps/indexer/lib/indexer/transform/polygon_zkevm/bridge.ex @@ -6,7 +6,7 @@ defmodule Indexer.Transform.PolygonZkevm.Bridge do require Logger import Indexer.Fetcher.PolygonZkevm.Bridge, - only: [filter_bridge_events: 2, prepare_operations: 4] + only: [filter_bridge_events: 2, prepare_operations: 8] alias Indexer.Fetcher.PolygonZkevm.{BridgeL1, BridgeL2} alias Indexer.Helper @@ -21,9 +21,18 @@ defmodule Indexer.Transform.PolygonZkevm.Bridge do items = with false <- is_nil(Application.get_env(:indexer, BridgeL2)[:start_block]), - false <- System.get_env("CHAIN_TYPE") != "polygon_zkevm", + false <- Application.get_env(:explorer, :chain_type) != :polygon_zkevm, rpc_l1 = Application.get_all_env(:indexer)[BridgeL1][:rpc], {:rpc_l1_undefined, false} <- {:rpc_l1_undefined, is_nil(rpc_l1)}, + rollup_network_id_l1 = Application.get_all_env(:indexer)[BridgeL1][:rollup_network_id_l1], + rollup_network_id_l2 = Application.get_all_env(:indexer)[BridgeL2][:rollup_network_id_l2], + rollup_index_l1 = Application.get_all_env(:indexer)[BridgeL1][:rollup_index_l1], + rollup_index_l2 = Application.get_all_env(:indexer)[BridgeL2][:rollup_index_l2], + {:rollup_network_id_l1_is_valid, true} <- + {:rollup_network_id_l1_is_valid, !is_nil(rollup_network_id_l1) and rollup_network_id_l1 >= 0}, + {:rollup_network_id_l2_is_valid, true} <- + {:rollup_network_id_l2_is_valid, !is_nil(rollup_network_id_l2) and rollup_network_id_l2 > 0}, + {:rollup_index_l2_is_valid, true} <- {:rollup_index_l2_is_valid, !is_nil(rollup_index_l2)}, bridge_contract = Application.get_env(:indexer, BridgeL2)[:bridge_contract], {:bridge_contract_address_is_valid, true} <- {:bridge_contract_address_is_valid, Helper.address_correct?(bridge_contract)} do @@ -33,7 +42,7 @@ defmodule Indexer.Transform.PolygonZkevm.Bridge do start_block = Enum.min(block_numbers) end_block = Enum.max(block_numbers) - Helper.log_blocks_chunk_handling(start_block, end_block, start_block, end_block, nil, "L2") + Helper.log_blocks_chunk_handling(start_block, end_block, start_block, end_block, nil, :L2) json_rpc_named_arguments_l1 = Helper.json_rpc_named_arguments(rpc_l1) @@ -42,7 +51,15 @@ defmodule Indexer.Transform.PolygonZkevm.Bridge do items = logs |> filter_bridge_events(bridge_contract) - |> prepare_operations(nil, json_rpc_named_arguments_l1, block_to_timestamp) + |> prepare_operations( + rollup_network_id_l1, + rollup_network_id_l2, + rollup_index_l1, + rollup_index_l2, + nil, + json_rpc_named_arguments_l1, + block_to_timestamp + ) Helper.log_blocks_chunk_handling( start_block, @@ -50,7 +67,7 @@ defmodule Indexer.Transform.PolygonZkevm.Bridge do start_block, end_block, "#{Enum.count(items)} L2 operation(s)", - "L2" + :L2 ) items @@ -62,6 +79,27 @@ defmodule Indexer.Transform.PolygonZkevm.Bridge do Logger.error("L1 RPC URL is not defined. Cannot use #{__MODULE__} for parsing logs.") [] + {:rollup_network_id_l1_is_valid, false} -> + Logger.error( + "Invalid network ID for L1. Please, check INDEXER_POLYGON_ZKEVM_L1_BRIDGE_NETWORK_ID env variable." + ) + + [] + + {:rollup_network_id_l2_is_valid, false} -> + Logger.error( + "Invalid network ID for L2. Please, check INDEXER_POLYGON_ZKEVM_L2_BRIDGE_NETWORK_ID env variable." + ) + + [] + + {:rollup_index_l2_is_valid, false} -> + Logger.error( + "Rollup index is undefined for L2. Please, check INDEXER_POLYGON_ZKEVM_L2_BRIDGE_ROLLUP_INDEX env variable." + ) + + [] + {:bridge_contract_address_is_valid, false} -> Logger.error( "PolygonZkEVMBridge contract address is invalid or not defined. Cannot use #{__MODULE__} for parsing logs." diff --git a/apps/indexer/lib/indexer/transform/shibarium/bridge.ex b/apps/indexer/lib/indexer/transform/shibarium/bridge.ex index 950d187d8bff..dc348815c105 100644 --- a/apps/indexer/lib/indexer/transform/shibarium/bridge.ex +++ b/apps/indexer/lib/indexer/transform/shibarium/bridge.ex @@ -24,7 +24,7 @@ defmodule Indexer.Transform.Shibarium.Bridge do items = with false <- is_nil(Application.get_env(:indexer, Indexer.Fetcher.Shibarium.L2)[:start_block]), - false <- System.get_env("CHAIN_TYPE") != "shibarium", + false <- Application.get_env(:explorer, :chain_type) != :shibarium, child_chain = Application.get_env(:indexer, Indexer.Fetcher.Shibarium.L2)[:child_chain], weth = Application.get_env(:indexer, Indexer.Fetcher.Shibarium.L2)[:weth], bone_withdraw = Application.get_env(:indexer, Indexer.Fetcher.Shibarium.L2)[:bone_withdraw], @@ -39,7 +39,7 @@ defmodule Indexer.Transform.Shibarium.Bridge do start_block = Enum.min(block_numbers) end_block = Enum.max(block_numbers) - Helper.log_blocks_chunk_handling(start_block, end_block, start_block, end_block, nil, "L2") + Helper.log_blocks_chunk_handling(start_block, end_block, start_block, end_block, nil, :L2) deposit_transaction_hashes = transactions_with_receipts @@ -76,7 +76,7 @@ defmodule Indexer.Transform.Shibarium.Bridge do start_block, end_block, "#{Enum.count(operations)} L2 operation(s)", - "L2" + :L2 ) items diff --git a/apps/indexer/lib/indexer/transform/token_instances.ex b/apps/indexer/lib/indexer/transform/token_instances.ex index a9fb4372d2fd..1b9374318b7d 100644 --- a/apps/indexer/lib/indexer/transform/token_instances.ex +++ b/apps/indexer/lib/indexer/transform/token_instances.ex @@ -51,27 +51,24 @@ defmodule Indexer.Transform.TokenInstances do current_key = {token_contract_address_hash, token_id} - Map.put( + Map.update( acc, current_key, - Enum.max_by( - [ - params, - acc[current_key] || params - ], - fn %{ - owner_updated_at_block: owner_updated_at_block, - owner_updated_at_log_index: owner_updated_at_log_index - } -> - {owner_updated_at_block, owner_updated_at_log_index} - end - ) + params, + fn current -> + Enum.max_by([params, current], fn ti -> + { + Map.get(ti, :owner_updated_at_block, 0), + Map.get(ti, :owner_updated_at_log_index, 0) + } + end) + end ) end defp transfer_to_instances( %{ - token_type: _token_type, + token_type: "ERC-404" = token_type, token_ids: [_ | _] = token_ids, token_contract_address_hash: token_contract_address_hash }, @@ -79,6 +76,23 @@ defmodule Indexer.Transform.TokenInstances do ) do Enum.reduce(token_ids, acc, fn id, sub_acc -> Map.put(sub_acc, {token_contract_address_hash, id}, %{ + token_contract_address_hash: token_contract_address_hash, + token_id: id, + token_type: token_type + }) + end) + end + + defp transfer_to_instances( + %{ + token_type: _token_type, + token_ids: [_ | _] = token_ids, + token_contract_address_hash: token_contract_address_hash + }, + acc + ) do + Enum.reduce(token_ids, acc, fn id, sub_acc -> + Map.put_new(sub_acc, {token_contract_address_hash, id}, %{ token_contract_address_hash: token_contract_address_hash, token_id: id, token_type: "ERC-1155" diff --git a/apps/indexer/lib/indexer/transform/token_transfers.ex b/apps/indexer/lib/indexer/transform/token_transfers.ex index 5163c5f7f458..2ffd90abd1f5 100644 --- a/apps/indexer/lib/indexer/transform/token_transfers.ex +++ b/apps/indexer/lib/indexer/transform/token_transfers.ex @@ -1,15 +1,14 @@ defmodule Indexer.Transform.TokenTransfers do @moduledoc """ - Helper functions for transforming data for ERC-20 and ERC-721 token transfers. + Helper functions for transforming data for known token standards (ERC-20, ERC-721, ERC-1155, ERC-404) transfers. """ require Logger import Explorer.Chain.SmartContract, only: [burn_address_hash_string: 0] - import Explorer.Helper, only: [decode_data: 2] - alias Explorer.Repo - alias Explorer.Chain.{Token, TokenTransfer} + alias Explorer.{Helper, Repo} + alias Explorer.Chain.{Hash, Token, TokenTransfer} alias Indexer.Fetcher.TokenTotalSupplyUpdater @doc """ @@ -39,12 +38,22 @@ defmodule Indexer.Transform.TokenTransfers do end) |> Enum.reduce(initial_acc, &do_parse(&1, &2, :erc1155)) + erc404_token_transfers = + logs + |> Enum.filter(fn log -> + log.first_topic == TokenTransfer.erc404_erc20_transfer_event() || + log.first_topic == TokenTransfer.erc404_erc721_transfer_event() + end) + |> Enum.reduce(initial_acc, &do_parse(&1, &2, :erc404)) + rough_tokens = - erc1155_token_transfers.tokens ++ + erc404_token_transfers.tokens ++ + erc1155_token_transfers.tokens ++ erc20_and_erc721_token_transfers.tokens ++ weth_transfers.tokens rough_token_transfers = - erc1155_token_transfers.token_transfers ++ + erc404_token_transfers.token_transfers ++ + erc1155_token_transfers.token_transfers ++ erc20_and_erc721_token_transfers.token_transfers ++ weth_transfers.token_transfers tokens = sanitize_token_types(rough_tokens, rough_token_transfers) @@ -142,17 +151,17 @@ defmodule Indexer.Transform.TokenTransfers do defp token_type_priority(nil), do: -1 - @token_types_priority_order ["ERC-20", "ERC-721", "ERC-1155"] + @token_types_priority_order ["ERC-20", "ERC-721", "ERC-1155", "ERC-404"] defp token_type_priority(token_type) do Enum.find_index(@token_types_priority_order, &(&1 == token_type)) end defp do_parse(log, %{tokens: tokens, token_transfers: token_transfers} = acc, type \\ :erc20_erc721) do parse_result = - if type != :erc1155 do - parse_params(log) - else - parse_erc1155_params(log) + case type do + :erc1155 -> parse_erc1155_params(log) + :erc404 -> parse_erc404_params(log) + _ -> parse_params(log) end case parse_result do @@ -177,15 +186,18 @@ defmodule Indexer.Transform.TokenTransfers do # ERC-20 token transfer defp parse_params(%{second_topic: second_topic, third_topic: third_topic, fourth_topic: nil} = log) when not is_nil(second_topic) and not is_nil(third_topic) do - [amount] = decode_data(log.data, [{:uint, 256}]) + [amount] = Helper.decode_data(log.data, [{:uint, 256}]) + + from_address_hash = truncate_address_hash(log.second_topic) + to_address_hash = truncate_address_hash(log.third_topic) token_transfer = %{ amount: Decimal.new(amount || 0), block_number: log.block_number, block_hash: log.block_hash, log_index: log.index, - from_address_hash: truncate_address_hash(log.second_topic), - to_address_hash: truncate_address_hash(log.third_topic), + from_address_hash: from_address_hash, + to_address_hash: to_address_hash, token_contract_address_hash: log.address_hash, transaction_hash: log.transaction_hash, token_ids: nil, @@ -203,7 +215,7 @@ defmodule Indexer.Transform.TokenTransfers do # ERC-20 token transfer for WETH defp parse_params(%{second_topic: second_topic, third_topic: nil, fourth_topic: nil} = log) when not is_nil(second_topic) do - [amount] = decode_data(log.data, [{:uint, 256}]) + [amount] = Helper.decode_data(log.data, [{:uint, 256}]) {from_address_hash, to_address_hash} = if log.first_topic == TokenTransfer.weth_deposit_signature() do @@ -236,14 +248,17 @@ defmodule Indexer.Transform.TokenTransfers do # ERC-721 token transfer with topics as addresses defp parse_params(%{second_topic: second_topic, third_topic: third_topic, fourth_topic: fourth_topic} = log) when not is_nil(second_topic) and not is_nil(third_topic) and not is_nil(fourth_topic) do - [token_id] = decode_data(fourth_topic, [{:uint, 256}]) + [token_id] = Helper.decode_data(fourth_topic, [{:uint, 256}]) + + from_address_hash = truncate_address_hash(log.second_topic) + to_address_hash = truncate_address_hash(log.third_topic) token_transfer = %{ block_number: log.block_number, log_index: log.index, block_hash: log.block_hash, - from_address_hash: truncate_address_hash(log.second_topic), - to_address_hash: truncate_address_hash(log.third_topic), + from_address_hash: from_address_hash, + to_address_hash: to_address_hash, token_contract_address_hash: log.address_hash, token_ids: [token_id || 0], transaction_hash: log.transaction_hash, @@ -268,7 +283,7 @@ defmodule Indexer.Transform.TokenTransfers do } = log ) when not is_nil(data) do - [from_address_hash, to_address_hash, token_id] = decode_data(data, [:address, :address, {:uint, 256}]) + [from_address_hash, to_address_hash, token_id] = Helper.decode_data(data, [:address, :address, {:uint, 256}]) token_transfer = %{ block_number: log.block_number, @@ -290,25 +305,34 @@ defmodule Indexer.Transform.TokenTransfers do {token, token_transfer} end - def parse_erc1155_params( - %{ - first_topic: unquote(TokenTransfer.erc1155_batch_transfer_signature()), - third_topic: third_topic, - fourth_topic: fourth_topic, - data: data - } = log - ) do - [token_ids, values] = decode_data(data, [{:array, {:uint, 256}}, {:array, {:uint, 256}}]) + @spec parse_erc1155_params(map()) :: + nil + | {%{ + contract_address_hash: Hash.Address.t(), + type: String.t() + }, map()} + defp parse_erc1155_params( + %{ + first_topic: unquote(TokenTransfer.erc1155_batch_transfer_signature()), + third_topic: third_topic, + fourth_topic: fourth_topic, + data: data + } = log + ) do + [token_ids, values] = Helper.decode_data(data, [{:array, {:uint, 256}}, {:array, {:uint, 256}}]) if is_nil(token_ids) or token_ids == [] or is_nil(values) or values == [] do nil else + from_address_hash = truncate_address_hash(third_topic) + to_address_hash = truncate_address_hash(fourth_topic) + token_transfer = %{ block_number: log.block_number, block_hash: log.block_hash, log_index: log.index, - from_address_hash: truncate_address_hash(third_topic), - to_address_hash: truncate_address_hash(fourth_topic), + from_address_hash: from_address_hash, + to_address_hash: to_address_hash, token_contract_address_hash: log.address_hash, transaction_hash: log.transaction_hash, token_type: "ERC-1155", @@ -325,16 +349,19 @@ defmodule Indexer.Transform.TokenTransfers do end end - def parse_erc1155_params(%{third_topic: third_topic, fourth_topic: fourth_topic, data: data} = log) do - [token_id, value] = decode_data(data, [{:uint, 256}, {:uint, 256}]) + defp parse_erc1155_params(%{third_topic: third_topic, fourth_topic: fourth_topic, data: data} = log) do + [token_id, value] = Helper.decode_data(data, [{:uint, 256}, {:uint, 256}]) + + from_address_hash = truncate_address_hash(third_topic) + to_address_hash = truncate_address_hash(fourth_topic) token_transfer = %{ amount: value, block_number: log.block_number, block_hash: log.block_hash, log_index: log.index, - from_address_hash: truncate_address_hash(third_topic), - to_address_hash: truncate_address_hash(fourth_topic), + from_address_hash: from_address_hash, + to_address_hash: to_address_hash, token_contract_address_hash: log.address_hash, transaction_hash: log.transaction_hash, token_type: "ERC-1155", @@ -349,6 +376,84 @@ defmodule Indexer.Transform.TokenTransfers do {token, token_transfer} end + @spec parse_erc404_params(map()) :: + nil + | {%{ + contract_address_hash: Hash.Address.t(), + type: String.t() + }, map()} + defp parse_erc404_params( + %{ + first_topic: unquote(TokenTransfer.erc404_erc20_transfer_event()), + second_topic: second_topic, + third_topic: third_topic, + fourth_topic: nil, + data: data + } = log + ) do + [value] = Helper.decode_data(data, [{:uint, 256}]) + + if is_nil(value) or value == [] do + nil + else + token_transfer = %{ + block_number: log.block_number, + block_hash: log.block_hash, + log_index: log.index, + from_address_hash: truncate_address_hash(second_topic), + to_address_hash: truncate_address_hash(third_topic), + token_contract_address_hash: log.address_hash, + transaction_hash: log.transaction_hash, + token_type: "ERC-404", + token_ids: [], + amounts: [value] + } + + token = %{ + contract_address_hash: log.address_hash, + type: "ERC-404" + } + + {token, token_transfer} + end + end + + defp parse_erc404_params( + %{ + first_topic: unquote(TokenTransfer.erc404_erc721_transfer_event()), + second_topic: second_topic, + third_topic: third_topic, + fourth_topic: fourth_topic, + data: _data + } = log + ) do + [token_id] = Helper.decode_data(fourth_topic, [{:uint, 256}]) + + if is_nil(token_id) or token_id == [] do + nil + else + token_transfer = %{ + block_number: log.block_number, + block_hash: log.block_hash, + log_index: log.index, + from_address_hash: truncate_address_hash(second_topic), + to_address_hash: truncate_address_hash(third_topic), + token_contract_address_hash: log.address_hash, + transaction_hash: log.transaction_hash, + token_type: "ERC-404", + token_ids: [token_id], + amounts: [] + } + + token = %{ + contract_address_hash: log.address_hash, + type: "ERC-404" + } + + {token, token_transfer} + end + end + defp truncate_address_hash(nil), do: burn_address_hash_string() defp truncate_address_hash("0x000000000000000000000000" <> truncated_hash) do diff --git a/apps/indexer/lib/indexer/transform/transaction_actions.ex b/apps/indexer/lib/indexer/transform/transaction_actions.ex index 8c5e34262b0b..44d782e77586 100644 --- a/apps/indexer/lib/indexer/transform/transaction_actions.ex +++ b/apps/indexer/lib/indexer/transform/transaction_actions.ex @@ -120,6 +120,9 @@ defmodule Indexer.Transform.TransactionActions do # 32-byte signature of the event Swap(address indexed sender, address indexed recipient, int256 amount0, int256 amount1, uint160 sqrtPriceX96, uint128 liquidity, int24 tick); @uniswap_v3_swap_event "0xc42079f94a6350d7e6235f29174924f928cc2ac818eb64fed8004e115fbcca67" + # max number of token decimals + @decimals_max 0xFF + @doc """ Returns a list of transaction actions given a list of logs. """ @@ -698,7 +701,7 @@ defmodule Indexer.Transform.TransactionActions do {responses_get_pool, error_messages} = read_contracts_with_retries(requests_get_pool, @uniswap_v3_factory_abi, max_retries) - if !Enum.empty?(error_messages) or Enum.count(requests_get_pool) != Enum.count(responses_get_pool) do + if not Enum.empty?(error_messages) or Enum.count(requests_get_pool) != Enum.count(responses_get_pool) do Logger.error( "TransactionActions: Cannot read Uniswap V3 Factory contract getPool public getter. Error messages: #{Enum.join(error_messages, ", ")}. Requests: #{inspect(requests_get_pool)}" ) @@ -728,7 +731,7 @@ defmodule Indexer.Transform.TransactionActions do {responses, error_messages} = read_contracts_with_retries(requests, @uniswap_v3_pool_abi, max_retries) - if !Enum.empty?(error_messages) do + if not Enum.empty?(error_messages) do incorrect_pools = uniswap_get_incorrect_pools(requests, responses) Logger.warning( @@ -807,7 +810,7 @@ defmodule Indexer.Transform.TransactionActions do |> get_token_data_from_rpc() if Enum.any?(token_data, fn {_, token} -> - is_nil(token.symbol) or token.symbol == "" or is_nil(token.decimals) + Map.get(token, :symbol, "") == "" or Map.get(token, :decimals) > @decimals_max end) do false else @@ -862,7 +865,7 @@ defmodule Indexer.Transform.TransactionActions do new_data = %{symbol: symbol, decimals: decimals} - TransactionActionTokensData.put_to_cache(contract_address_hash, new_data) + put_to_cache(contract_address_hash, new_data) Map.put(token_data_acc, contract_address_hash, new_data) end) @@ -887,6 +890,12 @@ defmodule Indexer.Transform.TransactionActions do end end + defp put_to_cache(contract_address_hash, new_data) do + if Map.get(new_data, :decimals, 0) <= @decimals_max do + TransactionActionTokensData.put_to_cache(contract_address_hash, new_data) + end + end + defp get_token_data_from_rpc(token_data) do token_addresses = token_data @@ -911,7 +920,7 @@ defmodule Indexer.Transform.TransactionActions do new_data = get_new_data(data, request, response) - TransactionActionTokensData.put_to_cache(request.contract_address, new_data) + put_to_cache(request.contract_address, new_data) Map.put(token_data_acc, request.contract_address, new_data) else @@ -953,7 +962,7 @@ defmodule Indexer.Transform.TransactionActions do max_retries = Application.get_env(:explorer, :token_functions_reader_max_retries) {responses, error_messages} = read_contracts_with_retries(requests, @erc20_abi, max_retries) - if !Enum.empty?(error_messages) or Enum.count(requests) != Enum.count(responses) do + if not Enum.empty?(error_messages) or Enum.count(requests) != Enum.count(responses) do Logger.warning( "TransactionActions: Cannot read symbol and decimals of an ERC-20 token contract. Error messages: #{Enum.join(error_messages, ", ")}. Addresses: #{Enum.join(token_addresses, ", ")}" ) diff --git a/apps/indexer/mix.exs b/apps/indexer/mix.exs index 0f1a39815391..c57e1cc33dfb 100644 --- a/apps/indexer/mix.exs +++ b/apps/indexer/mix.exs @@ -14,7 +14,17 @@ defmodule Indexer.MixProject do elixirc_paths: elixirc_paths(Mix.env()), lockfile: "../../mix.lock", start_permanent: Mix.env() == :prod, - version: "6.2.0" + version: "6.5.0", + xref: [ + exclude: [ + Explorer.Chain.Optimism.Deposit, + Explorer.Chain.Optimism.FrameSequence, + Explorer.Chain.Optimism.OutputRoot, + Explorer.Chain.Optimism.TxnBatch, + Explorer.Chain.Optimism.Withdrawal, + Explorer.Chain.Optimism.WithdrawalEvent + ] + ] ] end @@ -56,7 +66,8 @@ defmodule Indexer.MixProject do {:spandex, "~> 3.0"}, # `:spandex` integration with Datadog {:spandex_datadog, "~> 1.0"}, - {:logger_json, "~> 5.1"} + {:logger_json, "~> 5.1"}, + {:varint, "~> 1.4"} ] end diff --git a/apps/indexer/test/indexer/block/catchup/bound_interval_supervisor_test.exs b/apps/indexer/test/indexer/block/catchup/bound_interval_supervisor_test.exs index f55ec9134f95..8d9650a762ea 100644 --- a/apps/indexer/test/indexer/block/catchup/bound_interval_supervisor_test.exs +++ b/apps/indexer/test/indexer/block/catchup/bound_interval_supervisor_test.exs @@ -388,7 +388,7 @@ defmodule Indexer.Block.Catchup.BoundIntervalSupervisorTest do assert :ok = Supervisor.terminate_child(pid, :task) - assert_receive {:DOWN, ^reference, :process, ^child_pid, :shutdown} + assert_receive {:DOWN, ^reference, :process, ^child_pid, :normal} end test "with other child_id returns {:error, :not_found}", %{pid: pid} do diff --git a/apps/indexer/test/indexer/block/catchup/missing_ranges_collector_test.exs b/apps/indexer/test/indexer/block/catchup/missing_ranges_collector_test.exs index dd36cd1e9ec9..77449d9004b3 100644 --- a/apps/indexer/test/indexer/block/catchup/missing_ranges_collector_test.exs +++ b/apps/indexer/test/indexer/block/catchup/missing_ranges_collector_test.exs @@ -16,23 +16,21 @@ defmodule Indexer.Block.Catchup.MissingRangesCollectorTest do MissingRangesCollector.start_link([]) Process.sleep(1000) - assert [999_999..900_000//-1] = batch = MissingBlockRange.get_latest_batch(1) + assert [999_999..999_900//-1] = batch = MissingBlockRange.get_latest_batch(100) MissingBlockRange.clear_batch(batch) - assert [899_999..800_000//-1] = batch = MissingBlockRange.get_latest_batch(1) + assert [999_899..999_800//-1] = batch = MissingBlockRange.get_latest_batch(100) MissingBlockRange.clear_batch(batch) - assert [799_999..700_000//-1] = batch = MissingBlockRange.get_latest_batch(1) + assert [999_799..999_700//-1] = batch = MissingBlockRange.get_latest_batch(100) MissingBlockRange.clear_batch(batch) - insert(:block, number: 1_200_000) + insert(:block, number: 1_000_200) Process.sleep(1000) - assert [1_199_999..1_100_001//-1] = batch = MissingBlockRange.get_latest_batch(1) + assert [1_000_199..1_000_100//-1] = batch = MissingBlockRange.get_latest_batch(100) MissingBlockRange.clear_batch(batch) - assert [1_100_000..1_000_001//-1] = batch = MissingBlockRange.get_latest_batch(1) + assert [1_000_099..1_000_001//-1, 999_699..999_699//-1] = batch = MissingBlockRange.get_latest_batch(100) MissingBlockRange.clear_batch(batch) - assert [699_999..600_000//-1] = batch = MissingBlockRange.get_latest_batch(1) - MissingBlockRange.clear_batch(batch) - assert [599_999..500_124//-1, 500_122..500_000//-1] = MissingBlockRange.get_latest_batch(2) + assert [999_698..999_599//-1] = MissingBlockRange.get_latest_batch(100) end test "FIRST_BLOCK and LAST_BLOCK envs" do @@ -60,16 +58,14 @@ defmodule Indexer.Block.Catchup.MissingRangesCollectorTest do test "infinite range" do Application.put_env(:indexer, :block_ranges, "1..5,3..5,2qw1..12,10..11a,,asd..qwe,10..latest") - insert(:block, number: 200_000) + insert(:block, number: 200) MissingRangesCollector.start_link([]) Process.sleep(500) - assert [199_999..100_010//-1] = batch = MissingBlockRange.get_latest_batch(1) - MissingBlockRange.clear_batch(batch) - assert [100_009..10//-1] = batch = MissingBlockRange.get_latest_batch(1) + assert [199..100//-1] = batch = MissingBlockRange.get_latest_batch(100) MissingBlockRange.clear_batch(batch) - assert [5..1//-1] = MissingBlockRange.get_latest_batch(1) + assert [99..10//-1, 5..1//-1] = MissingBlockRange.get_latest_batch(100) end test "finite range" do @@ -80,7 +76,7 @@ defmodule Indexer.Block.Catchup.MissingRangesCollectorTest do MissingRangesCollector.start_link([]) Process.sleep(500) - assert [200..150//-1, 50..30//-1, 25..5//-1] = batch = MissingBlockRange.get_latest_batch(3) + assert [200..150//-1, 50..30//-1, 25..5//-1] = batch = MissingBlockRange.get_latest_batch(100) MissingBlockRange.clear_batch(batch) assert [] = MissingBlockRange.get_latest_batch() end @@ -96,7 +92,7 @@ defmodule Indexer.Block.Catchup.MissingRangesCollectorTest do Process.sleep(500) assert [200..176//-1, 174..150//-1, 50..34//-1, 32..30//-1, 25..5//-1] = - batch = MissingBlockRange.get_latest_batch(5) + batch = MissingBlockRange.get_latest_batch(91) MissingBlockRange.clear_batch(batch) assert [] = MissingBlockRange.get_latest_batch() diff --git a/apps/indexer/test/indexer/fetcher/beacon/blob_test.exs b/apps/indexer/test/indexer/fetcher/beacon/blob_test.exs index 3d41909b78a6..b744b1423aee 100644 --- a/apps/indexer/test/indexer/fetcher/beacon/blob_test.exs +++ b/apps/indexer/test/indexer/fetcher/beacon/blob_test.exs @@ -10,7 +10,7 @@ defmodule Indexer.Fetcher.Beacon.BlobTest do setup :verify_on_exit! setup :set_mox_global - if Application.compile_env(:explorer, :chain_type) == "ethereum" do + if Application.compile_env(:explorer, :chain_type) == :ethereum do describe "init/1" do setup do initial_env = Application.get_env(:indexer, BlobSupervisor) diff --git a/apps/indexer/test/indexer/fetcher/internal_transaction_test.exs b/apps/indexer/test/indexer/fetcher/internal_transaction_test.exs index 7e285aae23c6..fada8686e3cd 100644 --- a/apps/indexer/test/indexer/fetcher/internal_transaction_test.exs +++ b/apps/indexer/test/indexer/fetcher/internal_transaction_test.exs @@ -309,7 +309,7 @@ defmodule Indexer.Fetcher.InternalTransactionTest do assert %{block_hash: ^block_hash} = Repo.get(PendingBlockOperation, block_hash) end - test "remove block consensus on foreign_key_violation", %{ + test "set block refetch_needed=true on foreign_key_violation", %{ json_rpc_named_arguments: json_rpc_named_arguments } do block = insert(:block) @@ -465,7 +465,7 @@ defmodule Indexer.Fetcher.InternalTransactionTest do assert {:retry, [^block_number]} = InternalTransaction.run([block_number], json_rpc_named_arguments) end) - assert %{consensus: false} = Repo.reload(block) + assert %{consensus: true, refetch_needed: true} = Repo.reload(block) assert logs =~ "foreign_key_violation on internal transactions import, foreign transactions hashes:" end end @@ -504,4 +504,108 @@ defmodule Indexer.Fetcher.InternalTransactionTest do assert %{block_number: ^block_number, block_hash: ^block_hash} = Repo.one(PendingBlockOperation) end + + if Application.compile_env(:explorer, :chain_type) == :arbitrum do + test "fetches internal transactions from Arbitrum", %{ + json_rpc_named_arguments: json_rpc_named_arguments + } do + json_rpc_named_arguments = + json_rpc_named_arguments + |> Enum.reject(fn {key, _value} -> key == :variant || key == :transport_options end) + |> Enum.concat([{:variant, EthereumJSONRPC.Geth}]) + |> Enum.concat([{:transport_options, [http_options: []]}]) + + block = insert(:block, number: 1) + _transaction = :transaction |> insert() |> with_block(block) + block_number = block.number + block_hash = block.hash + insert(:pending_block_operation, block_hash: block_hash, block_number: block_number) + + EthereumJSONRPC.Mox + |> expect(:json_rpc, fn [%{id: id, method: "debug_traceTransaction"}], _options -> + {:ok, + [ + %{ + id: id, + result: %{ + "afterEVMTransfers" => [], + "beforeEVMTransfers" => [], + "calls" => [ + %{ + "from" => "0x0000000000000000000000000000000000000000", + "gas" => "0x0", + "gasUsed" => "0x0", + "input" => "0x", + "to" => "0x888f05d02ea7b42f32f103c089c1750170830642", + "type" => "INVALID", + "value" => "0xbf676993d52eb8bfe" + }, + %{ + "from" => "0x888f05d02ea7b42f32f103c089c1750170830642", + "gas" => "0x0", + "gasUsed" => "0x0", + "input" => "0x", + "to" => "0x6cbb552855ce5eb70af49b76a8048be8e3799a05", + "type" => "INVALID", + "value" => "0x0" + }, + %{ + "from" => "0x888f05d02ea7b42f32f103c089c1750170830642", + "gas" => "0x0", + "gasUsed" => "0x0", + "input" => "0x", + "to" => "0xfdaf8f210d52a3f8ee416ad06ff4a0868bb649d4", + "type" => "INVALID", + "value" => "0x64425bdf7e3fc6462" + }, + %{ + "from" => "0x888f05d02ea7b42f32f103c089c1750170830642", + "gas" => "0x0", + "gasUsed" => "0x0", + "input" => "0x", + "to" => "0xbeb639f6ac1e9ca8a4badb4e0f888fd150c042cb", + "type" => "INVALID", + "value" => "0x5b250db3e722b43fc" + }, + %{ + "from" => "0x888f05d02ea7b42f32f103c089c1750170830642", + "gas" => "0x0", + "gasUsed" => "0x0", + "input" => "0x", + "to" => "0xfdaf8f210d52a3f8ee416ad06ff4a0868bb649d4", + "type" => "INVALID", + "value" => "0x6fcc3e3a0" + } + ], + "from" => "0x888f05d02ea7b42f32f103c089c1750170830642", + "gas" => "0x0", + "gasUsed" => "0x0", + "input" => + "0xc9f95d32000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000bf676993d52eb8bfe000000000000000000000000000000000000000000000005b250db3e722b43fc00000000000000000000000000000000000000000000000000000000000f439e00000000000000000000000000000000000000000000000000000000000075300000000000000000000000000000000000000000000000064425bdf7e3fc6462000000000000000000000000fdaf8f210d52a3f8ee416ad06ff4a0868bb649d4000000000000000000000000fdaf8f210d52a3f8ee416ad06ff4a0868bb649d4000000000000000000000000fdaf8f210d52a3f8ee416ad06ff4a0868bb649d400000000000000000000000000000000000000000000000000000000000001600000000000000000000000000000000000000000000000000000000000000000", + "to" => "0x000000000000000000000000000000000000006e", + "type" => "CALL", + "value" => "0x0" + } + } + ]} + end) + + CoinBalanceCatchup.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments) + + assert %{block_hash: block_hash} = Repo.get(PendingBlockOperation, block_hash) + + assert :ok == InternalTransaction.run([block_number], json_rpc_named_arguments) + + assert nil == Repo.get(PendingBlockOperation, block_hash) + + int_txs = Repo.all(from(i in Chain.InternalTransaction, where: i.block_hash == ^block_hash)) + + assert Enum.count(int_txs) > 0 + + last_int_tx = List.last(int_txs) + + assert last_int_tx.type == :call + assert last_int_tx.call_type == :invalid + end + end end diff --git a/apps/indexer/test/indexer/fetcher/coin_balance_on_demand_test.exs b/apps/indexer/test/indexer/fetcher/on_demand/coin_balance_test.exs similarity index 98% rename from apps/indexer/test/indexer/fetcher/coin_balance_on_demand_test.exs rename to apps/indexer/test/indexer/fetcher/on_demand/coin_balance_test.exs index 17697b2f7b20..54c84b508d7a 100644 --- a/apps/indexer/test/indexer/fetcher/coin_balance_on_demand_test.exs +++ b/apps/indexer/test/indexer/fetcher/on_demand/coin_balance_test.exs @@ -1,4 +1,4 @@ -defmodule Indexer.Fetcher.CoinBalanceOnDemandTest do +defmodule Indexer.Fetcher.OnDemand.CoinBalanceTest do # MUST be `async: false` so that {:shared, pid} is set for connection to allow CoinBalanceFetcher's self-send to have # connection allowed immediately. use EthereumJSONRPC.Case, async: false @@ -11,7 +11,7 @@ defmodule Indexer.Fetcher.CoinBalanceOnDemandTest do alias Explorer.Chain.Events.Subscriber alias Explorer.Chain.Wei alias Explorer.Counters.AverageBlockTime - alias Indexer.Fetcher.CoinBalanceOnDemand + alias Indexer.Fetcher.OnDemand.CoinBalance, as: CoinBalanceOnDemand @moduletag :capture_log diff --git a/apps/indexer/test/indexer/fetcher/on_demand/contract_code_test.exs b/apps/indexer/test/indexer/fetcher/on_demand/contract_code_test.exs new file mode 100644 index 000000000000..010aa14faf9a --- /dev/null +++ b/apps/indexer/test/indexer/fetcher/on_demand/contract_code_test.exs @@ -0,0 +1,214 @@ +defmodule Indexer.Fetcher.OnDemand.ContractCodeTest do + use EthereumJSONRPC.Case, async: false + use Explorer.DataCase + + import Mox + + alias Explorer.Chain.Address + alias Explorer.Chain.Events.Subscriber + alias Explorer.Utility.AddressContractCodeFetchAttempt + alias Indexer.Fetcher.OnDemand.ContractCode, as: ContractCodeOnDemand + + @moduletag :capture_log + + setup :set_mox_global + + setup :verify_on_exit! + + setup %{json_rpc_named_arguments: json_rpc_named_arguments} do + mocked_json_rpc_named_arguments = Keyword.put(json_rpc_named_arguments, :transport, EthereumJSONRPC.Mox) + + start_supervised!({Task.Supervisor, name: Indexer.TaskSupervisor}) + start_supervised!({ContractCodeOnDemand, [mocked_json_rpc_named_arguments, [name: ContractCodeOnDemand]]}) + + %{json_rpc_named_arguments: mocked_json_rpc_named_arguments} + end + + describe "update behaviour" do + setup do + Subscriber.to(:fetched_bytecode, :on_demand) + + :ok + end + + test "address broadcasts fetched code" do + address = insert(:address) + address_hash = address.hash + string_address_hash = to_string(address.hash) + + contract_code = "0x6080" + + EthereumJSONRPC.Mox + |> expect(:json_rpc, fn [ + %{ + id: id, + jsonrpc: "2.0", + method: "eth_getCode", + params: [^string_address_hash, "latest"] + } + ], + _ -> + {:ok, [%{id: id, result: contract_code}]} + end) + + assert ContractCodeOnDemand.trigger_fetch(address) == :ok + + :timer.sleep(100) + + address = assert(Repo.get(Address, address_hash)) + refute is_nil(address.contract_code) + + assert is_nil(Repo.get(AddressContractCodeFetchAttempt, address_hash)) + + assert_receive({:chain_event, :fetched_bytecode, :on_demand, [^address_hash, ^contract_code]}) + end + + test "don't run the update on the address with non-empty nonce" do + address = insert(:address, nonce: 2) + address_hash = address.hash + + assert ContractCodeOnDemand.trigger_fetch(address) == :ok + + :timer.sleep(100) + + address = assert(Repo.get(Address, address_hash)) + assert is_nil(address.contract_code) + + attempts = Repo.get(AddressContractCodeFetchAttempt, address_hash) + assert is_nil(attempts) + + refute_receive({:chain_event, :fetched_bytecode, :on_demand, [^address_hash, "0x"]}) + end + + test "updates address_contract_code_fetch_attempts table" do + address = insert(:address) + address_hash = address.hash + string_address_hash = to_string(address.hash) + + EthereumJSONRPC.Mox + |> expect(:json_rpc, fn [ + %{ + id: id, + jsonrpc: "2.0", + method: "eth_getCode", + params: [^string_address_hash, "latest"] + } + ], + _ -> + {:ok, [%{id: id, result: "0x"}]} + end) + + assert ContractCodeOnDemand.trigger_fetch(address) == :ok + + :timer.sleep(100) + + address = assert(Repo.get(Address, address_hash)) + assert is_nil(address.contract_code) + + attempts = Repo.get(AddressContractCodeFetchAttempt, address_hash) + assert attempts.retries_number == 1 + + refute_receive({:chain_event, :fetched_bytecode, :on_demand, [^address_hash, "0x"]}) + end + + test "updates contract_code after 2nd attempt" do + threshold = parse_time_env_var("CONTRACT_CODE_ON_DEMAND_FETCHER_THRESHOLD", "500ms") + Application.put_env(:indexer, ContractCodeOnDemand, threshold: threshold) + + address = insert(:address) + address_hash = address.hash + string_address_hash = to_string(address.hash) + + EthereumJSONRPC.Mox + |> expect(:json_rpc, fn [ + %{ + id: id, + jsonrpc: "2.0", + method: "eth_getCode", + params: [^string_address_hash, "latest"] + } + ], + _ -> + {:ok, [%{id: id, result: "0x"}]} + end) + + assert ContractCodeOnDemand.trigger_fetch(address) == :ok + + :timer.sleep(100) + + address = assert(Repo.get(Address, address_hash)) + assert is_nil(address.contract_code) + + attempts = Repo.get(AddressContractCodeFetchAttempt, address_hash) + assert attempts.retries_number == 1 + + refute_receive({:chain_event, :fetched_bytecode, :on_demand, [^address_hash, "0x"]}) + + contract_code = "0x6080" + + # try 2nd time before update threshold reached: nothing should be updated + :timer.sleep(100) + + assert ContractCodeOnDemand.trigger_fetch(address) == :ok + + :timer.sleep(50) + + address = assert(Repo.get(Address, address_hash)) + assert is_nil(address.contract_code) + + refute is_nil(Repo.get(AddressContractCodeFetchAttempt, address_hash)) + + refute_receive({:chain_event, :fetched_bytecode, :on_demand, [^address_hash, ^contract_code]}) + + # trying 3d time after update threshold reached: update is expected. + :timer.sleep(1000) + + EthereumJSONRPC.Mox + |> expect(:json_rpc, fn [ + %{ + id: id, + jsonrpc: "2.0", + method: "eth_getCode", + params: [^string_address_hash, "latest"] + } + ], + _ -> + {:ok, [%{id: id, result: contract_code}]} + end) + + assert ContractCodeOnDemand.trigger_fetch(address) == :ok + + :timer.sleep(50) + + address = assert(Repo.get(Address, address_hash)) + refute is_nil(address.contract_code) + + assert is_nil(Repo.get(AddressContractCodeFetchAttempt, address_hash)) + + assert_receive({:chain_event, :fetched_bytecode, :on_demand, [^address_hash, ^contract_code]}) + + default_threshold = parse_time_env_var("CONTRACT_CODE_ON_DEMAND_FETCHER_THRESHOLD", "5s") + Application.put_env(:indexer, ContractCodeOnDemand, threshold: default_threshold) + end + + defp parse_time_env_var(env_var, default_value) do + case env_var |> safe_get_env(default_value) |> String.downcase() |> Integer.parse() do + {milliseconds, "ms"} -> milliseconds + {hours, "h"} -> :timer.hours(hours) + {minutes, "m"} -> :timer.minutes(minutes) + {seconds, s} when s in ["s", ""] -> :timer.seconds(seconds) + _ -> 0 + end + end + + defp safe_get_env(env_var, default_value) do + env_var + |> System.get_env(default_value) + |> case do + "" -> default_value + value -> value + end + |> to_string() + end + end +end diff --git a/apps/indexer/test/indexer/fetcher/rootstock_data_test.exs b/apps/indexer/test/indexer/fetcher/rootstock_data_test.exs index d7954ce886b8..4000e371ff2e 100644 --- a/apps/indexer/test/indexer/fetcher/rootstock_data_test.exs +++ b/apps/indexer/test/indexer/fetcher/rootstock_data_test.exs @@ -10,7 +10,7 @@ defmodule Indexer.Fetcher.RootstockDataTest do setup :verify_on_exit! setup :set_mox_global - if Application.compile_env(:explorer, :chain_type) == "rsk" do + if Application.compile_env(:explorer, :chain_type) == :rsk do test "do not start when all old blocks are fetched", %{json_rpc_named_arguments: json_rpc_named_arguments} do RootstockData.Supervisor.Case.start_supervised!(json_rpc_named_arguments: json_rpc_named_arguments) diff --git a/apps/indexer/test/indexer/fetcher/stability/validator_test.exs b/apps/indexer/test/indexer/fetcher/stability/validator_test.exs new file mode 100644 index 000000000000..accbebac2e7e --- /dev/null +++ b/apps/indexer/test/indexer/fetcher/stability/validator_test.exs @@ -0,0 +1,270 @@ +defmodule Indexer.Fetcher.Stability.ValidatorTest do + use EthereumJSONRPC.Case + use Explorer.DataCase + + import Mox + + alias Explorer.Chain.Stability.Validator, as: ValidatorStability + alias EthereumJSONRPC.Encoder + + setup :verify_on_exit! + setup :set_mox_global + + @accepts_list_of_addresses %{ + "type" => "function", + "stateMutability" => "view", + "payable" => false, + "outputs" => [%{"type" => "address[]", "name" => "", "internalType" => "address[]"}], + "name" => "getActiveValidatorList", + "inputs" => [%{"type" => "address[]", "name" => "", "internalType" => "address[]"}] + } + + @accepts_integer %{ + "type" => "function", + "stateMutability" => "view", + "payable" => false, + "outputs" => [ + %{ + "internalType" => "uint256", + "name" => "", + "type" => "uint256" + } + ], + "name" => "getActiveValidatorList", + "inputs" => [ + %{ + "internalType" => "uint256", + "name" => "", + "type" => "uint256" + } + ] + } + + if Application.compile_env(:explorer, :chain_type) == :stability do + describe "check update_validators_list" do + test "deletes absent validators" do + _validator = insert(:validator_stability) + _validator_active = insert(:validator_stability, state: :active) + _validator_inactive = insert(:validator_stability, state: :inactive) + _validator_probation = insert(:validator_stability, state: :probation) + + start_supervised!({Indexer.Fetcher.Stability.Validator, name: Indexer.Fetcher.Stability.Validator}) + + EthereumJSONRPC.Mox + |> expect(:json_rpc, 1, fn + [ + %{ + id: id_1, + jsonrpc: "2.0", + method: "eth_call", + params: [%{data: "0xa5aa7380", to: "0x0000000000000000000000000000000000000805"}, "latest"] + }, + %{ + id: id_2, + jsonrpc: "2.0", + method: "eth_call", + params: [%{data: "0xe35c0f7d", to: "0x0000000000000000000000000000000000000805"}, "latest"] + } + ], + _ -> + <<"0x", _method_id::binary-size(8), result::binary>> = + [@accepts_list_of_addresses] + |> ABI.parse_specification() + |> Enum.at(0) + |> Encoder.encode_function_call([[]]) + + {:ok, + [ + %{ + id: id_1, + jsonrpc: "2.0", + result: "0x" <> result + }, + %{ + id: id_2, + jsonrpc: "2.0", + result: "0x" <> result + } + ]} + end) + + :timer.sleep(100) + assert ValidatorStability.get_all_validators() == [] + end + + test "updates validators" do + validator_active1 = insert(:validator_stability, state: :active) + validator_active2 = insert(:validator_stability, state: :active) + _validator_active3 = insert(:validator_stability, state: :active) + + validator_inactive1 = insert(:validator_stability, state: :inactive) + validator_inactive2 = insert(:validator_stability, state: :inactive) + _validator_inactive3 = insert(:validator_stability, state: :inactive) + + validator_probation1 = insert(:validator_stability, state: :probation) + validator_probation2 = insert(:validator_stability, state: :probation) + _validator_probation3 = insert(:validator_stability, state: :probation) + + start_supervised!({Indexer.Fetcher.Stability.Validator, name: Indexer.Fetcher.Stability.Validator}) + + EthereumJSONRPC.Mox + |> expect(:json_rpc, fn + [ + %{ + id: id_1, + jsonrpc: "2.0", + method: "eth_call", + params: [%{data: "0xa5aa7380", to: "0x0000000000000000000000000000000000000805"}, "latest"] + }, + %{ + id: id_2, + jsonrpc: "2.0", + method: "eth_call", + params: [%{data: "0xe35c0f7d", to: "0x0000000000000000000000000000000000000805"}, "latest"] + } + ], + _ -> + <<"0x", _method_id::binary-size(8), result_all::binary>> = + [@accepts_list_of_addresses] + |> ABI.parse_specification() + |> Enum.at(0) + |> Encoder.encode_function_call([ + [ + validator_active1.address_hash.bytes, + validator_active2.address_hash.bytes, + validator_inactive1.address_hash.bytes, + validator_inactive2.address_hash.bytes, + validator_probation1.address_hash.bytes, + validator_probation2.address_hash.bytes + ] + ]) + + <<"0x", _method_id::binary-size(8), result_active::binary>> = + [@accepts_list_of_addresses] + |> ABI.parse_specification() + |> Enum.at(0) + |> Encoder.encode_function_call([ + [ + validator_active1.address_hash.bytes, + validator_inactive1.address_hash.bytes, + validator_probation1.address_hash.bytes + ] + ]) + + {:ok, + [ + %{ + id: id_1, + jsonrpc: "2.0", + result: "0x" <> result_active + }, + %{ + id: id_2, + jsonrpc: "2.0", + result: "0x" <> result_all + } + ]} + end) + + "0x" <> address_1 = to_string(validator_active1.address_hash) + "0x" <> address_2 = to_string(validator_inactive1.address_hash) + "0x" <> address_3 = to_string(validator_probation1.address_hash) + + EthereumJSONRPC.Mox + |> expect(:json_rpc, fn + [ + %{ + id: id_1, + jsonrpc: "2.0", + method: "eth_call", + params: [ + %{ + data: "0x41ee9a53000000000000000000000000" <> ^address_1, + to: "0x0000000000000000000000000000000000000805" + }, + "latest" + ] + }, + %{ + id: id_2, + jsonrpc: "2.0", + method: "eth_call", + params: [ + %{ + data: "0x41ee9a53000000000000000000000000" <> ^address_2, + to: "0x0000000000000000000000000000000000000805" + }, + "latest" + ] + }, + %{ + id: id_3, + jsonrpc: "2.0", + method: "eth_call", + params: [ + %{ + data: "0x41ee9a53000000000000000000000000" <> ^address_3, + to: "0x0000000000000000000000000000000000000805" + }, + "latest" + ] + } + ], + _ -> + <<"0x", _method_id::binary-size(8), result_1::binary>> = + [@accepts_integer] + |> ABI.parse_specification() + |> Enum.at(0) + |> Encoder.encode_function_call([10]) + + <<"0x", _method_id::binary-size(8), result_2::binary>> = + [@accepts_integer] + |> ABI.parse_specification() + |> Enum.at(0) + |> Encoder.encode_function_call([1]) + + <<"0x", _method_id::binary-size(8), result_3::binary>> = + [@accepts_integer] + |> ABI.parse_specification() + |> Enum.at(0) + |> Encoder.encode_function_call([0]) + + {:ok, + [ + %{ + id: id_1, + jsonrpc: "2.0", + result: "0x" <> result_1 + }, + %{ + id: id_2, + jsonrpc: "2.0", + result: "0x" <> result_2 + }, + %{ + id: id_3, + jsonrpc: "2.0", + result: "0x" <> result_3 + } + ]} + end) + + :timer.sleep(100) + validators = ValidatorStability.get_all_validators() + + assert Enum.count(validators) == 6 + + map = + Enum.reduce(validators, %{}, fn validator, map -> Map.put(map, validator.address_hash.bytes, validator) end) + + assert %ValidatorStability{state: :inactive} = map[validator_active2.address_hash.bytes] + assert %ValidatorStability{state: :inactive} = map[validator_inactive2.address_hash.bytes] + assert %ValidatorStability{state: :inactive} = map[validator_probation2.address_hash.bytes] + + assert %ValidatorStability{state: :probation} = map[validator_active1.address_hash.bytes] + assert %ValidatorStability{state: :probation} = map[validator_inactive1.address_hash.bytes] + assert %ValidatorStability{state: :active} = map[validator_probation1.address_hash.bytes] + end + end + end +end diff --git a/apps/indexer/test/indexer/fetcher/token_balance_test.exs b/apps/indexer/test/indexer/fetcher/token_balance_test.exs index 6c090973fd1c..3da5675d52aa 100644 --- a/apps/indexer/test/indexer/fetcher/token_balance_test.exs +++ b/apps/indexer/test/indexer/fetcher/token_balance_test.exs @@ -261,7 +261,8 @@ defmodule Indexer.Fetcher.TokenBalanceTest do address_hash: "0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF", block_number: 19999, token_contract_address_hash: to_string(contract.contract_address_hash), - token_id: 11, + token_id: nil, + value: 100_500, token_type: "ERC-20" }, %{ @@ -275,5 +276,30 @@ defmodule Indexer.Fetcher.TokenBalanceTest do assert TokenBalance.import_token_balances(token_balances_params) == :ok end + + test "import ERC-404 token balances and return :ok" do + contract = insert(:token) + insert(:block, number: 19999) + + token_balances_params = [ + %{ + address_hash: "0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF", + block_number: 19999, + token_contract_address_hash: to_string(contract.contract_address_hash), + token_id: 11, + token_type: "ERC-404" + }, + %{ + address_hash: "0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF", + block_number: 19999, + token_contract_address_hash: to_string(contract.contract_address_hash), + token_id: nil, + value: 100_500, + token_type: "ERC-404" + } + ] + + assert TokenBalance.import_token_balances(token_balances_params) == :ok + end end end diff --git a/apps/indexer/test/indexer/fetcher/token_instance/helper_test.exs b/apps/indexer/test/indexer/fetcher/token_instance/helper_test.exs index bc6fb2dd35ce..0f5524325551 100644 --- a/apps/indexer/test/indexer/fetcher/token_instance/helper_test.exs +++ b/apps/indexer/test/indexer/fetcher/token_instance/helper_test.exs @@ -262,5 +262,54 @@ defmodule Indexer.Fetcher.TokenInstance.HelperTest do Application.put_env(:indexer, Indexer.Fetcher.TokenInstance.Helper, base_uri_retry?: false) end + + # https://github.com/blockscout/blockscout/issues/9696 + test "fetch json in utf8 format" do + EthereumJSONRPC.Mox + |> expect(:json_rpc, fn [ + %{ + id: 0, + jsonrpc: "2.0", + method: "eth_call", + params: [ + %{ + data: + "0xc87b56dd000000000000000000000000000000000000000000000000042a0d58bfd13000", + to: "0x5caebd3b32e210e85ce3e9d51638b9c445481567" + }, + "latest" + ] + } + ], + _options -> + {:ok, + [ + %{ + id: 0, + jsonrpc: "2.0", + result: + "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000115646174613a6170706c69636174696f6e2f6a736f6e3b757466382c7b226e616d65223a20224f4d4e493430342023333030303637303030303030303030303030222c226465736372697074696f6e223a225468652066726f6e74696572206f66207065726d697373696f6e6c657373206173736574732e222c2265787465726e616c5f75726c223a2268747470733a2f2f747769747465722e636f6d2f6f6d6e69636861696e343034222c22696d616765223a2268747470733a2f2f697066732e696f2f697066732f516d55364447586369535a5854483166554b6b45716a3734503846655850524b7853546a675273564b55516139352f626173652f3330303036373030303030303030303030302e4a5047227d0000000000000000000000" + } + ]} + end) + + insert(:token, + contract_address: build(:address, hash: "0x5caebd3b32e210e85ce3e9d51638b9c445481567"), + type: "ERC-404" + ) + + assert [ + {:ok, + %Instance{ + metadata: %{ + "name" => "OMNI404 #300067000000000000", + "description" => "The frontier of permissionless assets.", + "external_url" => "https://twitter.com/omnichain404", + "image" => + "https://ipfs.io/ipfs/QmU6DGXciSZXTH1fUKkEqj74P8FeXPRKxSTjgRsVKUQa95/base/300067000000000000.JPG" + } + }} + ] = Helper.batch_fetch_instances([{"0x5caebd3b32e210e85ce3e9d51638b9c445481567", 300_067_000_000_000_000}]) + end end end diff --git a/apps/explorer/test/explorer/token/instance_metadata_retriever_test.exs b/apps/indexer/test/indexer/fetcher/token_instance/metadata_retriever_test.exs similarity index 65% rename from apps/explorer/test/explorer/token/instance_metadata_retriever_test.exs rename to apps/indexer/test/indexer/fetcher/token_instance/metadata_retriever_test.exs index d1d48cc65452..071fa859ac63 100644 --- a/apps/explorer/test/explorer/token/instance_metadata_retriever_test.exs +++ b/apps/indexer/test/indexer/fetcher/token_instance/metadata_retriever_test.exs @@ -1,4 +1,4 @@ -defmodule Explorer.Token.InstanceMetadataRetrieverTest do +defmodule Indexer.Fetcher.TokenInstance.MetadataRetrieverTest do use EthereumJSONRPC.Case alias Indexer.Fetcher.TokenInstance.MetadataRetriever @@ -9,144 +9,204 @@ defmodule Explorer.Token.InstanceMetadataRetrieverTest do setup :verify_on_exit! setup :set_mox_global - @abi [ - %{ - "type" => "function", - "stateMutability" => "view", - "payable" => false, - "outputs" => [ - %{"type" => "string", "name" => ""} - ], - "name" => "tokenURI", - "inputs" => [ - %{ - "type" => "uint256", - "name" => "_tokenId" - } - ], - "constant" => true - } - ] - - @abi_uri [ - %{ - "type" => "function", - "stateMutability" => "view", - "payable" => false, - "outputs" => [ - %{ - "type" => "string", - "name" => "", - "internalType" => "string" - } - ], - "name" => "uri", - "inputs" => [ - %{ - "type" => "uint256", - "name" => "_id", - "internalType" => "uint256" - } - ], - "constant" => true - } - ] - - describe "fetch_metadata/2" do - @tag :no_nethermind - @tag :no_geth - test "fetches json metadata", %{json_rpc_named_arguments: json_rpc_named_arguments} do - if json_rpc_named_arguments[:transport] == EthereumJSONRPC.Mox do - EthereumJSONRPC.Mox - |> expect(:json_rpc, fn [ - %{ - id: 0, - jsonrpc: "2.0", - method: "eth_call", - params: [ - %{ - data: - "0xc87b56dd000000000000000000000000000000000000000000000000fdd5b9fa9d4bfb20", - to: "0x5caebd3b32e210e85ce3e9d51638b9c445481567" - }, - "latest" - ] - } - ], - _options -> - {:ok, - [ - %{ - id: 0, - jsonrpc: "2.0", - result: - "0x0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003568747470733a2f2f7661756c742e7761727269646572732e636f6d2f31383239303732393934373636373130323439362e6a736f6e0000000000000000000000" - } - ]} - end) - end - - assert %{ - "c87b56dd" => {:ok, ["https://vault.warriders.com/18290729947667102496.json"]} - } == - MetadataRetriever.query_contract( - "0x5caebd3b32e210e85ce3e9d51638b9c445481567", - %{ - "c87b56dd" => [18_290_729_947_667_102_496] - }, - @abi - ) + describe "fetch_json/4" do + setup do + bypass = Bypass.open() + + {:ok, bypass: bypass} end - test "fetches json metadata for ERC-1155 token", %{json_rpc_named_arguments: json_rpc_named_arguments} do - if json_rpc_named_arguments[:transport] == EthereumJSONRPC.Mox do - EthereumJSONRPC.Mox - |> expect(:json_rpc, fn [ - %{ - id: 0, - jsonrpc: "2.0", - method: "eth_call", - params: [ - %{ - data: - "0x0e89341c000000000000000000000000000000000000000000000000fdd5b9fa9d4bfb20", - to: "0x5caebd3b32e210e85ce3e9d51638b9c445481567" - }, - "latest" - ] - } - ], - _options -> - {:ok, - [ - %{ - id: 0, - jsonrpc: "2.0", - result: - "0x0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003568747470733a2f2f7661756c742e7761727269646572732e636f6d2f31383239303732393934373636373130323439362e6a736f6e0000000000000000000000" - } - ]} - end) - end - - assert %{ - "0e89341c" => {:ok, ["https://vault.warriders.com/18290729947667102496.json"]} - } == - MetadataRetriever.query_contract( - "0x5caebd3b32e210e85ce3e9d51638b9c445481567", - %{ - "0e89341c" => [18_290_729_947_667_102_496] - }, - @abi_uri - ) + test "returns {:error, @no_uri_error} when empty uri is passed" do + error = {:error, "no uri"} + token_id = "TOKEN_ID" + hex_token_id = "HEX_TOKEN_ID" + from_base_uri = true + + result = MetadataRetriever.fetch_json({:ok, [""]}, token_id, hex_token_id, from_base_uri) + + assert result == error end - end - describe "fetch_json/1" do - setup do - bypass = Bypass.open() + test "returns {:error, @vm_execution_error} when 'execution reverted' error passed in uri" do + uri_error = {:error, "something happened: execution reverted"} + token_id = "TOKEN_ID" + hex_token_id = "HEX_TOKEN_ID" + from_base_uri = true + result_error = {:error, "VM execution error"} - {:ok, bypass: bypass} + result = MetadataRetriever.fetch_json(uri_error, token_id, hex_token_id, from_base_uri) + + assert result == result_error + end + + test "returns {:error, @vm_execution_error} when 'VM execution error' error passed in uri" do + error = {:error, "VM execution error"} + token_id = "TOKEN_ID" + hex_token_id = "HEX_TOKEN_ID" + from_base_uri = true + + result = MetadataRetriever.fetch_json(error, token_id, hex_token_id, from_base_uri) + + assert result == error + end + + test "returns {:error, error} when all other errors passed in uri" do + error = {:error, "Some error"} + token_id = "TOKEN_ID" + hex_token_id = "HEX_TOKEN_ID" + from_base_uri = true + + result = MetadataRetriever.fetch_json(error, token_id, hex_token_id, from_base_uri) + + assert result == error + end + + test "returns {:error, truncated_error} when long error passed in uri" do + error = + {:error, + "ERROR: Unable to establish a connection to the database server. The database server may be offline, or there could be a network issue preventing access. Please ensure that the database server is running and that the network configuration is correct. Additionally, check the database credentials and permissions to ensure they are valid. If the issue persists, contact your system administrator for further assistance. Error code: DB_CONN_FAILED_101234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"} + + token_id = "TOKEN_ID" + hex_token_id = "HEX_TOKEN_ID" + from_base_uri = true + + truncated_error = + {:error, + "ERROR: Unable to establish a connection to the database server. The database server may be offline, or there could be a network issue preventing access. Please ensure that the database server is running and that the network configuration is correct. Ad..."} + + result = MetadataRetriever.fetch_json(error, token_id, hex_token_id, from_base_uri) + + assert result == truncated_error + end + + test "Constructs IPFS link with query param" do + configuration = Application.get_env(:indexer, :ipfs) + + Application.put_env(:indexer, :ipfs, + gateway_url: Keyword.get(configuration, :gateway_url), + gateway_url_param_location: :query, + gateway_url_param_key: "x-apikey", + gateway_url_param_value: "mykey" + ) + + data = "QmT1Yz43R1PLn2RVovAnEM5dHQEvpTcnwgX8zftvY1FcjP" + + result = %{ + "name" => "asda", + "description" => "asda", + "salePrice" => 34, + "img_hash" => "QmUfW3PVnh9GGuHcQgc3ZeNEbhwp5HE8rS5ac9MDWWQebz", + "collectionId" => "1871_1665123820823" + } + + Application.put_env(:explorer, :http_adapter, Explorer.Mox.HTTPoison) + + Explorer.Mox.HTTPoison + |> expect(:get, fn "https://ipfs.io/ipfs/QmT1Yz43R1PLn2RVovAnEM5dHQEvpTcnwgX8zftvY1FcjP?x-apikey=mykey", + _headers, + _options -> + {:ok, %HTTPoison.Response{status_code: 200, body: Jason.encode!(result)}} + end) + + assert {:ok, + %{ + metadata: %{ + "collectionId" => "1871_1665123820823", + "description" => "asda", + "img_hash" => "QmUfW3PVnh9GGuHcQgc3ZeNEbhwp5HE8rS5ac9MDWWQebz", + "name" => "asda", + "salePrice" => 34 + } + }} == MetadataRetriever.fetch_json({:ok, [data]}) + + Application.put_env(:explorer, :http_adapter, HTTPoison) + Application.put_env(:indexer, :ipfs, configuration) + end + + test "Constructs IPFS link with no query param, if gateway_url_param_location is invalid" do + configuration = Application.get_env(:indexer, :ipfs) + + Application.put_env(:indexer, :ipfs, + gateway_url: Keyword.get(configuration, :gateway_url), + gateway_url_param_location: :query2, + gateway_url_param_key: "x-apikey", + gateway_url_param_value: "mykey" + ) + + data = "QmT1Yz43R1PLn2RVovAnEM5dHQEvpTcnwgX8zftvY1FcjP" + + result = %{ + "name" => "asda", + "description" => "asda", + "salePrice" => 34, + "img_hash" => "QmUfW3PVnh9GGuHcQgc3ZeNEbhwp5HE8rS5ac9MDWWQebz", + "collectionId" => "1871_1665123820823" + } + + Application.put_env(:explorer, :http_adapter, Explorer.Mox.HTTPoison) + + Explorer.Mox.HTTPoison + |> expect(:get, fn "https://ipfs.io/ipfs/QmT1Yz43R1PLn2RVovAnEM5dHQEvpTcnwgX8zftvY1FcjP", _headers, _options -> + {:ok, %HTTPoison.Response{status_code: 200, body: Jason.encode!(result)}} + end) + + assert {:ok, + %{ + metadata: %{ + "collectionId" => "1871_1665123820823", + "description" => "asda", + "img_hash" => "QmUfW3PVnh9GGuHcQgc3ZeNEbhwp5HE8rS5ac9MDWWQebz", + "name" => "asda", + "salePrice" => 34 + } + }} == MetadataRetriever.fetch_json({:ok, [data]}) + + Application.put_env(:explorer, :http_adapter, HTTPoison) + Application.put_env(:indexer, :ipfs, configuration) + end + + test "Constructs IPFS link with additional header" do + configuration = Application.get_env(:indexer, :ipfs) + + Application.put_env(:indexer, :ipfs, + gateway_url: Keyword.get(configuration, :gateway_url), + gateway_url_param_location: :header, + gateway_url_param_key: "x-apikey", + gateway_url_param_value: "mykey" + ) + + data = "QmT1Yz43R1PLn2RVovAnEM5dHQEvpTcnwgX8zftvY1FcjP" + + result = %{ + "name" => "asda", + "description" => "asda", + "salePrice" => 34, + "img_hash" => "QmUfW3PVnh9GGuHcQgc3ZeNEbhwp5HE8rS5ac9MDWWQebz", + "collectionId" => "1871_1665123820823" + } + + Application.put_env(:explorer, :http_adapter, Explorer.Mox.HTTPoison) + + Explorer.Mox.HTTPoison + |> expect(:get, fn "https://ipfs.io/ipfs/QmT1Yz43R1PLn2RVovAnEM5dHQEvpTcnwgX8zftvY1FcjP", + [{"x-apikey", "mykey"}], + _options -> + {:ok, %HTTPoison.Response{status_code: 200, body: Jason.encode!(result)}} + end) + + assert {:ok, + %{ + metadata: %{ + "collectionId" => "1871_1665123820823", + "description" => "asda", + "img_hash" => "QmUfW3PVnh9GGuHcQgc3ZeNEbhwp5HE8rS5ac9MDWWQebz", + "name" => "asda", + "salePrice" => 34 + } + }} == MetadataRetriever.fetch_json({:ok, [data]}) + + Application.put_env(:explorer, :http_adapter, HTTPoison) + Application.put_env(:indexer, :ipfs, configuration) end test "fetches json with latin1 encoding", %{bypass: bypass} do @@ -190,7 +250,8 @@ defmodule Explorer.Token.InstanceMetadataRetrieverTest do Conn.resp(conn, 200, json) end) - {:ok, %{metadata: metadata}} = MetadataRetriever.fetch_metadata_from_uri("http://localhost:#{bypass.port}#{path}") + {:ok, %{metadata: metadata}} = + MetadataRetriever.fetch_metadata_from_uri("http://localhost:#{bypass.port}#{path}", []) assert Map.get(metadata, "attributes") == Jason.decode!(attributes) end diff --git a/apps/indexer/test/indexer/token_balances_test.exs b/apps/indexer/test/indexer/token_balances_test.exs index 2f5c89c1a6dc..92265544486c 100644 --- a/apps/indexer/test/indexer/token_balances_test.exs +++ b/apps/indexer/test/indexer/token_balances_test.exs @@ -88,6 +88,63 @@ defmodule Indexer.TokenBalancesTest do } = result end + test "fetches balances of ERC-404 tokens" do + address = insert(:address, hash: "0x609991ca0ae39bc4eaf2669976237296d40c2f31") + + address_hash_string = Hash.to_string(address.hash) + + token_contract_address_hash = "0xf7f79032fd395978acb7069c74d21e5a53206559" + + contract_address = insert(:address, hash: token_contract_address_hash) + + token = insert(:token, contract_address: contract_address) + + data = [ + %{ + token_contract_address_hash: Hash.to_string(token.contract_address_hash), + address_hash: address_hash_string, + block_number: 1_000, + token_id: nil, + value: 10, + token_type: "ERC-404" + }, + %{ + token_contract_address_hash: Hash.to_string(token.contract_address_hash), + address_hash: address_hash_string, + block_number: 1_000, + token_id: 5, + token_type: "ERC-404", + value: 2 + } + ] + + get_404_ft_balances_from_blockchain() + get_404_nft_balances_from_blockchain() + + {:ok, result} = TokenBalances.fetch_token_balances_from_blockchain(data) + + assert %{ + failed_token_balances: [], + fetched_token_balances: [ + %{ + value: 10, + token_contract_address_hash: ^token_contract_address_hash, + address_hash: ^address_hash_string, + block_number: 1_000, + value_fetched_at: _ + }, + %{ + token_id: 5, + value: 2, + token_contract_address_hash: ^token_contract_address_hash, + address_hash: ^address_hash_string, + block_number: 1_000, + value_fetched_at: _ + } + ] + } = result + end + test "fetches multiple balances of tokens" do address_1 = insert(:address, hash: "0xecba3c9ea993b0e0594e0b0a0d361a1f9596e310") address_2 = insert(:address, hash: "0x609991ca0ae39bc4eaf2669976237296d40c2f31") @@ -363,6 +420,67 @@ defmodule Indexer.TokenBalancesTest do ) end + defp get_404_ft_balances_from_blockchain() do + expect( + EthereumJSONRPC.Mox, + :json_rpc, + fn [ + %{ + id: id, + method: "eth_call", + params: [ + %{ + data: "0x70a08231000000000000000000000000609991ca0ae39bc4eaf2669976237296d40c2f31", + to: "0xf7f79032fd395978acb7069c74d21e5a53206559" + }, + "0x3E8" + ] + } + ], + _options -> + {:ok, + [ + %{ + id: id, + jsonrpc: "2.0", + result: "0x000000000000000000000000000000000000000000000000000000000000000a" + } + ]} + end + ) + end + + defp get_404_nft_balances_from_blockchain() do + expect( + EthereumJSONRPC.Mox, + :json_rpc, + fn [ + %{ + id: id, + method: "eth_call", + params: [ + %{ + data: + "0x00fdd58e000000000000000000000000609991ca0ae39bc4eaf2669976237296d40c2f310000000000000000000000000000000000000000000000000000000000000005", + to: "0xf7f79032fd395978acb7069c74d21e5a53206559" + }, + "0x3E8" + ] + } + ], + _options -> + {:ok, + [ + %{ + id: id, + jsonrpc: "2.0", + result: "0x0000000000000000000000000000000000000000000000000000000000000002" + } + ]} + end + ) + end + defp get_erc1155_balance_from_blockchain() do expect( EthereumJSONRPC.Mox, diff --git a/apps/indexer/test/indexer/transform/address_token_balances_test.exs b/apps/indexer/test/indexer/transform/address_token_balances_test.exs index b70e2f84fe09..28b67ac2ffa7 100644 --- a/apps/indexer/test/indexer/transform/address_token_balances_test.exs +++ b/apps/indexer/test/indexer/transform/address_token_balances_test.exs @@ -26,7 +26,8 @@ defmodule Indexer.Transform.AddressTokenBalancesTest do to_address_hash: to_address_hash, token_contract_address_hash: token_contract_address_hash, token_ids: nil, - token_type: "ERC-20" + token_type: "ERC-20", + token: %{type: "ERC-20"} } params_set = AddressTokenBalances.params_set(%{token_transfers_params: [token_transfer_params]}) @@ -49,6 +50,7 @@ defmodule Indexer.Transform.AddressTokenBalancesTest do to_address_hash: to_address_hash, token_contract_address_hash: token_contract_address_hash, token_type: "ERC-721", + token: %{type: "ERC-721"}, token_ids: nil } @@ -78,6 +80,7 @@ defmodule Indexer.Transform.AddressTokenBalancesTest do to_address_hash: to_address_hash, token_contract_address_hash: token_contract_address_hash, token_type: "ERC-721", + token: %{type: "ERC-1155"}, token_ids: [1] } @@ -90,7 +93,7 @@ defmodule Indexer.Transform.AddressTokenBalancesTest do block_number: 1, token_contract_address_hash: "0xe18035bf8712672935fdb4e5e431b1a0183d2dfc", token_id: 1, - token_type: "ERC-721" + token_type: "ERC-1155" } ]) end diff --git a/apps/indexer/test/indexer/transform/token_transfers_test.exs b/apps/indexer/test/indexer/transform/token_transfers_test.exs index 3ff6e5e52fc0..f8be8358ab9d 100644 --- a/apps/indexer/test/indexer/transform/token_transfers_test.exs +++ b/apps/indexer/test/indexer/transform/token_transfers_test.exs @@ -187,7 +187,7 @@ defmodule Indexer.Transform.TokenTransfersTest do data: "0x1000000000000c520000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001", first_topic: "0xc3d58168c5ae7397731d063d5bbf3d657854427343f4c083240f7aacaa2d0f62", - secon_topic: "0x0000000000000000000000009c978f4cfa1fe13406bcc05baf26a35716f881dd", + second_topic: "0x0000000000000000000000009c978f4cfa1fe13406bcc05baf26a35716f881dd", third_topic: "0x0000000000000000000000009c978f4cfa1fe13406bcc05baf26a35716f881dd", fourth_topic: "0x0000000000000000000000009c978f4cfa1fe13406bcc05baf26a35716f881dd", index: 2, @@ -228,7 +228,7 @@ defmodule Indexer.Transform.TokenTransfersTest do data: "0x000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000001388", first_topic: "0x4a39dc06d4c0dbc64b70af90fd698a233a518aa5d07e595d983b8c0526c8f7fb", - secon_topic: "0x0000000000000000000000006c943470780461b00783ad530a53913bd2c104d3", + second_topic: "0x0000000000000000000000006c943470780461b00783ad530a53913bd2c104d3", third_topic: "0x0000000000000000000000006c943470780461b00783ad530a53913bd2c104d3", fourth_topic: "0x0000000000000000000000006c943470780461b00783ad530a53913bd2c104d3", index: 2, @@ -262,7 +262,7 @@ defmodule Indexer.Transform.TokenTransfersTest do data: "0x0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", first_topic: "0x4a39dc06d4c0dbc64b70af90fd698a233a518aa5d07e595d983b8c0526c8f7fb", - secon_topic: "0x81D0caF80E9bFfD9bF9c641ab964feB9ef69069e", + second_topic: "0x81D0caF80E9bFfD9bF9c641ab964feB9ef69069e", third_topic: "0x598AF04C88122FA4D1e08C5da3244C39F10D4F14", fourth_topic: "0x0000000000000000000000000000000000000000", index: 6, @@ -340,7 +340,7 @@ defmodule Indexer.Transform.TokenTransfersTest do data: "0x1000000000000c520000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001", first_topic: "0xc3d58168c5ae7397731d063d5bbf3d657854427343f4c083240f7aacaa2d0f62", - secon_topic: "0x0000000000000000000000009c978f4cfa1fe13406bcc05baf26a35716f881dd", + second_topic: "0x0000000000000000000000009c978f4cfa1fe13406bcc05baf26a35716f881dd", third_topic: "0x0000000000000000000000009c978f4cfa1fe13406bcc05baf26a35716f881dd", fourth_topic: "0x0000000000000000000000009c978f4cfa1fe13406bcc05baf26a35716f881dd", index: 2, @@ -357,6 +357,84 @@ defmodule Indexer.Transform.TokenTransfersTest do tokens: [%{contract_address_hash: ^contract_address_hash, type: "ERC-1155"}] } = TokenTransfers.parse(logs) end + + test "parses erc404 token transfer from ERC20Transfer" do + log = %{ + address_hash: "0x03F6CCfCE60273eFbEB9535675C8EFA69D863f37", + block_number: 10_561_358, + data: "0x00000000000000000000000000000000000000000000003635c9adc5de9ffc48", + first_topic: "0xe59fdd36d0d223c0c7d996db7ad796880f45e1936cb0bb7ac102e7082e031487", + second_topic: "0x000000000000000000000000c36442b4a4522e871399cd717abdd847ab11fe88", + third_topic: "0x00000000000000000000000018336808ed2f2c80795861041f711b299ecd38ca", + fourth_topic: nil, + index: 34, + transaction_hash: "0x6be468f465911ec70103aa83e38c84697848feaf760eee3a181ebcdcab82dc4a", + block_hash: "0x7cffabfd975bded1ec397f44b4af3a97618b96ca0e2f92d70a3025ba233815ca" + } + + assert TokenTransfers.parse([log]) == %{ + token_transfers: [ + %{ + block_hash: "0x7cffabfd975bded1ec397f44b4af3a97618b96ca0e2f92d70a3025ba233815ca", + block_number: 10_561_358, + from_address_hash: "0xc36442b4a4522e871399cd717abdd847ab11fe88", + log_index: 34, + to_address_hash: "0x18336808ed2f2c80795861041f711b299ecd38ca", + token_contract_address_hash: "0x03F6CCfCE60273eFbEB9535675C8EFA69D863f37", + amounts: [ + 999_999_999_999_999_999_048 + ], + token_ids: [], + token_type: "ERC-404", + transaction_hash: "0x6be468f465911ec70103aa83e38c84697848feaf760eee3a181ebcdcab82dc4a" + } + ], + tokens: [ + %{ + contract_address_hash: "0x03F6CCfCE60273eFbEB9535675C8EFA69D863f37", + type: "ERC-404" + } + ] + } + end + + test "parses erc404 token transfer from ERC721Transfer" do + log = %{ + address_hash: "0x68995c84aFb019913942E53F27E7ceA47D86Cd9d", + block_number: 10_514_498, + data: "0x", + first_topic: "0xe5f815dc84b8cecdfd4beedfc3f91ab5be7af100eca4e8fb11552b867995394f", + second_topic: "0x000000000000000000000000fd7ec4d8b6ba1a72f3895b6ce3846b00d6b83aab", + third_topic: "0x0000000000000000000000007a250d5630b4cf539739df2c5dacb4c659f2488d", + fourth_topic: "0x000000000000000000000000000000000000000000000000000000000000000a", + index: 41, + transaction_hash: "0xe201aed9c948f46395c6acc54de5e9c3ebe0c41a5c34cc6a507b67ec46057c55", + block_hash: "0xea065ff2fc04177bbef27317209a25f2633199aa453b86ee405b619c495b2e77" + } + + assert TokenTransfers.parse([log]) == %{ + token_transfers: [ + %{ + block_hash: "0xea065ff2fc04177bbef27317209a25f2633199aa453b86ee405b619c495b2e77", + block_number: 10_514_498, + from_address_hash: "0xfd7ec4d8b6ba1a72f3895b6ce3846b00d6b83aab", + log_index: 41, + to_address_hash: "0x7a250d5630b4cf539739df2c5dacb4c659f2488d", + token_contract_address_hash: "0x68995c84aFb019913942E53F27E7ceA47D86Cd9d", + amounts: [], + token_ids: [10], + token_type: "ERC-404", + transaction_hash: "0xe201aed9c948f46395c6acc54de5e9c3ebe0c41a5c34cc6a507b67ec46057c55" + } + ], + tokens: [ + %{ + contract_address_hash: "0x68995c84aFb019913942E53F27E7ceA47D86Cd9d", + type: "ERC-404" + } + ] + } + end end defp truncated_hash("0x000000000000000000000000" <> rest) do diff --git a/cliff.toml b/cliff.toml new file mode 100644 index 000000000000..dd8e87fbd0f1 --- /dev/null +++ b/cliff.toml @@ -0,0 +1,84 @@ +# git-cliff ~ default configuration file +# https://git-cliff.org/docs/configuration +# +# Lines starting with "#" are comments. +# Configuration options are organized into tables and keys. +# See documentation for more information on available options. + +[changelog] +# changelog header +header = """ +# Changelog\n +""" +body = """ +{% if version %}\ + ## [{{ version | trim_start_matches(pat="v") }}] - {{ timestamp | date(format="%Y-%m-%d") }} +{% else %}\ + ## Current +{% endif %}\ +{% for group, commits in commits | group_by(attribute="group") %} + ### {{ group | striptags | trim | upper_first }} + {% for commit in commits %} + - {% if commit.scope %}*({{ commit.scope }})* {% endif %}\ + {% if commit.breaking %}[**breaking**] {% endif %}\ + {{ commit.message | upper_first }}\ + {% endfor %} +{% endfor %}\n +""" +# template for the changelog footer +footer = """ + +""" +# remove the leading and trailing s +trim = true +# postprocessors +postprocessors = [ + # { pattern = ' ', replace = "https://github.com/orhun/git-cliff" }, # replace repository URL +] + +[git] +# parse the commits based on https://www.conventionalcommits.org +conventional_commits = true +# filter out the commits that are not conventional +filter_unconventional = false +# process each line of a commit as an individual commit +split_commits = false +# regex for preprocessing the commit messages +commit_preprocessors = [ + # Replace issue numbers + { pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](https://github.com/blockscout/blockscout/issues/${2}))"}, + # Check spelling of the commit with https://github.com/crate-ci/typos + # If the spelling is incorrect, it will be automatically fixed. + #{ pattern = '.*', replace_command = 'typos --write-changes -' }, +] +# regex for parsing and grouping commits +commit_parsers = [ + { message = "(?i)^feat", group = "🚀 Features" }, + { message = "(?i)^fix", group = "🐛 Bug Fixes" }, + { message = "(?i)^doc", group = "📚 Documentation" }, + { message = "(?i)^perf", group = "⚡ Performance" }, + { message = "(?i)^refactor", group = "🚜 Refactor" }, + { message = "(?i)^chore\\(release\\): prepare for", skip = true }, + { message = "(?i)^chore\\(deps.*\\)", skip = true }, + { message = "(?i)^chore\\(pr\\)", skip = true }, + { message = "(?i)^chore\\(pull\\)", skip = true }, + { message = "(?i)^chore|^ci", group = "⚙️ Miscellaneous Tasks" }, + { body = ".*security", group = "🛡️ Security" }, + { message = "^revert", group = "◀️ Revert" }, +] +# protect breaking changes from being skipped due to matching a skipping commit_parser +protect_breaking_commits = false +# filter out the commits that are not matched by commit parsers +filter_commits = true +# regex for matching git tags +# tag_pattern = "v[0-9].*" +# regex for skipping tags +# skip_tags = "" +# regex for ignoring tags +# ignore_tags = "" +# sort the tags topologically +topo_order = false +# sort the commits inside sections by oldest/newest order +sort_commits = "newest" +# limit the number of commits included in the changelog. +# limit_commits = 42 diff --git a/config/config_helper.exs b/config/config_helper.exs index 45e34c40cd7f..bde67152ddbe 100644 --- a/config/config_helper.exs +++ b/config/config_helper.exs @@ -1,4 +1,6 @@ defmodule ConfigHelper do + require Logger + import Bitwise alias Explorer.ExchangeRates.Source alias Explorer.Market.History.Source.{MarketCap, Price, TVL} @@ -8,14 +10,17 @@ defmodule ConfigHelper do base_repos = [Explorer.Repo, Explorer.Repo.Account] repos = - case System.get_env("CHAIN_TYPE") do - "ethereum" -> base_repos ++ [Explorer.Repo.Beacon] - "polygon_edge" -> base_repos ++ [Explorer.Repo.PolygonEdge] - "polygon_zkevm" -> base_repos ++ [Explorer.Repo.PolygonZkevm] - "rsk" -> base_repos ++ [Explorer.Repo.RSK] - "shibarium" -> base_repos ++ [Explorer.Repo.Shibarium] - "suave" -> base_repos ++ [Explorer.Repo.Suave] - "filecoin" -> base_repos ++ [Explorer.Repo.Filecoin] + case chain_type() do + :ethereum -> base_repos ++ [Explorer.Repo.Beacon] + :optimism -> base_repos ++ [Explorer.Repo.Optimism] + :polygon_edge -> base_repos ++ [Explorer.Repo.PolygonEdge] + :polygon_zkevm -> base_repos ++ [Explorer.Repo.PolygonZkevm] + :rsk -> base_repos ++ [Explorer.Repo.RSK] + :shibarium -> base_repos ++ [Explorer.Repo.Shibarium] + :suave -> base_repos ++ [Explorer.Repo.Suave] + :filecoin -> base_repos ++ [Explorer.Repo.Filecoin] + :stability -> base_repos ++ [Explorer.Repo.Stability] + :zksync -> base_repos ++ [Explorer.Repo.ZkSync] _ -> base_repos end @@ -59,6 +64,17 @@ defmodule ConfigHelper do end end + @spec parse_float_env_var(String.t(), float()) :: float() + def parse_float_env_var(env_var, default_value) do + env_var + |> safe_get_env(to_string(default_value)) + |> Float.parse() + |> case do + {float, _} -> float + _ -> 0 + end + end + @spec parse_integer_or_nil_env_var(String.t()) :: non_neg_integer() | nil def parse_integer_or_nil_env_var(env_var) do env_var @@ -81,6 +97,35 @@ defmodule ConfigHelper do end end + @doc """ + Parses value of env var through catalogued values list. If a value is not in the list, nil is returned. + Also, the application shutdown option is supported, if a value is wrong. + """ + @spec parse_catalog_value(String.t(), List.t(), bool(), String.t() | nil) :: atom() | nil + def parse_catalog_value(env_var, catalog, shutdown_on_wrong_value?, default_value \\ nil) do + value = env_var |> safe_get_env(default_value) + + if value !== "" do + if value in catalog do + String.to_atom(value) + else + if shutdown_on_wrong_value? do + Logger.error(wrong_value_error(value, env_var, catalog)) + exit(:shutdown) + else + Logger.warning(wrong_value_error(value, env_var, catalog)) + nil + end + end + else + nil + end + end + + defp wrong_value_error(value, env_var, catalog) do + "Invalid value \"#{value}\" of #{env_var} environment variable is provided. Supported values are #{inspect(catalog)}" + end + def safe_get_env(env_var, default_value) do env_var |> System.get_env(default_value) @@ -156,6 +201,20 @@ defmodule ConfigHelper do end end + @spec exchange_rates_secondary_coin_price_source() :: Price.CoinGecko | Price.CoinMarketCap | Price.CryptoCompare + def exchange_rates_secondary_coin_price_source do + cmc_secondary_coin_id = System.get_env("EXCHANGE_RATES_COINMARKETCAP_SECONDARY_COIN_ID") + cg_secondary_coin_id = System.get_env("EXCHANGE_RATES_COINGECKO_SECONDARY_COIN_ID") + cc_secondary_coin_symbol = System.get_env("EXCHANGE_RATES_CRYPTOCOMPARE_SECONDARY_COIN_SYMBOL") + + cond do + cg_secondary_coin_id && cg_secondary_coin_id !== "" -> Price.CoinGecko + cmc_secondary_coin_id && cmc_secondary_coin_id !== "" -> Price.CoinMarketCap + cc_secondary_coin_symbol && cc_secondary_coin_symbol !== "" -> Price.CryptoCompare + true -> Price.CryptoCompare + end + end + def block_transformer do block_transformers = %{ "clique" => Blocks.Clique, @@ -190,8 +249,43 @@ defmodule ConfigHelper do err -> raise "Invalid JSON in environment variable #{env_var}: #{inspect(err)}" end - @spec chain_type() :: String.t() - def chain_type, do: System.get_env("CHAIN_TYPE") || "default" + @spec parse_list_env_var(String.t(), String.t() | nil) :: list() + def parse_list_env_var(env_var, default_value \\ nil) do + addresses_var = safe_get_env(env_var, default_value) + + if addresses_var !== "" do + addresses_list = (addresses_var && String.split(addresses_var, ",")) || [] + + formatted_addresses_list = + addresses_list + |> Enum.map(fn addr -> + String.downcase(addr) + end) + + formatted_addresses_list + else + [] + end + end + + @supported_chain_types [ + "default", + "arbitrum", + "ethereum", + "filecoin", + "optimism", + "polygon_edge", + "polygon_zkevm", + "rsk", + "shibarium", + "stability", + "suave", + "zetachain", + "zksync" + ] + + @spec chain_type() :: atom() | nil + def chain_type, do: parse_catalog_value("CHAIN_TYPE", @supported_chain_types, true, "default") @spec eth_call_url(String.t() | nil) :: String.t() | nil def eth_call_url(default \\ nil) do diff --git a/config/runtime.exs b/config/runtime.exs index 729747fe2b4d..8945fd26cdb2 100644 --- a/config/runtime.exs +++ b/config/runtime.exs @@ -86,16 +86,18 @@ config :block_scout_web, :footer, config :block_scout_web, :contract, verification_max_libraries: ConfigHelper.parse_integer_env_var("CONTRACT_VERIFICATION_MAX_LIBRARIES", 10), max_length_to_show_string_without_trimming: System.get_env("CONTRACT_MAX_STRING_LENGTH_WITHOUT_TRIMMING", "2040"), - disable_interaction: ConfigHelper.parse_bool_env_var("CONTRACT_DISABLE_INTERACTION") + disable_interaction: ConfigHelper.parse_bool_env_var("CONTRACT_DISABLE_INTERACTION"), + certified_list: ConfigHelper.parse_list_env_var("CONTRACT_CERTIFIED_LIST", "") -default_api_rate_limit = 50 +default_global_api_rate_limit = 50 +default_api_rate_limit_by_key = 10 config :block_scout_web, :api_rate_limit, disabled: ConfigHelper.parse_bool_env_var("API_RATE_LIMIT_DISABLED"), - global_limit: ConfigHelper.parse_integer_env_var("API_RATE_LIMIT", default_api_rate_limit), - limit_by_key: ConfigHelper.parse_integer_env_var("API_RATE_LIMIT_BY_KEY", default_api_rate_limit), + global_limit: ConfigHelper.parse_integer_env_var("API_RATE_LIMIT", default_global_api_rate_limit), + limit_by_key: ConfigHelper.parse_integer_env_var("API_RATE_LIMIT_BY_KEY", default_api_rate_limit_by_key), limit_by_whitelisted_ip: - ConfigHelper.parse_integer_env_var("API_RATE_LIMIT_BY_WHITELISTED_IP", default_api_rate_limit), + ConfigHelper.parse_integer_env_var("API_RATE_LIMIT_BY_WHITELISTED_IP", default_global_api_rate_limit), time_interval_limit: ConfigHelper.parse_time_env_var("API_RATE_LIMIT_TIME_INTERVAL", "1s"), limit_by_ip: ConfigHelper.parse_integer_env_var("API_RATE_LIMIT_BY_IP", 3000), time_interval_limit_by_ip: ConfigHelper.parse_time_env_var("API_RATE_LIMIT_BY_IP_TIME_INTERVAL", "5m"), @@ -103,7 +105,28 @@ config :block_scout_web, :api_rate_limit, whitelisted_ips: System.get_env("API_RATE_LIMIT_WHITELISTED_IPS"), is_blockscout_behind_proxy: ConfigHelper.parse_bool_env_var("API_RATE_LIMIT_IS_BLOCKSCOUT_BEHIND_PROXY"), api_v2_ui_limit: ConfigHelper.parse_integer_env_var("API_RATE_LIMIT_UI_V2_WITH_TOKEN", 5), - api_v2_token_ttl_seconds: ConfigHelper.parse_integer_env_var("API_RATE_LIMIT_UI_V2_TOKEN_TTL_IN_SECONDS", 18000) + api_v2_token_ttl_seconds: ConfigHelper.parse_integer_env_var("API_RATE_LIMIT_UI_V2_TOKEN_TTL_IN_SECONDS", 18000), + eth_json_rpc_max_batch_size: ConfigHelper.parse_integer_env_var("ETH_JSON_RPC_MAX_BATCH_SIZE", 5) + +default_graphql_rate_limit = 10 + +config :block_scout_web, Api.GraphQL, + default_transaction_hash: + System.get_env( + "API_GRAPHQL_DEFAULT_TRANSACTION_HASH", + "0x69e3923eef50eada197c3336d546936d0c994211492c9f947a24c02827568f9f" + ), + enabled: ConfigHelper.parse_bool_env_var("API_GRAPHQL_ENABLED", "true"), + token_limit: ConfigHelper.parse_integer_env_var("API_GRAPHQL_TOKEN_LIMIT", 1000), + # Needs to be 215 to support the schema introspection for graphiql + max_complexity: ConfigHelper.parse_integer_env_var("API_GRAPHQL_MAX_COMPLEXITY", 215), + rate_limit_disabled?: ConfigHelper.parse_bool_env_var("API_GRAPHQL_RATE_LIMIT_DISABLED"), + global_limit: ConfigHelper.parse_integer_env_var("API_GRAPHQL_RATE_LIMIT", default_graphql_rate_limit), + limit_by_key: ConfigHelper.parse_integer_env_var("API_GRAPHQL_RATE_LIMIT_BY_KEY", default_graphql_rate_limit), + time_interval_limit: ConfigHelper.parse_time_env_var("API_GRAPHQL_RATE_LIMIT_TIME_INTERVAL", "1s"), + limit_by_ip: ConfigHelper.parse_integer_env_var("API_GRAPHQL_RATE_LIMIT_BY_IP", 500), + time_interval_limit_by_ip: ConfigHelper.parse_time_env_var("API_GRAPHQL_RATE_LIMIT_BY_IP_TIME_INTERVAL", "5m"), + static_api_key: System.get_env("API_GRAPHQL_RATE_LIMIT_STATIC_API_KEY") # Configures History price_chart_config = @@ -163,9 +186,9 @@ config :ethereum_jsonrpc, EthereumJSONRPC.HTTP, config :ethereum_jsonrpc, EthereumJSONRPC.Geth, block_traceable?: ConfigHelper.parse_bool_env_var("ETHEREUM_JSONRPC_GETH_TRACE_BY_BLOCK"), - debug_trace_transaction_timeout: System.get_env("ETHEREUM_JSONRPC_DEBUG_TRACE_TRANSACTION_TIMEOUT", "5s"), + debug_trace_timeout: System.get_env("ETHEREUM_JSONRPC_DEBUG_TRACE_TRANSACTION_TIMEOUT", "5s"), tracer: - if(ConfigHelper.chain_type() == "polygon_edge", + if(ConfigHelper.chain_type() == :polygon_edge, do: "polygon_edge", else: System.get_env("INDEXER_INTERNAL_TRANSACTIONS_TRACER_TYPE", "call_tracer") ) @@ -192,10 +215,10 @@ config :explorer, coin_name: System.get_env("COIN_NAME") || exchange_rates_coin || "ETH", allowed_solidity_evm_versions: System.get_env("CONTRACT_VERIFICATION_ALLOWED_SOLIDITY_EVM_VERSIONS") || - "homestead,tangerineWhistle,spuriousDragon,byzantium,constantinople,petersburg,istanbul,berlin,london,paris,shanghai,default", + "homestead,tangerineWhistle,spuriousDragon,byzantium,constantinople,petersburg,istanbul,berlin,london,paris,shanghai,cancun,default", allowed_vyper_evm_versions: System.get_env("CONTRACT_VERIFICATION_ALLOWED_VYPER_EVM_VERSIONS") || - "byzantium,constantinople,petersburg,istanbul,berlin,paris,shanghai,default", + "byzantium,constantinople,petersburg,istanbul,berlin,paris,shanghai,cancun,default", include_uncles_in_average_block_time: ConfigHelper.parse_bool_env_var("UNCLES_IN_AVERAGE_BLOCK_TIME"), healthy_blocks_period: ConfigHelper.parse_time_env_var("HEALTHY_BLOCKS_PERIOD", "5m"), realtime_events_sender: @@ -252,13 +275,18 @@ config :explorer, Explorer.Chain.Cache.GasPriceOracle, num_of_blocks: ConfigHelper.parse_integer_env_var("GAS_PRICE_ORACLE_NUM_OF_BLOCKS", 200), safelow_percentile: ConfigHelper.parse_integer_env_var("GAS_PRICE_ORACLE_SAFELOW_PERCENTILE", 35), average_percentile: ConfigHelper.parse_integer_env_var("GAS_PRICE_ORACLE_AVERAGE_PERCENTILE", 60), - fast_percentile: ConfigHelper.parse_integer_env_var("GAS_PRICE_ORACLE_FAST_PERCENTILE", 90) + fast_percentile: ConfigHelper.parse_integer_env_var("GAS_PRICE_ORACLE_FAST_PERCENTILE", 90), + safelow_time_coefficient: ConfigHelper.parse_float_env_var("GAS_PRICE_ORACLE_SAFELOW_TIME_COEFFICIENT", 5), + average_time_coefficient: ConfigHelper.parse_float_env_var("GAS_PRICE_ORACLE_AVERAGE_TIME_COEFFICIENT", 3), + fast_time_coefficient: ConfigHelper.parse_float_env_var("GAS_PRICE_ORACLE_FAST_TIME_COEFFICIENT", 1) config :explorer, Explorer.Chain.Cache.RootstockLockedBTC, enabled: System.get_env("ETHEREUM_JSONRPC_VARIANT") == "rsk", global_ttl: ConfigHelper.parse_time_env_var("ROOTSTOCK_LOCKED_BTC_CACHE_PERIOD", "10m"), locking_cap: ConfigHelper.parse_integer_env_var("ROOTSTOCK_LOCKING_CAP", 21_000_000) +config :explorer, Explorer.Chain.Cache.OptimismFinalizationPeriod, enabled: ConfigHelper.chain_type() == :optimism + config :explorer, Explorer.Counters.AddressTransactionsGasUsageCounter, cache_period: ConfigHelper.parse_time_env_var("CACHE_ADDRESS_TRANSACTIONS_GAS_USAGE_COUNTER_PERIOD", "30m") @@ -285,6 +313,21 @@ config :explorer, Explorer.Counters.AddressTokenUsdSum, config :explorer, Explorer.Counters.AddressTokenTransfersCounter, cache_period: ConfigHelper.parse_time_env_var("CACHE_ADDRESS_TOKEN_TRANSFERS_COUNTER_PERIOD", "1h") +config :explorer, Explorer.Counters.LastOutputRootSizeCounter, + enabled: ConfigHelper.chain_type() == :optimism, + enable_consolidation: ConfigHelper.chain_type() == :optimism, + cache_period: ConfigHelper.parse_time_env_var("CACHE_OPTIMISM_LAST_OUTPUT_ROOT_SIZE_COUNTER_PERIOD", "5m") + +config :explorer, Explorer.Counters.Transactions24hStats, + enabled: true, + cache_period: ConfigHelper.parse_time_env_var("CACHE_TRANSACTIONS_24H_STATS_PERIOD", "1h"), + enable_consolidation: true + +config :explorer, Explorer.Counters.FreshPendingTransactionsCounter, + enabled: true, + cache_period: ConfigHelper.parse_time_env_var("CACHE_FRESH_PENDING_TRANSACTIONS_COUNTER_PERIOD", "5m"), + enable_consolidation: true + config :explorer, Explorer.ExchangeRates, store: :ets, enabled: !disable_exchange_rates?, @@ -293,20 +336,34 @@ config :explorer, Explorer.ExchangeRates, config :explorer, Explorer.ExchangeRates.Source, source: ConfigHelper.exchange_rates_source(), price_source: ConfigHelper.exchange_rates_price_source(), + secondary_coin_price_source: ConfigHelper.exchange_rates_secondary_coin_price_source(), market_cap_source: ConfigHelper.exchange_rates_market_cap_source(), tvl_source: ConfigHelper.exchange_rates_tvl_source() +cmc_secondary_coin_id = System.get_env("EXCHANGE_RATES_COINMARKETCAP_SECONDARY_COIN_ID") + config :explorer, Explorer.ExchangeRates.Source.CoinMarketCap, + base_url: System.get_env("EXCHANGE_RATES_COINMARKETCAP_BASE_URL"), api_key: System.get_env("EXCHANGE_RATES_COINMARKETCAP_API_KEY"), - coin_id: System.get_env("EXCHANGE_RATES_COINMARKETCAP_COIN_ID") + coin_id: System.get_env("EXCHANGE_RATES_COINMARKETCAP_COIN_ID"), + secondary_coin_id: cmc_secondary_coin_id + +cg_secondary_coin_id = System.get_env("EXCHANGE_RATES_COINGECKO_SECONDARY_COIN_ID") config :explorer, Explorer.ExchangeRates.Source.CoinGecko, platform: System.get_env("EXCHANGE_RATES_COINGECKO_PLATFORM_ID"), + base_url: System.get_env("EXCHANGE_RATES_COINGECKO_BASE_URL"), + base_pro_url: System.get_env("EXCHANGE_RATES_COINGECKO_BASE_PRO_URL"), api_key: System.get_env("EXCHANGE_RATES_COINGECKO_API_KEY"), - coin_id: System.get_env("EXCHANGE_RATES_COINGECKO_COIN_ID") + coin_id: System.get_env("EXCHANGE_RATES_COINGECKO_COIN_ID"), + secondary_coin_id: cg_secondary_coin_id config :explorer, Explorer.ExchangeRates.Source.DefiLlama, coin_id: System.get_env("EXCHANGE_RATES_DEFILLAMA_COIN_ID") +cc_secondary_coin_symbol = System.get_env("EXCHANGE_RATES_CRYPTOCOMPARE_SECONDARY_COIN_SYMBOL") + +config :explorer, Explorer.Market.History.Source.Price.CryptoCompare, secondary_coin_symbol: cc_secondary_coin_symbol + config :explorer, Explorer.ExchangeRates.TokenExchangeRates, enabled: !ConfigHelper.parse_bool_env_var("DISABLE_TOKEN_EXCHANGE_RATE", "true"), interval: ConfigHelper.parse_time_env_var("TOKEN_EXCHANGE_RATE_INTERVAL", "5s"), @@ -315,7 +372,8 @@ config :explorer, Explorer.ExchangeRates.TokenExchangeRates, config :explorer, Explorer.Market.History.Cataloger, enabled: !disable_indexer? && !disable_exchange_rates?, - history_fetch_interval: ConfigHelper.parse_time_env_var("MARKET_HISTORY_FETCH_INTERVAL", "1h") + history_fetch_interval: ConfigHelper.parse_time_env_var("MARKET_HISTORY_FETCH_INTERVAL", "1h"), + secondary_coin_enabled: cmc_secondary_coin_id || cg_secondary_coin_id || cc_secondary_coin_symbol config :explorer, Explorer.Chain.Transaction, suave_bid_contracts: System.get_env("SUAVE_BID_CONTRACTS", "") @@ -389,7 +447,11 @@ config :explorer, Explorer.ThirdPartyIntegrations.NovesFi, chain_name: System.get_env("NOVES_FI_CHAIN_NAME"), api_key: System.get_env("NOVES_FI_API_TOKEN") -enabled? = ConfigHelper.parse_bool_env_var("MICROSERVICE_SC_VERIFIER_ENABLED") +config :explorer, Explorer.ThirdPartyIntegrations.Zerion, + service_url: System.get_env("ZERION_BASE_API_URL", "https://api.zerion.io/v1"), + api_key: System.get_env("ZERION_API_TOKEN") + +enabled? = ConfigHelper.parse_bool_env_var("MICROSERVICE_SC_VERIFIER_ENABLED", "true") # or "eth_bytecode_db" type = System.get_env("MICROSERVICE_SC_VERIFIER_TYPE", "sc_verifier") @@ -416,6 +478,10 @@ config :explorer, Explorer.MicroserviceInterfaces.AccountAbstraction, service_url: System.get_env("MICROSERVICE_ACCOUNT_ABSTRACTION_URL"), enabled: ConfigHelper.parse_bool_env_var("MICROSERVICE_ACCOUNT_ABSTRACTION_ENABLED") +config :explorer, Explorer.MicroserviceInterfaces.Metadata, + service_url: System.get_env("MICROSERVICE_METADATA_URL"), + enabled: ConfigHelper.parse_bool_env_var("MICROSERVICE_METADATA_ENABLED") + config :explorer, :air_table_public_tags, table_url: System.get_env("ACCOUNT_PUBLIC_TAGS_AIRTABLE_URL"), api_key: System.get_env("ACCOUNT_PUBLIC_TAGS_AIRTABLE_API_KEY") @@ -486,6 +552,14 @@ config :explorer, Explorer.Migrator.TransactionsDenormalization, batch_size: ConfigHelper.parse_integer_env_var("DENORMALIZATION_MIGRATION_BATCH_SIZE", 500), concurrency: ConfigHelper.parse_integer_env_var("DENORMALIZATION_MIGRATION_CONCURRENCY", 10) +config :explorer, Explorer.Migrator.TokenTransferTokenType, + batch_size: ConfigHelper.parse_integer_env_var("TOKEN_TRANSFER_TOKEN_TYPE_MIGRATION_BATCH_SIZE", 100), + concurrency: ConfigHelper.parse_integer_env_var("TOKEN_TRANSFER_TOKEN_TYPE_MIGRATION_CONCURRENCY", 1) + +config :explorer, Explorer.Migrator.SanitizeIncorrectNFTTokenTransfers, + batch_size: ConfigHelper.parse_integer_env_var("SANITIZE_INCORRECT_NFT_BATCH_SIZE", 100), + concurrency: ConfigHelper.parse_integer_env_var("SANITIZE_INCORRECT_NFT_CONCURRENCY", 1) + config :explorer, Explorer.Chain.BridgedToken, eth_omni_bridge_mediator: System.get_env("BRIDGED_TOKENS_ETH_OMNI_BRIDGE_MEDIATOR"), bsc_omni_bridge_mediator: System.get_env("BRIDGED_TOKENS_BSC_OMNI_BRIDGE_MEDIATOR"), @@ -525,7 +599,14 @@ config :indexer, ConfigHelper.parse_integer_env_var("INDEXER_TOKEN_BALANCES_FETCHER_INIT_QUERY_LIMIT", 100_000), coin_balances_fetcher_init_limit: ConfigHelper.parse_integer_env_var("INDEXER_COIN_BALANCES_FETCHER_INIT_QUERY_LIMIT", 2000), - ipfs_gateway_url: System.get_env("IPFS_GATEWAY_URL", "https://ipfs.io/ipfs") + graceful_shutdown_period: ConfigHelper.parse_time_env_var("INDEXER_GRACEFUL_SHUTDOWN_PERIOD", "5m") + +config :indexer, :ipfs, + gateway_url: System.get_env("IPFS_GATEWAY_URL", "https://ipfs.io/ipfs"), + gateway_url_param_key: System.get_env("IPFS_GATEWAY_URL_PARAM_KEY"), + gateway_url_param_value: System.get_env("IPFS_GATEWAY_URL_PARAM_VALUE"), + gateway_url_param_location: + ConfigHelper.parse_catalog_value("IPFS_GATEWAY_URL_PARAM_LOCATION", ["query", "header"], true) config :indexer, Indexer.Supervisor, enabled: !ConfigHelper.parse_bool_env_var("DISABLE_INDEXER") @@ -549,9 +630,7 @@ config :indexer, Indexer.Fetcher.TransactionAction, ) config :indexer, Indexer.Fetcher.PendingTransaction.Supervisor, - disabled?: - System.get_env("ETHEREUM_JSONRPC_VARIANT") == "besu" || - ConfigHelper.parse_bool_env_var("INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER") + disabled?: ConfigHelper.parse_bool_env_var("INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER") config :indexer, Indexer.Fetcher.Token, concurrency: ConfigHelper.parse_integer_env_var("INDEXER_TOKEN_CONCURRENCY", 10) @@ -559,14 +638,17 @@ config :indexer, Indexer.Fetcher.TokenBalance, batch_size: ConfigHelper.parse_integer_env_var("INDEXER_TOKEN_BALANCES_BATCH_SIZE", 100), concurrency: ConfigHelper.parse_integer_env_var("INDEXER_TOKEN_BALANCES_CONCURRENCY", 10) -config :indexer, Indexer.Fetcher.TokenBalanceOnDemand, +config :indexer, Indexer.Fetcher.OnDemand.TokenBalance, threshold: ConfigHelper.parse_time_env_var("TOKEN_BALANCE_ON_DEMAND_FETCHER_THRESHOLD", "1h"), fallback_threshold_in_blocks: 500 -config :indexer, Indexer.Fetcher.CoinBalanceOnDemand, +config :indexer, Indexer.Fetcher.OnDemand.CoinBalance, threshold: ConfigHelper.parse_time_env_var("COIN_BALANCE_ON_DEMAND_FETCHER_THRESHOLD", "1h"), fallback_threshold_in_blocks: 500 +config :indexer, Indexer.Fetcher.OnDemand.ContractCode, + threshold: ConfigHelper.parse_time_env_var("CONTRACT_CODE_ON_DEMAND_FETCHER_THRESHOLD", "5s") + config :indexer, Indexer.Fetcher.BlockReward.Supervisor, disabled?: ConfigHelper.parse_bool_env_var("INDEXER_DISABLE_BLOCK_REWARD_FETCHER") @@ -673,20 +755,54 @@ config :indexer, Indexer.Fetcher.CoinBalance.Realtime, batch_size: coin_balances_batch_size, concurrency: coin_balances_concurrency +config :indexer, Indexer.Fetcher.Optimism.TxnBatch.Supervisor, enabled: ConfigHelper.chain_type() == :optimism +config :indexer, Indexer.Fetcher.Optimism.OutputRoot.Supervisor, enabled: ConfigHelper.chain_type() == :optimism +config :indexer, Indexer.Fetcher.Optimism.DisputeGame.Supervisor, enabled: ConfigHelper.chain_type() == :optimism +config :indexer, Indexer.Fetcher.Optimism.Deposit.Supervisor, enabled: ConfigHelper.chain_type() == :optimism +config :indexer, Indexer.Fetcher.Optimism.Withdrawal.Supervisor, enabled: ConfigHelper.chain_type() == :optimism +config :indexer, Indexer.Fetcher.Optimism.WithdrawalEvent.Supervisor, enabled: ConfigHelper.chain_type() == :optimism + +config :indexer, Indexer.Fetcher.Optimism, + optimism_l1_rpc: System.get_env("INDEXER_OPTIMISM_L1_RPC"), + optimism_l1_portal: System.get_env("INDEXER_OPTIMISM_L1_PORTAL_CONTRACT") + +config :indexer, Indexer.Fetcher.Optimism.Deposit, + start_block_l1: System.get_env("INDEXER_OPTIMISM_L1_DEPOSITS_START_BLOCK"), + batch_size: System.get_env("INDEXER_OPTIMISM_L1_DEPOSITS_BATCH_SIZE") + +config :indexer, Indexer.Fetcher.Optimism.OutputRoot, + start_block_l1: System.get_env("INDEXER_OPTIMISM_L1_OUTPUT_ROOTS_START_BLOCK"), + output_oracle: System.get_env("INDEXER_OPTIMISM_L1_OUTPUT_ORACLE_CONTRACT") + +config :indexer, Indexer.Fetcher.Optimism.Withdrawal, + start_block_l2: System.get_env("INDEXER_OPTIMISM_L2_WITHDRAWALS_START_BLOCK"), + message_passer: System.get_env("INDEXER_OPTIMISM_L2_MESSAGE_PASSER_CONTRACT") + +config :indexer, Indexer.Fetcher.Optimism.WithdrawalEvent, + start_block_l1: System.get_env("INDEXER_OPTIMISM_L1_WITHDRAWALS_START_BLOCK") + +config :indexer, Indexer.Fetcher.Optimism.TxnBatch, + start_block_l1: System.get_env("INDEXER_OPTIMISM_L1_BATCH_START_BLOCK"), + batch_inbox: System.get_env("INDEXER_OPTIMISM_L1_BATCH_INBOX"), + batch_submitter: System.get_env("INDEXER_OPTIMISM_L1_BATCH_SUBMITTER"), + blocks_chunk_size: System.get_env("INDEXER_OPTIMISM_L1_BATCH_BLOCKS_CHUNK_SIZE", "4"), + blobs_api_url: System.get_env("INDEXER_OPTIMISM_L1_BATCH_BLOCKSCOUT_BLOBS_API_URL"), + genesis_block_l2: ConfigHelper.parse_integer_or_nil_env_var("INDEXER_OPTIMISM_L2_BATCH_GENESIS_BLOCK_NUMBER") + config :indexer, Indexer.Fetcher.Withdrawal.Supervisor, disabled?: System.get_env("INDEXER_DISABLE_WITHDRAWALS_FETCHER", "true") == "true" config :indexer, Indexer.Fetcher.Withdrawal, first_block: System.get_env("WITHDRAWALS_FIRST_BLOCK") -config :indexer, Indexer.Fetcher.PolygonEdge.Deposit.Supervisor, enabled: ConfigHelper.chain_type() == "polygon_edge" +config :indexer, Indexer.Fetcher.PolygonEdge.Deposit.Supervisor, enabled: ConfigHelper.chain_type() == :polygon_edge config :indexer, Indexer.Fetcher.PolygonEdge.DepositExecute.Supervisor, - enabled: ConfigHelper.chain_type() == "polygon_edge" + enabled: ConfigHelper.chain_type() == :polygon_edge -config :indexer, Indexer.Fetcher.PolygonEdge.Withdrawal.Supervisor, enabled: ConfigHelper.chain_type() == "polygon_edge" +config :indexer, Indexer.Fetcher.PolygonEdge.Withdrawal.Supervisor, enabled: ConfigHelper.chain_type() == :polygon_edge config :indexer, Indexer.Fetcher.PolygonEdge.WithdrawalExit.Supervisor, - enabled: ConfigHelper.chain_type() == "polygon_edge" + enabled: ConfigHelper.chain_type() == :polygon_edge config :indexer, Indexer.Fetcher.PolygonEdge, polygon_edge_l1_rpc: System.get_env("INDEXER_POLYGON_EDGE_L1_RPC"), @@ -709,9 +825,24 @@ config :indexer, Indexer.Fetcher.PolygonEdge.WithdrawalExit, start_block_l1: System.get_env("INDEXER_POLYGON_EDGE_L1_WITHDRAWALS_START_BLOCK"), exit_helper: System.get_env("INDEXER_POLYGON_EDGE_L1_EXIT_HELPER_CONTRACT") +config :indexer, Indexer.Fetcher.ZkSync.TransactionBatch, + chunk_size: ConfigHelper.parse_integer_env_var("INDEXER_ZKSYNC_BATCHES_CHUNK_SIZE", 50), + batches_max_range: ConfigHelper.parse_integer_env_var("INDEXER_ZKSYNC_NEW_BATCHES_MAX_RANGE", 50), + recheck_interval: ConfigHelper.parse_integer_env_var("INDEXER_ZKSYNC_NEW_BATCHES_RECHECK_INTERVAL", 60) + +config :indexer, Indexer.Fetcher.ZkSync.TransactionBatch.Supervisor, + enabled: ConfigHelper.parse_bool_env_var("INDEXER_ZKSYNC_BATCHES_ENABLED") + +config :indexer, Indexer.Fetcher.ZkSync.BatchesStatusTracker, + zksync_l1_rpc: System.get_env("INDEXER_ZKSYNC_L1_RPC"), + recheck_interval: ConfigHelper.parse_integer_env_var("INDEXER_ZKSYNC_BATCHES_STATUS_RECHECK_INTERVAL", 60) + +config :indexer, Indexer.Fetcher.ZkSync.BatchesStatusTracker.Supervisor, + enabled: ConfigHelper.parse_bool_env_var("INDEXER_ZKSYNC_BATCHES_ENABLED") + config :indexer, Indexer.Fetcher.RootstockData.Supervisor, disabled?: - ConfigHelper.chain_type() != "rsk" || ConfigHelper.parse_bool_env_var("INDEXER_DISABLE_ROOTSTOCK_DATA_FETCHER") + ConfigHelper.chain_type() != :rsk || ConfigHelper.parse_bool_env_var("INDEXER_DISABLE_ROOTSTOCK_DATA_FETCHER") config :indexer, Indexer.Fetcher.RootstockData, interval: ConfigHelper.parse_time_env_var("INDEXER_ROOTSTOCK_DATA_FETCHER_INTERVAL", "3s"), @@ -723,7 +854,7 @@ config :indexer, Indexer.Fetcher.Beacon, beacon_rpc: System.get_env("INDEXER_BEA config :indexer, Indexer.Fetcher.Beacon.Blob.Supervisor, disabled?: - ConfigHelper.chain_type() != "ethereum" || + ConfigHelper.chain_type() != :ethereum || ConfigHelper.parse_bool_env_var("INDEXER_DISABLE_BEACON_BLOB_FETCHER") config :indexer, Indexer.Fetcher.Beacon.Blob, @@ -750,27 +881,31 @@ config :indexer, Indexer.Fetcher.Shibarium.L2, weth: System.get_env("INDEXER_SHIBARIUM_L2_WETH_CONTRACT"), bone_withdraw: System.get_env("INDEXER_SHIBARIUM_L2_BONE_WITHDRAW_CONTRACT") -config :indexer, Indexer.Fetcher.Shibarium.L1.Supervisor, enabled: ConfigHelper.chain_type() == "shibarium" +config :indexer, Indexer.Fetcher.Shibarium.L1.Supervisor, enabled: ConfigHelper.chain_type() == :shibarium -config :indexer, Indexer.Fetcher.Shibarium.L2.Supervisor, enabled: ConfigHelper.chain_type() == "shibarium" +config :indexer, Indexer.Fetcher.Shibarium.L2.Supervisor, enabled: ConfigHelper.chain_type() == :shibarium config :indexer, Indexer.Fetcher.PolygonZkevm.BridgeL1, rpc: System.get_env("INDEXER_POLYGON_ZKEVM_L1_RPC"), start_block: System.get_env("INDEXER_POLYGON_ZKEVM_L1_BRIDGE_START_BLOCK"), bridge_contract: System.get_env("INDEXER_POLYGON_ZKEVM_L1_BRIDGE_CONTRACT"), native_symbol: System.get_env("INDEXER_POLYGON_ZKEVM_L1_BRIDGE_NATIVE_SYMBOL", "ETH"), - native_decimals: ConfigHelper.parse_integer_env_var("INDEXER_POLYGON_ZKEVM_L1_BRIDGE_NATIVE_DECIMALS", 18) + native_decimals: ConfigHelper.parse_integer_env_var("INDEXER_POLYGON_ZKEVM_L1_BRIDGE_NATIVE_DECIMALS", 18), + rollup_network_id_l1: ConfigHelper.parse_integer_or_nil_env_var("INDEXER_POLYGON_ZKEVM_L1_BRIDGE_NETWORK_ID"), + rollup_index_l1: ConfigHelper.parse_integer_or_nil_env_var("INDEXER_POLYGON_ZKEVM_L1_BRIDGE_ROLLUP_INDEX") -config :indexer, Indexer.Fetcher.PolygonZkevm.BridgeL1.Supervisor, enabled: ConfigHelper.chain_type() == "polygon_zkevm" +config :indexer, Indexer.Fetcher.PolygonZkevm.BridgeL1.Supervisor, enabled: ConfigHelper.chain_type() == :polygon_zkevm config :indexer, Indexer.Fetcher.PolygonZkevm.BridgeL1Tokens.Supervisor, - enabled: ConfigHelper.chain_type() == "polygon_zkevm" + enabled: ConfigHelper.chain_type() == :polygon_zkevm config :indexer, Indexer.Fetcher.PolygonZkevm.BridgeL2, start_block: System.get_env("INDEXER_POLYGON_ZKEVM_L2_BRIDGE_START_BLOCK"), - bridge_contract: System.get_env("INDEXER_POLYGON_ZKEVM_L2_BRIDGE_CONTRACT") + bridge_contract: System.get_env("INDEXER_POLYGON_ZKEVM_L2_BRIDGE_CONTRACT"), + rollup_network_id_l2: ConfigHelper.parse_integer_or_nil_env_var("INDEXER_POLYGON_ZKEVM_L2_BRIDGE_NETWORK_ID"), + rollup_index_l2: ConfigHelper.parse_integer_or_nil_env_var("INDEXER_POLYGON_ZKEVM_L2_BRIDGE_ROLLUP_INDEX") -config :indexer, Indexer.Fetcher.PolygonZkevm.BridgeL2.Supervisor, enabled: ConfigHelper.chain_type() == "polygon_zkevm" +config :indexer, Indexer.Fetcher.PolygonZkevm.BridgeL2.Supervisor, enabled: ConfigHelper.chain_type() == :polygon_zkevm config :indexer, Indexer.Fetcher.PolygonZkevm.TransactionBatch, chunk_size: ConfigHelper.parse_integer_env_var("INDEXER_POLYGON_ZKEVM_BATCHES_CHUNK_SIZE", 20), @@ -778,7 +913,7 @@ config :indexer, Indexer.Fetcher.PolygonZkevm.TransactionBatch, config :indexer, Indexer.Fetcher.PolygonZkevm.TransactionBatch.Supervisor, enabled: - ConfigHelper.chain_type() == "polygon_zkevm" && + ConfigHelper.chain_type() == :polygon_zkevm && ConfigHelper.parse_bool_env_var("INDEXER_POLYGON_ZKEVM_BATCHES_ENABLED") Code.require_file("#{config_env()}.exs", "config/runtime") diff --git a/config/runtime/dev.exs b/config/runtime/dev.exs index 12809ebda8b1..a8f21fdbbbbd 100644 --- a/config/runtime/dev.exs +++ b/config/runtime/dev.exs @@ -92,6 +92,13 @@ config :explorer, Explorer.Repo.BridgedTokens, # separating repos for different CHAIN_TYPE is implemented only for the sake of keeping DB schema update relevant to the current chain type pool_size: 1 +# Configure Optimism database +config :explorer, Explorer.Repo.Optimism, + database: database, + hostname: hostname, + url: System.get_env("DATABASE_URL"), + pool_size: 1 + # Configure PolygonEdge database config :explorer, Explorer.Repo.PolygonEdge, database: database, @@ -110,6 +117,15 @@ config :explorer, Explorer.Repo.PolygonZkevm, # separating repos for different CHAIN_TYPE is implemented only for the sake of keeping DB schema update relevant to the current chain type pool_size: 1 +# Configure ZkSync database +config :explorer, Explorer.Repo.ZkSync, + database: database, + hostname: hostname, + url: System.get_env("DATABASE_URL"), + # actually this repo is not started, and its pool size remains unused. + # separating repos for different CHAIN_TYPE is implemented only for the sake of keeping DB schema update relevant to the current chain type + pool_size: 1 + # Configure Rootstock database config :explorer, Explorer.Repo.RSK, database: database, @@ -140,6 +156,13 @@ config :explorer, Explorer.Repo.Filecoin, url: System.get_env("DATABASE_URL"), pool_size: 1 +# Configures Stability database +config :explorer, Explorer.Repo.Stability, + database: database, + hostname: hostname, + url: System.get_env("DATABASE_URL"), + pool_size: 1 + variant = Variant.get() Code.require_file("#{variant}.exs", "apps/explorer/config/dev") diff --git a/config/runtime/prod.exs b/config/runtime/prod.exs index 7474cde488cf..cabdab7b9429 100644 --- a/config/runtime/prod.exs +++ b/config/runtime/prod.exs @@ -67,6 +67,12 @@ config :explorer, Explorer.Repo.BridgedTokens, pool_size: 1, ssl: ExplorerConfigHelper.ssl_enabled?() +# Configures Optimism database +config :explorer, Explorer.Repo.Optimism, + url: System.get_env("DATABASE_URL"), + pool_size: 1, + ssl: ExplorerConfigHelper.ssl_enabled?() + # Configures PolygonEdge database config :explorer, Explorer.Repo.PolygonEdge, url: System.get_env("DATABASE_URL"), @@ -81,6 +87,14 @@ config :explorer, Explorer.Repo.PolygonZkevm, pool_size: 1, ssl: ExplorerConfigHelper.ssl_enabled?() +# Configures ZkSync database +config :explorer, Explorer.Repo.ZkSync, + url: System.get_env("DATABASE_URL"), + # actually this repo is not started, and its pool size remains unused. + # separating repos for different CHAIN_TYPE is implemented only for the sake of keeping DB schema update relevant to the current chain type + pool_size: 1, + ssl: ExplorerConfigHelper.ssl_enabled?() + # Configures Rootstock database config :explorer, Explorer.Repo.RSK, url: System.get_env("DATABASE_URL"), @@ -107,6 +121,12 @@ config :explorer, Explorer.Repo.Filecoin, pool_size: 1, ssl: ExplorerConfigHelper.ssl_enabled?() +# Configures Stability database +config :explorer, Explorer.Repo.Stability, + url: System.get_env("DATABASE_URL"), + pool_size: 1, + ssl: ExplorerConfigHelper.ssl_enabled?() + variant = Variant.get() Code.require_file("#{variant}.exs", "apps/explorer/config/prod") diff --git a/config/runtime/test.exs b/config/runtime/test.exs index ca3eed98e10c..786755f81298 100644 --- a/config/runtime/test.exs +++ b/config/runtime/test.exs @@ -16,6 +16,10 @@ config :block_scout_web, BlockScoutWeb.API.V2, enabled: true ### Explorer ### ################ +config :explorer, Explorer.Counters.Transactions24hStats, + cache_period: ConfigHelper.parse_time_env_var("CACHE_TRANSACTIONS_24H_STATS_PERIOD", "1h"), + enable_consolidation: false + variant = Variant.get() Code.require_file("#{variant}.exs", "apps/explorer/config/test") diff --git a/cspell.json b/cspell.json index 691c40233b58..5ab24e0e43f2 100644 --- a/cspell.json +++ b/cspell.json @@ -9,28 +9,115 @@ "apps/block_scout_web/assets/js/lib/ace/src-min/*.js" ], "words": [ + "AION", + "AIRTABLE", + "ARGMAX", + "Aiubo", + "Arbitrum", + "Asfpp", + "Asfpp", + "Autodetection", + "Autonity", + "bitmask", + "Blockchair", + "CALLCODE", + "CBOR", + "Celestia", + "Cldr", + "Consolas", + "Cyclomatic", + "DATETIME", + "DELEGATECALL", + "Decompiler", + "DefiLlama", + "DefiLlama", + "Denormalization", + "Denormalized", + "ECTO", + "EDCSA", + "Ebhwp", + "Encryptor", + "Erigon", + "Ethash", + "Faileddi", + "Filesize", + "Floki", + "Fuov", + "Hazkne", + "Hodl", + "Iframe", + "Iframes", + "Incrementer", + "Instrumenter", + "Karnaugh", + "Keepalive", + "LUKSO", + "Limegreen", + "MARKETCAP", + "MDWW", + "Mainnets", + "Mendonça", + "Menlo", + "Merkle", + "Mixfile", + "NOTOK", + "Nerg", + "Nerg", + "Nethermind", + "Neue", + "Njhr", + "Nodealus", + "NovesFi", + "Numbe", + "Nunito", + "PGDATABASE", + "PGHOST", + "PGPASSWORD", + "PGPORT", + "PGUSER", + "POSDAO", + "Posix", + "Postrge", + "Qebz", + "Qmbgk", + "REINDEX", + "RPC's", + "RPCs", + "SENDGRID", + "SJONRPC", + "SOLIDITYSCAN", + "SOLIDITYSCAN", + "STATICCALL", + "Secon", + "Segoe", + "Sokol", + "Synthereum", + "Sérgio", + "Tcnwg", + "Testinit", + "Testit", + "Testname", + "Txns", + "UUPS", + "Unitarion", + "Unitorius", + "Unitorus", + "Utqn", + "Wanchain", "aave", "absname", "acbs", "accs", "actb", "addedfile", - "AION", - "AIRTABLE", - "Aiubo", "alloc", "amzootyukbugmx", "apikey", - "Arbitrum", - "ARGMAX", "arounds", "asda", - "Asfpp", "atoken", "autodetectfalse", - "Autodetection", "autodetecttrue", - "Autonity", "autoplay", "backoff", "badhash", @@ -46,7 +133,6 @@ "bigserial", "binwrite", "bizbuz", - "Blockchair", "blockheight", "blockless", "blockno", @@ -54,6 +140,7 @@ "blockscout", "blockscoutuser", "bools", + "bridgedtokenlist", "browserconfig", "bsdr", "buildcache", @@ -61,26 +148,26 @@ "buildx", "bytea", "bytecodes", + "byteshash", "byts", "bzzr", "cacerts", "callcode", - "CALLCODE", "calltracer", "capturelog", "cattributes", - "CBOR", "cellspacing", "certifi", "cfasync", + "chainid", "chainlink", "chakra", "chartjs", + "checkproxyverification", "checksummed", "checkverifystatus", "childspec", "citext", - "Cldr", "clearfix", "clickover", "codeformat", @@ -98,39 +185,33 @@ "compilerversion", "concache", "cond", - "Consolas", "contractaddress", + "contractaddresses", "contractname", "cooldown", "cooltesthost", "crossorigin", + "CRYPTOCOMPARE", "ctbs", "ctid", "cumalative", - "Cyclomatic", "cypherpunk", "czilladx", "datapoint", "datepicker", - "DATETIME", "deae", "decamelize", "decompiled", "decompiler", - "Decompiler", "dedup", - "DefiLlama", "defmock", "defsupervisor", "dejob", "dejobio", "delegatecall", - "DELEGATECALL", "delegators", "demonitor", "denormalization", - "Denormalization", - "Denormalized", "descr", "describedby", "differenceby", @@ -138,22 +219,17 @@ "dropzone", "dxgd", "dyntsrohg", - "Ebhwp", "econnrefused", - "ECTO", - "EDCSA", "edhygl", "efkuga", - "Encryptor", "endregion", "enetunreach", "enoent", "epns", - "Erigon", "errora", "errorb", "erts", - "Ethash", + "erts", "etherchain", "ethprice", "ethsupply", @@ -161,6 +237,7 @@ "etimedout", "eveem", "evenodd", + "evmversion", "exitor", "explorable", "exponention", @@ -168,18 +245,18 @@ "extname", "extremums", "exvcr", - "Faileddi", "falala", "FEVM", + "filecoin", + "Filecoin", "Filesize", "Filecoin", "fkey", - "Floki", + "fkey", "fontawesome", "fortawesome", "fsym", "fullwidth", - "Fuov", "fvdskvjglav", "fwrite", "fwupv", @@ -188,6 +265,7 @@ "getblockcountdown", "getblocknobytime", "getblockreward", + "getcontractcreation", "getlogs", "getminedblocks", "getsourcecode", @@ -203,24 +281,22 @@ "graphiql", "grecaptcha", "greymatter", + "gtag", "happygokitty", "haspopup", - "Hazkne", "histoday", "hljs", "Hodl", + "HOPR", "httpoison", + "hyperledger", "ifdef", "ifeq", - "Iframe", "iframes", - "Iframes", "ilike", "illustr", "inapp", - "Incrementer", "insertable", - "Instrumenter", "intersectionby", "ints", "invalidend", @@ -231,23 +307,24 @@ "invalidstart", "inversed", "ipfs", + "ipos", "itxs", "johnnny", "jsons", "juon", - "Karnaugh", "keccak", - "Keepalive", "keyout", "kittencream", "labeledby", "labelledby", "lastmod", + "lastmod", "lastname", "lastword", "lformat", + "libraryaddress", + "libraryname", "libsecp", - "Limegreen", "linecap", "linejoin", "listaccounts", @@ -255,30 +332,23 @@ "lkve", "llhauc", "loggable", - "LUKSO", "luxon", "mabi", - "Mainnets", "malihu", "mallowance", - "MARKETCAP", "maxlength", "mcap", "mconst", "mdef", - "MDWW", "meer", - "Mendonça", - "Menlo", + "meer", "mergeable", - "Merkle", "metatags", "microsecs", "millis", "mintings", "mistmatches", "miterlimit", - "Mixfile", "mmem", "mname", "mnot", @@ -298,19 +368,15 @@ "munknownc", "munknowne", "mydep", + "mykey", "nanomorph", "nbsp", - "Nerg", - "Nethermind", - "Neue", "newkey", "nftproduct", "ngettext", "nillifies", - "Njhr", "nlmyzui", "nocheck", - "Nodealus", "nohighlight", "nolink", "nonconsensus", @@ -318,18 +384,17 @@ "noproc", "noreferrer", "noreply", + "NOTOK", "noves", - "NovesFi", "nowarn", "nowrap", "ntoa", - "Numbe", - "Nunito", "nxdomain", "omni", "onclick", "onconnect", "ondisconnect", + "opos", "outcoming", "overengineering", "pawesome", @@ -339,11 +404,6 @@ "pendingtxlist", "perc", "persistable", - "PGDATABASE", - "PGHOST", - "PGPASSWORD", - "PGPORT", - "PGUSER", "phash", "pikaday", "pkey", @@ -356,9 +416,6 @@ "pocc", "polyline", "poolboy", - "POSDAO", - "Posix", - "Postrge", "prederive", "prederived", "progressbar", @@ -366,15 +423,15 @@ "psql", "purrstige", "qdai", - "Qebz", "qitmeer", - "Qmbgk", + "qitmeer", "qrcode", "queriable", "questiona", "questionb", "qwertyufhgkhiop", "qwertyuioiuytrewertyuioiuytrertyuio", + "qwertyuioiuytrewertyuioiuytrertyuio", "racecar", "raisedbrow", "rangeright", @@ -387,8 +444,10 @@ "recollated", "redix", "refetched", + "regclass", "REINDEX", "relname", + "relpages", "reltuples", "remasc", "removedfile", @@ -405,26 +464,23 @@ "RPCs", "safelow", "savechives", - "Secon", "secp", - "Segoe", + "secp", "seindexed", "selfdestruct", "selfdestructed", "SENDGRID", + "Sepolia", "Sérgio", "sharelock", "sharelocks", "shibarium", "shortdoc", "shortify", - "SJONRPC", "smallint", "smth", "snapshotted", "snapshotting", - "Sokol", - "SOLIDITYSCAN", "soljson", "someout", "sourcecode", @@ -435,8 +491,8 @@ "stakers", "stateroot", "staticcall", - "STATICCALL", "strftime", + "strhash", "stringly", "stylelint", "stylesheet", @@ -452,28 +508,26 @@ "successa", "successb", "supernet", + "sushiswap", "swal", "sweetalert", - "Synthereum", "tabindex", "tablist", "tabpanel", "tarekraafat", "tbody", "tbrf", - "Tcnwg", "tems", - "Testinit", - "Testit", - "Testname", "testpassword", "testtest", "testuser", "thead", "thicccbrowz", "throttleable", + "timestmaps", "tokenbalance", "tokenlist", + "tokennfttx", "tokensupply", "tokentx", "topbar", @@ -486,8 +540,8 @@ "tsquery", "tsvector", "tsym", + "txid", "txlistinternal", - "Txns", "txpool", "txreceipt", "ueberauth", @@ -496,9 +550,6 @@ "unclosable", "unfetched", "unfinalized", - "Unitarion", - "Unitorius", - "Unitorus", "unknownc", "unknowne", "unmarshal", @@ -513,19 +564,19 @@ "upserts", "urijs", "urlset", - "Utqn", - "UUPS", + "urlset", "valign", "valuemax", "valuemin", "valuenow", + "varint", + "verifyproxycontract", "verifysourcecode", "viewerjs", "volumefrom", "volumeto", "vyper", "walletconnect", - "Wanchain", "warninga", "warningb", "watchlist", @@ -546,6 +597,8 @@ "yellowgreen", "zaphod", "zeppelinos", + "zerion", + "zetachain", "zftv", "ziczr", "zindex", @@ -578,7 +631,11 @@ "zetachain", "zksync", "filecoin", - "Filecoin" + "Filecoin", + "permissionless", + "feelin", + "KnxbUejwY", + "Btvk" ], "enableFiletypes": [ "dotenv", diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index a62c1024b3de..ced92cb4304f 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -12,6 +12,9 @@ services: service: db-init db: + depends_on: + db-init: + condition: service_completed_successfully extends: file: ./services/db.yml service: db @@ -34,7 +37,7 @@ services: CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED: "" CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL: "" ADMIN_PANEL_ENABLED: "" - RELEASE_VERSION: 6.2.0 + RELEASE_VERSION: 6.5.0 links: - db:database environment: @@ -67,7 +70,8 @@ services: stats-db: depends_on: - - backend + stats-db-init: + condition: service_completed_successfully extends: file: ./services/stats.yml service: stats-db @@ -75,6 +79,7 @@ services: stats: depends_on: - stats-db + - backend extends: file: ./services/stats.yml service: stats diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env index 53ed9eed2f3b..142c7ea993a1 100644 --- a/docker-compose/envs/common-blockscout.env +++ b/docker-compose/envs/common-blockscout.env @@ -5,6 +5,7 @@ DATABASE_URL=postgresql://blockscout:ceWb1MeLBEeOIfk65gU8EjF8@db:5432/blockscout # DATABASE_QUEUE_TARGET ETHEREUM_JSONRPC_TRACE_URL=http://host.docker.internal:8545/ # ETHEREUM_JSONRPC_FALLBACK_TRACE_URL= +# ETHEREUM_JSONRPC_FALLBACK_ETH_CALL_URL= # ETHEREUM_JSONRPC_ETH_CALL_URL= # ETHEREUM_JSONRPC_HTTP_TIMEOUT= # CHAIN_TYPE= @@ -40,9 +41,15 @@ EXCHANGE_RATES_COIN= # EXCHANGE_RATES_TVL_SOURCE= # EXCHANGE_RATES_PRICE_SOURCE= # EXCHANGE_RATES_COINGECKO_COIN_ID= +# EXCHANGE_RATES_COINGECKO_SECONDARY_COIN_ID= # EXCHANGE_RATES_COINGECKO_API_KEY= +# EXCHANGE_RATES_COINGECKO_BASE_URL= +# EXCHANGE_RATES_COINGECKO_BASE_PRO_URL= +# EXCHANGE_RATES_COINMARKETCAP_BASE_URL= # EXCHANGE_RATES_COINMARKETCAP_API_KEY= # EXCHANGE_RATES_COINMARKETCAP_COIN_ID= +# EXCHANGE_RATES_COINMARKETCAP_SECONDARY_COIN_ID= +# EXCHANGE_RATES_CRYPTOCOMPARE_SECONDARY_COIN_SYMBOL= POOL_SIZE=80 # EXCHANGE_RATES_COINGECKO_PLATFORM_ID= # TOKEN_EXCHANGE_RATE_INTERVAL= @@ -60,7 +67,6 @@ HEART_BEAT_TIMEOUT=30 # BLOCKSCOUT_VERSION= RELEASE_LINK= BLOCK_TRANSFORMER=base -# GRAPHIQL_TRANSACTION= # BLOCK_RANGES= # FIRST_BLOCK= # LAST_BLOCK= @@ -90,14 +96,20 @@ CACHE_MARKET_HISTORY_PERIOD=21600 CACHE_ADDRESS_TRANSACTIONS_COUNTER_PERIOD=1800 CACHE_ADDRESS_TOKENS_USD_SUM_PERIOD=3600 CACHE_ADDRESS_TOKEN_TRANSFERS_COUNTER_PERIOD=1800 +# CACHE_TRANSACTIONS_24H_STATS_PERIOD= +# CACHE_FRESH_PENDING_TRANSACTIONS_COUNTER_PERIOD= +# TOKEN_BALANCE_ON_DEMAND_FETCHER_THRESHOLD= +# COIN_BALANCE_ON_DEMAND_FETCHER_THRESHOLD= +# CONTRACT_CODE_ON_DEMAND_FETCHER_THRESHOLD= TOKEN_METADATA_UPDATE_INTERVAL=172800 -CONTRACT_VERIFICATION_ALLOWED_SOLIDITY_EVM_VERSIONS=homestead,tangerineWhistle,spuriousDragon,byzantium,constantinople,petersburg,istanbul,berlin,london,paris,shanghai,default -CONTRACT_VERIFICATION_ALLOWED_VYPER_EVM_VERSIONS=byzantium,constantinople,petersburg,istanbul,berlin,paris,shanghai,default +CONTRACT_VERIFICATION_ALLOWED_SOLIDITY_EVM_VERSIONS=homestead,tangerineWhistle,spuriousDragon,byzantium,constantinople,petersburg,istanbul,berlin,london,paris,shanghai,cancun,default +CONTRACT_VERIFICATION_ALLOWED_VYPER_EVM_VERSIONS=byzantium,constantinople,petersburg,istanbul,berlin,paris,shanghai,cancun,default # CONTRACT_VERIFICATION_MAX_LIBRARIES=10 CONTRACT_MAX_STRING_LENGTH_WITHOUT_TRIMMING=2040 # CONTRACT_DISABLE_INTERACTION= # CONTRACT_AUDIT_REPORTS_AIRTABLE_URL= # CONTRACT_AUDIT_REPORTS_AIRTABLE_API_KEY= +# CONTRACT_CERTIFIED_LIST= UNCLES_IN_AVERAGE_BLOCK_TIME=false DISABLE_WEBAPP=false API_V2_ENABLED=true @@ -114,6 +126,17 @@ API_RATE_LIMIT_WHITELISTED_IPS= API_RATE_LIMIT_STATIC_API_KEY= API_RATE_LIMIT_UI_V2_WITH_TOKEN=5 API_RATE_LIMIT_BY_IP=3000 +# API_GRAPHQL_ENABLED= +# API_GRAPHQL_MAX_COMPLEXITY= +# API_GRAPHQL_TOKEN_LIMIT= +# API_GRAPHQL_DEFAULT_TRANSACTION_HASH= +# API_GRAPHQL_RATE_LIMIT_DISABLED= +# API_GRAPHQL_RATE_LIMIT= +# API_GRAPHQL_RATE_LIMIT_BY_KEY= +# API_GRAPHQL_RATE_LIMIT_TIME_INTERVAL= +# API_GRAPHQL_RATE_LIMIT_BY_IP= +# API_GRAPHQL_RATE_LIMIT_BY_IP_TIME_INTERVAL= +# API_GRAPHQL_RATE_LIMIT_STATIC_API_KEY= DISABLE_INDEXER=false DISABLE_REALTIME_INDEXER=false DISABLE_CATCHUP_INDEXER=false @@ -134,6 +157,7 @@ INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER=false # INDEXER_EMPTY_BLOCKS_SANITIZER_INTERVAL= # INDEXER_INTERNAL_TRANSACTIONS_BATCH_SIZE= # INDEXER_INTERNAL_TRANSACTIONS_CONCURRENCY= +# ETHEREUM_JSONRPC_DEBUG_TRACE_TRANSACTION_TIMEOUT= # INDEXER_BLOCK_REWARD_BATCH_SIZE= # INDEXER_BLOCK_REWARD_CONCURRENCY= # INDEXER_TOKEN_INSTANCE_USE_BASE_URI_RETRY= @@ -186,13 +210,38 @@ INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER=false # INDEXER_POLYGON_ZKEVM_L1_BRIDGE_CONTRACT= # INDEXER_POLYGON_ZKEVM_L1_BRIDGE_NATIVE_SYMBOL= # INDEXER_POLYGON_ZKEVM_L1_BRIDGE_NATIVE_DECIMALS= +# INDEXER_POLYGON_ZKEVM_L1_BRIDGE_NETWORK_ID= +# INDEXER_POLYGON_ZKEVM_L1_BRIDGE_ROLLUP_INDEX= # INDEXER_POLYGON_ZKEVM_L2_BRIDGE_START_BLOCK= # INDEXER_POLYGON_ZKEVM_L2_BRIDGE_CONTRACT= +# INDEXER_POLYGON_ZKEVM_L2_BRIDGE_NETWORK_ID= +# INDEXER_POLYGON_ZKEVM_L2_BRIDGE_ROLLUP_INDEX= +# INDEXER_ZKSYNC_BATCHES_ENABLED= +# INDEXER_ZKSYNC_BATCHES_CHUNK_SIZE= +# INDEXER_ZKSYNC_NEW_BATCHES_MAX_RANGE= +# INDEXER_ZKSYNC_NEW_BATCHES_RECHECK_INTERVAL= +# INDEXER_ZKSYNC_L1_RPC= +# INDEXER_ZKSYNC_BATCHES_STATUS_RECHECK_INTERVAL= # INDEXER_REALTIME_FETCHER_MAX_GAP= # INDEXER_FETCHER_INIT_QUERY_LIMIT= # INDEXER_TOKEN_BALANCES_FETCHER_INIT_QUERY_LIMIT= # INDEXER_COIN_BALANCES_FETCHER_INIT_QUERY_LIMIT= +# INDEXER_GRACEFUL_SHUTDOWN_PERIOD= # WITHDRAWALS_FIRST_BLOCK= +# INDEXER_OPTIMISM_L1_RPC= +# INDEXER_OPTIMISM_L1_BATCH_START_BLOCK= +# INDEXER_OPTIMISM_L1_BATCH_INBOX= +# INDEXER_OPTIMISM_L1_BATCH_SUBMITTER= +# INDEXER_OPTIMISM_L1_BATCH_BLOCKS_CHUNK_SIZE= +# INDEXER_OPTIMISM_L2_BATCH_GENESIS_BLOCK_NUMBER= +# INDEXER_OPTIMISM_L1_PORTAL_CONTRACT= +# INDEXER_OPTIMISM_L1_OUTPUT_ROOTS_START_BLOCK= +# INDEXER_OPTIMISM_L1_OUTPUT_ORACLE_CONTRACT= +# INDEXER_OPTIMISM_L1_WITHDRAWALS_START_BLOCK= +# INDEXER_OPTIMISM_L2_WITHDRAWALS_START_BLOCK= +# INDEXER_OPTIMISM_L2_MESSAGE_PASSER_CONTRACT= +# INDEXER_OPTIMISM_L1_DEPOSITS_START_BLOCK= +# INDEXER_OPTIMISM_L1_DEPOSITS_BATCH_SIZE= # ROOTSTOCK_REMASC_ADDRESS= # ROOTSTOCK_BRIDGE_ADDRESS= # ROOTSTOCK_LOCKED_BTC_CACHE_PERIOD= @@ -235,6 +284,9 @@ EXTERNAL_APPS=[] # GAS_PRICE_ORACLE_SAFELOW_PERCENTILE= # GAS_PRICE_ORACLE_AVERAGE_PERCENTILE= # GAS_PRICE_ORACLE_FAST_PERCENTILE= +# GAS_PRICE_ORACLE_SAFELOW_TIME_COEFFICIENT= +# GAS_PRICE_ORACLE_AVERAGE_TIME_COEFFICIENT= +# GAS_PRICE_ORACLE_FAST_TIME_COEFFICIENT= # RESTRICTED_LIST= # RESTRICTED_LIST_KEY= SHOW_MAINTENANCE_ALERT=false @@ -266,8 +318,10 @@ MICROSERVICE_SIG_PROVIDER_ENABLED=true MICROSERVICE_SIG_PROVIDER_URL=http://sig-provider:8050/ # MICROSERVICE_BENS_URL= # MICROSERVICE_BENS_ENABLED= -#MICROSERVICE_ACCOUNT_ABSTRACTION_ENABLED=true -#MICROSERVICE_ACCOUNT_ABSTRACTION_URL= +# MICROSERVICE_ACCOUNT_ABSTRACTION_ENABLED=true +# MICROSERVICE_ACCOUNT_ABSTRACTION_URL= +# MICROSERVICE_METADATA_URL= +# MICROSERVICE_METADATA_ENABLED= DECODE_NOT_A_CONTRACT_CALLS=true # DATABASE_READ_ONLY_API_URL= # ACCOUNT_DATABASE_URL= @@ -295,6 +349,10 @@ EIP_1559_ELASTICITY_MULTIPLIER=2 # ADDRESSES_TABS_COUNTERS_TTL=10m # DENORMALIZATION_MIGRATION_BATCH_SIZE= # DENORMALIZATION_MIGRATION_CONCURRENCY= +# TOKEN_TRANSFER_TOKEN_TYPE_MIGRATION_BATCH_SIZE= +# TOKEN_TRANSFER_TOKEN_TYPE_MIGRATION_CONCURRENCY= +# SANITIZE_INCORRECT_NFT_BATCH_SIZE= +# SANITIZE_INCORRECT_NFT_CONCURRENCY= SOURCIFY_INTEGRATION_ENABLED=false SOURCIFY_SERVER_URL= SOURCIFY_REPO_URL= @@ -305,6 +363,8 @@ TENDERLY_CHAIN_PATH= # NOVES_FI_BASE_API_URL= # NOVES_FI_CHAIN_NAME= # NOVES_FI_API_TOKEN= +# ZERION_BASE_API_URL= +# ZERION_API_TOKEN= # BRIDGED_TOKENS_ENABLED= # BRIDGED_TOKENS_ETH_OMNI_BRIDGE_MEDIATOR= # BRIDGED_TOKENS_BSC_OMNI_BRIDGE_MEDIATOR= diff --git a/docker-compose/erigon.yml b/docker-compose/erigon.yml index dea8047f4666..231d2f92eb78 100644 --- a/docker-compose/erigon.yml +++ b/docker-compose/erigon.yml @@ -12,6 +12,9 @@ services: service: db-init db: + depends_on: + db-init: + condition: service_completed_successfully extends: file: ./services/db.yml service: db @@ -52,7 +55,8 @@ services: stats-db: depends_on: - - backend + stats-db-init: + condition: service_completed_successfully extends: file: ./services/stats.yml service: stats-db @@ -60,6 +64,7 @@ services: stats: depends_on: - stats-db + - backend extends: file: ./services/stats.yml service: stats diff --git a/docker-compose/external-backend.yml b/docker-compose/external-backend.yml index 37cd5783652b..82f03bf14dda 100644 --- a/docker-compose/external-backend.yml +++ b/docker-compose/external-backend.yml @@ -12,6 +12,9 @@ services: service: db-init db: + depends_on: + db-init: + condition: service_completed_successfully extends: file: ./services/db.yml service: db @@ -37,6 +40,9 @@ services: service: stats-db-init stats-db: + depends_on: + stats-db-init: + condition: service_completed_successfully extends: file: ./services/stats.yml service: stats-db diff --git a/docker-compose/external-db.yml b/docker-compose/external-db.yml index bd4ec6f069f0..f1172c29f83f 100644 --- a/docker-compose/external-db.yml +++ b/docker-compose/external-db.yml @@ -39,7 +39,8 @@ services: stats-db: depends_on: - - backend + stats-db-init: + condition: service_completed_successfully extends: file: ./services/stats.yml service: stats-db @@ -47,6 +48,7 @@ services: stats: depends_on: - stats-db + - backend extends: file: ./services/stats.yml service: stats diff --git a/docker-compose/external-frontend.yml b/docker-compose/external-frontend.yml index bad65c4afa8c..6f3fbee2910d 100644 --- a/docker-compose/external-frontend.yml +++ b/docker-compose/external-frontend.yml @@ -12,6 +12,9 @@ services: service: db-init db: + depends_on: + db-init: + condition: service_completed_successfully extends: file: ./services/db.yml service: db @@ -49,7 +52,8 @@ services: stats-db: depends_on: - - backend + stats-db-init: + condition: service_completed_successfully extends: file: ./services/stats.yml service: stats-db @@ -57,6 +61,7 @@ services: stats: depends_on: - stats-db + - backend extends: file: ./services/stats.yml service: stats diff --git a/docker-compose/ganache.yml b/docker-compose/ganache.yml index dce2aed9c1e6..136d5b25d2ad 100644 --- a/docker-compose/ganache.yml +++ b/docker-compose/ganache.yml @@ -12,6 +12,9 @@ services: service: db-init db: + depends_on: + db-init: + condition: service_completed_successfully extends: file: ./services/db.yml service: db @@ -59,7 +62,8 @@ services: stats-db: depends_on: - - backend + stats-db-init: + condition: service_completed_successfully extends: file: ./services/stats.yml service: stats-db @@ -67,6 +71,7 @@ services: stats: depends_on: - stats-db + - backend extends: file: ./services/stats.yml service: stats diff --git a/docker-compose/geth-clique-consensus.yml b/docker-compose/geth-clique-consensus.yml index 27fa83563529..8d42b273d2d0 100644 --- a/docker-compose/geth-clique-consensus.yml +++ b/docker-compose/geth-clique-consensus.yml @@ -12,6 +12,9 @@ services: service: db-init db: + depends_on: + db-init: + condition: service_completed_successfully extends: file: ./services/db.yml service: db @@ -53,7 +56,8 @@ services: stats-db: depends_on: - - backend + stats-db-init: + condition: service_completed_successfully extends: file: ./services/stats.yml service: stats-db @@ -61,6 +65,7 @@ services: stats: depends_on: - stats-db + - backend extends: file: ./services/stats.yml service: stats diff --git a/docker-compose/geth.yml b/docker-compose/geth.yml index 0e55eb33d742..366630ce5296 100644 --- a/docker-compose/geth.yml +++ b/docker-compose/geth.yml @@ -12,6 +12,9 @@ services: service: db-init db: + depends_on: + db-init: + condition: service_completed_successfully extends: file: ./services/db.yml service: db @@ -52,7 +55,8 @@ services: stats-db: depends_on: - - backend + stats-db-init: + condition: service_completed_successfully extends: file: ./services/stats.yml service: stats-db @@ -60,6 +64,7 @@ services: stats: depends_on: - stats-db + - backend extends: file: ./services/stats.yml service: stats diff --git a/docker-compose/hardhat-network.yml b/docker-compose/hardhat-network.yml index 74c29218f720..1a014c72f713 100644 --- a/docker-compose/hardhat-network.yml +++ b/docker-compose/hardhat-network.yml @@ -12,6 +12,9 @@ services: service: db-init db: + depends_on: + db-init: + condition: service_completed_successfully extends: file: ./services/db.yml service: db @@ -59,7 +62,8 @@ services: stats-db: depends_on: - - backend + stats-db-init: + condition: service_completed_successfully extends: file: ./services/stats.yml service: stats-db @@ -67,6 +71,7 @@ services: stats: depends_on: - stats-db + - backend extends: file: ./services/stats.yml service: stats diff --git a/docker-compose/microservices.yml b/docker-compose/microservices.yml index ee4a07bd6d1d..f61347f01210 100644 --- a/docker-compose/microservices.yml +++ b/docker-compose/microservices.yml @@ -27,6 +27,9 @@ services: service: stats-db-init stats-db: + depends_on: + stats-db-init: + condition: service_completed_successfully extends: file: ./services/stats.yml service: stats-db diff --git a/docker-compose/services/db.yml b/docker-compose/services/db.yml index a7370d6b1531..430409bbecfe 100644 --- a/docker-compose/services/db.yml +++ b/docker-compose/services/db.yml @@ -12,9 +12,6 @@ services: chown -R 2000:2000 /var/lib/postgresql/data db: - depends_on: - db-init: - condition: service_completed_successfully image: postgres:15 user: 2000:2000 shm_size: 256m diff --git a/docker-compose/services/stats.yml b/docker-compose/services/stats.yml index b4c14aac2e1f..83c9ea02a22b 100644 --- a/docker-compose/services/stats.yml +++ b/docker-compose/services/stats.yml @@ -12,9 +12,6 @@ services: chown -R 2000:2000 /var/lib/postgresql/data stats-db: - depends_on: - stats-db-init: - condition: service_completed_successfully image: postgres:15 user: 2000:2000 shm_size: 256m @@ -43,8 +40,6 @@ services: platform: linux/amd64 restart: always container_name: 'stats' - depends_on: - - "stats-db" extra_hosts: - 'host.docker.internal:host-gateway' env_file: diff --git a/docker/Makefile b/docker/Makefile index b7521d41ad9d..946028577ef3 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -10,7 +10,7 @@ STATS_CONTAINER_NAME := stats STATS_DB_CONTAINER_NAME := stats-db PROXY_CONTAINER_NAME := proxy PG_CONTAINER_NAME := postgres -RELEASE_VERSION ?= '6.2.0' +RELEASE_VERSION ?= '6.5.0' TAG := $(RELEASE_VERSION)-commit-$(shell git log -1 --pretty=format:"%h") STABLE_TAG := $(RELEASE_VERSION) diff --git a/mix.exs b/mix.exs index 8b59a29aeb0e..ae63d3c7ef1b 100644 --- a/mix.exs +++ b/mix.exs @@ -7,7 +7,7 @@ defmodule BlockScout.Mixfile do [ # app: :block_scout, # aliases: aliases(config_env()), - version: "6.2.0", + version: "6.5.0", apps_path: "apps", deps: deps(), dialyzer: dialyzer(), @@ -93,10 +93,10 @@ defmodule BlockScout.Mixfile do defp deps do [ {:prometheus_ex, git: "https://github.com/lanodan/prometheus.ex", branch: "fix/elixir-1.14", override: true}, - {:absinthe_plug, git: "https://github.com/blockscout/absinthe_plug.git", tag: "1.5.3", override: true}, - {:tesla, "~> 1.8.0"}, + {:absinthe_plug, git: "https://github.com/blockscout/absinthe_plug.git", tag: "1.5.8", override: true}, + {:tesla, "~> 1.9.0"}, # Documentation - {:ex_doc, "~> 0.31.0", only: :dev, runtime: false}, + {:ex_doc, "~> 0.32.1", only: :dev, runtime: false}, {:number, "~> 1.0.3"} ] end diff --git a/mix.lock b/mix.lock index 2ca4e78b1313..ff23247ff7c0 100644 --- a/mix.lock +++ b/mix.lock @@ -1,7 +1,7 @@ %{ "absinthe": {:hex, :absinthe, "1.7.6", "0b897365f98d068cfcb4533c0200a8e58825a4aeeae6ec33633ebed6de11773b", [:mix], [{:dataloader, "~> 1.0.0 or ~> 2.0", [hex: :dataloader, repo: "hexpm", optional: true]}, {:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}, {:opentelemetry_process_propagator, "~> 0.2.1", [hex: :opentelemetry_process_propagator, repo: "hexpm", optional: true]}, {:telemetry, "~> 1.0 or ~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "e7626951ca5eec627da960615b51009f3a774765406ff02722b1d818f17e5778"}, - "absinthe_phoenix": {:hex, :absinthe_phoenix, "2.0.2", "e607b438db900049b9b3760f8ecd0591017a46122fffed7057bf6989020992b5", [:mix], [{:absinthe, "~> 1.5", [hex: :absinthe, repo: "hexpm", optional: false]}, {:absinthe_plug, "~> 1.5", [hex: :absinthe_plug, repo: "hexpm", optional: false]}, {:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.5", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.13 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}], "hexpm", "d36918925c380dc7d2ed7d039c9a3b4182ec36723f7417a68745ade5aab22f8d"}, - "absinthe_plug": {:git, "https://github.com/blockscout/absinthe_plug.git", "c435d43f316769e1beee1dbe500b623124c96785", [tag: "1.5.3"]}, + "absinthe_phoenix": {:hex, :absinthe_phoenix, "2.0.3", "74e0862f280424b7bc290f6f69e133268bce0b4e7db0218c7e129c5c2b1d3fd4", [:mix], [{:absinthe, "~> 1.5", [hex: :absinthe, repo: "hexpm", optional: false]}, {:absinthe_plug, "~> 1.5", [hex: :absinthe_plug, repo: "hexpm", optional: false]}, {:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.5", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.13 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}], "hexpm", "caffaea03c17ea7419fe07e4bc04c2399c47f0d8736900623dbf4749a826fd2c"}, + "absinthe_plug": {:git, "https://github.com/blockscout/absinthe_plug.git", "90a8188e94e2650f13259fb16462075a87f98e18", [tag: "1.5.8"]}, "absinthe_relay": {:hex, :absinthe_relay, "1.5.2", "cfb8aed70f4e4c7718d3f1c212332d2ea728f17c7fc0f68f1e461f0f5f0c4b9a", [:mix], [{:absinthe, "~> 1.5.0 or ~> 1.6.0 or ~> 1.7.0", [hex: :absinthe, repo: "hexpm", optional: false]}, {:ecto, "~> 2.0 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}], "hexpm", "0587ee913afa31512e1457a5064ee88427f8fe7bcfbeeecd41c71d9cff0b62b6"}, "accept": {:hex, :accept, "0.3.5", "b33b127abca7cc948bbe6caa4c263369abf1347cfa9d8e699c6d214660f10cd1", [:rebar3], [], "hexpm", "11b18c220bcc2eab63b5470c038ef10eb6783bcb1fcdb11aa4137defa5ac1bb8"}, "bamboo": {:hex, :bamboo, "2.3.0", "d2392a2cabe91edf488553d3c70638b532e8db7b76b84b0a39e3dfe492ffd6fc", [:mix], [{:hackney, ">= 1.15.2", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mime, "~> 1.4 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "dd0037e68e108fd04d0e8773921512c940e35d981e097b5793543e3b2f9cd3f6"}, @@ -10,24 +10,24 @@ "benchee_csv": {:hex, :benchee_csv, "1.0.0", "0b3b9223290bfcb8003552705bec9bcf1a89b4a83b70bd686e45295c264f3d16", [:mix], [{:benchee, ">= 0.99.0 and < 2.0.0", [hex: :benchee, repo: "hexpm", optional: false]}, {:csv, "~> 2.0", [hex: :csv, repo: "hexpm", optional: false]}], "hexpm", "cdefb804c021dcf7a99199492026584be9b5a21d6644ac0d01c81c5d97c520d5"}, "briefly": {:git, "https://github.com/CargoSense/briefly.git", "4836ba322ffb504a102a15cc6e35d928ef97120e", []}, "bunt": {:hex, :bunt, "1.0.0", "081c2c665f086849e6d57900292b3a161727ab40431219529f13c4ddcf3e7a44", [:mix], [], "hexpm", "dc5f86aa08a5f6fa6b8096f0735c4e76d54ae5c9fa2c143e5a1fc7c1cd9bb6b5"}, - "bureaucrat": {:hex, :bureaucrat, "0.2.9", "d98e4d2b9bdbf22e4a45c2113ce8b38b5b63278506c6ff918e3b943a4355d85b", [:mix], [{:inflex, ">= 1.10.0", [hex: :inflex, repo: "hexpm", optional: false]}, {:phoenix, ">= 1.2.0", [hex: :phoenix, repo: "hexpm", optional: true]}, {:plug, ">= 1.0.0", [hex: :plug, repo: "hexpm", optional: false]}, {:poison, "~> 1.5 or ~> 2.0 or ~> 3.0 or ~> 4.0", [hex: :poison, repo: "hexpm", optional: true]}], "hexpm", "111c8dd84382a62e1026ae011d592ceee918553e5203fe8448d9ba6ccbdfff7d"}, + "bureaucrat": {:hex, :bureaucrat, "0.2.10", "b0de157dad540e40007b663b683f716ced21f85ff0591093aadb209ad0d967e1", [:mix], [{:inflex, ">= 1.10.0", [hex: :inflex, repo: "hexpm", optional: false]}, {:phoenix, ">= 1.2.0", [hex: :phoenix, repo: "hexpm", optional: true]}, {:plug, ">= 1.0.0", [hex: :plug, repo: "hexpm", optional: false]}, {:poison, "~> 1.5 or ~> 2.0 or ~> 3.0 or ~> 4.0 or ~> 5.0", [hex: :poison, repo: "hexpm", optional: true]}], "hexpm", "bc7e5162b911c29c8ebefee87a2c16fbf13821a58f448a8fd024eb6c17fae15c"}, "bypass": {:hex, :bypass, "2.1.0", "909782781bf8e20ee86a9cabde36b259d44af8b9f38756173e8f5e2e1fabb9b1", [:mix], [{:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: false]}, {:ranch, "~> 1.3", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "d9b5df8fa5b7a6efa08384e9bbecfe4ce61c77d28a4282f79e02f1ef78d96b80"}, - "castore": {:hex, :castore, "1.0.5", "9eeebb394cc9a0f3ae56b813459f990abb0a3dedee1be6b27fdb50301930502f", [:mix], [], "hexpm", "8d7c597c3e4a64c395980882d4bca3cebb8d74197c590dc272cfd3b6a6310578"}, + "castore": {:hex, :castore, "1.0.6", "ffc42f110ebfdafab0ea159cd43d31365fa0af0ce4a02ecebf1707ae619ee727", [:mix], [], "hexpm", "374c6e7ca752296be3d6780a6d5b922854ffcc74123da90f2f328996b962d33a"}, "cbor": {:hex, :cbor, "1.0.1", "39511158e8ea5a57c1fcb9639aaa7efde67129678fee49ebbda780f6f24959b0", [:mix], [], "hexpm", "5431acbe7a7908f17f6a9cd43311002836a34a8ab01876918d8cfb709cd8b6a2"}, "certifi": {:hex, :certifi, "2.12.0", "2d1cca2ec95f59643862af91f001478c9863c2ac9cb6e2f89780bfd8de987329", [:rebar3], [], "hexpm", "ee68d85df22e554040cdb4be100f33873ac6051387baf6a8f6ce82272340ff1c"}, - "cldr_utils": {:hex, :cldr_utils, "2.24.2", "364fa30be55d328e704629568d431eb74cd2f085752b27f8025520b566352859", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:decimal, "~> 1.9 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "3362b838836a9f0fa309de09a7127e36e67310e797d556db92f71b548832c7cf"}, - "cloak": {:hex, :cloak, "1.1.2", "7e0006c2b0b98d976d4f559080fabefd81f0e0a50a3c4b621f85ceeb563e80bb", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "940d5ac4fcd51b252930fd112e319ea5ae6ab540b722f3ca60a85666759b9585"}, - "cloak_ecto": {:hex, :cloak_ecto, "1.2.0", "e86a3df3bf0dc8980f70406bcb0af2858bac247d55494d40bc58a152590bd402", [:mix], [{:cloak, "~> 1.1.1", [hex: :cloak, repo: "hexpm", optional: false]}, {:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}], "hexpm", "8bcc677185c813fe64b786618bd6689b1707b35cd95acaae0834557b15a0c62f"}, + "cldr_utils": {:hex, :cldr_utils, "2.25.0", "3cc2ab6e9e4f855ba78a3f3fc4963ccf7b68b731f4e91de3d9b310adddb96b62", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:decimal, "~> 1.9 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "9041660356ffa1129e0d87d110e188f5da0e0bba94fb915e11275e04ace066e1"}, + "cloak": {:hex, :cloak, "1.1.4", "aba387b22ea4d80d92d38ab1890cc528b06e0e7ef2a4581d71c3fdad59e997e7", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "92b20527b9aba3d939fab0dd32ce592ff86361547cfdc87d74edce6f980eb3d7"}, + "cloak_ecto": {:hex, :cloak_ecto, "1.3.0", "0de127c857d7452ba3c3367f53fb814b0410ff9c680a8d20fbe8b9a3c57a1118", [:mix], [{:cloak, "~> 1.1.1", [hex: :cloak, repo: "hexpm", optional: false]}, {:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}], "hexpm", "314beb0c123b8a800418ca1d51065b27ba3b15f085977e65c0f7b2adab2de1cc"}, "coerce": {:hex, :coerce, "1.0.1", "211c27386315dc2894ac11bc1f413a0e38505d808153367bd5c6e75a4003d096", [:mix], [], "hexpm", "b44a691700f7a1a15b4b7e2ff1fa30bebd669929ac8aa43cffe9e2f8bf051cf1"}, "combine": {:hex, :combine, "0.10.0", "eff8224eeb56498a2af13011d142c5e7997a80c8f5b97c499f84c841032e429f", [:mix], [], "hexpm", "1b1dbc1790073076580d0d1d64e42eae2366583e7aecd455d1215b0d16f2451b"}, "comeonin": {:hex, :comeonin, "5.4.0", "246a56ca3f41d404380fc6465650ddaa532c7f98be4bda1b4656b3a37cc13abe", [:mix], [], "hexpm", "796393a9e50d01999d56b7b8420ab0481a7538d0caf80919da493b4a6e51faf1"}, "con_cache": {:hex, :con_cache, "1.0.0", "6405e2bd5d5005334af72939432783562a8c35a196c2e63108fe10bb97b366e6", [:mix], [], "hexpm", "4d1f5cb1a67f3c1a468243dc98d10ac83af7f3e33b7e7c15999dc2c9bc0a551e"}, "connection": {:hex, :connection, "1.1.0", "ff2a49c4b75b6fb3e674bfc5536451607270aac754ffd1bdfe175abe4a6d7a68", [:mix], [], "hexpm", "722c1eb0a418fbe91ba7bd59a47e28008a189d47e37e0e7bb85585a016b2869c"}, "cors_plug": {:hex, :cors_plug, "3.0.3", "7c3ac52b39624bc616db2e937c282f3f623f25f8d550068b6710e58d04a0e330", [:mix], [{:plug, "~> 1.13", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "3f2d759e8c272ed3835fab2ef11b46bddab8c1ab9528167bd463b6452edf830d"}, - "cowboy": {:hex, :cowboy, "2.10.0", "ff9ffeff91dae4ae270dd975642997afe2a1179d94b1887863e43f681a203e26", [:make, :rebar3], [{:cowlib, "2.12.1", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "1.8.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "3afdccb7183cc6f143cb14d3cf51fa00e53db9ec80cdcd525482f5e99bc41d6b"}, + "cowboy": {:hex, :cowboy, "2.12.0", "f276d521a1ff88b2b9b4c54d0e753da6c66dd7be6c9fca3d9418b561828a3731", [:make, :rebar3], [{:cowlib, "2.13.0", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "1.8.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "8a7abe6d183372ceb21caa2709bec928ab2b72e18a3911aa1771639bef82651e"}, "cowboy_telemetry": {:hex, :cowboy_telemetry, "0.3.1", "ebd1a1d7aff97f27c66654e78ece187abdc646992714164380d8a041eda16754", [:rebar3], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "3a6efd3366130eab84ca372cbd4a7d3c3a97bdfcfb4911233b035d117063f0af"}, - "cowlib": {:hex, :cowlib, "2.12.1", "a9fa9a625f1d2025fe6b462cb865881329b5caff8f1854d1cbc9f9533f00e1e1", [:make, :rebar3], [], "hexpm", "163b73f6367a7341b33c794c4e88e7dbfe6498ac42dcd69ef44c5bc5507c8db0"}, - "credo": {:hex, :credo, "1.7.4", "68ca5cf89071511c12fd9919eb84e388d231121988f6932756596195ccf7fd35", [:mix], [{:bunt, "~> 0.2.1 or ~> 1.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "9cf776d062c78bbe0f0de1ecaee183f18f2c3ec591326107989b054b7dddefc2"}, + "cowlib": {:hex, :cowlib, "2.13.0", "db8f7505d8332d98ef50a3ef34b34c1afddec7506e4ee4dd4a3a266285d282ca", [:make, :rebar3], [], "hexpm", "e1e1284dc3fc030a64b1ad0d8382ae7e99da46c3246b815318a4b848873800a4"}, + "credo": {:hex, :credo, "1.7.5", "643213503b1c766ec0496d828c90c424471ea54da77c8a168c725686377b9545", [:mix], [{:bunt, "~> 0.2.1 or ~> 1.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "f799e9b5cd1891577d8c773d245668aa74a2fcd15eb277f51a0131690ebfb3fd"}, "csv": {:hex, :csv, "2.5.0", "c47b5a5221bf2e56d6e8eb79e77884046d7fd516280dc7d9b674251e0ae46246", [:mix], [{:parallel_stream, "~> 1.0.4 or ~> 1.1.0", [hex: :parallel_stream, repo: "hexpm", optional: false]}], "hexpm", "e821f541487045c7591a1963eeb42afff0dfa99bdcdbeb3410795a2f59c77d34"}, "dataloader": {:hex, :dataloader, "1.0.11", "49bbfc7dd8a1990423c51000b869b1fecaab9e3ccd6b29eab51616ae8ad0a2f5", [:mix], [{:ecto, ">= 3.4.3 and < 4.0.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:telemetry, "~> 1.0 or ~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ba0b0ec532ec68e9d033d03553561d693129bd7cbd5c649dc7903f07ffba08fe"}, "db_connection": {:hex, :db_connection, "2.6.0", "77d835c472b5b67fc4f29556dee74bf511bbafecdcaf98c27d27fa5918152086", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "c2f992d15725e721ec7fbc1189d4ecdb8afef76648c746a8e1cad35e3b8a35f3"}, @@ -37,35 +37,35 @@ "dialyxir": {:hex, :dialyxir, "1.4.3", "edd0124f358f0b9e95bfe53a9fcf806d615d8f838e2202a9f430d59566b6b53b", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "bf2cfb75cd5c5006bec30141b131663299c661a864ec7fbbc72dfa557487a986"}, "digital_token": {:hex, :digital_token, "0.6.0", "13e6de581f0b1f6c686f7c7d12ab11a84a7b22fa79adeb4b50eec1a2d278d258", [:mix], [{:cldr_utils, "~> 2.17", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "2455d626e7c61a128b02a4a8caddb092548c3eb613ac6f6a85e4cbb6caddc4d1"}, "earmark_parser": {:hex, :earmark_parser, "1.4.39", "424642f8335b05bb9eb611aa1564c148a8ee35c9c8a8bba6e129d51a3e3c6769", [:mix], [], "hexpm", "06553a88d1f1846da9ef066b87b57c6f605552cfbe40d20bd8d59cc6bde41944"}, - "ecto": {:hex, :ecto, "3.11.1", "4b4972b717e7ca83d30121b12998f5fcdc62ba0ed4f20fd390f16f3270d85c3e", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ebd3d3772cd0dfcd8d772659e41ed527c28b2a8bde4b00fe03e0463da0f1983b"}, + "ecto": {:hex, :ecto, "3.11.2", "e1d26be989db350a633667c5cda9c3d115ae779b66da567c68c80cfb26a8c9ee", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "3c38bca2c6f8d8023f2145326cc8a80100c3ffe4dcbd9842ff867f7fc6156c65"}, "ecto_sql": {:hex, :ecto_sql, "3.11.1", "e9abf28ae27ef3916b43545f9578b4750956ccea444853606472089e7d169470", [:mix], [{:db_connection, "~> 2.5 or ~> 2.4.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.11.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 0.17.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ce14063ab3514424276e7e360108ad6c2308f6d88164a076aac8a387e1fea634"}, "elixir_make": {:hex, :elixir_make, "0.7.7", "7128c60c2476019ed978210c245badf08b03dbec4f24d05790ef791da11aa17c", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "5bc19fff950fad52bbe5f211b12db9ec82c6b34a9647da0c2224b8b8464c7e6c"}, "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"}, - "ex_abi": {:hex, :ex_abi, "0.6.4", "f722a38298f176dab511cf94627b2815282669255bc2eb834674f23ca71f5cfb", [:mix], [{:ex_keccak, "~> 0.7.3", [hex: :ex_keccak, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "07eaf39b70dd3beac1286c10368d27091a9a64844830eb26a38f1c8d8b19dfbb"}, + "ex_abi": {:hex, :ex_abi, "0.7.2", "9950d8aa764c74b8c89cc279c72ac786675aca315c08bc06b4a387407fe67873", [:mix], [{:ex_keccak, "~> 0.7.5", [hex: :ex_keccak, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "1ca991d6eb497959aab4b3aaeb7d0f71b67d4b617d5689113da82d6e4cedc408"}, "ex_cldr": {:hex, :ex_cldr, "2.37.5", "9da6d97334035b961d2c2de167dc6af8cd3e09859301a5b8f49f90bd8b034593", [:mix], [{:cldr_utils, "~> 2.21", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:gettext, "~> 0.19", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: true]}], "hexpm", "74ad5ddff791112ce4156382e171a5f5d3766af9d5c4675e0571f081fe136479"}, "ex_cldr_currencies": {:hex, :ex_cldr_currencies, "2.15.1", "e92ba17c41e7405b7784e0e65f406b5f17cfe313e0e70de9befd653e12854822", [:mix], [{:ex_cldr, "~> 2.34", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "31df8bd37688340f8819bdd770eb17d659652078d34db632b85d4a32864d6a25"}, - "ex_cldr_lists": {:hex, :ex_cldr_lists, "2.10.2", "c8dbb3324ca35cea3679a96f4c774cdf4bdd425786a44c4f52aacb57a0cee446", [:mix], [{:ex_cldr_numbers, "~> 2.25", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "0cc2124eccffa5438045c2504dd3365490b64065131f58ecc27f344db1edb4b8"}, + "ex_cldr_lists": {:hex, :ex_cldr_lists, "2.11.0", "1d39e75f0e493ccc95adfc85c55b4ca34f0771626350ce326d9ab8813d91444e", [:mix], [{:ex_cldr_numbers, "~> 2.25", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "8132b30a5506ae8a09e5c9a21c23fd60c8837ce6c3a1de9966d813eb78951695"}, "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.32.4", "5562148dfc631b04712983975093d2aac29df30b3bf2f7257e0c94b85b72e91b", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "6fd5a82f0785418fa8b698c0be2b1845dff92b77f1b3172c763d37868fb503d2"}, - "ex_cldr_units": {:hex, :ex_cldr_units, "3.16.4", "fee054e9ebed40ef05cbb405cb0c7e7c9fda201f8f03ec0d1e54e879af413246", [:mix], [{:cldr_utils, "~> 2.24", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr_lists, "~> 2.10", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.31", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "7c15c6357dd555a5bc6c72fdeb243e4706a04065753dbd2f40150f062ca996c7"}, - "ex_doc": {:hex, :ex_doc, "0.31.1", "8a2355ac42b1cc7b2379da9e40243f2670143721dd50748bf6c3b1184dae2089", [:mix], [{:earmark_parser, "~> 1.4.39", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_c, ">= 0.1.1", [hex: :makeup_c, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "3178c3a407c557d8343479e1ff117a96fd31bafe52a039079593fb0524ef61b0"}, + "ex_cldr_units": {:hex, :ex_cldr_units, "3.16.5", "0eec02875fce00d7f0012adbe3ad92aeea6bcacf4b7b91e7dfb24589ec330979", [:mix], [{:cldr_utils, "~> 2.24", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr_lists, "~> 2.10", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.31", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_doc, "~> 0.18", [hex: :ex_doc, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "560838a192c501c6eb97c86337a732b7149bbab74e619be4ac6a177da0169e23"}, + "ex_doc": {:hex, :ex_doc, "0.32.1", "21e40f939515373bcdc9cffe65f3b3543f05015ac6c3d01d991874129d173420", [:mix], [{:earmark_parser, "~> 1.4.39", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_c, ">= 0.1.1", [hex: :makeup_c, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "5142c9db521f106d61ff33250f779807ed2a88620e472ac95dc7d59c380113da"}, "ex_json_schema": {:hex, :ex_json_schema, "0.10.2", "7c4b8c1481fdeb1741e2ce66223976edfb9bccebc8014f6aec35d4efe964fb71", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "37f43be60f8407659d4d0155a7e45e7f406dab1f827051d3d35858a709baf6a6"}, - "ex_keccak": {:hex, :ex_keccak, "0.7.3", "33298f97159f6b0acd28f6e96ce5ea975a0f4a19f85fe615b4f4579b88b24d06", [:mix], [{:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.6.1", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "4c5e6d9d5f77b64ab48769a0166a9814180d40ced68ed74ce60a5174ab55b3fc"}, + "ex_keccak": {:hex, :ex_keccak, "0.7.5", "f3b733173510d48ae9a1ea1de415e694b2651f35c787e63f33b5ed0013fbfd35", [:mix], [{:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.7", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "8a5e1cb7f96fff5e480ff6a121477b90c4fd8c150984086dffd98819f5d83763"}, "ex_machina": {:hex, :ex_machina, "2.7.0", "b792cc3127fd0680fecdb6299235b4727a4944a09ff0fa904cc639272cd92dc7", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}], "hexpm", "419aa7a39bde11894c87a615c4ecaa52d8f107bbdd81d810465186f783245bf8"}, "ex_rlp": {:hex, :ex_rlp, "0.6.0", "985391d2356a7cb8712a4a9a2deb93f19f2fbca0323f5c1203fcaf64d077e31e", [:mix], [], "hexpm", "7135db93b861d9e76821039b60b00a6a22d2c4e751bf8c444bffe7a042f1abaf"}, - "ex_secp256k1": {:hex, :ex_secp256k1, "0.7.2", "33398c172813b90fab9ab75c12b98d16cfab472c6dcbde832b13c45ce1c01947", [:mix], [{:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.6", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "f3b1bf56e6992e28b9d86e3bf741a4aca3e641052eb47d13ae4f5f4d4944bdaf"}, + "ex_secp256k1": {:hex, :ex_secp256k1, "0.7.3", "489b6fd57fab5a7259ace927d8cb5171aad835e9c7279c2a859a0483cb069415", [:mix], [{:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.7", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "ea63159442f4d8143166cd1507da03edc43216d6e7c6bac4b416bdce04f0daa8"}, "ex_utils": {:hex, :ex_utils, "0.1.7", "2c133e0bcdc49a858cf8dacf893308ebc05bc5fba501dc3d2935e65365ec0bf3", [:mix], [], "hexpm", "66d4fe75285948f2d1e69c2a5ddd651c398c813574f8d36a9eef11dc20356ef6"}, "exactor": {:hex, :exactor, "2.2.4", "5efb4ddeb2c48d9a1d7c9b465a6fffdd82300eb9618ece5d34c3334d5d7245b1", [:mix], [], "hexpm", "1222419f706e01bfa1095aec9acf6421367dcfab798a6f67c54cf784733cd6b5"}, "exjsx": {:hex, :exjsx, "4.0.0", "60548841e0212df401e38e63c0078ec57b33e7ea49b032c796ccad8cde794b5c", [:mix], [{:jsx, "~> 2.8.0", [hex: :jsx, repo: "hexpm", optional: false]}], "hexpm", "32e95820a97cffea67830e91514a2ad53b888850442d6d395f53a1ac60c82e07"}, - "expo": {:hex, :expo, "0.5.1", "249e826a897cac48f591deba863b26c16682b43711dd15ee86b92f25eafd96d9", [:mix], [], "hexpm", "68a4233b0658a3d12ee00d27d37d856b1ba48607e7ce20fd376958d0ba6ce92b"}, + "expo": {:hex, :expo, "0.5.2", "beba786aab8e3c5431813d7a44b828e7b922bfa431d6bfbada0904535342efe2", [:mix], [], "hexpm", "8c9bfa06ca017c9cb4020fabe980bc7fdb1aaec059fd004c2ab3bff03b1c599c"}, "exvcr": {:hex, :exvcr, "0.15.1", "772db4d065f5136c6a984c302799a79e4ade3e52701c95425fa2229dd6426886", [:mix], [{:exactor, "~> 2.2", [hex: :exactor, repo: "hexpm", optional: false]}, {:exjsx, "~> 4.0", [hex: :exjsx, repo: "hexpm", optional: false]}, {:finch, "~> 0.16", [hex: :finch, repo: "hexpm", optional: true]}, {:httpoison, "~> 1.0 or ~> 2.0", [hex: :httpoison, repo: "hexpm", optional: true]}, {:httpotion, "~> 3.1", [hex: :httpotion, repo: "hexpm", optional: true]}, {:ibrowse, "4.4.0", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:meck, "~> 0.8", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm", "de4fc18b1d672d9b72bc7468735e19779aa50ea963a1f859ef82cd9e294b13e3"}, "file_info": {:hex, :file_info, "0.0.4", "2e0e77f211e833f38ead22cb29ce53761d457d80b3ffe0ffe0eb93880b0963b2", [:mix], [{:mimetype_parser, "~> 0.1.2", [hex: :mimetype_parser, repo: "hexpm", optional: false]}], "hexpm", "50e7ad01c2c8b9339010675fe4dc4a113b8d6ca7eddce24d1d74fd0e762781a5"}, "file_system": {:hex, :file_system, "0.2.10", "fb082005a9cd1711c05b5248710f8826b02d7d1784e7c3451f9c1231d4fc162d", [:mix], [], "hexpm", "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"}, - "floki": {:hex, :floki, "0.35.3", "0c8c6234aa71cb2b069cf801e8f8f30f8d096eb452c3dae2ccc409510ec32720", [:mix], [], "hexpm", "6d9f07f3fc76599f3b66c39f4a81ac62c8f4d9631140268db92aacad5d0e56d4"}, + "floki": {:hex, :floki, "0.36.1", "712b7f2ba19a4d5a47dfe3e74d81876c95bbcbee44fe551f0af3d2a388abb3da", [:mix], [], "hexpm", "21ba57abb8204bcc70c439b423fc0dd9f0286de67dc82773a14b0200ada0995f"}, "flow": {:hex, :flow, "1.2.4", "1dd58918287eb286656008777cb32714b5123d3855956f29aa141ebae456922d", [:mix], [{:gen_stage, "~> 1.0", [hex: :gen_stage, repo: "hexpm", optional: false]}], "hexpm", "874adde96368e71870f3510b91e35bc31652291858c86c0e75359cbdd35eb211"}, "gen_stage": {:hex, :gen_stage, "1.2.1", "19d8b5e9a5996d813b8245338a28246307fd8b9c99d1237de199d21efc4c76a1", [:mix], [], "hexpm", "83e8be657fa05b992ffa6ac1e3af6d57aa50aace8f691fcf696ff02f8335b001"}, "gettext": {:hex, :gettext, "0.24.0", "6f4d90ac5f3111673cbefc4ebee96fe5f37a114861ab8c7b7d5b30a1108ce6d8", [:mix], [{:expo, "~> 0.5.1", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "bdf75cdfcbe9e4622dd18e034b227d77dd17f0f133853a1c73b97b3d6c770e8b"}, "hackney": {:hex, :hackney, "1.20.1", "8d97aec62ddddd757d128bfd1df6c5861093419f8f7a4223823537bad5d064e2", [:rebar3], [{:certifi, "~>2.12.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~>6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~>1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.4.1", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~>1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "fe9094e5f1a2a2c0a7d10918fee36bfec0ec2a979994cff8cfe8058cd9af38e3"}, - "hammer": {:hex, :hammer, "6.2.0", "956e578f210ee67f7801caf7109b0e1145d2dad77ed5a0e5c0041a04739ede36", [:mix], [{:poolboy, "~> 1.5", [hex: :poolboy, repo: "hexpm", optional: false]}], "hexpm", "1431a30e1f9c816e0fc58d2587de2d5f4c709b74bf81be77515dc902e35bb3a7"}, + "hammer": {:hex, :hammer, "6.2.1", "5ae9c33e3dceaeb42de0db46bf505bd9c35f259c8defb03390cd7556fea67ee2", [:mix], [{:poolboy, "~> 1.5", [hex: :poolboy, repo: "hexpm", optional: false]}], "hexpm", "b9476d0c13883d2dc0cc72e786bac6ac28911fba7cc2e04b70ce6a6d9c4b2bdc"}, "hammer_backend_redis": {:hex, :hammer_backend_redis, "6.1.2", "eb296bb4924928e24135308b2afc189201fd09411c870c6bbadea444a49b2f2c", [:mix], [{:hammer, "~> 6.0", [hex: :hammer, repo: "hexpm", optional: false]}, {:redix, "~> 1.1", [hex: :redix, repo: "hexpm", optional: false]}], "hexpm", "217ea066278910543a5e9b577d5bf2425419446b94fe76bdd9f255f39feec9fa"}, "html_entities": {:hex, :html_entities, "0.5.2", "9e47e70598da7de2a9ff6af8758399251db6dbb7eebe2b013f2bbd2515895c3c", [:mix], [], "hexpm", "c53ba390403485615623b9531e97696f076ed415e8d8058b1dbaa28181f4fdcc"}, "httpoison": {:hex, :httpoison, "2.2.1", "87b7ed6d95db0389f7df02779644171d7319d319178f6680438167d7b69b1f3d", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "51364e6d2f429d80e14fe4b5f8e39719cacd03eb3f9a9286e61e216feac2d2df"}, @@ -73,12 +73,12 @@ "inflex": {:hex, :inflex, "2.1.0", "a365cf0821a9dacb65067abd95008ca1b0bb7dcdd85ae59965deef2aa062924c", [:mix], [], "hexpm", "14c17d05db4ee9b6d319b0bff1bdf22aa389a25398d1952c7a0b5f3d93162dd8"}, "jason": {:hex, :jason, "1.4.1", "af1504e35f629ddcdd6addb3513c3853991f694921b1b9368b0bd32beb9f1b63", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "fbb01ecdfd565b56261302f7e1fcc27c4fb8f32d56eab74db621fc154604a7a1"}, "jsx": {:hex, :jsx, "2.8.3", "a05252d381885240744d955fbe3cf810504eb2567164824e19303ea59eef62cf", [:mix, :rebar3], [], "hexpm", "fc3499fed7a726995aa659143a248534adc754ebd16ccd437cd93b649a95091f"}, - "junit_formatter": {:hex, :junit_formatter, "3.3.1", "c729befb848f1b9571f317d2fefa648e9d4869befc4b2980daca7c1edc468e40", [:mix], [], "hexpm", "761fc5be4b4c15d8ba91a6dafde0b2c2ae6db9da7b8832a55b5a1deb524da72b"}, - "logger_file_backend": {:hex, :logger_file_backend, "0.0.13", "df07b14970e9ac1f57362985d76e6f24e3e1ab05c248055b7d223976881977c2", [:mix], [], "hexpm", "71a453a7e6e899ae4549fb147b1c6621f4233f8f48f58ca10a64ec67b6c50018"}, - "logger_json": {:hex, :logger_json, "5.1.3", "fe931b54826e7ba3b1233ede5c13d87cd670a23563f8d146d0ee22985549dbb5", [:mix], [{:ecto, "~> 2.1 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix, ">= 1.5.0", [hex: :phoenix, repo: "hexpm", optional: true]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "ecc67e24f9ccf1688c5e48c3d6b7889a0ab5d398fe32a7fec69c461303a9b89c"}, + "junit_formatter": {:hex, :junit_formatter, "3.4.0", "d0e8db6c34dab6d3c4154c3b46b21540db1109ae709d6cf99ba7e7a2ce4b1ac2", [:mix], [], "hexpm", "bb36e2ae83f1ced6ab931c4ce51dd3dbef1ef61bb4932412e173b0cfa259dacd"}, + "logger_file_backend": {:hex, :logger_file_backend, "0.0.14", "774bb661f1c3fed51b624d2859180c01e386eb1273dc22de4f4a155ef749a602", [:mix], [], "hexpm", "071354a18196468f3904ef09413af20971d55164267427f6257b52cfba03f9e6"}, + "logger_json": {:hex, :logger_json, "5.1.4", "9e30a4f2e31a8b9e402bdc20bd37cf9b67d3a31f19d0b33082a19a06b4c50f6d", [:mix], [{:ecto, "~> 2.1 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix, ">= 1.5.0", [hex: :phoenix, repo: "hexpm", optional: true]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "3f20eea58e406a33d3eb7814c7dff5accb503bab2ee8601e84da02976fa3934c"}, "makeup": {:hex, :makeup, "1.1.1", "fa0bc768698053b2b3869fa8a62616501ff9d11a562f3ce39580d60860c3a55e", [:mix], [{:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "5dc62fbdd0de44de194898b6710692490be74baa02d9d108bc29f007783b0b48"}, - "makeup_elixir": {:hex, :makeup_elixir, "0.16.1", "cc9e3ca312f1cfeccc572b37a09980287e243648108384b97ff2b76e505c3555", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "e127a341ad1b209bd80f7bd1620a15693a9908ed780c3b763bccf7d200c767c6"}, - "makeup_erlang": {:hex, :makeup_erlang, "0.1.3", "d684f4bac8690e70b06eb52dad65d26de2eefa44cd19d64a8095e1417df7c8fd", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "b78dc853d2e670ff6390b605d807263bf606da3c82be37f9d7f68635bd886fc9"}, + "makeup_elixir": {:hex, :makeup_elixir, "0.16.2", "627e84b8e8bf22e60a2579dad15067c755531fea049ae26ef1020cad58fe9578", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "41193978704763f6bbe6cc2758b84909e62984c7752b3784bd3c218bb341706b"}, + "makeup_erlang": {:hex, :makeup_erlang, "0.1.5", "e0ff5a7c708dda34311f7522a8758e23bfcd7d8d8068dc312b5eb41c6fd76eba", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "94d2e986428585a21516d7d7149781480013c56e30c6a233534bedf38867a59a"}, "math": {:hex, :math, "0.7.0", "12af548c3892abf939a2e242216c3e7cbfb65b9b2fe0d872d05c6fb609f8127b", [:mix], [], "hexpm", "7987af97a0c6b58ad9db43eb5252a49fc1dfe1f6d98f17da9282e297f594ebc2"}, "meck": {:hex, :meck, "0.9.2", "85ccbab053f1db86c7ca240e9fc718170ee5bda03810a6292b5306bf31bae5f5", [:rebar3], [], "hexpm", "81344f561357dc40a8344afa53767c32669153355b626ea9fcbc8da6b3045826"}, "memento": {:hex, :memento, "0.3.2", "38cfc8ff9bcb1adff7cbd0f3b78a762636b86dff764729d1c82d0464c539bdd0", [:mix], [], "hexpm", "25cf691a98a0cb70262f4a7543c04bab24648cb2041d937eb64154a8d6f8012b"}, @@ -91,25 +91,25 @@ "mox": {:hex, :mox, "1.1.0", "0f5e399649ce9ab7602f72e718305c0f9cdc351190f72844599545e4996af73c", [:mix], [], "hexpm", "d44474c50be02d5b72131070281a5d3895c0e7a95c780e90bc0cfe712f633a13"}, "msgpax": {:hex, :msgpax, "2.4.0", "4647575c87cb0c43b93266438242c21f71f196cafa268f45f91498541148c15d", [:mix], [{:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "ca933891b0e7075701a17507c61642bf6e0407bb244040d5d0a58597a06369d2"}, "nimble_csv": {:hex, :nimble_csv, "1.2.0", "4e26385d260c61eba9d4412c71cea34421f296d5353f914afe3f2e71cce97722", [:mix], [], "hexpm", "d0628117fcc2148178b034044c55359b26966c6eaa8e2ce15777be3bbc91b12a"}, - "nimble_options": {:hex, :nimble_options, "1.0.2", "92098a74df0072ff37d0c12ace58574d26880e522c22801437151a159392270e", [:mix], [], "hexpm", "fd12a8db2021036ce12a309f26f564ec367373265b53e25403f0ee697380f1b8"}, + "nimble_options": {:hex, :nimble_options, "1.1.0", "3b31a57ede9cb1502071fade751ab0c7b8dbe75a9a4c2b5bbb0943a690b63172", [:mix], [], "hexpm", "8bbbb3941af3ca9acc7835f5655ea062111c9c27bcac53e004460dfd19008a99"}, "nimble_parsec": {:hex, :nimble_parsec, "1.4.0", "51f9b613ea62cfa97b25ccc2c1b4216e81df970acd8e16e8d1bdc58fef21370d", [:mix], [], "hexpm", "9c565862810fb383e9838c1dd2d7d2c437b3d13b267414ba6af33e50d2d1cf28"}, - "number": {:hex, :number, "1.0.4", "3e6e6032a3c1d4c3760e77a42c580a57a15545dd993af380809da30fe51a032c", [:mix], [{:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "16f7516584ef2be812af4f33f2eaf3f9b9f6ed8892f45853eb93113f83721e42"}, + "number": {:hex, :number, "1.0.5", "d92136f9b9382aeb50145782f116112078b3465b7be58df1f85952b8bb399b0f", [:mix], [{:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "c0733a0a90773a66582b9e92a3f01290987f395c972cb7d685f51dd927cd5169"}, "numbers": {:hex, :numbers, "5.2.4", "f123d5bb7f6acc366f8f445e10a32bd403c8469bdbce8ce049e1f0972b607080", [:mix], [{:coerce, "~> 1.0", [hex: :coerce, repo: "hexpm", optional: false]}, {:decimal, "~> 1.9 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "eeccf5c61d5f4922198395bf87a465b6f980b8b862dd22d28198c5e6fab38582"}, "oauth2": {:hex, :oauth2, "2.0.1", "70729503e05378697b958919bb2d65b002ba6b28c8112328063648a9348aaa3f", [:mix], [{:hackney, "~> 1.13", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "c64e20d4d105bcdbcbe03170fb530d0eddc3a3e6b135a87528a22c8aecf74c52"}, "optimal": {:hex, :optimal, "0.3.6", "46bbf52fbbbd238cda81e02560caa84f93a53c75620f1fe19e81e4ae7b07d1dd", [:mix], [], "hexpm", "1a06ea6a653120226b35b283a1cd10039550f2c566edcdec22b29316d73640fd"}, "parallel_stream": {:hex, :parallel_stream, "1.1.0", "f52f73eb344bc22de335992377413138405796e0d0ad99d995d9977ac29f1ca9", [:mix], [], "hexpm", "684fd19191aedfaf387bbabbeb8ff3c752f0220c8112eb907d797f4592d6e871"}, "parse_trans": {:hex, :parse_trans, "3.4.1", "6e6aa8167cb44cc8f39441d05193be6e6f4e7c2946cb2759f015f8c56b76e5ff", [:rebar3], [], "hexpm", "620a406ce75dada827b82e453c19cf06776be266f5a67cff34e1ef2cbb60e49a"}, "phoenix": {:hex, :phoenix, "1.5.14", "2d5db884be496eefa5157505ec0134e66187cb416c072272420c5509d67bf808", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_html, "~> 2.13 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.10", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.2", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.1.2 or ~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "207f1aa5520320cbb7940d7ff2dde2342162cf513875848f88249ea0ba02fef7"}, - "phoenix_ecto": {:hex, :phoenix_ecto, "4.4.3", "86e9878f833829c3f66da03d75254c155d91d72a201eb56ae83482328dc7ca93", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "d36c401206f3011fefd63d04e8ef626ec8791975d9d107f9a0817d426f61ac07"}, + "phoenix_ecto": {:hex, :phoenix_ecto, "4.5.1", "6fdbc334ea53620e71655664df6f33f670747b3a7a6c4041cdda3e2c32df6257", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.1", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "ebe43aa580db129e54408e719fb9659b7f9e0d52b965c5be26cdca416ecead28"}, "phoenix_html": {:hex, :phoenix_html, "3.0.4", "232d41884fe6a9c42d09f48397c175cd6f0d443aaa34c7424da47604201df2e1", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "ce17fd3cf815b2ed874114073e743507704b1f5288bb03c304a77458485efc8b"}, "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.3.3", "3a53772a6118d5679bf50fc1670505a290e32a1d195df9e069d8c53ab040c054", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "766796676e5f558dbae5d1bdb066849673e956005e3730dfd5affd7a6da4abac"}, "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.1.3", "3168d78ba41835aecad272d5e8cd51aa87a7ac9eb836eabc42f6e57538e3731d", [:mix], [], "hexpm", "bba06bc1dcfd8cb086759f0edc94a8ba2bc8896d5331a1e2c2902bf8e36ee502"}, "plug": {:hex, :plug, "1.15.3", "712976f504418f6dff0a3e554c40d705a9bcf89a7ccef92fc6a5ef8f16a30a97", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "cc4365a3c010a56af402e0809208873d113e9c38c401cabd88027ef4f5c01fd2"}, - "plug_cowboy": {:hex, :plug_cowboy, "2.7.0", "3ae9369c60641084363b08fe90267cbdd316df57e3557ea522114b30b63256ea", [:mix], [{:cowboy, "~> 2.7.0 or ~> 2.8.0 or ~> 2.9.0 or ~> 2.10.0", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowboy_telemetry, "~> 0.3", [hex: :cowboy_telemetry, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "d85444fb8aa1f2fc62eabe83bbe387d81510d773886774ebdcb429b3da3c1a4a"}, + "plug_cowboy": {:hex, :plug_cowboy, "2.7.1", "87677ffe3b765bc96a89be7960f81703223fe2e21efa42c125fcd0127dd9d6b2", [:mix], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowboy_telemetry, "~> 0.3", [hex: :cowboy_telemetry, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "02dbd5f9ab571b864ae39418db7811618506256f6d13b4a45037e5fe78dc5de3"}, "plug_crypto": {:hex, :plug_crypto, "1.2.5", "918772575e48e81e455818229bf719d4ab4181fcbf7f85b68a35620f78d89ced", [:mix], [], "hexpm", "26549a1d6345e2172eb1c233866756ae44a9609bd33ee6f99147ab3fd87fd842"}, "poison": {:hex, :poison, "4.0.1", "bcb755a16fac91cad79bfe9fc3585bb07b9331e50cfe3420a24bcc2d735709ae", [:mix], [], "hexpm", "ba8836feea4b394bb718a161fc59a288fe0109b5006d6bdf97b6badfcf6f0f25"}, "poolboy": {:hex, :poolboy, "1.5.2", "392b007a1693a64540cead79830443abf5762f5d30cf50bc95cb2c1aaafa006b", [:rebar3], [], "hexpm", "dad79704ce5440f3d5a3681c8590b9dc25d1a561e8f5a9c995281012860901e3"}, - "postgrex": {:hex, :postgrex, "0.17.4", "5777781f80f53b7c431a001c8dad83ee167bcebcf3a793e3906efff680ab62b3", [:mix], [{:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "6458f7d5b70652bc81c3ea759f91736c16a31be000f306d3c64bcdfe9a18b3cc"}, + "postgrex": {:hex, :postgrex, "0.17.5", "0483d054938a8dc069b21bdd636bf56c487404c241ce6c319c1f43588246b281", [:mix], [{:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "50b8b11afbb2c4095a3ba675b4f055c416d0f3d7de6633a595fc131a828a67eb"}, "prometheus": {:hex, :prometheus, "4.11.0", "b95f8de8530f541bd95951e18e355a840003672e5eda4788c5fa6183406ba29a", [:mix, :rebar3], [{:quantile_estimator, "~> 0.2.1", [hex: :quantile_estimator, repo: "hexpm", optional: false]}], "hexpm", "719862351aabf4df7079b05dc085d2bbcbe3ac0ac3009e956671b1d5ab88247d"}, "prometheus_ecto": {:hex, :prometheus_ecto, "1.4.3", "3dd4da1812b8e0dbee81ea58bb3b62ed7588f2eae0c9e97e434c46807ff82311", [:mix], [{:ecto, "~> 2.0 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:prometheus_ex, "~> 1.1 or ~> 2.0 or ~> 3.0", [hex: :prometheus_ex, repo: "hexpm", optional: false]}], "hexpm", "8d66289f77f913b37eda81fd287340c17e61a447549deb28efc254532b2bed82"}, "prometheus_ex": {:git, "https://github.com/lanodan/prometheus.ex", "31f7fbe4b71b79ba27efc2a5085746c4011ceb8f", [branch: "fix/elixir-1.14"]}, @@ -121,9 +121,9 @@ "que": {:hex, :que, "0.10.1", "788ed0ec92ed69bdf9cfb29bf41a94ca6355b8d44959bd0669cf706e557ac891", [:mix], [{:ex_utils, "~> 0.1.6", [hex: :ex_utils, repo: "hexpm", optional: false]}, {:memento, "~> 0.3.0", [hex: :memento, repo: "hexpm", optional: false]}], "hexpm", "a737b365253e75dbd24b2d51acc1d851049e87baae08cd0c94e2bc5cd65088d5"}, "ranch": {:hex, :ranch, "1.8.0", "8c7a100a139fd57f17327b6413e4167ac559fbc04ca7448e9be9057311597a1d", [:make, :rebar3], [], "hexpm", "49fbcfd3682fab1f5d109351b61257676da1a2fdbe295904176d5e521a2ddfe5"}, "ratio": {:hex, :ratio, "2.4.2", "c8518f3536d49b1b00d88dd20d49f8b11abb7819638093314a6348139f14f9f9", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}, {:numbers, "~> 5.2.0", [hex: :numbers, repo: "hexpm", optional: false]}], "hexpm", "441ef6f73172a3503de65ccf1769030997b0d533b1039422f1e5e0e0b4cbf89e"}, - "redix": {:hex, :redix, "1.3.0", "f4121163ff9d73bf72157539ff23b13e38422284520bb58c05e014b19d6f0577", [:mix], [{:castore, "~> 0.1.0 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:nimble_options, "~> 0.5.0 or ~> 1.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "60d483d320c77329c8cbd3df73007e51b23f3fae75b7693bc31120d83ab26131"}, + "redix": {:hex, :redix, "1.4.1", "8303e13bad38ca80c15bdf79ea9cbd6eb879554c9cbb815b35df1602d7b1549d", [:mix], [{:castore, "~> 0.1.0 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:nimble_options, "~> 0.5.0 or ~> 1.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "676b5ce37d7b1d46931d506e3208786bd8334a1625ecb591d87d790b23ffbd1f"}, "remote_ip": {:hex, :remote_ip, "1.1.0", "cb308841595d15df3f9073b7c39243a1dd6ca56e5020295cb012c76fbec50f2d", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "616ffdf66aaad6a72fc546dabf42eed87e2a99e97b09cbd92b10cc180d02ed74"}, - "rustler_precompiled": {:hex, :rustler_precompiled, "0.6.3", "f838d94bc35e1844973ee7266127b156fdc962e9e8b7ff666c8fb4fed7964d23", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:rustler, "~> 0.23", [hex: :rustler, repo: "hexpm", optional: true]}], "hexpm", "e18ecca3669a7454b3a2be75ae6c3ef01d550bc9a8cf5fbddcfff843b881d7c6"}, + "rustler_precompiled": {:hex, :rustler_precompiled, "0.7.1", "ecadf02cc59a0eccbaed6c1937303a5827fbcf60010c541595e6d3747d3d0f9f", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:rustler, "~> 0.23", [hex: :rustler, repo: "hexpm", optional: true]}], "hexpm", "b9e4657b99a1483ea31502e1d58c464bedebe9028808eda45c3a429af4550c66"}, "sobelow": {:hex, :sobelow, "0.13.0", "218afe9075904793f5c64b8837cc356e493d88fddde126a463839351870b8d1e", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "cd6e9026b85fc35d7529da14f95e85a078d9dd1907a9097b3ba6ac7ebbe34a0d"}, "spandex": {:hex, :spandex, "3.2.0", "f8cd40146ea988c87f3c14054150c9a47ba17e53cd4515c00e1f93c29c45404d", [:mix], [{:decorator, "~> 1.2", [hex: :decorator, repo: "hexpm", optional: true]}, {:optimal, "~> 0.3.3", [hex: :optimal, repo: "hexpm", optional: false]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "d0a7d5aef4c5af9cf5467f2003e8a5d8d2bdae3823a6cc95d776b9a2251d4d03"}, "spandex_datadog": {:hex, :spandex_datadog, "1.4.0", "0594b9655b0af00ab9137122616bc0208b68ceec01e9916ab13d6fbb33dcce35", [:mix], [{:msgpax, "~> 2.2.1 or ~> 2.3", [hex: :msgpax, repo: "hexpm", optional: false]}, {:spandex, "~> 3.2", [hex: :spandex, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "360f8e1b4db238c1749c4872b1697b096429927fa42b8858d0bb782067380123"}, @@ -132,14 +132,15 @@ "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.7", "354c321cf377240c7b8716899e182ce4890c5938111a1296add3ec74cf1715df", [:make, :mix, :rebar3], [], "hexpm", "fe4c190e8f37401d30167c8c405eda19469f34577987c76dde613e838bbc67f8"}, "statistex": {:hex, :statistex, "1.0.0", "f3dc93f3c0c6c92e5f291704cf62b99b553253d7969e9a5fa713e5481cd858a5", [:mix], [], "hexpm", "ff9d8bee7035028ab4742ff52fc80a2aa35cece833cf5319009b52f1b5a86c27"}, "telemetry": {:hex, :telemetry, "0.4.3", "a06428a514bdbc63293cd9a6263aad00ddeb66f608163bdec7c8995784080818", [:rebar3], [], "hexpm", "eb72b8365ffda5bed68a620d1da88525e326cb82a75ee61354fc24b844768041"}, - "tesla": {:hex, :tesla, "1.8.0", "d511a4f5c5e42538d97eef7c40ec4f3e44effdc5068206f42ed859e09e51d1fd", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:exjsx, ">= 3.0.0", [hex: :exjsx, repo: "hexpm", optional: true]}, {:finch, "~> 0.13", [hex: :finch, repo: "hexpm", optional: true]}, {:fuse, "~> 2.4", [hex: :fuse, repo: "hexpm", optional: true]}, {:gun, ">= 1.0.0", [hex: :gun, repo: "hexpm", optional: true]}, {:hackney, "~> 1.6", [hex: :hackney, repo: "hexpm", optional: true]}, {:ibrowse, "4.4.2", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.0", [hex: :mint, repo: "hexpm", optional: true]}, {:msgpax, "~> 2.3", [hex: :msgpax, repo: "hexpm", optional: true]}, {:poison, ">= 1.0.0", [hex: :poison, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "10501f360cd926a309501287470372af1a6e1cbed0f43949203a4c13300bc79f"}, + "tesla": {:hex, :tesla, "1.9.0", "8c22db6a826e56a087eeb8cdef56889731287f53feeb3f361dec5d4c8efb6f14", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:exjsx, ">= 3.0.0", [hex: :exjsx, repo: "hexpm", optional: true]}, {:finch, "~> 0.13", [hex: :finch, repo: "hexpm", optional: true]}, {:fuse, "~> 2.4", [hex: :fuse, repo: "hexpm", optional: true]}, {:gun, ">= 1.0.0", [hex: :gun, repo: "hexpm", optional: true]}, {:hackney, "~> 1.6", [hex: :hackney, repo: "hexpm", optional: true]}, {:ibrowse, "4.4.2", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.0", [hex: :mint, repo: "hexpm", optional: true]}, {:msgpax, "~> 2.3", [hex: :msgpax, repo: "hexpm", optional: true]}, {:poison, ">= 1.0.0", [hex: :poison, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "7c240c67e855f7e63e795bf16d6b3f5115a81d1f44b7fe4eadbf656bae0fef8a"}, "timex": {:hex, :timex, "3.7.11", "bb95cb4eb1d06e27346325de506bcc6c30f9c6dea40d1ebe390b262fad1862d1", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:gettext, "~> 0.20", [hex: :gettext, repo: "hexpm", optional: false]}, {:tzdata, "~> 1.1", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm", "8b9024f7efbabaf9bd7aa04f65cf8dcd7c9818ca5737677c7b76acbc6a94d1aa"}, "toml": {:hex, :toml, "0.6.2", "38f445df384a17e5d382befe30e3489112a48d3ba4c459e543f748c2f25dd4d1", [:mix], [], "hexpm", "d013e45126d74c0c26a38d31f5e8e9b83ea19fc752470feb9a86071ca5a672fa"}, "typed_ecto_schema": {:hex, :typed_ecto_schema, "0.4.1", "a373ca6f693f4de84cde474a67467a9cb9051a8a7f3f615f1e23dc74b75237fa", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}], "hexpm", "85c6962f79d35bf543dd5659c6adc340fd2480cacc6f25d2cc2933ea6e8fcb3b"}, "tzdata": {:hex, :tzdata, "1.1.1", "20c8043476dfda8504952d00adac41c6eda23912278add38edc140ae0c5bcc46", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "a69cec8352eafcd2e198dea28a34113b60fdc6cb57eb5ad65c10292a6ba89787"}, - "ueberauth": {:hex, :ueberauth, "0.10.7", "5a31cbe11e7ce5c7484d745dc9e1f11948e89662f8510d03c616de03df581ebd", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "0bccf73e2ffd6337971340832947ba232877aa8122dba4c95be9f729c8987377"}, + "ueberauth": {:hex, :ueberauth, "0.10.8", "ba78fbcbb27d811a6cd06ad851793aaf7d27c3b30c9e95349c2c362b344cd8f0", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "f2d3172e52821375bccb8460e5fa5cb91cfd60b19b636b6e57e9759b6f8c10c1"}, "ueberauth_auth0": {:hex, :ueberauth_auth0, "2.1.0", "0632d5844049fa2f26823f15e1120aa32f27df6f27ce515a4b04641736594bf4", [:mix], [{:oauth2, "~> 2.0", [hex: :oauth2, repo: "hexpm", optional: false]}, {:ueberauth, "~> 0.7", [hex: :ueberauth, repo: "hexpm", optional: false]}], "hexpm", "8d3b30fa27c95c9e82c30c4afb016251405706d2e9627e603c3c9787fd1314fc"}, "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"}, + "varint": {:hex, :varint, "1.4.0", "b7405c8a99db7b95d4341fa9cb15e7c3af6c8dda43e21bbe1c4a9cdff50b6502", [:mix], [], "hexpm", "0fd461901b7120c03467530dff3c58fa3475328fd75ba72c7d3cbf13bce6b0d2"}, "wallaby": {:hex, :wallaby, "0.30.6", "7dc4c1213f3b52c4152581d126632bc7e06892336d3a0f582853efeeabd45a71", [:mix], [{:ecto_sql, ">= 3.0.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}, {:httpoison, "~> 0.12 or ~> 1.0 or ~> 2.0", [hex: :httpoison, repo: "hexpm", optional: false]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix_ecto, ">= 3.0.0", [hex: :phoenix_ecto, repo: "hexpm", optional: true]}, {:web_driver_client, "~> 0.2.0", [hex: :web_driver_client, repo: "hexpm", optional: false]}], "hexpm", "50950c1d968549b54c20e16175c68c7fc0824138e2bb93feb11ef6add8eb23d4"}, "web_driver_client": {:hex, :web_driver_client, "0.2.0", "63b76cd9eb3b0716ec5467a0f8bead73d3d9612e63f7560d21357f03ad86e31a", [:mix], [{:hackney, "~> 1.6", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:tesla, "~> 1.3", [hex: :tesla, repo: "hexpm", optional: false]}], "hexpm", "83cc6092bc3e74926d1c8455f0ce927d5d1d36707b74d9a65e38c084aab0350f"}, "websocket_client": {:git, "https://github.com/blockscout/websocket_client.git", "0b4ecc5b1fb8a0bd1c8352728da787c20add53aa", [branch: "master"]}, diff --git a/rel/config.exs b/rel/config.exs index ee8931e915d2..e581a15c60f0 100644 --- a/rel/config.exs +++ b/rel/config.exs @@ -71,7 +71,7 @@ end # will be used by default release :blockscout do - set version: "6.2.0-beta" + set version: "6.5.0-beta" set applications: [ :runtime_tools, block_scout_web: :permanent,