From ee3a819c3f1731cf76ce430e333843b615038923 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Fri, 24 Apr 2020 10:04:35 +0300 Subject: [PATCH 01/79] Besu support --- apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex | 4 ++-- .../lib/ethereum_jsonrpc/parity.ex | 2 +- .../indexer/fetcher/internal_transaction.ex | 19 ++++++++++--------- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex index dfe5fa4ea5..e4ecadfa6a 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex @@ -295,7 +295,7 @@ defmodule EthereumJSONRPC do Fetches internal transactions for entire blocks from variant API. """ def fetch_block_internal_transactions(params_list, json_rpc_named_arguments) when is_list(params_list) do - Keyword.fetch!(json_rpc_named_arguments, :variant).fetch_block_internal_transactions( + EthereumJSONRPC.Parity.fetch_block_internal_transactions( params_list, json_rpc_named_arguments ) @@ -315,7 +315,7 @@ defmodule EthereumJSONRPC do Fetches pending transactions from variant API. """ def fetch_pending_transactions(json_rpc_named_arguments) do - Keyword.fetch!(json_rpc_named_arguments, :variant).fetch_pending_transactions(json_rpc_named_arguments) + EthereumJSONRPC.Parity.fetch_pending_transactions(json_rpc_named_arguments) end @spec fetch_transaction_receipts( diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/parity.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/parity.ex index 84a1b94702..5ca0f5e5a8 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/parity.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/parity.ex @@ -94,7 +94,7 @@ defmodule EthereumJSONRPC.Parity do {:ok, [Transaction.params()]} | {:error, reason :: term} def fetch_pending_transactions(json_rpc_named_arguments) do with {:ok, transactions} <- - %{id: 1, method: "parity_pendingTransactions", params: []} + %{id: 1, method: "txpool_besuTransactions", params: []} |> request() |> json_rpc(json_rpc_named_arguments) do transactions_params = diff --git a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex index e9d914bd8c..0be16bf040 100644 --- a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex +++ b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex @@ -99,15 +99,16 @@ defmodule Indexer.Fetcher.InternalTransaction do Logger.debug("fetching internal transactions for blocks") - json_rpc_named_arguments - |> Keyword.fetch!(:variant) - |> case do - EthereumJSONRPC.Parity -> - EthereumJSONRPC.fetch_block_internal_transactions(unique_numbers, json_rpc_named_arguments) - - _ -> - fetch_block_internal_transactions_by_transactions(unique_numbers, json_rpc_named_arguments) - end + # json_rpc_named_arguments + # |> Keyword.fetch!(:variant) + # |> case do + # EthereumJSONRPC.Parity -> + # EthereumJSONRPC.fetch_block_internal_transactions(unique_numbers, json_rpc_named_arguments) + + # _ -> + # fetch_block_internal_transactions_by_transactions(unique_numbers, json_rpc_named_arguments) + # end + EthereumJSONRPC.fetch_block_internal_transactions(unique_numbers, json_rpc_named_arguments) |> case do {:ok, internal_transactions_params} -> import_internal_transaction(internal_transactions_params, unique_numbers) From 41dc4bdb4d56474726f1caea31a7b6fc7c20349e Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Tue, 12 May 2020 15:59:40 +0300 Subject: [PATCH 02/79] Finalize Besu variant --- .../templates/layout/_topnav.html.eex | 16 +- apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex | 4 +- .../lib/ethereum_jsonrpc/besu.ex | 287 ++++++++++++++++++ .../lib/ethereum_jsonrpc/geth.ex | 2 +- .../lib/ethereum_jsonrpc/parity.ex | 2 +- apps/explorer/config/config.exs | 5 + apps/explorer/config/dev/besu.exs | 25 ++ apps/explorer/config/prod/besu.exs | 25 ++ apps/explorer/config/test/besu.exs | 14 + apps/indexer/config/dev/besu.exs | 30 ++ apps/indexer/config/prod/besu.exs | 29 ++ apps/indexer/config/test/besu.exs | 8 + .../indexer/fetcher/internal_transaction.ex | 22 +- 13 files changed, 449 insertions(+), 20 deletions(-) create mode 100644 apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/besu.ex create mode 100644 apps/explorer/config/dev/besu.exs create mode 100644 apps/explorer/config/prod/besu.exs create mode 100644 apps/explorer/config/test/besu.exs create mode 100644 apps/indexer/config/dev/besu.exs create mode 100644 apps/indexer/config/prod/besu.exs create mode 100644 apps/indexer/config/test/besu.exs 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 ce01098d43..d54f71fb41 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 @@ -55,12 +55,16 @@ class: "dropdown-item #{tab_status("txs", @conn.request_path)}", to: transaction_path(@conn, :index) ) %> - <%= link( - gettext("Pending"), - class: "dropdown-item #{tab_status("pending_transactions", @conn.request_path)}", - "data-test": "pending_transactions_link", - to: pending_transaction_path(@conn, :index) - ) %> + <% json_rpc_named_arguments = Application.fetch_env!(:indexer, :json_rpc_named_arguments)%> + <% variant = Keyword.fetch!(json_rpc_named_arguments, :variant) %> + <%= if variant !== EthereumJSONRPC.Besu do %> + <%= link( + gettext("Pending"), + class: "dropdown-item #{tab_status("pending_transactions", @conn.request_path)}", + "data-test": "pending_transactions_link", + to: pending_transaction_path(@conn, :index) + ) %> + <% end %>
  • diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex index e4ecadfa6a..dfe5fa4ea5 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex @@ -295,7 +295,7 @@ defmodule EthereumJSONRPC do Fetches internal transactions for entire blocks from variant API. """ def fetch_block_internal_transactions(params_list, json_rpc_named_arguments) when is_list(params_list) do - EthereumJSONRPC.Parity.fetch_block_internal_transactions( + Keyword.fetch!(json_rpc_named_arguments, :variant).fetch_block_internal_transactions( params_list, json_rpc_named_arguments ) @@ -315,7 +315,7 @@ defmodule EthereumJSONRPC do Fetches pending transactions from variant API. """ def fetch_pending_transactions(json_rpc_named_arguments) do - EthereumJSONRPC.Parity.fetch_pending_transactions(json_rpc_named_arguments) + Keyword.fetch!(json_rpc_named_arguments, :variant).fetch_pending_transactions(json_rpc_named_arguments) end @spec fetch_transaction_receipts( diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/besu.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/besu.ex new file mode 100644 index 0000000000..2e5eaeff32 --- /dev/null +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/besu.ex @@ -0,0 +1,287 @@ +defmodule EthereumJSONRPC.Besu do + @moduledoc """ + Ethereum JSONRPC methods that are only supported by [Besu](https://besu.hyperledger.org/en/stable/Reference/API-Methods). + """ + require Logger + import EthereumJSONRPC, only: [id_to_params: 1, integer_to_quantity: 1, json_rpc: 2, request: 1] + + alias EthereumJSONRPC.Parity.{Traces} + alias EthereumJSONRPC.{Transaction, Transactions} + + @behaviour EthereumJSONRPC.Variant + + @impl EthereumJSONRPC.Variant + def fetch_beneficiaries(_block_range, _json_rpc_named_arguments), do: :ignore + + @impl EthereumJSONRPC.Variant + def fetch_internal_transactions(_transactions_params, _json_rpc_named_arguments), do: :ignore + + @doc """ + Fetches the `t:Explorer.Chain.InternalTransaction.changeset/2` params from the Besu trace URL. + """ + @impl EthereumJSONRPC.Variant + def fetch_block_internal_transactions(block_numbers, json_rpc_named_arguments) when is_list(block_numbers) do + id_to_params = id_to_params(block_numbers) + + with {:ok, responses} <- + id_to_params + |> trace_replay_block_transactions_requests() + |> json_rpc(json_rpc_named_arguments) do + trace_replay_block_transactions_responses_to_internal_transactions_params(responses, id_to_params) + end + end + + @impl EthereumJSONRPC.Variant + def fetch_first_trace(transactions_params, json_rpc_named_arguments) when is_list(transactions_params) do + id_to_params = id_to_params(transactions_params) + + trace_replay_transaction_response = + id_to_params + |> trace_replay_transaction_requests() + |> json_rpc(json_rpc_named_arguments) + + case trace_replay_transaction_response do + {:ok, responses} -> + case trace_replay_transaction_responses_to_first_trace_params(responses, id_to_params) do + {:ok, [first_trace]} -> + %{block_hash: block_hash} = + transactions_params + |> Enum.at(0) + + {:ok, + [%{first_trace: first_trace, block_hash: block_hash, json_rpc_named_arguments: json_rpc_named_arguments}]} + + {:error, error} -> + Logger.error(inspect(error)) + {:error, error} + end + + {:error, :econnrefused} -> + {:error, :econnrefused} + + {:error, [error]} -> + Logger.error(inspect(error)) + {:error, error} + end + end + + @doc """ + Fetches the pending transactions from the Besu node. + + *NOTE*: The pending transactions are local to the node that is contacted and may not be consistent across nodes based + on the transactions that each node has seen and how each node prioritizes collating transactions into the next block. + """ + @impl EthereumJSONRPC.Variant + @spec fetch_pending_transactions(EthereumJSONRPC.json_rpc_named_arguments()) :: + {:ok, [Transaction.params()]} | {:error, reason :: term} + def fetch_pending_transactions(json_rpc_named_arguments) do + with {:ok, transactions} <- + %{id: 1, method: "txpool_besuTransactions", params: []} + |> request() + |> json_rpc(json_rpc_named_arguments) do + transactions_params = + transactions + |> Transactions.to_elixir() + |> Transactions.elixir_to_params() + + {:ok, transactions_params} + end + end + + defp trace_replay_block_transactions_responses_to_internal_transactions_params(responses, id_to_params) + when is_list(responses) and is_map(id_to_params) do + with {:ok, traces} <- trace_replay_block_transactions_responses_to_traces(responses, id_to_params) do + params = + traces + |> Traces.to_elixir() + |> Traces.elixir_to_params() + + {:ok, params} + end + end + + defp trace_replay_block_transactions_responses_to_traces(responses, id_to_params) + when is_list(responses) and is_map(id_to_params) do + responses + |> Enum.map(&trace_replay_block_transactions_response_to_traces(&1, id_to_params)) + |> Enum.reduce( + {:ok, []}, + fn + {:ok, traces}, {:ok, acc_traces_list} -> + {:ok, [traces | acc_traces_list]} + + {:ok, _}, {:error, _} = acc_error -> + acc_error + + {:error, reason}, {:ok, _} -> + {:error, [reason]} + + {:error, reason}, {:error, acc_reason} -> + {:error, [reason | acc_reason]} + end + ) + |> case do + {:ok, traces_list} -> + traces = + traces_list + |> Enum.reverse() + |> List.flatten() + + {:ok, traces} + + {:error, reverse_reasons} -> + reasons = Enum.reverse(reverse_reasons) + {:error, reasons} + end + end + + defp trace_replay_block_transactions_response_to_traces(%{id: id, result: results}, id_to_params) + when is_list(results) and is_map(id_to_params) do + block_number = Map.fetch!(id_to_params, id) + + annotated_traces = + results + |> Stream.with_index() + |> Enum.flat_map(fn {%{"trace" => traces, "transactionHash" => transaction_hash}, transaction_index} -> + traces + |> Stream.with_index() + |> Enum.map(fn {trace, index} -> + Map.merge(trace, %{ + "blockNumber" => block_number, + "transactionHash" => transaction_hash, + "transactionIndex" => transaction_index, + "index" => index + }) + end) + end) + + {:ok, annotated_traces} + end + + defp trace_replay_block_transactions_response_to_traces(%{id: id, error: error}, id_to_params) + when is_map(id_to_params) do + block_number = Map.fetch!(id_to_params, id) + + annotated_error = + Map.put(error, :data, %{ + "blockNumber" => block_number + }) + + {:error, annotated_error} + end + + defp trace_replay_block_transactions_requests(id_to_params) when is_map(id_to_params) do + Enum.map(id_to_params, fn {id, block_number} -> + trace_replay_block_transactions_request(%{id: id, block_number: block_number}) + end) + end + + defp trace_replay_block_transactions_request(%{id: id, block_number: block_number}) do + request(%{id: id, method: "trace_replayBlockTransactions", params: [integer_to_quantity(block_number), ["trace"]]}) + end + + def trace_replay_transaction_responses_to_first_trace_params(responses, id_to_params) + when is_list(responses) and is_map(id_to_params) do + with {:ok, traces} <- trace_replay_transaction_responses_to_first_trace(responses, id_to_params) do + params = + traces + |> Traces.to_elixir() + |> Traces.elixir_to_params() + + {:ok, params} + end + end + + defp trace_replay_transaction_responses_to_first_trace(responses, id_to_params) + when is_list(responses) and is_map(id_to_params) do + responses + |> Enum.map(&trace_replay_transaction_response_to_first_trace(&1, id_to_params)) + |> Enum.reduce( + {:ok, []}, + fn + {:ok, traces}, {:ok, acc_traces_list} -> + {:ok, [traces | acc_traces_list]} + + {:ok, _}, {:error, _} = acc_error -> + acc_error + + {:error, reason}, {:ok, _} -> + {:error, [reason]} + + {:error, reason}, {:error, acc_reason} -> + {:error, [reason | acc_reason]} + end + ) + |> case do + {:ok, traces_list} -> + traces = + traces_list + |> Enum.reverse() + |> List.flatten() + + {:ok, traces} + + {:error, reverse_reasons} -> + reasons = Enum.reverse(reverse_reasons) + {:error, reasons} + end + end + + defp trace_replay_transaction_response_to_first_trace(%{id: id, result: %{"trace" => traces}}, id_to_params) + when is_list(traces) and is_map(id_to_params) do + %{ + block_hash: block_hash, + block_number: block_number, + hash_data: transaction_hash, + transaction_index: transaction_index + } = Map.fetch!(id_to_params, id) + + first_trace = + traces + |> Stream.with_index() + |> Enum.map(fn {trace, index} -> + Map.merge(trace, %{ + "blockHash" => block_hash, + "blockNumber" => block_number, + "index" => index, + "transactionIndex" => transaction_index, + "transactionHash" => transaction_hash + }) + end) + |> Enum.filter(fn trace -> + Map.get(trace, "index") == 0 + end) + + {:ok, first_trace} + end + + defp trace_replay_transaction_response_to_first_trace(%{id: id, error: error}, id_to_params) + when is_map(id_to_params) do + %{ + block_hash: block_hash, + block_number: block_number, + hash_data: transaction_hash, + transaction_index: transaction_index + } = Map.fetch!(id_to_params, id) + + annotated_error = + Map.put(error, :data, %{ + "blockHash" => block_hash, + "blockNumber" => block_number, + "transactionIndex" => transaction_index, + "transactionHash" => transaction_hash + }) + + {:error, annotated_error} + end + + defp trace_replay_transaction_requests(id_to_params) when is_map(id_to_params) do + Enum.map(id_to_params, fn {id, %{hash_data: hash_data}} -> + trace_replay_transaction_request(%{id: id, hash_data: hash_data}) + end) + end + + defp trace_replay_transaction_request(%{id: id, hash_data: hash_data}) do + request(%{id: id, method: "trace_replayTransaction", params: [hash_data, ["trace"]]}) + end +end diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex index 03e8c8457c..05e32348f2 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/geth.ex @@ -38,7 +38,7 @@ defmodule EthereumJSONRPC.Geth do end @doc """ - Fetches the first trace from the Parity trace URL. + Fetches the first trace from the trace URL. """ @impl EthereumJSONRPC.Variant def fetch_first_trace(_transactions_params, _json_rpc_named_arguments), do: :ignore diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/parity.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/parity.ex index 5ca0f5e5a8..84a1b94702 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/parity.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/parity.ex @@ -94,7 +94,7 @@ defmodule EthereumJSONRPC.Parity do {:ok, [Transaction.params()]} | {:error, reason :: term} def fetch_pending_transactions(json_rpc_named_arguments) do with {:ok, transactions} <- - %{id: 1, method: "txpool_besuTransactions", params: []} + %{id: 1, method: "parity_pendingTransactions", params: []} |> request() |> json_rpc(json_rpc_named_arguments) do transactions_params = diff --git a/apps/explorer/config/config.exs b/apps/explorer/config/config.exs index 8424590e95..57d5030cf5 100644 --- a/apps/explorer/config/config.exs +++ b/apps/explorer/config/config.exs @@ -207,6 +207,11 @@ config :explorer, Explorer.Chain.Cache.Accounts, global_ttl: if(System.get_env("DISABLE_INDEXER") == "true", do: :timer.seconds(5)) config :explorer, Explorer.Chain.Cache.PendingTransactions, + enabled: + if(System.get_env("ETHEREUM_JSONRPC_VARIANT") == "besu", + do: false, + else: true + ), ttl_check_interval: if(System.get_env("DISABLE_INDEXER") == "true", do: :timer.seconds(1), else: false), global_ttl: if(System.get_env("DISABLE_INDEXER") == "true", do: :timer.seconds(5)) diff --git a/apps/explorer/config/dev/besu.exs b/apps/explorer/config/dev/besu.exs new file mode 100644 index 0000000000..e014ac960c --- /dev/null +++ b/apps/explorer/config/dev/besu.exs @@ -0,0 +1,25 @@ +use Mix.Config + +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", + method_to_url: [ + eth_call: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545", + eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545", + trace_replayTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545" + ], + http_options: [recv_timeout: :timer.minutes(1), timeout: :timer.minutes(1), hackney: [pool: :ethereum_jsonrpc]] + ], + variant: EthereumJSONRPC.Besu + ], + subscribe_named_arguments: [ + transport: EthereumJSONRPC.WebSocket, + transport_options: [ + web_socket: EthereumJSONRPC.WebSocket.WebSocketClient, + url: System.get_env("ETHEREUM_JSONRPC_WS_URL") + ], + variant: EthereumJSONRPC.Besu + ] diff --git a/apps/explorer/config/prod/besu.exs b/apps/explorer/config/prod/besu.exs new file mode 100644 index 0000000000..4b69e1363e --- /dev/null +++ b/apps/explorer/config/prod/besu.exs @@ -0,0 +1,25 @@ +use Mix.Config + +config :explorer, + json_rpc_named_arguments: [ + transport: EthereumJSONRPC.HTTP, + transport_options: [ + http: EthereumJSONRPC.HTTP.HTTPoison, + url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL"), + method_to_url: [ + eth_call: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"), + eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"), + trace_replayTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") + ], + http_options: [recv_timeout: :timer.minutes(1), timeout: :timer.minutes(1), hackney: [pool: :ethereum_jsonrpc]] + ], + variant: EthereumJSONRPC.Besu + ], + subscribe_named_arguments: [ + transport: EthereumJSONRPC.WebSocket, + transport_options: [ + web_socket: EthereumJSONRPC.WebSocket.WebSocketClient, + url: System.get_env("ETHEREUM_JSONRPC_WS_URL") + ], + variant: EthereumJSONRPC.Besu + ] diff --git a/apps/explorer/config/test/besu.exs b/apps/explorer/config/test/besu.exs new file mode 100644 index 0000000000..f5c234c7e1 --- /dev/null +++ b/apps/explorer/config/test/besu.exs @@ -0,0 +1,14 @@ +use Mix.Config + +config :explorer, + transport: EthereumJSONRPC.HTTP, + json_rpc_named_arguments: [ + transport: EthereumJSONRPC.Mox, + transport_options: [], + variant: EthereumJSONRPC.Besu + ], + subscribe_named_arguments: [ + transport: EthereumJSONRPC.Mox, + transport_options: [], + variant: EthereumJSONRPC.Besu + ] diff --git a/apps/indexer/config/dev/besu.exs b/apps/indexer/config/dev/besu.exs new file mode 100644 index 0000000000..dc61acea33 --- /dev/null +++ b/apps/indexer/config/dev/besu.exs @@ -0,0 +1,30 @@ +use Mix.Config + +config :indexer, + block_interval: :timer.seconds(5), + json_rpc_named_arguments: [ + transport: + if(System.get_env("ETHEREUM_JSONRPC_TRANSPORT", "http") == "http", + do: EthereumJSONRPC.HTTP, + else: EthereumJSONRPC.IPC + ), + else: EthereumJSONRPC.IPC, + transport_options: [ + http: EthereumJSONRPC.HTTP.HTTPoison, + url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || "http://localhost:8545", + method_to_url: [ + eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545", + trace_block: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545", + trace_replayBlockTransactions: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") || "http://localhost:8545" + ], + http_options: [recv_timeout: :timer.minutes(10), timeout: :timer.minutes(10), hackney: [pool: :ethereum_jsonrpc]] + ], + variant: EthereumJSONRPC.Besu + ], + subscribe_named_arguments: [ + transport: System.get_env("ETHEREUM_JSONRPC_WS_URL") && EthereumJSONRPC.WebSocket, + transport_options: [ + web_socket: EthereumJSONRPC.WebSocket.WebSocketClient, + url: System.get_env("ETHEREUM_JSONRPC_WS_URL") + ] + ] diff --git a/apps/indexer/config/prod/besu.exs b/apps/indexer/config/prod/besu.exs new file mode 100644 index 0000000000..aad6529e5c --- /dev/null +++ b/apps/indexer/config/prod/besu.exs @@ -0,0 +1,29 @@ +use Mix.Config + +config :indexer, + block_interval: :timer.seconds(5), + json_rpc_named_arguments: [ + transport: + if(System.get_env("ETHEREUM_JSONRPC_TRANSPORT", "http") == "http", + do: EthereumJSONRPC.HTTP, + else: EthereumJSONRPC.IPC + ), + transport_options: [ + http: EthereumJSONRPC.HTTP.HTTPoison, + url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL"), + method_to_url: [ + eth_getBalance: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"), + trace_block: System.get_env("ETHEREUM_JSONRPC_TRACE_URL"), + trace_replayTransaction: System.get_env("ETHEREUM_JSONRPC_TRACE_URL") + ], + http_options: [recv_timeout: :timer.minutes(10), timeout: :timer.minutes(10), hackney: [pool: :ethereum_jsonrpc]] + ], + variant: EthereumJSONRPC.Besu + ], + subscribe_named_arguments: [ + transport: System.get_env("ETHEREUM_JSONRPC_WS_URL") && EthereumJSONRPC.WebSocket, + transport_options: [ + web_socket: EthereumJSONRPC.WebSocket.WebSocketClient, + url: System.get_env("ETHEREUM_JSONRPC_WS_URL") + ] + ] diff --git a/apps/indexer/config/test/besu.exs b/apps/indexer/config/test/besu.exs new file mode 100644 index 0000000000..ceaac3a9b4 --- /dev/null +++ b/apps/indexer/config/test/besu.exs @@ -0,0 +1,8 @@ +use Mix.Config + +config :indexer, + json_rpc_named_arguments: [ + transport: EthereumJSONRPC.Mox, + transport_options: [], + variant: EthereumJSONRPC.Besu + ] diff --git a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex index 0be16bf040..4ed5a85888 100644 --- a/apps/indexer/lib/indexer/fetcher/internal_transaction.ex +++ b/apps/indexer/lib/indexer/fetcher/internal_transaction.ex @@ -99,16 +99,18 @@ defmodule Indexer.Fetcher.InternalTransaction do Logger.debug("fetching internal transactions for blocks") - # json_rpc_named_arguments - # |> Keyword.fetch!(:variant) - # |> case do - # EthereumJSONRPC.Parity -> - # EthereumJSONRPC.fetch_block_internal_transactions(unique_numbers, json_rpc_named_arguments) - - # _ -> - # fetch_block_internal_transactions_by_transactions(unique_numbers, json_rpc_named_arguments) - # end - EthereumJSONRPC.fetch_block_internal_transactions(unique_numbers, json_rpc_named_arguments) + json_rpc_named_arguments + |> Keyword.fetch!(:variant) + |> case do + EthereumJSONRPC.Parity -> + EthereumJSONRPC.fetch_block_internal_transactions(unique_numbers, json_rpc_named_arguments) + + EthereumJSONRPC.Besu -> + EthereumJSONRPC.fetch_block_internal_transactions(unique_numbers, json_rpc_named_arguments) + + _ -> + fetch_block_internal_transactions_by_transactions(unique_numbers, json_rpc_named_arguments) + end |> case do {:ok, internal_transactions_params} -> import_internal_transaction(internal_transactions_params, unique_numbers) From 8604b91f2bdb6b8526c834a689fa7745f933115a Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Thu, 4 Jun 2020 14:48:46 +0300 Subject: [PATCH 03/79] Pending txs per address API endpoint --- CHANGELOG.md | 3 +- .../controllers/api/rpc/address_controller.ex | 30 ++++++++ .../lib/block_scout_web/etherscan.ex | 72 +++++++++++++++++++ .../views/api/rpc/address_view.ex | 21 ++++++ apps/explorer/lib/explorer/chain.ex | 2 +- apps/explorer/lib/explorer/etherscan.ex | 49 ++++++++++++- 6 files changed, 174 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c222d86c10..ac11a18bb5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,8 @@ ## Current ### Features -- [#3125](https://github.com/poanetwork/blockscout/pull/3125) - Availability to configure a number of days to consider at coin balance history chart via environment variable +- [#3145](https://github.com/poanetwork/blockscout/pull/3145) - Pending txs per address API endpoint +- [#3125](https://github.com/poanetwork/blockscout/pull/3125) - Availability to configure a number of days to consider at coin balance history chart via environment variable ### Fixes - [#3142](https://github.com/poanetwork/blockscout/pull/3142) - Speed-up last coin balance timestamp query (coin balance history page performance improvement) diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/address_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/address_controller.ex index 3150d3bd60..055744480c 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/address_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/address_controller.ex @@ -71,6 +71,29 @@ defmodule BlockScoutWeb.API.RPC.AddressController do balance(conn, params, :balancemulti) end + def pendingtxlist(conn, params) do + options = optional_params(params) + + with {:address_param, {:ok, address_param}} <- fetch_address(params), + {:format, {:ok, address_hash}} <- to_address_hash(address_param), + {:ok, transactions} <- list_pending_transactions(address_hash, options) do + render(conn, :pendingtxlist, %{transactions: transactions}) + else + {:address_param, :error} -> + conn + |> put_status(200) + |> render(:error, error: "Query parameter 'address' is required") + + {:format, :error} -> + conn + |> put_status(200) + |> render(:error, error: "Invalid address format") + + {:error, :not_found} -> + render(conn, :error, error: "No transactions found", data: []) + end + end + def txlist(conn, params) do options = optional_params(params) @@ -457,6 +480,13 @@ defmodule BlockScoutWeb.API.RPC.AddressController do end end + defp list_pending_transactions(address_hash, options) do + case Etherscan.list_pending_transactions(address_hash, options) do + [] -> {:error, :not_found} + pending_transactions -> {:ok, pending_transactions} + end + end + defp list_internal_transactions(transaction_hash) do case Etherscan.list_internal_transactions(transaction_hash) do [] -> {:error, :not_found} diff --git a/apps/block_scout_web/lib/block_scout_web/etherscan.ex b/apps/block_scout_web/lib/block_scout_web/etherscan.ex index 019795dc69..330b493d8c 100644 --- a/apps/block_scout_web/lib/block_scout_web/etherscan.ex +++ b/apps/block_scout_web/lib/block_scout_web/etherscan.ex @@ -37,6 +37,27 @@ defmodule BlockScoutWeb.Etherscan do ] } + @account_pendingtxlist_example_value %{ + "status" => "1", + "message" => "OK", + "result" => [ + %{ + "hash" => "0x98beb27135aa0a25650557005ad962919d6a278c4b3dde7f4f6a3a1e65aa746c", + "nonce" => "0", + "from" => "0x3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4", + "to" => "0xde0b295669a9fd93d5f28d9ec85e40f4cb697bae", + "value" => "0", + "gas" => "122261", + "gasPrice" => "50000000000", + "input" => + "0xf00d4b5d000000000000000000000000036c8cecce8d8bbf0831d840d7f29c9e3ddefa63000000000000000000000000c5a96db085dda36ffbe390f455315d30d6d3dc52", + "contractAddress" => "", + "cumulativeGasUsed" => "122207", + "gasUsed" => "122207" + } + ] + } + @account_txlist_example_value %{ "status" => "1", "message" => "OK", @@ -1187,6 +1208,56 @@ defmodule BlockScoutWeb.Etherscan do ] } + @account_pendingtxlist_action %{ + name: "pendingtxlist", + description: "Get pending transactions by address.", + required_params: [ + %{ + key: "address", + placeholder: "addressHash", + type: "string", + description: "A 160-bit code used for identifying Accounts." + } + ], + optional_params: [ + %{ + key: "page", + type: "integer", + description: + "A nonnegative integer that represents the page number to be used for pagination. 'offset' must be provided in conjunction." + }, + %{ + key: "offset", + type: "integer", + description: + "A nonnegative integer that represents the maximum number of records to return when paginating. 'page' must be provided in conjunction." + } + ], + responses: [ + %{ + code: "200", + description: "successful operation", + example_value: Jason.encode!(@account_pendingtxlist_example_value), + model: %{ + name: "Result", + fields: %{ + status: @status_type, + message: @message_type, + result: %{ + type: "array", + array_type: @transaction + } + } + } + }, + %{ + code: "200", + description: "error", + example_value: Jason.encode!(@account_txlist_example_value_error) + } + ] + } + @account_txlist_action %{ name: "txlist", description: @@ -2343,6 +2414,7 @@ defmodule BlockScoutWeb.Etherscan do @account_eth_get_balance_action, @account_balance_action, @account_balancemulti_action, + @account_pendingtxlist_action, @account_txlist_action, @account_txlistinternal_action, @account_tokentx_action, 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 62da759428..30f9803259 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 @@ -22,6 +22,11 @@ defmodule BlockScoutWeb.API.RPC.AddressView do RPCView.render("show.json", data: data) end + def render("pendingtxlist.json", %{transactions: transactions}) do + data = Enum.map(transactions, &prepare_pending_transaction/1) + RPCView.render("show.json", data: data) + end + def render("txlist.json", %{transactions: transactions}) do data = Enum.map(transactions, &prepare_transaction/1) RPCView.render("show.json", data: data) @@ -79,6 +84,22 @@ defmodule BlockScoutWeb.API.RPC.AddressView do } end + defp prepare_pending_transaction(transaction) do + %{ + "hash" => "#{transaction.hash}", + "nonce" => "#{transaction.nonce}", + "from" => "#{transaction.from_address_hash}", + "to" => "#{transaction.to_address_hash}", + "value" => "#{transaction.value.value}", + "gas" => "#{transaction.gas}", + "gasPrice" => "#{transaction.gas_price.value}", + "input" => "#{transaction.input}", + "contractAddress" => "#{transaction.created_contract_address_hash}", + "cumulativeGasUsed" => "#{transaction.cumulative_gas_used}", + "gasUsed" => "#{transaction.gas_used}" + } + end + defp prepare_transaction(transaction) do %{ "blockNumber" => "#{transaction.block_number}", diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex index f89e94a365..e447d26be4 100644 --- a/apps/explorer/lib/explorer/chain.ex +++ b/apps/explorer/lib/explorer/chain.ex @@ -2446,7 +2446,7 @@ defmodule Explorer.Chain do |> Repo.all() end - defp pending_transactions_query(query) do + def pending_transactions_query(query) do from(transaction in query, where: is_nil(transaction.block_hash) and (is_nil(transaction.error) or transaction.error != "dropped/replaced") ) diff --git a/apps/explorer/lib/explorer/etherscan.ex b/apps/explorer/lib/explorer/etherscan.ex index 1caf9f7e64..1ce210840a 100644 --- a/apps/explorer/lib/explorer/etherscan.ex +++ b/apps/explorer/lib/explorer/etherscan.ex @@ -3,7 +3,7 @@ defmodule Explorer.Etherscan do The etherscan context. """ - import Ecto.Query, only: [from: 2, where: 3, or_where: 3, union: 2, subquery: 1] + import Ecto.Query, only: [from: 2, where: 3, or_where: 3, union: 2, subquery: 1, order_by: 3] alias Explorer.Etherscan.Logs alias Explorer.{Chain, Repo} @@ -52,6 +52,22 @@ defmodule Explorer.Etherscan do end end + @doc """ + Gets a list of pending transactions for a given `t:Explorer.Chain.Hash.Address.t/0`. + + If `filter_by: `to_address_hash`, + `from_address_hash`, and `created_contract_address_hash`. + + """ + @spec list_pending_transactions(Hash.Address.t()) :: [map()] + def list_pending_transactions( + %Hash{byte_count: unquote(Hash.Address.byte_count())} = address_hash, + options \\ @default_options + ) do + merged_options = Map.merge(@default_options, options) + list_pending_transactions_query(address_hash, merged_options) + end + @internal_transaction_fields ~w( from_address_hash to_address_hash @@ -334,6 +350,37 @@ defmodule Explorer.Etherscan do value )a + @pending_transaction_fields ~w( + created_contract_address_hash + cumulative_gas_used + from_address_hash + gas + gas_price + gas_used + hash + index + input + nonce + to_address_hash + value + )a + + defp list_pending_transactions_query(address_hash, options) do + query = + from( + t in Transaction, + limit: ^options.page_size, + offset: ^offset(options), + select: map(t, ^@pending_transaction_fields) + ) + + query + |> where_address_match(address_hash, options) + |> Chain.pending_transactions_query() + |> order_by([transaction], desc: transaction.inserted_at, desc: transaction.hash) + |> Repo.all() + end + defp list_transactions(address_hash, max_block_number, options) do query = from( From 42896e766114bd3ec0a3c2a37302759e0319ee11 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Thu, 4 Jun 2020 22:12:47 +0300 Subject: [PATCH 04/79] Fix coin balance history page if no balance changes --- .../address_coin_balance_controller.ex | 12 +-- apps/explorer/lib/explorer/chain.ex | 99 ++++++++++--------- .../explorer/chain/address/coin_balance.ex | 48 ++++++--- 3 files changed, 90 insertions(+), 69 deletions(-) diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_coin_balance_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_coin_balance_controller.ex index b4e21e3393..538f8fd7f4 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/address_coin_balance_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_coin_balance_controller.ex @@ -23,16 +23,6 @@ defmodule BlockScoutWeb.AddressCoinBalanceController do {coin_balances, next_page} = split_list_by_page(coin_balances_plus_one) - deduplicated_coin_balances = - coin_balances - |> Enum.dedup_by(fn record -> - if record.delta == Decimal.new(0) do - :dup - else - System.unique_integer() - end - end) - next_page_url = case next_page_params(next_page, coin_balances, params) do nil -> @@ -48,7 +38,7 @@ defmodule BlockScoutWeb.AddressCoinBalanceController do end coin_balances_json = - Enum.map(deduplicated_coin_balances, fn coin_balance -> + Enum.map(coin_balances, fn coin_balance -> View.render_to_string( AddressCoinBalanceView, "_coin_balances.html", diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex index f89e94a365..9fc94e6af0 100644 --- a/apps/explorer/lib/explorer/chain.ex +++ b/apps/explorer/lib/explorer/chain.ex @@ -3499,56 +3499,63 @@ defmodule Explorer.Chain do |> page_coin_balances(paging_options) |> Repo.all() - min_block_number = + if Enum.empty?(balances_raw) do balances_raw - |> Enum.min_by(fn balance -> balance.block_number end) - |> Map.get(:block_number) - - max_block_number = - balances_raw - |> Enum.max_by(fn balance -> balance.block_number end) - |> Map.get(:block_number) - - min_block_timestamp = find_block_timestamp(min_block_number) - max_block_timestamp = find_block_timestamp(max_block_number) - - min_block_unix_timestamp = - min_block_timestamp - |> Timex.to_unix() - - max_block_unix_timestamp = - max_block_timestamp - |> Timex.to_unix() - - blocks_delta = max_block_number - min_block_number - - balances_with_dates = - if blocks_delta > 0 do - balances_raw - |> Enum.map(fn balance -> - date = - trunc( - min_block_unix_timestamp + - (balance.block_number - min_block_number) * (max_block_unix_timestamp - min_block_unix_timestamp) / - blocks_delta - ) - - formatted_date = Timex.from_unix(date) - %{balance | block_timestamp: formatted_date} - end) - else + else + balances_raw_filtered = balances_raw - |> Enum.map(fn balance -> - date = min_block_unix_timestamp + |> Enum.filter(fn balance -> balance.value end) + + min_block_number = + balances_raw_filtered + |> Enum.min_by(fn balance -> balance.block_number end, fn -> %{} end) + |> Map.get(:block_number) + + max_block_number = + balances_raw_filtered + |> Enum.max_by(fn balance -> balance.block_number end, fn -> %{} end) + |> Map.get(:block_number) + + min_block_timestamp = find_block_timestamp(min_block_number) + max_block_timestamp = find_block_timestamp(max_block_number) + + min_block_unix_timestamp = + min_block_timestamp + |> Timex.to_unix() + + max_block_unix_timestamp = + max_block_timestamp + |> Timex.to_unix() + + blocks_delta = max_block_number - min_block_number + + balances_with_dates = + if blocks_delta > 0 do + balances_raw_filtered + |> Enum.map(fn balance -> + date = + trunc( + min_block_unix_timestamp + + (balance.block_number - min_block_number) * (max_block_unix_timestamp - min_block_unix_timestamp) / + blocks_delta + ) + + formatted_date = Timex.from_unix(date) + %{balance | block_timestamp: formatted_date} + end) + else + balances_raw_filtered + |> Enum.map(fn balance -> + date = min_block_unix_timestamp - formatted_date = Timex.from_unix(date) - %{balance | block_timestamp: formatted_date} - end) - end + formatted_date = Timex.from_unix(date) + %{balance | block_timestamp: formatted_date} + end) + end - balances_with_dates - |> Enum.filter(fn balance -> balance.value end) - |> Enum.sort(fn balance1, balance2 -> balance1.block_timestamp >= balance2.block_timestamp end) + balances_with_dates + |> Enum.sort(fn balance1, balance2 -> balance1.block_number >= balance2.block_number end) + end end def get_coin_balance(address_hash, block_number) do diff --git a/apps/explorer/lib/explorer/chain/address/coin_balance.ex b/apps/explorer/lib/explorer/chain/address/coin_balance.ex index ca693b84a8..cada366173 100644 --- a/apps/explorer/lib/explorer/chain/address/coin_balance.ex +++ b/apps/explorer/lib/explorer/chain/address/coin_balance.ex @@ -72,13 +72,18 @@ defmodule Explorer.Chain.Address.CoinBalance do The last coin balance from an Address is the last block indexed. """ def fetch_coin_balances(address_hash, %PagingOptions{page_size: page_size}) do - from( - cb in CoinBalance, - where: cb.address_hash == ^address_hash, - where: not is_nil(cb.value), - order_by: [desc: :block_number], - limit: ^page_size, - select_merge: %{delta: fragment("value - coalesce(lead(value, 1) over (order by block_number desc), 0)")} + query = + from( + cb in CoinBalance, + where: cb.address_hash == ^address_hash, + where: not is_nil(cb.value), + order_by: [desc: :block_number], + select_merge: %{delta: fragment("value - coalesce(lead(value, 1) over (order by block_number desc), 0)")} + ) + + from(balance in subquery(query), + where: balance.delta != 0, + limit: ^page_size ) end @@ -87,21 +92,40 @@ defmodule Explorer.Chain.Address.CoinBalance do corresponds to the maximum balance in that day. Only the last 90 days of data are used. """ def balances_by_day(address_hash, block_timestamp \\ nil) do + {days_to_consider, _} = + Application.get_env(:block_scout_web, BlockScoutWeb.Chain.Address.CoinBalance)[:coin_balance_history_days] + |> Integer.parse() + CoinBalance |> join(:inner, [cb], b in Block, on: cb.block_number == b.number) |> where([cb], cb.address_hash == ^address_hash) - |> limit_time_interval(block_timestamp) + |> limit_time_interval(days_to_consider, block_timestamp) |> group_by([cb, b], fragment("date_trunc('day', ?)", b.timestamp)) |> order_by([cb, b], fragment("date_trunc('day', ?)", b.timestamp)) |> select([cb, b], %{date: type(fragment("date_trunc('day', ?)", b.timestamp), :date), value: max(cb.value)}) end - def limit_time_interval(query, nil) do - query |> where([cb, b], b.timestamp >= fragment("date_trunc('day', now()) - interval '90 days'")) + def limit_time_interval(query, days_to_consider, nil) do + query + |> where( + [cb, b], + b.timestamp >= + fragment("date_trunc('day', now() - CAST(? AS INTERVAL))", ^%Postgrex.Interval{days: days_to_consider}) + ) end - def limit_time_interval(query, %{timestamp: timestamp}) do - query |> where([cb, b], b.timestamp >= fragment("(? AT TIME ZONE ?) - interval '90 days'", ^timestamp, ^"Etc/UTC")) + def limit_time_interval(query, days_to_consider, %{timestamp: timestamp}) do + query + |> where( + [cb, b], + b.timestamp >= + fragment( + "(? AT TIME ZONE ?) - CAST(? AS INTERVAL)", + ^timestamp, + ^"Etc/UTC", + ^%Postgrex.Interval{days: days_to_consider} + ) + ) end def last_coin_balance_timestamp(address_hash) do From dd60c427b0902cb771eebf6f080328e2c5f4430f Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Fri, 5 Jun 2020 16:33:22 +0300 Subject: [PATCH 05/79] Add CHANGELOG entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c222d86c10..65627e9e12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - [#3125](https://github.com/poanetwork/blockscout/pull/3125) - Availability to configure a number of days to consider at coin balance history chart via environment variable ### Fixes +- [#3146](https://github.com/poanetwork/blockscout/pull/3146) - Fix coin balance history page: order of items, fix if no balance changes - [#3142](https://github.com/poanetwork/blockscout/pull/3142) - Speed-up last coin balance timestamp query (coin balance history page performance improvement) - [#3140](https://github.com/poanetwork/blockscout/pull/3140) - Fix performance of the balance changing history list loading - [#3133](https://github.com/poanetwork/blockscout/pull/3133) - Take into account FIRST_BLOCK in trace_ReplayBlockTransactions requests From a2e667f5cc13c9a9a36b083cf132a0b6c98b41f8 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Fri, 5 Jun 2020 17:01:49 +0300 Subject: [PATCH 06/79] Release 3.1.3 --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65627e9e12..7cebfb1c7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ ## Current +### Features + +### Fixes + +### Chore + + +## 3.1.3-beta + ### Features - [#3125](https://github.com/poanetwork/blockscout/pull/3125) - Availability to configure a number of days to consider at coin balance history chart via environment variable From 0404df18b907dbe25d347ae906c10da3f6677cc0 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Mon, 8 Jun 2020 13:30:06 +0300 Subject: [PATCH 07/79] Display and store revert reason on demand --- CHANGELOG.md | 1 + .../api/rpc/transaction_controller.ex | 19 ++++- .../lib/block_scout_web/etherscan.ex | 12 ++- .../templates/transaction/overview.html.eex | 8 ++ .../views/api/rpc/transaction_view.ex | 1 + .../block_scout_web/views/transaction_view.ex | 4 + apps/block_scout_web/priv/gettext/default.pot | 79 ++++++++++--------- .../priv/gettext/en/LC_MESSAGES/default.po | 79 ++++++++++--------- .../lib/ethereum_jsonrpc/transaction.ex | 16 +++- apps/explorer/lib/explorer/chain.ex | 67 ++++++++++++++++ .../lib/explorer/chain/transaction.ex | 8 +- apps/explorer/lib/explorer/etherscan.ex | 1 + ...22_alter_transactions_add_error_reason.exs | 9 +++ 13 files changed, 223 insertions(+), 81 deletions(-) create mode 100644 apps/explorer/priv/repo/migrations/20200608075122_alter_transactions_add_error_reason.exs diff --git a/CHANGELOG.md b/CHANGELOG.md index 7cebfb1c7f..2e35153b36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## Current ### Features +- [#3149](https://github.com/poanetwork/blockscout/pull/3149) - Display and store revert reason of tx on demand at transaction details page and at gettxinfo API endpoint. ### Fixes diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/transaction_controller.ex index 565ea4b6a5..c109714009 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/transaction_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/transaction_controller.ex @@ -5,16 +5,31 @@ defmodule BlockScoutWeb.API.RPC.TransactionController do alias Explorer.Chain + alias Explorer.Chain.Transaction + def gettxinfo(conn, params) do with {:txhash_param, {:ok, txhash_param}} <- fetch_txhash(params), {:format, {:ok, transaction_hash}} <- to_transaction_hash(txhash_param), - {:transaction, {:ok, transaction}} <- transaction_from_hash(transaction_hash), + {:transaction, {:ok, %Transaction{revert_reason: revert_reason, error: error} = transaction}} <- + transaction_from_hash(transaction_hash), paging_options <- paging_options(params) do logs = Chain.transaction_to_logs(transaction_hash, paging_options) {logs, next_page} = split_list_by_page(logs) + transaction_updated = + if error == "Reverted" do + if String.strip(revert_reason) == "" do + revert_reason_from_node = Chain.fetch_tx_revert_reason(transaction) + %Transaction{transaction | revert_reason: revert_reason_from_node} + else + transaction + end + else + transaction + end + render(conn, :gettxinfo, %{ - transaction: transaction, + transaction: transaction_updated, block_height: Chain.block_height(), logs: logs, next_page_params: next_page_params(next_page, logs, params) diff --git a/apps/block_scout_web/lib/block_scout_web/etherscan.ex b/apps/block_scout_web/lib/block_scout_web/etherscan.ex index 019795dc69..f419f05eee 100644 --- a/apps/block_scout_web/lib/block_scout_web/etherscan.ex +++ b/apps/block_scout_web/lib/block_scout_web/etherscan.ex @@ -470,7 +470,8 @@ defmodule BlockScoutWeb.Etherscan do "success" => true, "timeStamp" => "1541018182", "to" => "0x000000000000000000000000000000000000000d", - "value" => "67612" + "value" => "67612", + revertReason: "No credit of that type" } } @@ -609,6 +610,12 @@ defmodule BlockScoutWeb.Etherscan do example: ~s("18") } + @revert_reason_type %{ + type: "revert_reason", + definition: "Revert reason of transaction.", + example: ~s("No credit of that type") + } + @logs_details %{ name: "Log Detail", fields: %{ @@ -1010,7 +1017,8 @@ defmodule BlockScoutWeb.Etherscan do logs: %{ type: "array", array_type: @logs_details - } + }, + revertReason: @revert_reason_type } } 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 cca53f0865..5ee1fac85e 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 @@ -53,6 +53,14 @@
    + <%= if status == {:error, "Reverted"} do %> +
    +
    <%= gettext "Revert reason" %>
    +
    + <%= BlockScoutWeb.TransactionView.transaction_revert_reason(@transaction) %> +
    +
    + <% end %>
    <%= gettext "Block Number" %>
    diff --git a/apps/block_scout_web/lib/block_scout_web/views/api/rpc/transaction_view.ex b/apps/block_scout_web/lib/block_scout_web/views/api/rpc/transaction_view.ex index b9e8f7430d..4b81b11091 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/api/rpc/transaction_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/api/rpc/transaction_view.ex @@ -70,6 +70,7 @@ defmodule BlockScoutWeb.API.RPC.TransactionView do "gasUsed" => "#{transaction.gas_used}", "gasPrice" => "#{transaction.gas_price.value}", "logs" => Enum.map(logs, &prepare_log/1), + "revertReason" => "#{transaction.revert_reason}", "next_page_params" => next_page_params } end 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 1c01ab80a3..c128083916 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 @@ -237,6 +237,10 @@ defmodule BlockScoutWeb.TransactionView do Chain.transaction_to_status(transaction) end + def transaction_revert_reason(transaction) do + Chain.transaction_to_revert_reason(transaction) + end + def empty_exchange_rate?(exchange_rate) do Token.null?(exchange_rate) end diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot index b4edc9e73c..9157634e2c 100644 --- a/apps/block_scout_web/priv/gettext/default.pot +++ b/apps/block_scout_web/priv/gettext/default.pot @@ -13,7 +13,7 @@ msgstr[0] "" msgstr[1] "" #, elixir-format -#: lib/block_scout_web/templates/transaction/overview.html.eex:196 +#: lib/block_scout_web/templates/transaction/overview.html.eex:204 msgid " Token Transfer" msgstr "" @@ -59,7 +59,7 @@ msgid "%{subnetwork} Explorer - BlockScout" msgstr "" #, elixir-format -#: lib/block_scout_web/views/transaction_view.ex:247 +#: lib/block_scout_web/views/transaction_view.ex:251 msgid "(Awaiting internal transactions for status)" msgstr "" @@ -193,7 +193,7 @@ msgid "Block %{block_number} - %{subnetwork} Explorer" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction/overview.html.eex:72 +#: lib/block_scout_web/templates/transaction/overview.html.eex:80 msgid "Block Confirmations" msgstr "" @@ -213,7 +213,7 @@ msgid "Block Mined, awaiting import..." msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction/overview.html.eex:58 +#: lib/block_scout_web/templates/transaction/overview.html.eex:66 msgid "Block Number" msgstr "" @@ -355,12 +355,12 @@ msgid "Contract Byte Code" msgstr "" #, elixir-format -#: lib/block_scout_web/views/transaction_view.ex:336 +#: lib/block_scout_web/views/transaction_view.ex:340 msgid "Contract Call" msgstr "" #, elixir-format -#: lib/block_scout_web/views/transaction_view.ex:333 +#: lib/block_scout_web/views/transaction_view.ex:337 msgid "Contract Creation" msgstr "" @@ -621,12 +621,12 @@ msgid "Error trying to fetch balances." msgstr "" #, elixir-format -#: lib/block_scout_web/views/transaction_view.ex:251 +#: lib/block_scout_web/views/transaction_view.ex:255 msgid "Error: %{reason}" msgstr "" #, elixir-format -#: lib/block_scout_web/views/transaction_view.ex:249 +#: lib/block_scout_web/views/transaction_view.ex:253 msgid "Error: (Awaiting internal transactions for reason)" msgstr "" @@ -646,8 +646,8 @@ msgstr "" #: lib/block_scout_web/templates/layout/app.html.eex:32 #: lib/block_scout_web/templates/transaction/_pending_tile.html.eex:20 #: lib/block_scout_web/templates/transaction/_tile.html.eex:29 -#: lib/block_scout_web/templates/transaction/overview.html.eex:181 -#: lib/block_scout_web/templates/transaction/overview.html.eex:255 +#: lib/block_scout_web/templates/transaction/overview.html.eex:189 +#: lib/block_scout_web/templates/transaction/overview.html.eex:263 #: lib/block_scout_web/views/wei_helpers.ex:78 msgid "Ether" msgstr "" @@ -666,7 +666,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/block/overview.html.eex:73 -#: lib/block_scout_web/templates/transaction/overview.html.eex:79 +#: lib/block_scout_web/templates/transaction/overview.html.eex:87 msgid "Nonce" msgstr "" @@ -753,8 +753,8 @@ msgid "Hash" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction/overview.html.eex:115 -#: lib/block_scout_web/templates/transaction/overview.html.eex:119 +#: lib/block_scout_web/templates/transaction/overview.html.eex:123 +#: lib/block_scout_web/templates/transaction/overview.html.eex:127 msgid "Hex (Default)" msgstr "" @@ -776,7 +776,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/transaction/_emission_reward_tile.html.eex:8 -#: lib/block_scout_web/views/transaction_view.ex:248 +#: lib/block_scout_web/views/transaction_view.ex:252 msgid "Success" msgstr "" @@ -789,7 +789,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/transaction/_pending_tile.html.eex:21 #: lib/block_scout_web/templates/transaction/_tile.html.eex:32 -#: lib/block_scout_web/templates/transaction/overview.html.eex:84 +#: lib/block_scout_web/templates/transaction/overview.html.eex:92 msgid "TX Fee" msgstr "" @@ -891,7 +891,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/tokens/transfer/_token_transfer.html.eex:12 #: lib/block_scout_web/templates/transaction_token_transfer/_token_transfer.html.eex:10 -#: lib/block_scout_web/views/transaction_view.ex:329 +#: lib/block_scout_web/views/transaction_view.ex:333 msgid "Token Transfer" msgstr "" @@ -906,7 +906,7 @@ msgstr "" #: lib/block_scout_web/views/address_view.ex:325 #: lib/block_scout_web/views/tokens/instance/overview_view.ex:98 #: lib/block_scout_web/views/tokens/overview_view.ex:35 -#: lib/block_scout_web/views/transaction_view.ex:390 +#: lib/block_scout_web/views/transaction_view.ex:394 msgid "Token Transfers" msgstr "" @@ -922,7 +922,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/_logs.html.eex:18 -#: lib/block_scout_web/views/transaction_view.ex:339 +#: lib/block_scout_web/views/transaction_view.ex:343 msgid "Transaction" msgstr "" @@ -1005,7 +1005,7 @@ msgid "License ID" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction/overview.html.eex:283 +#: lib/block_scout_web/templates/transaction/overview.html.eex:291 msgid "Limit" msgstr "" @@ -1159,8 +1159,8 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/layout/_topnav.html.eex:59 -#: lib/block_scout_web/views/transaction_view.ex:246 -#: lib/block_scout_web/views/transaction_view.ex:280 +#: lib/block_scout_web/views/transaction_view.ex:250 +#: lib/block_scout_web/views/transaction_view.ex:284 msgid "Pending" msgstr "" @@ -1201,14 +1201,14 @@ msgid "RPC" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction/overview.html.eex:109 +#: lib/block_scout_web/templates/transaction/overview.html.eex:117 msgid "Raw Input" msgstr "" #, elixir-format #: lib/block_scout_web/templates/transaction/_tabs.html.eex:24 #: lib/block_scout_web/templates/transaction_raw_trace/index.html.eex:7 -#: lib/block_scout_web/views/transaction_view.ex:393 +#: lib/block_scout_web/views/transaction_view.ex:397 msgid "Raw Trace" msgstr "" @@ -1488,7 +1488,7 @@ msgid "Transaction Inputs" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction/overview.html.eex:101 +#: lib/block_scout_web/templates/transaction/overview.html.eex:109 msgid "Transaction Speed" msgstr "" @@ -1518,7 +1518,7 @@ msgid "Type" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction/overview.html.eex:122 +#: lib/block_scout_web/templates/transaction/overview.html.eex:130 msgid "UTF-8" msgstr "" @@ -1544,7 +1544,7 @@ msgid "Use the search box to find a hosted network, or select from the list of a msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction/overview.html.eex:277 +#: lib/block_scout_web/templates/transaction/overview.html.eex:285 msgid "Used" msgstr "" @@ -1574,8 +1574,8 @@ msgid "Validator Info" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction/overview.html.eex:181 -#: lib/block_scout_web/templates/transaction/overview.html.eex:255 +#: lib/block_scout_web/templates/transaction/overview.html.eex:189 +#: lib/block_scout_web/templates/transaction/overview.html.eex:263 msgid "Value" msgstr "" @@ -1752,7 +1752,7 @@ msgid "Decimals" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction/overview.html.eex:273 +#: lib/block_scout_web/templates/transaction/overview.html.eex:281 msgid "Gas" msgstr "" @@ -1799,8 +1799,8 @@ msgid "Transfers" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction/overview.html.eex:134 -#: lib/block_scout_web/templates/transaction/overview.html.eex:147 +#: lib/block_scout_web/templates/transaction/overview.html.eex:142 +#: lib/block_scout_web/templates/transaction/overview.html.eex:155 msgid "Copy Txn Input" msgstr "" @@ -1838,7 +1838,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:324 -#: lib/block_scout_web/views/transaction_view.ex:391 +#: lib/block_scout_web/views/transaction_view.ex:395 msgid "Internal Transactions" msgstr "" @@ -1848,7 +1848,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:331 -#: lib/block_scout_web/views/transaction_view.ex:392 +#: lib/block_scout_web/views/transaction_view.ex:396 msgid "Logs" msgstr "" @@ -1881,26 +1881,26 @@ msgid "Transactions" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction/overview.html.eex:232 +#: lib/block_scout_web/templates/transaction/overview.html.eex:240 msgid " Token Burning" msgstr "" #, elixir-format #: lib/block_scout_web/templates/tokens/transfer/_token_transfer.html.eex:8 #: lib/block_scout_web/templates/transaction_token_transfer/_token_transfer.html.eex:6 -#: lib/block_scout_web/views/transaction_view.ex:328 +#: lib/block_scout_web/views/transaction_view.ex:332 msgid "Token Burning" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction/overview.html.eex:214 +#: lib/block_scout_web/templates/transaction/overview.html.eex:222 msgid " Token Minting" msgstr "" #, elixir-format #: lib/block_scout_web/templates/tokens/transfer/_token_transfer.html.eex:10 #: lib/block_scout_web/templates/transaction_token_transfer/_token_transfer.html.eex:8 -#: lib/block_scout_web/views/transaction_view.ex:327 +#: lib/block_scout_web/views/transaction_view.ex:331 msgid "Token Minting" msgstr "" @@ -1908,3 +1908,8 @@ msgstr "" #: lib/block_scout_web/views/block_view.ex:62 msgid "Chore Reward" msgstr "" + +#, elixir-format +#: lib/block_scout_web/templates/transaction/overview.html.eex:58 +msgid "Revert reason" +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 b4edc9e73c..9157634e2c 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 @@ -13,7 +13,7 @@ msgstr[0] "" msgstr[1] "" #, elixir-format -#: lib/block_scout_web/templates/transaction/overview.html.eex:196 +#: lib/block_scout_web/templates/transaction/overview.html.eex:204 msgid " Token Transfer" msgstr "" @@ -59,7 +59,7 @@ msgid "%{subnetwork} Explorer - BlockScout" msgstr "" #, elixir-format -#: lib/block_scout_web/views/transaction_view.ex:247 +#: lib/block_scout_web/views/transaction_view.ex:251 msgid "(Awaiting internal transactions for status)" msgstr "" @@ -193,7 +193,7 @@ msgid "Block %{block_number} - %{subnetwork} Explorer" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction/overview.html.eex:72 +#: lib/block_scout_web/templates/transaction/overview.html.eex:80 msgid "Block Confirmations" msgstr "" @@ -213,7 +213,7 @@ msgid "Block Mined, awaiting import..." msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction/overview.html.eex:58 +#: lib/block_scout_web/templates/transaction/overview.html.eex:66 msgid "Block Number" msgstr "" @@ -355,12 +355,12 @@ msgid "Contract Byte Code" msgstr "" #, elixir-format -#: lib/block_scout_web/views/transaction_view.ex:336 +#: lib/block_scout_web/views/transaction_view.ex:340 msgid "Contract Call" msgstr "" #, elixir-format -#: lib/block_scout_web/views/transaction_view.ex:333 +#: lib/block_scout_web/views/transaction_view.ex:337 msgid "Contract Creation" msgstr "" @@ -621,12 +621,12 @@ msgid "Error trying to fetch balances." msgstr "" #, elixir-format -#: lib/block_scout_web/views/transaction_view.ex:251 +#: lib/block_scout_web/views/transaction_view.ex:255 msgid "Error: %{reason}" msgstr "" #, elixir-format -#: lib/block_scout_web/views/transaction_view.ex:249 +#: lib/block_scout_web/views/transaction_view.ex:253 msgid "Error: (Awaiting internal transactions for reason)" msgstr "" @@ -646,8 +646,8 @@ msgstr "" #: lib/block_scout_web/templates/layout/app.html.eex:32 #: lib/block_scout_web/templates/transaction/_pending_tile.html.eex:20 #: lib/block_scout_web/templates/transaction/_tile.html.eex:29 -#: lib/block_scout_web/templates/transaction/overview.html.eex:181 -#: lib/block_scout_web/templates/transaction/overview.html.eex:255 +#: lib/block_scout_web/templates/transaction/overview.html.eex:189 +#: lib/block_scout_web/templates/transaction/overview.html.eex:263 #: lib/block_scout_web/views/wei_helpers.ex:78 msgid "Ether" msgstr "" @@ -666,7 +666,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/block/overview.html.eex:73 -#: lib/block_scout_web/templates/transaction/overview.html.eex:79 +#: lib/block_scout_web/templates/transaction/overview.html.eex:87 msgid "Nonce" msgstr "" @@ -753,8 +753,8 @@ msgid "Hash" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction/overview.html.eex:115 -#: lib/block_scout_web/templates/transaction/overview.html.eex:119 +#: lib/block_scout_web/templates/transaction/overview.html.eex:123 +#: lib/block_scout_web/templates/transaction/overview.html.eex:127 msgid "Hex (Default)" msgstr "" @@ -776,7 +776,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/transaction/_emission_reward_tile.html.eex:8 -#: lib/block_scout_web/views/transaction_view.ex:248 +#: lib/block_scout_web/views/transaction_view.ex:252 msgid "Success" msgstr "" @@ -789,7 +789,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/transaction/_pending_tile.html.eex:21 #: lib/block_scout_web/templates/transaction/_tile.html.eex:32 -#: lib/block_scout_web/templates/transaction/overview.html.eex:84 +#: lib/block_scout_web/templates/transaction/overview.html.eex:92 msgid "TX Fee" msgstr "" @@ -891,7 +891,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/tokens/transfer/_token_transfer.html.eex:12 #: lib/block_scout_web/templates/transaction_token_transfer/_token_transfer.html.eex:10 -#: lib/block_scout_web/views/transaction_view.ex:329 +#: lib/block_scout_web/views/transaction_view.ex:333 msgid "Token Transfer" msgstr "" @@ -906,7 +906,7 @@ msgstr "" #: lib/block_scout_web/views/address_view.ex:325 #: lib/block_scout_web/views/tokens/instance/overview_view.ex:98 #: lib/block_scout_web/views/tokens/overview_view.ex:35 -#: lib/block_scout_web/views/transaction_view.ex:390 +#: lib/block_scout_web/views/transaction_view.ex:394 msgid "Token Transfers" msgstr "" @@ -922,7 +922,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/_logs.html.eex:18 -#: lib/block_scout_web/views/transaction_view.ex:339 +#: lib/block_scout_web/views/transaction_view.ex:343 msgid "Transaction" msgstr "" @@ -1005,7 +1005,7 @@ msgid "License ID" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction/overview.html.eex:283 +#: lib/block_scout_web/templates/transaction/overview.html.eex:291 msgid "Limit" msgstr "" @@ -1159,8 +1159,8 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/layout/_topnav.html.eex:59 -#: lib/block_scout_web/views/transaction_view.ex:246 -#: lib/block_scout_web/views/transaction_view.ex:280 +#: lib/block_scout_web/views/transaction_view.ex:250 +#: lib/block_scout_web/views/transaction_view.ex:284 msgid "Pending" msgstr "" @@ -1201,14 +1201,14 @@ msgid "RPC" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction/overview.html.eex:109 +#: lib/block_scout_web/templates/transaction/overview.html.eex:117 msgid "Raw Input" msgstr "" #, elixir-format #: lib/block_scout_web/templates/transaction/_tabs.html.eex:24 #: lib/block_scout_web/templates/transaction_raw_trace/index.html.eex:7 -#: lib/block_scout_web/views/transaction_view.ex:393 +#: lib/block_scout_web/views/transaction_view.ex:397 msgid "Raw Trace" msgstr "" @@ -1488,7 +1488,7 @@ msgid "Transaction Inputs" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction/overview.html.eex:101 +#: lib/block_scout_web/templates/transaction/overview.html.eex:109 msgid "Transaction Speed" msgstr "" @@ -1518,7 +1518,7 @@ msgid "Type" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction/overview.html.eex:122 +#: lib/block_scout_web/templates/transaction/overview.html.eex:130 msgid "UTF-8" msgstr "" @@ -1544,7 +1544,7 @@ msgid "Use the search box to find a hosted network, or select from the list of a msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction/overview.html.eex:277 +#: lib/block_scout_web/templates/transaction/overview.html.eex:285 msgid "Used" msgstr "" @@ -1574,8 +1574,8 @@ msgid "Validator Info" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction/overview.html.eex:181 -#: lib/block_scout_web/templates/transaction/overview.html.eex:255 +#: lib/block_scout_web/templates/transaction/overview.html.eex:189 +#: lib/block_scout_web/templates/transaction/overview.html.eex:263 msgid "Value" msgstr "" @@ -1752,7 +1752,7 @@ msgid "Decimals" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction/overview.html.eex:273 +#: lib/block_scout_web/templates/transaction/overview.html.eex:281 msgid "Gas" msgstr "" @@ -1799,8 +1799,8 @@ msgid "Transfers" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction/overview.html.eex:134 -#: lib/block_scout_web/templates/transaction/overview.html.eex:147 +#: lib/block_scout_web/templates/transaction/overview.html.eex:142 +#: lib/block_scout_web/templates/transaction/overview.html.eex:155 msgid "Copy Txn Input" msgstr "" @@ -1838,7 +1838,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:324 -#: lib/block_scout_web/views/transaction_view.ex:391 +#: lib/block_scout_web/views/transaction_view.ex:395 msgid "Internal Transactions" msgstr "" @@ -1848,7 +1848,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:331 -#: lib/block_scout_web/views/transaction_view.ex:392 +#: lib/block_scout_web/views/transaction_view.ex:396 msgid "Logs" msgstr "" @@ -1881,26 +1881,26 @@ msgid "Transactions" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction/overview.html.eex:232 +#: lib/block_scout_web/templates/transaction/overview.html.eex:240 msgid " Token Burning" msgstr "" #, elixir-format #: lib/block_scout_web/templates/tokens/transfer/_token_transfer.html.eex:8 #: lib/block_scout_web/templates/transaction_token_transfer/_token_transfer.html.eex:6 -#: lib/block_scout_web/views/transaction_view.ex:328 +#: lib/block_scout_web/views/transaction_view.ex:332 msgid "Token Burning" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction/overview.html.eex:214 +#: lib/block_scout_web/templates/transaction/overview.html.eex:222 msgid " Token Minting" msgstr "" #, elixir-format #: lib/block_scout_web/templates/tokens/transfer/_token_transfer.html.eex:10 #: lib/block_scout_web/templates/transaction_token_transfer/_token_transfer.html.eex:8 -#: lib/block_scout_web/views/transaction_view.ex:327 +#: lib/block_scout_web/views/transaction_view.ex:331 msgid "Token Minting" msgstr "" @@ -1908,3 +1908,8 @@ msgstr "" #: lib/block_scout_web/views/block_view.ex:62 msgid "Chore Reward" msgstr "" + +#, elixir-format +#: lib/block_scout_web/templates/transaction/overview.html.eex:58 +msgid "Revert reason" +msgstr "" diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex index 031b150384..54d812c4c4 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex @@ -9,7 +9,7 @@ defmodule EthereumJSONRPC.Transaction do """ require Logger - import EthereumJSONRPC, only: [quantity_to_integer: 1] + import EthereumJSONRPC, only: [quantity_to_integer: 1, integer_to_quantity: 1, request: 1] alias EthereumJSONRPC @@ -313,6 +313,20 @@ defmodule EthereumJSONRPC.Transaction do nil end + def eth_call_request(id, block_number, data, to, from, gas, gas_price, value) do + block = + case block_number do + nil -> "latest" + block_number -> integer_to_quantity(block_number) + end + + request(%{ + id: id, + method: "eth_call", + params: [%{to: to, from: from, data: data, gas: gas, gas_price: gas_price, value: value}, block] + }) + end + # double check that no new keys are being missed by requiring explicit match for passthrough # `t:EthereumJSONRPC.address/0` and `t:EthereumJSONRPC.hash/0` pass through as `Explorer.Chain` can verify correct # hash format diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex index 9fc94e6af0..93f655a190 100644 --- a/apps/explorer/lib/explorer/chain.ex +++ b/apps/explorer/lib/explorer/chain.ex @@ -28,6 +28,8 @@ defmodule Explorer.Chain do alias Ecto.Adapters.SQL alias Ecto.{Changeset, Multi} + alias EthereumJSONRPC.Transaction, as: EthereumJSONRPCTransaction + alias Explorer.Counters.LastFetchedCounter alias Explorer.Chain @@ -2715,6 +2717,71 @@ defmodule Explorer.Chain do def transaction_to_status(%Transaction{status: :error, error: error}) when is_binary(error), do: {:error, error} + def transaction_to_revert_reason(%Transaction{revert_reason: revert_reason} = transaction) do + revert_reason = + if revert_reason == nil do + fetch_tx_revert_reason(transaction) + else + revert_reason + end + + revert_reason + end + + def fetch_tx_revert_reason( + %Transaction{ + block_number: block_number, + to_address_hash: to_address_hash, + from_address_hash: from_address_hash, + input: data, + gas: gas, + gas_price: gas_price, + value: value + } = transaction + ) do + json_rpc_named_arguments = Application.get_env(:explorer, :json_rpc_named_arguments) + + req = + EthereumJSONRPCTransaction.eth_call_request( + 0, + block_number, + data, + to_address_hash, + from_address_hash, + gas, + Wei.hex_format(gas_price), + Wei.hex_format(value) + ) + + data = + case EthereumJSONRPC.json_rpc(req, json_rpc_named_arguments) do + {:error, %{data: data}} -> + data + + _ -> + nil + end + + if data == nil do + nil + else + revert_reason_parts = String.split(data, "revert: ") + + formatted_revert_reason = + if Enum.count(revert_reason_parts) > 1 do + Enum.at(revert_reason_parts, 1) + else + data + end + + transaction + |> Changeset.change(%{revert_reason: formatted_revert_reason}) + |> Repo.update() + + formatted_revert_reason + end + end + @doc """ The `t:Explorer.Chain.Transaction.t/0` or `t:Explorer.Chain.InternalTransaction.t/0` `value` of the `transaction` in `unit`. diff --git a/apps/explorer/lib/explorer/chain/transaction.ex b/apps/explorer/lib/explorer/chain/transaction.ex index 66127868c6..9d60d58edd 100644 --- a/apps/explorer/lib/explorer/chain/transaction.ex +++ b/apps/explorer/lib/explorer/chain/transaction.ex @@ -30,7 +30,7 @@ defmodule Explorer.Chain.Transaction do @optional_attrs ~w(block_hash block_number created_contract_address_hash cumulative_gas_used earliest_processing_start error gas_used index created_contract_code_indexed_at status - to_address_hash)a + to_address_hash revert_reason)a @required_attrs ~w(from_address_hash gas gas_price hash input nonce r s v value)a @@ -106,6 +106,7 @@ defmodule Explorer.Chain.Transaction do * `internal_transactions` - transactions (value transfers) created while executing contract used for this transaction * `created_contract_code_indexed_at` - when created `address` code was fetched by `Indexer` + * `revert_reason` - revert reason of transaction | `status` | `contract_creation_address_hash` | `input` | Token Transfer? | `internal_transactions_indexed_at` | `internal_transactions` | Description | |----------|----------------------------------|------------|-----------------|-------------------------------------------|-------------------------|-----------------------------------------------------------------------------------------------------| @@ -129,6 +130,7 @@ defmodule Explorer.Chain.Transaction do * `uncles` - uncle blocks where `forks` were collated * `v` - The V field of the signature. * `value` - wei transferred from `from_address` to `to_address` + * `revert_reason` - revert reason of transaction """ @type t :: %__MODULE__{ block: %Ecto.Association.NotLoaded{} | Block.t() | nil, @@ -159,7 +161,8 @@ defmodule Explorer.Chain.Transaction do to_address_hash: Hash.Address.t() | nil, uncles: %Ecto.Association.NotLoaded{} | [Block.t()], v: v(), - value: Wei.t() + value: Wei.t(), + revert_reason: String.t() } @derive {Poison.Encoder, @@ -199,6 +202,7 @@ defmodule Explorer.Chain.Transaction do field(:status, Status) field(:v, :decimal) field(:value, Wei) + field(:revert_reason, :string) # A transient field for deriving old block hash during transaction upserts. # Used to force refetch of a block in case a transaction is re-collated diff --git a/apps/explorer/lib/explorer/etherscan.ex b/apps/explorer/lib/explorer/etherscan.ex index 1caf9f7e64..82fd5a45f9 100644 --- a/apps/explorer/lib/explorer/etherscan.ex +++ b/apps/explorer/lib/explorer/etherscan.ex @@ -332,6 +332,7 @@ defmodule Explorer.Etherscan do status to_address_hash value + revert_reason )a defp list_transactions(address_hash, max_block_number, options) do diff --git a/apps/explorer/priv/repo/migrations/20200608075122_alter_transactions_add_error_reason.exs b/apps/explorer/priv/repo/migrations/20200608075122_alter_transactions_add_error_reason.exs new file mode 100644 index 0000000000..6f0ab6320e --- /dev/null +++ b/apps/explorer/priv/repo/migrations/20200608075122_alter_transactions_add_error_reason.exs @@ -0,0 +1,9 @@ +defmodule Explorer.Repo.Migrations.AlterTransactionsAddErrorReason do + use Ecto.Migration + + def change do + alter table(:transactions) do + add(:revert_reason, :text) + end + end +end From 964d1a2b464be986ab4dce37e3e3d7a9c04747ed Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Mon, 8 Jun 2020 15:44:30 +0300 Subject: [PATCH 08/79] Update test --- .../controllers/api/rpc/transaction_controller_test.exs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/transaction_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/transaction_controller_test.exs index 2b3f6fff5e..5c5dd11f27 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/transaction_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/transaction_controller_test.exs @@ -520,7 +520,8 @@ defmodule BlockScoutWeb.API.RPC.TransactionControllerTest do "index" => "#{log.index}" } ], - "next_page_params" => nil + "next_page_params" => nil, + "revertReason" => "" } schema = From ff183cb17a6c8539d0c4f382d09a7251c320b4ef Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Tue, 9 Jun 2020 15:03:53 +0300 Subject: [PATCH 09/79] Add tests --- .../api/rpc/address_controller_test.exs | 326 ++++++++++++++++++ apps/explorer/lib/explorer/etherscan.ex | 1 + .../explorer/test/explorer/etherscan_test.exs | 150 ++++++++ 3 files changed, 477 insertions(+) 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 5378ca6cfe..32d2be6be4 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 @@ -1419,6 +1419,332 @@ defmodule BlockScoutWeb.API.RPC.AddressControllerTest do end end + describe "pendingtxlist" do + test "with missing address hash", %{conn: conn} do + params = %{ + "module" => "account", + "action" => "pendingtxlist" + } + + assert response = + conn + |> get("/api", params) + |> json_response(200) + + assert response["message"] =~ "'address' is required" + assert response["status"] == "0" + assert Map.has_key?(response, "result") + refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) + end + + test "with an invalid address hash", %{conn: conn} do + params = %{ + "module" => "account", + "action" => "pendingtxlist", + "address" => "badhash" + } + + assert response = + conn + |> get("/api", params) + |> json_response(200) + + assert response["message"] =~ "Invalid address format" + assert response["status"] == "0" + assert Map.has_key?(response, "result") + refute response["result"] + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) + end + + test "with an address that doesn't exist", %{conn: conn} do + params = %{ + "module" => "account", + "action" => "pendingtxlist", + "address" => "0x8bf38d4764929064f2d4d3a56520a76ab3df415b" + } + + assert response = + conn + |> get("/api", params) + |> json_response(200) + + assert response["result"] == [] + assert response["status"] == "0" + assert response["message"] == "No transactions found" + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) + end + + test "with a valid address", %{conn: conn} do + address = insert(:address) + + transaction = + :transaction + |> insert(from_address: address) + + params = %{ + "module" => "account", + "action" => "pendingtxlist", + "address" => "#{address.hash}" + } + + expected_result = [ + %{ + "hash" => "#{transaction.hash}", + "nonce" => "#{transaction.nonce}", + "from" => "#{transaction.from_address_hash}", + "to" => "#{transaction.to_address_hash}", + "value" => "#{transaction.value.value}", + "gas" => "#{transaction.gas}", + "gasPrice" => "#{transaction.gas_price.value}", + "input" => "#{transaction.input}", + "contractAddress" => "#{transaction.created_contract_address_hash}", + "cumulativeGasUsed" => "#{transaction.cumulative_gas_used}", + "gasUsed" => "#{transaction.gas_used}" + } + ] + + assert response = + conn + |> get("/api", params) + |> json_response(200) + + assert response["result"] == expected_result + assert response["status"] == "1" + assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) + end + + test "with address with multiple transactions", %{conn: conn} do + address1 = insert(:address) + address2 = insert(:address) + + transactions = + 3 + |> insert_list(:transaction, from_address: address1) + + :transaction + |> insert(from_address: address2) + + params = %{ + "module" => "account", + "action" => "pendingtxlist", + "address" => "#{address1.hash}" + } + + expected_transaction_hashes = Enum.map(transactions, &"#{&1.hash}") + + assert response = + conn + |> get("/api", params) + |> json_response(200) + + assert length(response["result"]) == 3 + + for returned_transaction <- response["result"] do + assert returned_transaction["hash"] in expected_transaction_hashes + end + + assert response["status"] == "1" + assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) + end + + test "with valid pagination params", %{conn: conn} do + address = insert(:address) + + _transactions_1 = + 2 + |> insert_list(:transaction, from_address: address) + + _transactions_2 = + 2 + |> insert_list(:transaction, from_address: address) + + transactions_3 = + 2 + |> insert_list(:transaction, from_address: address) + + params = %{ + "module" => "account", + "action" => "pendingtxlist", + "address" => "#{address.hash}", + # page number + "page" => "1", + # page size + "offset" => "2" + } + + assert response = + conn + |> get("/api", params) + |> json_response(200) + + page1_hashes = Enum.map(response["result"], & &1["hash"]) + + assert length(response["result"]) == 2 + + for transaction <- transactions_3 do + assert "#{transaction.hash}" in page1_hashes + end + + assert response["status"] == "1" + assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) + end + + test "ignores pagination params when invalid", %{conn: conn} do + address = insert(:address) + + _transactions_1 = + 2 + |> insert_list(:transaction, from_address: address) + + _transactions_2 = + 2 + |> insert_list(:transaction, from_address: address) + + _transactions_3 = + 2 + |> insert_list(:transaction, from_address: address) + + params = %{ + "module" => "account", + "action" => "pendingtxlist", + "address" => "#{address.hash}", + # page number + "page" => "invalidpage", + # page size + "offset" => "invalidoffset" + } + + assert response = + conn + |> get("/api", params) + |> json_response(200) + + assert length(response["result"]) == 6 + assert response["status"] == "1" + assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) + end + + test "ignores offset param if offset is less than 1", %{conn: conn} do + address = insert(:address) + + 6 + |> insert_list(:transaction, from_address: address) + + params = %{ + "module" => "account", + "action" => "pendingtxlist", + "address" => "#{address.hash}", + # page number + "page" => "1", + # page size + "offset" => "0" + } + + assert response = + conn + |> get("/api", params) + |> json_response(200) + + assert length(response["result"]) == 6 + assert response["status"] == "1" + assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) + end + + test "ignores offset param if offset is over 10,000", %{conn: conn} do + address = insert(:address) + + 6 + |> insert_list(:transaction, from_address: address) + + params = %{ + "module" => "account", + "action" => "pendingtxlist", + "address" => "#{address.hash}", + # page number + "page" => "1", + # page size + "offset" => "10_500" + } + + assert response = + conn + |> get("/api", params) + |> json_response(200) + + assert length(response["result"]) == 6 + assert response["status"] == "1" + assert response["message"] == "OK" + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) + end + + test "with page number with no results", %{conn: conn} do + address = insert(:address) + + _transactions_1 = + 2 + |> insert_list(:transaction, from_address: address) + + _transactions_2 = + 2 + |> insert_list(:transaction, from_address: address) + + _transactions_3 = + 2 + |> insert_list(:transaction, from_address: address) + + params = %{ + "module" => "account", + "action" => "pendingtxlist", + "address" => "#{address.hash}", + # page number + "page" => "5", + # page size + "offset" => "2" + } + + assert response = + conn + |> get("/api", params) + |> json_response(200) + + assert response["result"] == [] + assert response["status"] == "0" + assert response["message"] == "No transactions found" + assert :ok = ExJsonSchema.Validator.validate(txlist_schema(), response) + end + + test "supports GET and POST requests", %{conn: conn} do + address = insert(:address) + + :transaction + |> insert(from_address: address) + + params = %{ + "module" => "account", + "action" => "pendingtxlist", + "address" => "#{address.hash}" + } + + assert get_response = + conn + |> get("/api", params) + |> json_response(200) + + assert post_response = + conn + |> post("/api", params) + |> json_response(200) + + assert get_response == post_response + end + end + describe "txlistinternal" do test "with missing txhash and address", %{conn: conn} do params = %{ diff --git a/apps/explorer/lib/explorer/etherscan.ex b/apps/explorer/lib/explorer/etherscan.ex index 1ce210840a..9df3fea296 100644 --- a/apps/explorer/lib/explorer/etherscan.ex +++ b/apps/explorer/lib/explorer/etherscan.ex @@ -363,6 +363,7 @@ defmodule Explorer.Etherscan do nonce to_address_hash value + inserted_at )a defp list_pending_transactions_query(address_hash, options) do diff --git a/apps/explorer/test/explorer/etherscan_test.exs b/apps/explorer/test/explorer/etherscan_test.exs index 4761990b82..d3cc73b554 100644 --- a/apps/explorer/test/explorer/etherscan_test.exs +++ b/apps/explorer/test/explorer/etherscan_test.exs @@ -463,6 +463,156 @@ defmodule Explorer.EtherscanTest do end end + describe "list_pending_transactions/2" do + test "with empty db" do + address = build(:address) + + assert Etherscan.list_pending_transactions(address.hash) == [] + end + + test "with from address" do + address = insert(:address) + + transaction = + :transaction + |> insert(from_address: address) + + [found_transaction] = Etherscan.list_pending_transactions(address.hash) + + assert transaction.hash == found_transaction.hash + end + + test "with to address" do + address = insert(:address) + + transaction = + :transaction + |> insert(to_address: address) + + [found_transaction] = Etherscan.list_pending_transactions(address.hash) + + assert transaction.hash == found_transaction.hash + end + + test "with same to and from address" do + address = insert(:address) + + _transaction = + :transaction + |> insert(from_address: address, to_address: address) + + found_transactions = Etherscan.list_pending_transactions(address.hash) + + assert length(found_transactions) == 1 + end + + test "with address with 0 transactions" do + address1 = insert(:address) + address2 = insert(:address) + + :transaction + |> insert(from_address: address2) + + assert Etherscan.list_pending_transactions(address1.hash) == [] + end + + test "with address with multiple transactions" do + address1 = insert(:address) + address2 = insert(:address) + + 3 + |> insert_list(:transaction, from_address: address1) + + :transaction + |> insert(from_address: address2) + + found_transactions = Etherscan.list_pending_transactions(address1.hash) + + assert length(found_transactions) == 3 + + for found_transaction <- found_transactions do + assert found_transaction.from_address_hash == address1.hash + end + end + + test "orders transactions by inserted_at, in descending order" do + address = insert(:address) + + 2 + |> insert_list(:transaction, from_address: address) + + 2 + |> insert_list(:transaction, from_address: address) + + 2 + |> insert_list(:transaction, from_address: address) + + options = %{order_by_direction: :desc} + + found_transactions = Etherscan.list_pending_transactions(address.hash, options) + + inserted_at_order = Enum.map(found_transactions, & &1.inserted_at) + + assert inserted_at_order == Enum.sort(inserted_at_order, &(&1 >= &2)) + end + + test "with page_size and page_number options" do + address = insert(:address) + + transactions_1 = + 2 + |> insert_list(:transaction, from_address: address) + + transactions_2 = + 2 + |> insert_list(:transaction, from_address: address) + + transactions_3 = + 2 + |> insert_list(:transaction, from_address: address) + + options = %{page_number: 1, page_size: 2} + + page1_transactions = Etherscan.list_pending_transactions(address.hash, options) + + page1_hashes = Enum.map(page1_transactions, & &1.hash) + + assert length(page1_transactions) == 2 + + for transaction <- transactions_3 do + assert transaction.hash in page1_hashes + end + + options = %{page_number: 2, page_size: 2} + + page2_transactions = Etherscan.list_pending_transactions(address.hash, options) + + page2_hashes = Enum.map(page2_transactions, & &1.hash) + + assert length(page2_transactions) == 2 + + for transaction <- transactions_2 do + assert transaction.hash in page2_hashes + end + + options = %{page_number: 3, page_size: 2} + + page3_transactions = Etherscan.list_pending_transactions(address.hash, options) + + page3_hashes = Enum.map(page3_transactions, & &1.hash) + + assert length(page3_transactions) == 2 + + for transaction <- transactions_1 do + assert transaction.hash in page3_hashes + end + + options = %{page_number: 4, page_size: 2} + + assert Etherscan.list_pending_transactions(address.hash, options) == [] + end + end + describe "list_internal_transactions/1 with transaction hash" do test "with empty db" do transaction = build(:transaction) From 27964a5e3d32de771d4a19f7895471191ca1b8e1 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Tue, 9 Jun 2020 14:14:34 +0300 Subject: [PATCH 10/79] Add unit tests --- .dialyzer-ignore | 4 +- .../api/rpc/transaction_controller.ex | 5 +- .../api/rpc/transaction_controller_test.exs | 180 ++++++++++++++++++ apps/explorer/lib/explorer/chain.ex | 41 ++-- apps/explorer/test/explorer/chain_test.exs | 28 +++ .../indexer/fetcher/coin_balance_test.exs | 8 +- 6 files changed, 236 insertions(+), 30 deletions(-) diff --git a/.dialyzer-ignore b/.dialyzer-ignore index 1535f582c8..79833b82e3 100644 --- a/.dialyzer-ignore +++ b/.dialyzer-ignore @@ -12,4 +12,6 @@ apps/explorer/lib/explorer/smart_contract/publisher_worker.ex:6: The pattern 'fa apps/explorer/lib/explorer/smart_contract/publisher_worker.ex:6: The test 5 == 'infinity' can never evaluate to 'true' lib/block_scout_web/router.ex:1 lib/phoenix/router.ex:324 -lib/block_scout_web/views/layout_view.ex:143 \ No newline at end of file +lib/block_scout_web/views/layout_view.ex:143 +lib/block_scout_web/controllers/api/rpc/transaction_controller.ex:21 +lib/block_scout_web/controllers/api/rpc/transaction_controller.ex:22 \ No newline at end of file diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/transaction_controller.ex index c109714009..4c7abad3fe 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/transaction_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/transaction_controller.ex @@ -18,9 +18,8 @@ defmodule BlockScoutWeb.API.RPC.TransactionController do transaction_updated = if error == "Reverted" do - if String.strip(revert_reason) == "" do - revert_reason_from_node = Chain.fetch_tx_revert_reason(transaction) - %Transaction{transaction | revert_reason: revert_reason_from_node} + if revert_reason == nil do + %Transaction{transaction | revert_reason: Chain.fetch_tx_revert_reason(transaction)} else transaction end diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/transaction_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/transaction_controller_test.exs index 5c5dd11f27..d46071d215 100644 --- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/transaction_controller_test.exs +++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/transaction_controller_test.exs @@ -1,6 +1,8 @@ defmodule BlockScoutWeb.API.RPC.TransactionControllerTest do use BlockScoutWeb.ConnCase + import Mox + @moduletag capture_log: true describe "gettxreceiptstatus" do @@ -577,6 +579,184 @@ defmodule BlockScoutWeb.API.RPC.TransactionControllerTest do assert response["status"] == "1" assert response["message"] == "OK" end + + test "with a txhash with revert reason from DB", %{conn: conn} do + block = insert(:block, number: 100) + + transaction = + :transaction + |> insert(revert_reason: "No credit of that type") + |> with_block(block) + + insert(:address) + + params = %{ + "module" => "transaction", + "action" => "gettxinfo", + "txhash" => "#{transaction.hash}" + } + + assert response = + conn + |> get("/api", params) + |> json_response(200) + + assert response["result"]["revertReason"] == "No credit of that type" + assert response["status"] == "1" + assert response["message"] == "OK" + end + + test "with a txhash with empty revert reason from DB", %{conn: conn} do + block = insert(:block, number: 100) + + transaction = + :transaction + |> insert(revert_reason: "") + |> with_block(block) + + insert(:address) + + params = %{ + "module" => "transaction", + "action" => "gettxinfo", + "txhash" => "#{transaction.hash}" + } + + assert response = + conn + |> get("/api", params) + |> json_response(200) + + assert response["result"]["revertReason"] == "" + assert response["status"] == "1" + assert response["message"] == "OK" + end + + test "with a txhash with revert reason from the archive node", %{conn: conn} do + block = insert(:block, number: 100, hash: "0x3e51328bccedee581e8ba35190216a61a5d67fd91ca528f3553142c0c7d18391") + + transaction = + :transaction + |> insert( + error: "Reverted", + status: :error, + block_hash: block.hash, + block_number: block.number, + cumulative_gas_used: 884_322, + gas_used: 106_025, + index: 0, + hash: "0xac2a7dab94d965893199e7ee01649e2d66f0787a4c558b3118c09e80d4df8269" + ) + + insert(:address) + + expect( + EthereumJSONRPC.Mox, + :json_rpc, + fn _json, [] -> + {:error, %{code: -32015, message: "VM execution error.", data: "revert: No credit of that type"}} + end + ) + + params = %{ + "module" => "transaction", + "action" => "gettxinfo", + "txhash" => "#{transaction.hash}" + } + + assert response = + conn + |> get("/api", params) + |> json_response(200) + + assert response["result"]["revertReason"] == "No credit of that type" + assert response["status"] == "1" + assert response["message"] == "OK" + end + end + + test "with a txhash with empty revert reason from the archive node", %{conn: conn} do + block = insert(:block, number: 100, hash: "0x3e51328bccedee581e8ba35190216a61a5d67fd91ca528f3553142c0c7d18391") + + transaction = + :transaction + |> insert( + error: "Reverted", + status: :error, + block_hash: block.hash, + block_number: block.number, + cumulative_gas_used: 884_322, + gas_used: 106_025, + index: 0, + hash: "0xac2a7dab94d965893199e7ee01649e2d66f0787a4c558b3118c09e80d4df8269" + ) + + insert(:address) + + expect( + EthereumJSONRPC.Mox, + :json_rpc, + fn _json, [] -> + {:error, %{code: -32015, message: "VM execution error.", data: ""}} + end + ) + + params = %{ + "module" => "transaction", + "action" => "gettxinfo", + "txhash" => "#{transaction.hash}" + } + + assert response = + conn + |> get("/api", params) + |> json_response(200) + + assert response["result"]["revertReason"] == "" + assert response["status"] == "1" + assert response["message"] == "OK" + end + + test "with a txhash with empty revert reason from DB if eth_call doesn't return an error", %{conn: conn} do + block = insert(:block, number: 100, hash: "0x3e51328bccedee581e8ba35190216a61a5d67fd91ca528f3553142c0c7d18391") + + transaction = + :transaction + |> insert( + error: "Reverted", + status: :error, + block_hash: block.hash, + block_number: block.number, + cumulative_gas_used: 884_322, + gas_used: 106_025, + index: 0, + hash: "0xac2a7dab94d965893199e7ee01649e2d66f0787a4c558b3118c09e80d4df8269" + ) + + insert(:address) + + expect( + EthereumJSONRPC.Mox, + :json_rpc, + fn _json, [] -> + {:ok} + end + ) + + params = %{ + "module" => "transaction", + "action" => "gettxinfo", + "txhash" => "#{transaction.hash}" + } + + assert response = + conn + |> get("/api", params) + |> json_response(200) + + assert response["result"]["revertReason"] == "" + assert response["status"] == "1" + assert response["message"] == "OK" end defp resolve_schema(result \\ %{}) do diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex index 93f655a190..bd520b4e70 100644 --- a/apps/explorer/lib/explorer/chain.ex +++ b/apps/explorer/lib/explorer/chain.ex @@ -2717,15 +2717,14 @@ defmodule Explorer.Chain do def transaction_to_status(%Transaction{status: :error, error: error}) when is_binary(error), do: {:error, error} - def transaction_to_revert_reason(%Transaction{revert_reason: revert_reason} = transaction) do - revert_reason = - if revert_reason == nil do - fetch_tx_revert_reason(transaction) - else - revert_reason - end + def transaction_to_revert_reason(transaction) do + %Transaction{revert_reason: revert_reason} = transaction - revert_reason + if revert_reason == nil do + fetch_tx_revert_reason(transaction) + else + revert_reason + end end def fetch_tx_revert_reason( @@ -2748,7 +2747,7 @@ defmodule Explorer.Chain do data, to_address_hash, from_address_hash, - gas, + Decimal.to_integer(gas), Wei.hex_format(gas_price), Wei.hex_format(value) ) @@ -2759,27 +2758,25 @@ defmodule Explorer.Chain do data _ -> - nil + "" end - if data == nil do - nil - else - revert_reason_parts = String.split(data, "revert: ") + revert_reason_parts = String.split(data, "revert: ") - formatted_revert_reason = - if Enum.count(revert_reason_parts) > 1 do - Enum.at(revert_reason_parts, 1) - else - data - end + formatted_revert_reason = + if Enum.count(revert_reason_parts) > 1 do + Enum.at(revert_reason_parts, 1) + else + data + end + if byte_size(formatted_revert_reason) > 0 do transaction |> Changeset.change(%{revert_reason: formatted_revert_reason}) |> Repo.update() - - formatted_revert_reason end + + formatted_revert_reason end @doc """ diff --git a/apps/explorer/test/explorer/chain_test.exs b/apps/explorer/test/explorer/chain_test.exs index 76774460c1..ed6d37aaa4 100644 --- a/apps/explorer/test/explorer/chain_test.exs +++ b/apps/explorer/test/explorer/chain_test.exs @@ -5165,4 +5165,32 @@ defmodule Explorer.ChainTest do } end end + + describe "transaction_to_revert_reason/1" do + test "returns correct revert_reason from DB" do + transaction = insert(:transaction, revert_reason: "No credit of that type") + assert Chain.transaction_to_revert_reason(transaction) == "No credit of that type" + end + + test "returns correct revert_reason from the archive node" do + transaction = + insert(:transaction, + gas: 27319, + gas_price: "0x1b31d2900", + value: "0x86b3", + input: %Explorer.Chain.Data{bytes: <<1>>} + ) + |> with_block(insert(:block, number: 1)) + + expect( + EthereumJSONRPC.Mox, + :json_rpc, + fn _json, [] -> + {:error, %{code: -32015, message: "VM execution error.", data: "revert: No credit of that type"}} + end + ) + + assert Chain.transaction_to_revert_reason(transaction) == "No credit of that type" + end + end end diff --git a/apps/indexer/test/indexer/fetcher/coin_balance_test.exs b/apps/indexer/test/indexer/fetcher/coin_balance_test.exs index e61d54d6f8..12acf46a09 100644 --- a/apps/indexer/test/indexer/fetcher/coin_balance_test.exs +++ b/apps/indexer/test/indexer/fetcher/coin_balance_test.exs @@ -440,8 +440,8 @@ defmodule Indexer.Fetcher.CoinBalanceTest do {:ok, responses} end) - bad_block_quantity = integer_to_quantity(bad_block_number) - res_bad = eth_block_number_fake_response(bad_block_quantity) + good_block_quantity = integer_to_quantity(good_block_number) + res_good = eth_block_number_fake_response(good_block_quantity) EthereumJSONRPC.Mox |> expect(:json_rpc, fn [ @@ -449,11 +449,11 @@ defmodule Indexer.Fetcher.CoinBalanceTest do id: 0, jsonrpc: "2.0", method: "eth_getBlockByNumber", - params: [bad_block_quantity, true] + params: [^good_block_quantity, true] } ], [] -> - {:ok, [res_bad]} + {:ok, [res_good]} end) assert {:retry, [{^address_hash_bytes, ^bad_block_number}]} = From 7b079ee10e1279390afcc501ceb2bbcf520ef58d Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Fri, 12 Jun 2020 10:51:39 +0300 Subject: [PATCH 11/79] Fix contract compilation tests for old versions of compiler: change compiler version since nightly versions of some older versions were removed --- .../explorer/smart_contract/solidity/code_compiler_test.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/explorer/test/explorer/smart_contract/solidity/code_compiler_test.exs b/apps/explorer/test/explorer/smart_contract/solidity/code_compiler_test.exs index 270684c8d1..8d092d66bf 100644 --- a/apps/explorer/test/explorer/smart_contract/solidity/code_compiler_test.exs +++ b/apps/explorer/test/explorer/smart_contract/solidity/code_compiler_test.exs @@ -166,7 +166,7 @@ defmodule Explorer.SmartContract.Solidity.CodeCompilerTest do } """ - version = "v0.1.3-nightly.2015.9.25+commit.4457170" + version = "v0.1.3+commit.028f561d" response = CodeCompiler.run(name: name, compiler_version: version, code: code, optimize: optimize) From 8e262ddd27da795be8d088aa8b8ebaad798c017b Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Fri, 12 Jun 2020 10:54:12 +0300 Subject: [PATCH 12/79] Add CHANGELOG entry --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e35153b36..5371ca264f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ ### Chore +- [#3152](https://github.com/poanetwork/blockscout/pull/3152) - Fix contract compilation tests for old versions of compiler + ## 3.1.3-beta From 32d3bb85edbddd06f85c08a7e929e1f4706929c5 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Fri, 12 Jun 2020 15:06:46 +0300 Subject: [PATCH 13/79] Disable Pending transactions supervisor --- apps/indexer/config/config.exs | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/indexer/config/config.exs b/apps/indexer/config/config.exs index 071f741a74..b53cd74e91 100644 --- a/apps/indexer/config/config.exs +++ b/apps/indexer/config/config.exs @@ -38,6 +38,7 @@ config :indexer, first_block: System.get_env("FIRST_BLOCK") || "0", last_block: System.get_env("LAST_BLOCK") || "" +config :indexer, Indexer.Fetcher.PendingTransaction.Supervisor, disabled?: System.get_env("ETHEREUM_JSONRPC_VARIANT") == "besu" # config :indexer, Indexer.Fetcher.ReplacedTransaction.Supervisor, disabled?: true # config :indexer, Indexer.Fetcher.BlockReward.Supervisor, disabled?: true config :indexer, Indexer.Fetcher.StakingPools.Supervisor, disabled?: true From 15bc0d391eab948264f807918356875b96274c6f Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Fri, 12 Jun 2020 16:53:19 +0300 Subject: [PATCH 14/79] trace_block for BESU --- .../lib/ethereum_jsonrpc/besu.ex | 21 +- .../besu/fetched_beneficiaries.ex | 197 ++++++++++++++++++ 2 files changed, 216 insertions(+), 2 deletions(-) create mode 100644 apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/besu/fetched_beneficiaries.ex diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/besu.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/besu.ex index 2e5eaeff32..198ba61be4 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/besu.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/besu.ex @@ -5,13 +5,26 @@ defmodule EthereumJSONRPC.Besu do require Logger import EthereumJSONRPC, only: [id_to_params: 1, integer_to_quantity: 1, json_rpc: 2, request: 1] - alias EthereumJSONRPC.Parity.{Traces} + alias EthereumJSONRPC.Parity.{FetchedBeneficiaries, Traces} alias EthereumJSONRPC.{Transaction, Transactions} @behaviour EthereumJSONRPC.Variant @impl EthereumJSONRPC.Variant - def fetch_beneficiaries(_block_range, _json_rpc_named_arguments), do: :ignore + def fetch_beneficiaries(block_numbers, json_rpc_named_arguments) + when is_list(block_numbers) and is_list(json_rpc_named_arguments) do + id_to_params = + block_numbers + |> block_numbers_to_params_list() + |> id_to_params() + + with {:ok, responses} <- + id_to_params + |> FetchedBeneficiaries.requests() + |> json_rpc(json_rpc_named_arguments) do + {:ok, FetchedBeneficiaries.from_responses(responses, id_to_params)} + end + end @impl EthereumJSONRPC.Variant def fetch_internal_transactions(_transactions_params, _json_rpc_named_arguments), do: :ignore @@ -88,6 +101,10 @@ defmodule EthereumJSONRPC.Besu do end end + defp block_numbers_to_params_list(block_numbers) when is_list(block_numbers) do + Enum.map(block_numbers, &%{block_quantity: integer_to_quantity(&1)}) + end + defp trace_replay_block_transactions_responses_to_internal_transactions_params(responses, id_to_params) when is_list(responses) and is_map(id_to_params) do with {:ok, traces} <- trace_replay_block_transactions_responses_to_traces(responses, id_to_params) do diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/besu/fetched_beneficiaries.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/besu/fetched_beneficiaries.ex new file mode 100644 index 0000000000..13638272d0 --- /dev/null +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/besu/fetched_beneficiaries.ex @@ -0,0 +1,197 @@ +defmodule EthereumJSONRPC.Besu.FetchedBeneficiaries do + @moduledoc """ + Beneficiaries and errors from batch requests to `trace_block`. + """ + + import EthereumJSONRPC, only: [quantity_to_integer: 1] + + @doc """ + Converts `responses` to `EthereumJSONRPC.FetchedBeneficiaries.t()`. + + responses - List with trace_block responses + id_to_params - Maps request id to query params + + ## Examples + iex> EthereumJSONRPC.Besu.FetchedBeneficiaries.from_responses( + ...> [ + ...> %{ + ...> id: 0, + ...> result: [ + ...> %{ + ...> "action" => %{"author" => "0x1", "rewardType" => "external", "value" => "0x0"}, + ...> "blockHash" => "0xFFF", + ...> "blockNumber" => 12, + ...> "result" => nil, + ...> "subtraces" => 0, + ...> "traceAddress" => [], + ...> "transactionHash" => nil, + ...> "transactionPosition" => nil, + ...> "type" => "reward" + ...> }, + ...> %{ + ...> "action" => %{"author" => "0x2", "rewardType" => "external", "value" => "0x0"}, + ...> "blockHash" => "0xFFF", + ...> "blockNumber" => 12, + ...> "result" => nil, + ...> "subtraces" => 0, + ...> "traceAddress" => [], + ...> "transactionHash" => nil, + ...> "transactionPosition" => nil, + ...> "type" => "reward" + ...> } + ...> ] + ...> } + ...> ], + ...> %{0 => %{block_quantity: "0xC"}} + ...> ) + %EthereumJSONRPC.FetchedBeneficiaries{ + errors: [], + params_set: #MapSet<[ + %{ + address_hash: "0x1", + address_type: :validator, + block_hash: "0xFFF", + block_number: 12, + reward: "0x0" + }, + %{ + address_hash: "0x2", + address_type: :emission_funds, + block_hash: "0xFFF", + block_number: 12, + reward: "0x0" + } + ]> + } + """ + def from_responses(responses, id_to_params) when is_list(responses) and is_map(id_to_params) do + responses + |> Enum.map(&response_to_params_set(&1, id_to_params)) + |> Enum.reduce( + %EthereumJSONRPC.FetchedBeneficiaries{}, + fn + {:ok, params_set}, %EthereumJSONRPC.FetchedBeneficiaries{params_set: acc_params_set} = acc -> + %EthereumJSONRPC.FetchedBeneficiaries{acc | params_set: MapSet.union(acc_params_set, params_set)} + + {:error, reason}, %EthereumJSONRPC.FetchedBeneficiaries{errors: errors} = acc -> + %EthereumJSONRPC.FetchedBeneficiaries{acc | errors: [reason | errors]} + end + ) + end + + @doc """ + `trace_block` requests for `id_to_params`. + """ + def requests(id_to_params) when is_map(id_to_params) do + Enum.map(id_to_params, fn {id, %{block_quantity: block_quantity}} -> + request(%{id: id, block_quantity: block_quantity}) + end) + end + + @spec response_to_params_set(%{id: id, result: nil}, %{id => %{block_quantity: block_quantity}}) :: + {:error, %{code: 404, message: String.t(), data: %{block_quantity: block_quantity}}} + when id: non_neg_integer(), block_quantity: String.t() + defp response_to_params_set(%{id: id, result: nil}, id_to_params) when is_map(id_to_params) do + %{block_quantity: block_quantity} = Map.fetch!(id_to_params, id) + + {:error, %{code: 404, message: "Not Found", data: %{block_quantity: block_quantity}}} + end + + @spec response_to_params_set(%{id: id, result: list(map())}, %{id => %{block_quantity: block_quantity}}) :: + {:ok, MapSet.t(EthereumJSONRPC.FetchedBeneficiary.params())} + when id: non_neg_integer(), block_quantity: String.t() + defp response_to_params_set(%{id: id, result: traces}, id_to_params) when is_list(traces) and is_map(id_to_params) do + %{block_quantity: block_quantity} = Map.fetch!(id_to_params, id) + block_number = quantity_to_integer(block_quantity) + params_set = traces_to_params_set(traces, block_number) + + {:ok, params_set} + end + + @spec response_to_params_set(%{id: id, error: %{code: code, message: message}}, %{ + id => %{block_quantity: block_quantity} + }) :: {:error, %{code: code, message: message, data: %{block_quantity: block_quantity}}} + when id: non_neg_integer(), code: integer(), message: String.t(), block_quantity: String.t() + defp response_to_params_set(%{id: id, error: error}, id_to_params) when is_map(id_to_params) do + %{block_quantity: block_quantity} = Map.fetch!(id_to_params, id) + + annotated_error = Map.put(error, :data, %{block_quantity: block_quantity}) + + {:error, annotated_error} + end + + defp request(%{id: id, block_quantity: block_quantity}) when is_integer(id) and is_binary(block_quantity) do + EthereumJSONRPC.request(%{id: id, method: "trace_block", params: [block_quantity]}) + end + + defp traces_to_params_set(traces, block_number) when is_list(traces) and is_integer(block_number) do + traces + |> Stream.filter(&(&1["type"] == "reward")) + |> Stream.with_index() + |> Enum.reduce(MapSet.new(), fn {trace, index}, acc -> + MapSet.union(acc, trace_to_params_set(trace, block_number, index)) + end) + end + + defp trace_to_params_set( + %{ + "action" => %{ + "rewardType" => reward_type, + "author" => address_hash_data, + "value" => reward_value + }, + "blockHash" => block_hash, + "blockNumber" => block_number + }, + block_number, + index + ) + when is_integer(block_number) and reward_type in ~w(block external uncle) do + MapSet.new([ + %{ + address_hash: address_hash_data, + block_hash: block_hash, + block_number: block_number, + reward: reward_value, + address_type: get_address_type(reward_type, index) + } + ]) + end + + # Beneficiary's address type will depend on the responses' action.rewardType, + # which will vary depending on which network is being indexed + # + # On POA networks, rewardType will always be external and the type of the address being + # rewarded will depend on its position. + # First address will always be the validator's while the second will be the EmissionsFunds address + # + # On PoW networks, like Ethereum, the reward type will already specify the type for the + # address being rewarded + # The rewardType "block" will show the reward for the consensus block validator + # The rewardType "uncle" will show reward for validating an uncle block + defp get_address_type(reward_type, index) when reward_type == "external" and index == 0, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 1, do: :emission_funds + defp get_address_type(reward_type, index) when reward_type == "external" and index == 2, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 3, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 4, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 5, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 6, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 7, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 8, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 9, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 10, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 11, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 12, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 13, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 14, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 15, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 16, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 17, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 18, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 19, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 20, do: :validator + defp get_address_type(reward_type, _index) when reward_type == "block", do: :validator + defp get_address_type(reward_type, _index) when reward_type == "uncle", do: :uncle + defp get_address_type(reward_type, _index) when reward_type == "emptyStep", do: :validator + end + \ No newline at end of file From a801cfae3900b567ec38f6159fe53343869ceacb Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Tue, 16 Jun 2020 15:48:10 +0300 Subject: [PATCH 15/79] Proxy contracts: decoding using implementation ABI --- CHANGELOG.md | 1 + .../lib/explorer/chain/transaction.ex | 55 +++++++++++++++++-- 2 files changed, 50 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5371ca264f..fb499b052d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## Current ### Features +- [#3153](https://github.com/poanetwork/blockscout/pull/3153) - Proxy contracts: methods decoding using implementation ABI - [#3149](https://github.com/poanetwork/blockscout/pull/3149) - Display and store revert reason of tx on demand at transaction details page and at gettxinfo API endpoint. ### Fixes diff --git a/apps/explorer/lib/explorer/chain/transaction.ex b/apps/explorer/lib/explorer/chain/transaction.ex index 9d60d58edd..cef9c54193 100644 --- a/apps/explorer/lib/explorer/chain/transaction.ex +++ b/apps/explorer/lib/explorer/chain/transaction.ex @@ -11,6 +11,8 @@ defmodule Explorer.Chain.Transaction do alias Ecto.Changeset + alias Explorer.{Chain, Repo} + alias Explorer.Chain.{ Address, Block, @@ -26,7 +28,7 @@ defmodule Explorer.Chain.Transaction do } alias Explorer.Chain.Transaction.{Fork, Status} - alias Explorer.Repo + alias Explorer.SmartContract.Reader @optional_attrs ~w(block_hash block_number created_contract_address_hash cumulative_gas_used earliest_processing_start error gas_used index created_contract_code_indexed_at status @@ -423,7 +425,7 @@ defmodule Explorer.Chain.Transaction do candidates_query |> Repo.all() |> Enum.flat_map(fn candidate -> - case do_decoded_input_data(data, [candidate.abi], hash) do + case do_decoded_input_data(data, [candidate.abi], nil, hash) do {:ok, _, _, _} = decoded -> [decoded] _ -> [] end @@ -436,12 +438,53 @@ defmodule Explorer.Chain.Transaction do {:error, :contract_not_verified, []} end - def decoded_input_data(%__MODULE__{input: %{bytes: data}, to_address: %{smart_contract: %{abi: abi}}, hash: hash}) do - do_decoded_input_data(data, abi, hash) + def decoded_input_data(%__MODULE__{ + input: %{bytes: data}, + to_address: %{smart_contract: %{abi: abi, address_hash: address_hash}}, + hash: hash + }) do + do_decoded_input_data(data, abi, address_hash, hash) end - defp do_decoded_input_data(data, abi, hash) do - with {:ok, {selector, values}} <- find_and_decode(abi, data, hash), + defp do_decoded_input_data(data, abi, address_hash, hash) do + implementation_method_abi = + abi + |> Enum.find(fn method -> + Map.get(method, "name") == "implementation" + end) + + implementation_abi = + if implementation_method_abi do + implementation_address = + case Reader.query_contract(address_hash, abi, %{ + "implementation" => [] + }) do + %{"implementation" => {:ok, [result]}} -> result + _ -> nil + end + + if implementation_address do + implementation_address_hash_string = "0x" <> Base.encode16(implementation_address, case: :lower) + + case Chain.string_to_address_hash(implementation_address_hash_string) do + {:ok, implementation_address_hash} -> + implementation_address_hash + |> Chain.address_hash_to_smart_contract() + |> Map.get(:abi) + + _ -> + [] + end + else + [] + end + else + [] + end + + full_abi = if Enum.empty?(implementation_abi), do: abi, else: implementation_abi ++ abi + + with {:ok, {selector, values}} <- find_and_decode(full_abi, data, hash), {:ok, mapping} <- selector_mapping(selector, values, hash), identifier <- Base.encode16(selector.method_id, case: :lower), text <- function_call(selector.function, mapping), From 485a262d915494ed7a9c154168a4d354870a8463 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Wed, 17 Jun 2020 13:04:30 +0300 Subject: [PATCH 16/79] Check if implementation is verified --- apps/explorer/lib/explorer/chain/transaction.ex | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/apps/explorer/lib/explorer/chain/transaction.ex b/apps/explorer/lib/explorer/chain/transaction.ex index cef9c54193..5168f5db61 100644 --- a/apps/explorer/lib/explorer/chain/transaction.ex +++ b/apps/explorer/lib/explorer/chain/transaction.ex @@ -468,9 +468,16 @@ defmodule Explorer.Chain.Transaction do case Chain.string_to_address_hash(implementation_address_hash_string) do {:ok, implementation_address_hash} -> - implementation_address_hash - |> Chain.address_hash_to_smart_contract() - |> Map.get(:abi) + implementation_smart_contract = + implementation_address_hash + |> Chain.address_hash_to_smart_contract() + + if implementation_smart_contract do + implementation_smart_contract + |> Map.get(:abi) + else + [] + end _ -> [] From 102b80fada035a505dc18be22e953b2dbf33b102 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Wed, 17 Jun 2020 13:53:40 +0300 Subject: [PATCH 17/79] Decode log in proxy contracts --- apps/explorer/lib/explorer/chain.ex | 47 +++++++++++++++++++ apps/explorer/lib/explorer/chain/log.ex | 9 ++-- .../lib/explorer/chain/transaction.ex | 45 +----------------- 3 files changed, 54 insertions(+), 47 deletions(-) diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex index bd520b4e70..316eddd8fa 100644 --- a/apps/explorer/lib/explorer/chain.ex +++ b/apps/explorer/lib/explorer/chain.ex @@ -74,6 +74,7 @@ defmodule Explorer.Chain do alias Explorer.Counters.{AddressesCounter, AddressesWithBalanceCounter} alias Explorer.Market.MarketHistoryCache alias Explorer.{PagingOptions, Repo} + alias Explorer.SmartContract.Reader alias Dataloader.Ecto, as: DataloaderEcto @@ -4337,6 +4338,52 @@ defmodule Explorer.Chain do end end + def combine_proxy_implementation_abi(address_hash, abi) do + implementation_method_abi = + abi + |> Enum.find(fn method -> + Map.get(method, "name") == "implementation" + end) + + implementation_abi = + if implementation_method_abi do + implementation_address = + case Reader.query_contract(address_hash, abi, %{ + "implementation" => [] + }) do + %{"implementation" => {:ok, [result]}} -> result + _ -> nil + end + + if implementation_address do + implementation_address_hash_string = "0x" <> Base.encode16(implementation_address, case: :lower) + + case Chain.string_to_address_hash(implementation_address_hash_string) do + {:ok, implementation_address_hash} -> + implementation_smart_contract = + implementation_address_hash + |> Chain.address_hash_to_smart_contract() + + if implementation_smart_contract do + implementation_smart_contract + |> Map.get(:abi) + else + [] + end + + _ -> + [] + end + else + [] + end + else + [] + end + + if Enum.empty?(implementation_abi), do: abi, else: implementation_abi ++ abi + end + defp format_tx_first_trace(first_trace, block_hash, json_rpc_named_arguments) do {:ok, to_address_hash} = if Map.has_key?(first_trace, :to_address_hash) do diff --git a/apps/explorer/lib/explorer/chain/log.ex b/apps/explorer/lib/explorer/chain/log.ex index 27899303f3..82c10c3eab 100644 --- a/apps/explorer/lib/explorer/chain/log.ex +++ b/apps/explorer/lib/explorer/chain/log.ex @@ -6,8 +6,8 @@ defmodule Explorer.Chain.Log do require Logger alias ABI.{Event, FunctionSelector} + alias Explorer{Chain, Repo} alias Explorer.Chain.{Address, Block, ContractMethod, Data, Hash, Transaction} - alias Explorer.Repo @required_attrs ~w(address_hash data block_hash index transaction_hash)a @optional_attrs ~w(first_topic second_topic third_topic fourth_topic type block_number)a @@ -121,8 +121,11 @@ defmodule Explorer.Chain.Log do """ def decode(_log, %Transaction{to_address: nil}), do: {:error, :no_to_address} - def decode(log, transaction = %Transaction{to_address: %{smart_contract: %{abi: abi}}}) when not is_nil(abi) do - with {:ok, selector, mapping} <- find_and_decode(abi, log, transaction), + def decode(log, transaction = %Transaction{to_address: %{smart_contract: %{abi: abi, address_hash: address_hash}}}) + when not is_nil(abi) do + full_abi = Chain.combine_proxy_implementation_abi(address_hash, abi) + + with {:ok, selector, mapping} <- find_and_decode(full_abi, log, transaction), identifier <- Base.encode16(selector.method_id, case: :lower), text <- function_call(selector.function, mapping), do: {:ok, identifier, text, mapping} diff --git a/apps/explorer/lib/explorer/chain/transaction.ex b/apps/explorer/lib/explorer/chain/transaction.ex index 5168f5db61..e4518c7349 100644 --- a/apps/explorer/lib/explorer/chain/transaction.ex +++ b/apps/explorer/lib/explorer/chain/transaction.ex @@ -28,7 +28,6 @@ defmodule Explorer.Chain.Transaction do } alias Explorer.Chain.Transaction.{Fork, Status} - alias Explorer.SmartContract.Reader @optional_attrs ~w(block_hash block_number created_contract_address_hash cumulative_gas_used earliest_processing_start error gas_used index created_contract_code_indexed_at status @@ -447,49 +446,7 @@ defmodule Explorer.Chain.Transaction do end defp do_decoded_input_data(data, abi, address_hash, hash) do - implementation_method_abi = - abi - |> Enum.find(fn method -> - Map.get(method, "name") == "implementation" - end) - - implementation_abi = - if implementation_method_abi do - implementation_address = - case Reader.query_contract(address_hash, abi, %{ - "implementation" => [] - }) do - %{"implementation" => {:ok, [result]}} -> result - _ -> nil - end - - if implementation_address do - implementation_address_hash_string = "0x" <> Base.encode16(implementation_address, case: :lower) - - case Chain.string_to_address_hash(implementation_address_hash_string) do - {:ok, implementation_address_hash} -> - implementation_smart_contract = - implementation_address_hash - |> Chain.address_hash_to_smart_contract() - - if implementation_smart_contract do - implementation_smart_contract - |> Map.get(:abi) - else - [] - end - - _ -> - [] - end - else - [] - end - else - [] - end - - full_abi = if Enum.empty?(implementation_abi), do: abi, else: implementation_abi ++ abi + full_abi = Chain.combine_proxy_implementation_abi(address_hash, abi) with {:ok, {selector, values}} <- find_and_decode(full_abi, data, hash), {:ok, mapping} <- selector_mapping(selector, values, hash), From ffa8d3c9cc0eb90c5efdf46ba46139c5aa9f94cc Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Wed, 17 Jun 2020 15:12:17 +0300 Subject: [PATCH 18/79] Add tests --- CHANGELOG.md | 1 + apps/explorer/lib/explorer/chain.ex | 6 +- apps/explorer/lib/explorer/chain/log.ex | 2 +- apps/explorer/test/explorer/chain_test.exs | 172 +++++++++++++++++++++ 4 files changed, 179 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fb499b052d..edb75b6440 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## Current ### Features +- [#3153](https://github.com/poanetwork/blockscout/pull/3153) - Proxy contracts: logs decoding using implementation ABI - [#3153](https://github.com/poanetwork/blockscout/pull/3153) - Proxy contracts: methods decoding using implementation ABI - [#3149](https://github.com/poanetwork/blockscout/pull/3149) - Display and store revert reason of tx on demand at transaction details page and at gettxinfo API endpoint. diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex index 316eddd8fa..b0a7f06de9 100644 --- a/apps/explorer/lib/explorer/chain.ex +++ b/apps/explorer/lib/explorer/chain.ex @@ -4338,7 +4338,7 @@ defmodule Explorer.Chain do end end - def combine_proxy_implementation_abi(address_hash, abi) do + def combine_proxy_implementation_abi(address_hash, abi) when not is_nil(abi) do implementation_method_abi = abi |> Enum.find(fn method -> @@ -4384,6 +4384,10 @@ defmodule Explorer.Chain do if Enum.empty?(implementation_abi), do: abi, else: implementation_abi ++ abi end + def combine_proxy_implementation_abi(_, abi) when is_nil(abi) do + [] + end + defp format_tx_first_trace(first_trace, block_hash, json_rpc_named_arguments) do {:ok, to_address_hash} = if Map.has_key?(first_trace, :to_address_hash) do diff --git a/apps/explorer/lib/explorer/chain/log.ex b/apps/explorer/lib/explorer/chain/log.ex index 82c10c3eab..9592f0b2dd 100644 --- a/apps/explorer/lib/explorer/chain/log.ex +++ b/apps/explorer/lib/explorer/chain/log.ex @@ -6,7 +6,7 @@ defmodule Explorer.Chain.Log do require Logger alias ABI.{Event, FunctionSelector} - alias Explorer{Chain, Repo} + alias Explorer.{Chain, Repo} alias Explorer.Chain.{Address, Block, ContractMethod, Data, Hash, Transaction} @required_attrs ~w(address_hash data block_hash index transaction_hash)a diff --git a/apps/explorer/test/explorer/chain_test.exs b/apps/explorer/test/explorer/chain_test.exs index ed6d37aaa4..e374ab492c 100644 --- a/apps/explorer/test/explorer/chain_test.exs +++ b/apps/explorer/test/explorer/chain_test.exs @@ -5193,4 +5193,176 @@ defmodule Explorer.ChainTest do assert Chain.transaction_to_revert_reason(transaction) == "No credit of that type" end end + + describe "combine_proxy_implementation_abi/2" do + @proxy_abi [ + %{ + "type" => "function", + "stateMutability" => "nonpayable", + "payable" => false, + "outputs" => [%{"type" => "bool", "name" => ""}], + "name" => "upgradeTo", + "inputs" => [%{"type" => "address", "name" => "newImplementation"}], + "constant" => false + }, + %{ + "type" => "function", + "stateMutability" => "view", + "payable" => false, + "outputs" => [%{"type" => "uint256", "name" => ""}], + "name" => "version", + "inputs" => [], + "constant" => true + }, + %{ + "type" => "function", + "stateMutability" => "view", + "payable" => false, + "outputs" => [%{"type" => "address", "name" => ""}], + "name" => "implementation", + "inputs" => [], + "constant" => true + }, + %{ + "type" => "function", + "stateMutability" => "nonpayable", + "payable" => false, + "outputs" => [], + "name" => "renounceOwnership", + "inputs" => [], + "constant" => false + }, + %{ + "type" => "function", + "stateMutability" => "view", + "payable" => false, + "outputs" => [%{"type" => "address", "name" => ""}], + "name" => "getOwner", + "inputs" => [], + "constant" => true + }, + %{ + "type" => "function", + "stateMutability" => "view", + "payable" => false, + "outputs" => [%{"type" => "address", "name" => ""}], + "name" => "getProxyStorage", + "inputs" => [], + "constant" => true + }, + %{ + "type" => "function", + "stateMutability" => "nonpayable", + "payable" => false, + "outputs" => [], + "name" => "transferOwnership", + "inputs" => [%{"type" => "address", "name" => "_newOwner"}], + "constant" => false + }, + %{ + "type" => "constructor", + "stateMutability" => "nonpayable", + "payable" => false, + "inputs" => [ + %{"type" => "address", "name" => "_proxyStorage"}, + %{"type" => "address", "name" => "_implementationAddress"} + ] + }, + %{"type" => "fallback", "stateMutability" => "nonpayable", "payable" => false}, + %{ + "type" => "event", + "name" => "Upgraded", + "inputs" => [ + %{"type" => "uint256", "name" => "version", "indexed" => false}, + %{"type" => "address", "name" => "implementation", "indexed" => true} + ], + "anonymous" => false + }, + %{ + "type" => "event", + "name" => "OwnershipRenounced", + "inputs" => [%{"type" => "address", "name" => "previousOwner", "indexed" => true}], + "anonymous" => false + }, + %{ + "type" => "event", + "name" => "OwnershipTransferred", + "inputs" => [ + %{"type" => "address", "name" => "previousOwner", "indexed" => true}, + %{"type" => "address", "name" => "newOwner", "indexed" => true} + ], + "anonymous" => false + } + ] + + @implementation_abi [ + %{ + "constant" => false, + "inputs" => [%{"name" => "x", "type" => "uint256"}], + "name" => "set", + "outputs" => [], + "payable" => false, + "stateMutability" => "nonpayable", + "type" => "function" + }, + %{ + "constant" => true, + "inputs" => [], + "name" => "get", + "outputs" => [%{"name" => "", "type" => "uint256"}], + "payable" => false, + "stateMutability" => "view", + "type" => "function" + } + ] + + test "returns empty [] abi if proxy abi is null" do + proxy_contract_address = insert(:contract_address) + assert Chain.combine_proxy_implementation_abi(proxy_contract_address, nil) == [] + end + + test "returns [] abi for unverified proxy" do + proxy_contract_address = insert(:contract_address) + assert Chain.combine_proxy_implementation_abi(proxy_contract_address, []) == [] + end + + test "returns proxy abi if implementation is not verified" do + proxy_contract_address = insert(:contract_address) + insert(:smart_contract, address_hash: proxy_contract_address.hash, abi: @proxy_abi) + assert Chain.combine_proxy_implementation_abi(proxy_contract_address, @proxy_abi) == @proxy_abi + end + + test "returns proxy + implementation abi if implementation is verified" do + proxy_contract_address = insert(:contract_address) + insert(:smart_contract, address_hash: proxy_contract_address.hash, abi: @proxy_abi) + + implementation_contract_address = insert(:contract_address) + insert(:smart_contract, address_hash: implementation_contract_address.hash, abi: @implementation_abi) + + implementation_contract_address_hash_string = + Base.encode16(implementation_contract_address.hash.bytes, case: :lower) + + expect( + EthereumJSONRPC.Mox, + :json_rpc, + fn [%{id: id, method: _, params: [%{data: _, to: _}, _]}], _options -> + {:ok, + [ + %{ + id: id, + jsonrpc: "2.0", + result: "0x000000000000000000000000" <> implementation_contract_address_hash_string + } + ]} + end + ) + + combined_abi = Chain.combine_proxy_implementation_abi(proxy_contract_address.hash, @proxy_abi) + + assert Enum.any?(@proxy_abi, fn el -> el == Enum.at(@implementation_abi, 0) end) == false + assert Enum.any?(@proxy_abi, fn el -> el == Enum.at(@implementation_abi, 1) end) == false + assert Enum.any?(combined_abi, fn el -> el == Enum.at(@implementation_abi, 0) end) == true + assert Enum.any?(combined_abi, fn el -> el == Enum.at(@implementation_abi, 1) end) == true + end + end end From 067b67547a2c27f2d47b27a9eb0f3e72de47e52f Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Wed, 17 Jun 2020 18:35:39 +0300 Subject: [PATCH 19/79] Fix several tests --- CHANGELOG.md | 1 + apps/block_scout_web/priv/gettext/default.pot | 18 +- .../priv/gettext/en/LC_MESSAGES/default.po | 18 +- .../lib/ethereum_jsonrpc/besu.ex | 1 + .../besu/fetched_beneficiaries.ex | 385 +++++++++--------- .../lib/ethereum_jsonrpc/parity.ex | 1 + apps/indexer/config/config.exs | 4 +- 7 files changed, 216 insertions(+), 212 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5371ca264f..f9e00a2fbb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## Current ### Features +- [#3154](https://github.com/poanetwork/blockscout/pull/3154) - Support of Hyperledger Besu client - [#3149](https://github.com/poanetwork/blockscout/pull/3149) - Display and store revert reason of tx on demand at transaction details page and at gettxinfo API endpoint. ### Fixes diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot index 9157634e2c..ac3a6b36cb 100644 --- a/apps/block_scout_web/priv/gettext/default.pot +++ b/apps/block_scout_web/priv/gettext/default.pot @@ -107,12 +107,12 @@ msgid "API for the %{subnetwork} - BlockScout" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:81 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:85 msgid "APIs" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:71 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:75 msgid "Accounts" msgstr "" @@ -636,7 +636,7 @@ msgid "Error: Could not determine contract creator." msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:95 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:99 msgid "Eth RPC" msgstr "" @@ -737,7 +737,7 @@ msgid "Github" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:85 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:89 msgid "GraphQL" msgstr "" @@ -1158,7 +1158,7 @@ msgid "Parent Hash" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:59 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:62 #: lib/block_scout_web/views/transaction_view.ex:250 #: lib/block_scout_web/views/transaction_view.ex:284 msgid "Pending" @@ -1196,7 +1196,7 @@ msgid "Query" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:90 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:94 msgid "RPC" msgstr "" @@ -1254,14 +1254,14 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/index.html.eex:14 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:141 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:158 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:145 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:162 msgid "Search" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:135 #: lib/block_scout_web/templates/layout/_topnav.html.eex:139 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:143 msgid "Search by address, token symbol name, transaction hash, or block number" 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 9157634e2c..ac3a6b36cb 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 @@ -107,12 +107,12 @@ msgid "API for the %{subnetwork} - BlockScout" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:81 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:85 msgid "APIs" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:71 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:75 msgid "Accounts" msgstr "" @@ -636,7 +636,7 @@ msgid "Error: Could not determine contract creator." msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:95 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:99 msgid "Eth RPC" msgstr "" @@ -737,7 +737,7 @@ msgid "Github" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:85 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:89 msgid "GraphQL" msgstr "" @@ -1158,7 +1158,7 @@ msgid "Parent Hash" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:59 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:62 #: lib/block_scout_web/views/transaction_view.ex:250 #: lib/block_scout_web/views/transaction_view.ex:284 msgid "Pending" @@ -1196,7 +1196,7 @@ msgid "Query" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:90 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:94 msgid "RPC" msgstr "" @@ -1254,14 +1254,14 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/index.html.eex:14 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:141 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:158 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:145 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:162 msgid "Search" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:135 #: lib/block_scout_web/templates/layout/_topnav.html.eex:139 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:143 msgid "Search by address, token symbol name, transaction hash, or block number" msgstr "" diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/besu.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/besu.ex index 198ba61be4..4e834d78a8 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/besu.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/besu.ex @@ -1,3 +1,4 @@ +# credo:disable-for-this-file defmodule EthereumJSONRPC.Besu do @moduledoc """ Ethereum JSONRPC methods that are only supported by [Besu](https://besu.hyperledger.org/en/stable/Reference/API-Methods). diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/besu/fetched_beneficiaries.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/besu/fetched_beneficiaries.ex index 13638272d0..cb569cf9f2 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/besu/fetched_beneficiaries.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/besu/fetched_beneficiaries.ex @@ -1,197 +1,196 @@ defmodule EthereumJSONRPC.Besu.FetchedBeneficiaries do - @moduledoc """ - Beneficiaries and errors from batch requests to `trace_block`. - """ - - import EthereumJSONRPC, only: [quantity_to_integer: 1] - - @doc """ - Converts `responses` to `EthereumJSONRPC.FetchedBeneficiaries.t()`. - - responses - List with trace_block responses - id_to_params - Maps request id to query params - - ## Examples - iex> EthereumJSONRPC.Besu.FetchedBeneficiaries.from_responses( - ...> [ - ...> %{ - ...> id: 0, - ...> result: [ - ...> %{ - ...> "action" => %{"author" => "0x1", "rewardType" => "external", "value" => "0x0"}, - ...> "blockHash" => "0xFFF", - ...> "blockNumber" => 12, - ...> "result" => nil, - ...> "subtraces" => 0, - ...> "traceAddress" => [], - ...> "transactionHash" => nil, - ...> "transactionPosition" => nil, - ...> "type" => "reward" - ...> }, - ...> %{ - ...> "action" => %{"author" => "0x2", "rewardType" => "external", "value" => "0x0"}, - ...> "blockHash" => "0xFFF", - ...> "blockNumber" => 12, - ...> "result" => nil, - ...> "subtraces" => 0, - ...> "traceAddress" => [], - ...> "transactionHash" => nil, - ...> "transactionPosition" => nil, - ...> "type" => "reward" - ...> } - ...> ] - ...> } - ...> ], - ...> %{0 => %{block_quantity: "0xC"}} - ...> ) - %EthereumJSONRPC.FetchedBeneficiaries{ - errors: [], - params_set: #MapSet<[ - %{ - address_hash: "0x1", - address_type: :validator, - block_hash: "0xFFF", - block_number: 12, - reward: "0x0" - }, - %{ - address_hash: "0x2", - address_type: :emission_funds, - block_hash: "0xFFF", - block_number: 12, - reward: "0x0" - } - ]> - } - """ - def from_responses(responses, id_to_params) when is_list(responses) and is_map(id_to_params) do - responses - |> Enum.map(&response_to_params_set(&1, id_to_params)) - |> Enum.reduce( - %EthereumJSONRPC.FetchedBeneficiaries{}, - fn - {:ok, params_set}, %EthereumJSONRPC.FetchedBeneficiaries{params_set: acc_params_set} = acc -> - %EthereumJSONRPC.FetchedBeneficiaries{acc | params_set: MapSet.union(acc_params_set, params_set)} - - {:error, reason}, %EthereumJSONRPC.FetchedBeneficiaries{errors: errors} = acc -> - %EthereumJSONRPC.FetchedBeneficiaries{acc | errors: [reason | errors]} - end - ) - end - - @doc """ - `trace_block` requests for `id_to_params`. - """ - def requests(id_to_params) when is_map(id_to_params) do - Enum.map(id_to_params, fn {id, %{block_quantity: block_quantity}} -> - request(%{id: id, block_quantity: block_quantity}) - end) - end - - @spec response_to_params_set(%{id: id, result: nil}, %{id => %{block_quantity: block_quantity}}) :: - {:error, %{code: 404, message: String.t(), data: %{block_quantity: block_quantity}}} - when id: non_neg_integer(), block_quantity: String.t() - defp response_to_params_set(%{id: id, result: nil}, id_to_params) when is_map(id_to_params) do - %{block_quantity: block_quantity} = Map.fetch!(id_to_params, id) - - {:error, %{code: 404, message: "Not Found", data: %{block_quantity: block_quantity}}} - end - - @spec response_to_params_set(%{id: id, result: list(map())}, %{id => %{block_quantity: block_quantity}}) :: - {:ok, MapSet.t(EthereumJSONRPC.FetchedBeneficiary.params())} - when id: non_neg_integer(), block_quantity: String.t() - defp response_to_params_set(%{id: id, result: traces}, id_to_params) when is_list(traces) and is_map(id_to_params) do - %{block_quantity: block_quantity} = Map.fetch!(id_to_params, id) - block_number = quantity_to_integer(block_quantity) - params_set = traces_to_params_set(traces, block_number) - - {:ok, params_set} - end - - @spec response_to_params_set(%{id: id, error: %{code: code, message: message}}, %{ - id => %{block_quantity: block_quantity} - }) :: {:error, %{code: code, message: message, data: %{block_quantity: block_quantity}}} - when id: non_neg_integer(), code: integer(), message: String.t(), block_quantity: String.t() - defp response_to_params_set(%{id: id, error: error}, id_to_params) when is_map(id_to_params) do - %{block_quantity: block_quantity} = Map.fetch!(id_to_params, id) - - annotated_error = Map.put(error, :data, %{block_quantity: block_quantity}) - - {:error, annotated_error} - end - - defp request(%{id: id, block_quantity: block_quantity}) when is_integer(id) and is_binary(block_quantity) do - EthereumJSONRPC.request(%{id: id, method: "trace_block", params: [block_quantity]}) - end - - defp traces_to_params_set(traces, block_number) when is_list(traces) and is_integer(block_number) do - traces - |> Stream.filter(&(&1["type"] == "reward")) - |> Stream.with_index() - |> Enum.reduce(MapSet.new(), fn {trace, index}, acc -> - MapSet.union(acc, trace_to_params_set(trace, block_number, index)) - end) - end - - defp trace_to_params_set( - %{ - "action" => %{ - "rewardType" => reward_type, - "author" => address_hash_data, - "value" => reward_value - }, - "blockHash" => block_hash, - "blockNumber" => block_number - }, - block_number, - index - ) - when is_integer(block_number) and reward_type in ~w(block external uncle) do - MapSet.new([ + @moduledoc """ + Beneficiaries and errors from batch requests to `trace_block`. + """ + + import EthereumJSONRPC, only: [quantity_to_integer: 1] + + @doc """ + Converts `responses` to `EthereumJSONRPC.FetchedBeneficiaries.t()`. + + responses - List with trace_block responses + id_to_params - Maps request id to query params + + ## Examples + iex> EthereumJSONRPC.Besu.FetchedBeneficiaries.from_responses( + ...> [ + ...> %{ + ...> id: 0, + ...> result: [ + ...> %{ + ...> "action" => %{"author" => "0x1", "rewardType" => "external", "value" => "0x0"}, + ...> "blockHash" => "0xFFF", + ...> "blockNumber" => 12, + ...> "result" => nil, + ...> "subtraces" => 0, + ...> "traceAddress" => [], + ...> "transactionHash" => nil, + ...> "transactionPosition" => nil, + ...> "type" => "reward" + ...> }, + ...> %{ + ...> "action" => %{"author" => "0x2", "rewardType" => "external", "value" => "0x0"}, + ...> "blockHash" => "0xFFF", + ...> "blockNumber" => 12, + ...> "result" => nil, + ...> "subtraces" => 0, + ...> "traceAddress" => [], + ...> "transactionHash" => nil, + ...> "transactionPosition" => nil, + ...> "type" => "reward" + ...> } + ...> ] + ...> } + ...> ], + ...> %{0 => %{block_quantity: "0xC"}} + ...> ) + %EthereumJSONRPC.FetchedBeneficiaries{ + errors: [], + params_set: #MapSet<[ + %{ + address_hash: "0x1", + address_type: :validator, + block_hash: "0xFFF", + block_number: 12, + reward: "0x0" + }, %{ - address_hash: address_hash_data, - block_hash: block_hash, - block_number: block_number, - reward: reward_value, - address_type: get_address_type(reward_type, index) + address_hash: "0x2", + address_type: :emission_funds, + block_hash: "0xFFF", + block_number: 12, + reward: "0x0" } - ]) - end - - # Beneficiary's address type will depend on the responses' action.rewardType, - # which will vary depending on which network is being indexed - # - # On POA networks, rewardType will always be external and the type of the address being - # rewarded will depend on its position. - # First address will always be the validator's while the second will be the EmissionsFunds address - # - # On PoW networks, like Ethereum, the reward type will already specify the type for the - # address being rewarded - # The rewardType "block" will show the reward for the consensus block validator - # The rewardType "uncle" will show reward for validating an uncle block - defp get_address_type(reward_type, index) when reward_type == "external" and index == 0, do: :validator - defp get_address_type(reward_type, index) when reward_type == "external" and index == 1, do: :emission_funds - defp get_address_type(reward_type, index) when reward_type == "external" and index == 2, do: :validator - defp get_address_type(reward_type, index) when reward_type == "external" and index == 3, do: :validator - defp get_address_type(reward_type, index) when reward_type == "external" and index == 4, do: :validator - defp get_address_type(reward_type, index) when reward_type == "external" and index == 5, do: :validator - defp get_address_type(reward_type, index) when reward_type == "external" and index == 6, do: :validator - defp get_address_type(reward_type, index) when reward_type == "external" and index == 7, do: :validator - defp get_address_type(reward_type, index) when reward_type == "external" and index == 8, do: :validator - defp get_address_type(reward_type, index) when reward_type == "external" and index == 9, do: :validator - defp get_address_type(reward_type, index) when reward_type == "external" and index == 10, do: :validator - defp get_address_type(reward_type, index) when reward_type == "external" and index == 11, do: :validator - defp get_address_type(reward_type, index) when reward_type == "external" and index == 12, do: :validator - defp get_address_type(reward_type, index) when reward_type == "external" and index == 13, do: :validator - defp get_address_type(reward_type, index) when reward_type == "external" and index == 14, do: :validator - defp get_address_type(reward_type, index) when reward_type == "external" and index == 15, do: :validator - defp get_address_type(reward_type, index) when reward_type == "external" and index == 16, do: :validator - defp get_address_type(reward_type, index) when reward_type == "external" and index == 17, do: :validator - defp get_address_type(reward_type, index) when reward_type == "external" and index == 18, do: :validator - defp get_address_type(reward_type, index) when reward_type == "external" and index == 19, do: :validator - defp get_address_type(reward_type, index) when reward_type == "external" and index == 20, do: :validator - defp get_address_type(reward_type, _index) when reward_type == "block", do: :validator - defp get_address_type(reward_type, _index) when reward_type == "uncle", do: :uncle - defp get_address_type(reward_type, _index) when reward_type == "emptyStep", do: :validator + ]> + } + """ + def from_responses(responses, id_to_params) when is_list(responses) and is_map(id_to_params) do + responses + |> Enum.map(&response_to_params_set(&1, id_to_params)) + |> Enum.reduce( + %EthereumJSONRPC.FetchedBeneficiaries{}, + fn + {:ok, params_set}, %EthereumJSONRPC.FetchedBeneficiaries{params_set: acc_params_set} = acc -> + %EthereumJSONRPC.FetchedBeneficiaries{acc | params_set: MapSet.union(acc_params_set, params_set)} + + {:error, reason}, %EthereumJSONRPC.FetchedBeneficiaries{errors: errors} = acc -> + %EthereumJSONRPC.FetchedBeneficiaries{acc | errors: [reason | errors]} + end + ) + end + + @doc """ + `trace_block` requests for `id_to_params`. + """ + def requests(id_to_params) when is_map(id_to_params) do + Enum.map(id_to_params, fn {id, %{block_quantity: block_quantity}} -> + request(%{id: id, block_quantity: block_quantity}) + end) + end + + @spec response_to_params_set(%{id: id, result: nil}, %{id => %{block_quantity: block_quantity}}) :: + {:error, %{code: 404, message: String.t(), data: %{block_quantity: block_quantity}}} + when id: non_neg_integer(), block_quantity: String.t() + defp response_to_params_set(%{id: id, result: nil}, id_to_params) when is_map(id_to_params) do + %{block_quantity: block_quantity} = Map.fetch!(id_to_params, id) + + {:error, %{code: 404, message: "Not Found", data: %{block_quantity: block_quantity}}} + end + + @spec response_to_params_set(%{id: id, result: list(map())}, %{id => %{block_quantity: block_quantity}}) :: + {:ok, MapSet.t(EthereumJSONRPC.FetchedBeneficiary.params())} + when id: non_neg_integer(), block_quantity: String.t() + defp response_to_params_set(%{id: id, result: traces}, id_to_params) when is_list(traces) and is_map(id_to_params) do + %{block_quantity: block_quantity} = Map.fetch!(id_to_params, id) + block_number = quantity_to_integer(block_quantity) + params_set = traces_to_params_set(traces, block_number) + + {:ok, params_set} + end + + @spec response_to_params_set(%{id: id, error: %{code: code, message: message}}, %{ + id => %{block_quantity: block_quantity} + }) :: {:error, %{code: code, message: message, data: %{block_quantity: block_quantity}}} + when id: non_neg_integer(), code: integer(), message: String.t(), block_quantity: String.t() + defp response_to_params_set(%{id: id, error: error}, id_to_params) when is_map(id_to_params) do + %{block_quantity: block_quantity} = Map.fetch!(id_to_params, id) + + annotated_error = Map.put(error, :data, %{block_quantity: block_quantity}) + + {:error, annotated_error} + end + + defp request(%{id: id, block_quantity: block_quantity}) when is_integer(id) and is_binary(block_quantity) do + EthereumJSONRPC.request(%{id: id, method: "trace_block", params: [block_quantity]}) + end + + defp traces_to_params_set(traces, block_number) when is_list(traces) and is_integer(block_number) do + traces + |> Stream.filter(&(&1["type"] == "reward")) + |> Stream.with_index() + |> Enum.reduce(MapSet.new(), fn {trace, index}, acc -> + MapSet.union(acc, trace_to_params_set(trace, block_number, index)) + end) + end + + defp trace_to_params_set( + %{ + "action" => %{ + "rewardType" => reward_type, + "author" => address_hash_data, + "value" => reward_value + }, + "blockHash" => block_hash, + "blockNumber" => block_number + }, + block_number, + index + ) + when is_integer(block_number) and reward_type in ~w(block external uncle) do + MapSet.new([ + %{ + address_hash: address_hash_data, + block_hash: block_hash, + block_number: block_number, + reward: reward_value, + address_type: get_address_type(reward_type, index) + } + ]) end - \ No newline at end of file + + # Beneficiary's address type will depend on the responses' action.rewardType, + # which will vary depending on which network is being indexed + # + # On POA networks, rewardType will always be external and the type of the address being + # rewarded will depend on its position. + # First address will always be the validator's while the second will be the EmissionsFunds address + # + # On PoW networks, like Ethereum, the reward type will already specify the type for the + # address being rewarded + # The rewardType "block" will show the reward for the consensus block validator + # The rewardType "uncle" will show reward for validating an uncle block + defp get_address_type(reward_type, index) when reward_type == "external" and index == 0, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 1, do: :emission_funds + defp get_address_type(reward_type, index) when reward_type == "external" and index == 2, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 3, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 4, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 5, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 6, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 7, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 8, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 9, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 10, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 11, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 12, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 13, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 14, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 15, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 16, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 17, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 18, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 19, do: :validator + defp get_address_type(reward_type, index) when reward_type == "external" and index == 20, do: :validator + defp get_address_type(reward_type, _index) when reward_type == "block", do: :validator + defp get_address_type(reward_type, _index) when reward_type == "uncle", do: :uncle + defp get_address_type(reward_type, _index) when reward_type == "emptyStep", do: :validator +end diff --git a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/parity.ex b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/parity.ex index 84a1b94702..8165651ad5 100644 --- a/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/parity.ex +++ b/apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/parity.ex @@ -1,3 +1,4 @@ +# credo:disable-for-this-file defmodule EthereumJSONRPC.Parity do @moduledoc """ Ethereum JSONRPC methods that are only supported by [Parity](https://wiki.parity.io/). diff --git a/apps/indexer/config/config.exs b/apps/indexer/config/config.exs index b53cd74e91..24b9edd909 100644 --- a/apps/indexer/config/config.exs +++ b/apps/indexer/config/config.exs @@ -38,7 +38,9 @@ config :indexer, first_block: System.get_env("FIRST_BLOCK") || "0", last_block: System.get_env("LAST_BLOCK") || "" -config :indexer, Indexer.Fetcher.PendingTransaction.Supervisor, disabled?: System.get_env("ETHEREUM_JSONRPC_VARIANT") == "besu" +config :indexer, Indexer.Fetcher.PendingTransaction.Supervisor, + disabled?: System.get_env("ETHEREUM_JSONRPC_VARIANT") == "besu" + # config :indexer, Indexer.Fetcher.ReplacedTransaction.Supervisor, disabled?: true # config :indexer, Indexer.Fetcher.BlockReward.Supervisor, disabled?: true config :indexer, Indexer.Fetcher.StakingPools.Supervisor, disabled?: true From 8aab41150517824c4daccd1a12c6c62cf5a674fc Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Wed, 17 Jun 2020 18:59:50 +0300 Subject: [PATCH 20/79] Blockcout 3.2.0 --- CHANGELOG.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8227c01b41..57abc3c063 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ ## Current +### Features + +### Fixes + +### Chore + + +## 3.2.0-beta + ### Features - [#3154](https://github.com/poanetwork/blockscout/pull/3154) - Support of Hyperledger Besu client - [#3153](https://github.com/poanetwork/blockscout/pull/3153) - Proxy contracts: logs decoding using implementation ABI @@ -9,7 +18,6 @@ ### Fixes ### Chore - - [#3152](https://github.com/poanetwork/blockscout/pull/3152) - Fix contract compilation tests for old versions of compiler From 7adf3f422098cf294afae4f238f9aa97e6e7c220 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Fri, 19 Jun 2020 15:25:52 +0300 Subject: [PATCH 21/79] Read proxy --- CHANGELOG.md | 1 + .../lib/smart_contract/read_only_functions.js | 3 +- .../address_read_contract_controller.ex | 1 + .../address_read_proxy_controller.ex | 38 +++++++ .../controllers/smart_contract_controller.ex | 9 +- .../templates/address/_tabs.html.eex | 7 ++ .../address_read_contract/index.html.eex | 2 +- .../address_read_proxy/_metatags.html.eex | 1 + .../address_read_proxy/index.html.eex | 19 ++++ .../views/address_read_proxy_view.ex | 7 ++ .../lib/block_scout_web/views/address_view.ex | 8 ++ .../lib/block_scout_web/web_router.ex | 7 ++ apps/block_scout_web/priv/gettext/default.pot | 37 ++++--- .../priv/gettext/en/LC_MESSAGES/default.po | 37 ++++--- .../address_read_proxy_controller_test.exs | 81 ++++++++++++++ .../smart_contract_controller_test.exs | 20 +++- .../views/address_read_proxy_view_test.exs | 19 ++++ apps/explorer/lib/explorer/chain.ex | 101 +++++++++++++----- .../lib/explorer/smart_contract/reader.ex | 19 ++++ apps/explorer/test/explorer/chain_test.exs | 56 +++++++++- .../explorer/smart_contract/reader_test.exs | 93 ++++++++++++++++ 21 files changed, 496 insertions(+), 70 deletions(-) create mode 100644 apps/block_scout_web/lib/block_scout_web/controllers/address_read_proxy_controller.ex create mode 100644 apps/block_scout_web/lib/block_scout_web/templates/address_read_proxy/_metatags.html.eex create mode 100644 apps/block_scout_web/lib/block_scout_web/templates/address_read_proxy/index.html.eex create mode 100644 apps/block_scout_web/lib/block_scout_web/views/address_read_proxy_view.ex create mode 100644 apps/block_scout_web/test/block_scout_web/controllers/address_read_proxy_controller_test.exs create mode 100644 apps/block_scout_web/test/block_scout_web/views/address_read_proxy_view_test.exs diff --git a/CHANGELOG.md b/CHANGELOG.md index 57abc3c063..177901e0ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## Current ### Features +- [#3157](https://github.com/poanetwork/blockscout/pull/3157) - Read methods of implementation on proxy contract ### Fixes diff --git a/apps/block_scout_web/assets/js/lib/smart_contract/read_only_functions.js b/apps/block_scout_web/assets/js/lib/smart_contract/read_only_functions.js index b7e6c9316c..43b5b171d9 100644 --- a/apps/block_scout_web/assets/js/lib/smart_contract/read_only_functions.js +++ b/apps/block_scout_web/assets/js/lib/smart_contract/read_only_functions.js @@ -4,10 +4,11 @@ const loadFunctions = (element) => { const $element = $(element) const url = $element.data('url') const hash = $element.data('hash') + const type = $element.data('type') $.get( url, - { hash: hash }, + { hash: hash, type: type }, response => $element.html(response) ) .done(function () { diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_read_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_read_contract_controller.ex index 130debf038..2be5e2995a 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/address_read_contract_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_read_contract_controller.ex @@ -31,6 +31,7 @@ defmodule BlockScoutWeb.AddressReadContractController do conn, "index.html", address: address, + type: :regular, coin_balance_status: CoinBalanceOnDemand.trigger_fetch(address), exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null(), counters_path: address_path(conn, :address_counters, %{"id" => Address.checksum(address_hash)}) diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_read_proxy_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_read_proxy_controller.ex new file mode 100644 index 0000000000..1d0ed7aeae --- /dev/null +++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_read_proxy_controller.ex @@ -0,0 +1,38 @@ +# credo:disable-for-this-file +defmodule BlockScoutWeb.AddressReadProxyController do + use BlockScoutWeb, :controller + + alias Explorer.{Chain, Market} + alias Explorer.Chain.Address + alias Explorer.ExchangeRates.Token + alias Indexer.Fetcher.CoinBalanceOnDemand + + def index(conn, %{"address_id" => address_hash_string}) do + address_options = [ + necessity_by_association: %{ + :contracts_creation_internal_transaction => :optional, + :names => :optional, + :smart_contract => :optional, + :token => :optional, + :contracts_creation_transaction => :optional + } + ] + + with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), + {:ok, address} <- Chain.find_contract_address(address_hash, address_options, true), + false <- is_nil(address.smart_contract) do + render( + conn, + "index.html", + address: address, + type: :proxy, + coin_balance_status: CoinBalanceOnDemand.trigger_fetch(address), + exchange_rate: Market.get_exchange_rate(Explorer.coin()) || Token.null(), + counters_path: address_path(conn, :address_counters, %{"id" => Address.checksum(address_hash)}) + ) + else + _ -> + not_found(conn) + end + end +end diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/smart_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/smart_contract_controller.ex index 16b0122c5b..7facded61c 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/smart_contract_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/smart_contract_controller.ex @@ -4,11 +4,16 @@ defmodule BlockScoutWeb.SmartContractController do alias Explorer.Chain alias Explorer.SmartContract.Reader - def index(conn, %{"hash" => address_hash_string}) do + def index(conn, %{"hash" => address_hash_string, "type" => contract_type}) do with true <- ajax?(conn), {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string), {:ok, address} <- Chain.find_contract_address(address_hash) do - read_only_functions = Reader.read_only_functions(address_hash) + read_only_functions = + if contract_type == "proxy" do + Reader.read_only_functions_proxy(address_hash) + else + Reader.read_only_functions(address_hash) + end conn |> put_status(200) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address/_tabs.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address/_tabs.html.eex index b615035ac4..e872bf91e1 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/address/_tabs.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/address/_tabs.html.eex @@ -64,4 +64,11 @@ class: "card-tab #{tab_status("read_contract", @conn.request_path)}") %> <% end %> + <%= if smart_contract_is_proxy?(@address) do %> + <%= link( + gettext("Read Proxy"), + to: address_read_proxy_path(@conn, :index, @address.hash), + class: "card-tab #{tab_status("read_proxy", @conn.request_path)}") + %> + <% end %> diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_read_contract/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_read_contract/index.html.eex index 6ba9117e3e..1ad7f03c7a 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/address_read_contract/index.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/address_read_contract/index.html.eex @@ -5,7 +5,7 @@
    <%= render BlockScoutWeb.AddressView, "_tabs.html", assigns %> -
    +
    diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_read_contract/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_read_contract/index.html.eex index 1ad7f03c7a..9181602ffe 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/address_read_contract/index.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/address_read_contract/index.html.eex @@ -5,7 +5,7 @@
    <%= render BlockScoutWeb.AddressView, "_tabs.html", assigns %> -
    +
    • <% end %> + <%= if Application.get_env(:block_scout_web, :apps_menu) == true do %> +
  • + +
    + <%= for %{url: url, title: title} <- external_apps_list() do %> + <%= title %> + + <%= render BlockScoutWeb.IconsView, "_external_link.html" %> + + + <% end %> +
    +
    • + <% end %>
  • " href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> diff --git a/apps/block_scout_web/lib/block_scout_web/views/layout_view.ex b/apps/block_scout_web/lib/block_scout_web/views/layout_view.ex index 03dee8da28..ab3e02818b 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/layout_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/layout_view.ex @@ -216,6 +216,21 @@ defmodule BlockScoutWeb.LayoutView do end end + def external_apps_list do + if Application.get_env(:block_scout_web, :external_apps) do + try do + :block_scout_web + |> Application.get_env(:external_apps) + |> Parser.parse!(%{keys: :atoms!}) + rescue + _ -> + [] + end + else + [] + end + end + defp validate_url(url) when is_binary(url) do case URI.parse(url) do %URI{host: nil} -> :error diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot index c4a0a11936..904669752d 100644 --- a/apps/block_scout_web/priv/gettext/default.pot +++ b/apps/block_scout_web/priv/gettext/default.pot @@ -1258,14 +1258,14 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/index.html.eex:14 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:145 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:162 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:164 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:181 msgid "Search" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:139 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:143 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:158 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:162 msgid "Search by address, token symbol name, transaction hash, or block number" msgstr "" @@ -1946,3 +1946,8 @@ msgstr "" #: lib/block_scout_web/views/address_view.ex:350 msgid "Write Proxy" msgstr "" + +#, elixir-format +#: lib/block_scout_web/templates/layout/_topnav.html.eex:112 +msgid "Apps" +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 c4a0a11936..904669752d 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 @@ -1258,14 +1258,14 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/index.html.eex:14 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:145 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:162 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:164 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:181 msgid "Search" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:139 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:143 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:158 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:162 msgid "Search by address, token symbol name, transaction hash, or block number" msgstr "" @@ -1946,3 +1946,8 @@ msgstr "" #: lib/block_scout_web/views/address_view.ex:350 msgid "Write Proxy" msgstr "" + +#, elixir-format +#: lib/block_scout_web/templates/layout/_topnav.html.eex:112 +msgid "Apps" +msgstr "" From 05ff0494f7fd2a778abd3c9b841c023396d63c1f Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Mon, 6 Jul 2020 19:05:10 +0300 Subject: [PATCH 49/79] Add env vars to Docker setup --- docker/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docker/Makefile b/docker/Makefile index e25b1f8e33..54803b94f0 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -220,6 +220,12 @@ endif ifdef TXS_STATS_DAYS_TO_COMPILE_AT_INIT BLOCKSCOUT_CONTAINER_PARAMS += -e 'TXS_STATS_DAYS_TO_COMPILE_AT_INIT=$(TXS_STATS_DAYS_TO_COMPILE_AT_INIT)' endif +ifdef APPS_MENU + BLOCKSCOUT_CONTAINER_PARAMS += -e 'APPS_MENU=$(APPS_MENU)' +endif +ifdef EXTERNAL_APPS + BLOCKSCOUT_CONTAINER_PARAMS += -e 'EXTERNAL_APPS=$(EXTERNAL_APPS)' +endif HAS_BLOCKSCOUT_IMAGE := $(shell docker images | grep ${DOCKER_IMAGE}) build: From ac854e698905ba1184527d6ec89e7a244913ff1f Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Wed, 8 Jul 2020 16:52:53 +0300 Subject: [PATCH 50/79] Transaction page: decoding logs from called contracts --- .../templates/transaction_log/_logs.html.eex | 2 +- .../views/transaction_log_view.ex | 4 ++-- apps/explorer/lib/explorer/chain/log.ex | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex index 0d958b938c..df2380b666 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex @@ -1,5 +1,5 @@
    - <% decoded_result = decode(@log, @transaction) %> + <% decoded_result = decode(@log, @transaction, @log.address) %> <%= case decoded_result do %> <%= {:error, :contract_not_verified, _cadidates} -> %>
    diff --git a/apps/block_scout_web/lib/block_scout_web/views/transaction_log_view.ex b/apps/block_scout_web/lib/block_scout_web/views/transaction_log_view.ex index 50d406433c..762908ac18 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/transaction_log_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/transaction_log_view.ex @@ -4,7 +4,7 @@ defmodule BlockScoutWeb.TransactionLogView do alias Explorer.Chain.Log - def decode(log, transaction) do - Log.decode(log, transaction) + def decode(log, transaction, address) do + Log.decode(log, transaction, address) end end diff --git a/apps/explorer/lib/explorer/chain/log.ex b/apps/explorer/lib/explorer/chain/log.ex index 9592f0b2dd..063796f734 100644 --- a/apps/explorer/lib/explorer/chain/log.ex +++ b/apps/explorer/lib/explorer/chain/log.ex @@ -148,6 +148,25 @@ defmodule Explorer.Chain.Log do end end + def decode(log, transaction, %Address{hash: address_hash}) do + address_options = [ + necessity_by_association: %{ + :smart_contract => :optional + } + ] + + with {:ok, %{smart_contract: %{abi: abi}}} <- Chain.find_contract_address(address_hash, address_options, true) do + full_abi = Chain.combine_proxy_implementation_abi(address_hash, abi) + + with {:ok, selector, mapping} <- find_and_decode(full_abi, log, transaction), + identifier <- Base.encode16(selector.method_id, case: :lower), + text <- function_call(selector.function, mapping), + do: {:ok, identifier, text, mapping} + end + end + + def decode(_log, _transaction, nil), do: {:error, :no_to_address} + defp find_candidates(method_id, log, transaction) do candidates_query = from( From 2b65e1c671dd884e23727eb675336230073b7cc7 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Wed, 8 Jul 2020 17:12:26 +0300 Subject: [PATCH 51/79] Add HCANGELOG entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6708a78be3..f4a918d2ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - [#3184](https://github.com/poanetwork/blockscout/pull/3184) - Apps navbar menu item ### Fixes +- [#3185](https://github.com/poanetwork/blockscout/pull/3185) - Transaction page: decoding logs from nested contracts calls - [#3178](https://github.com/poanetwork/blockscout/pull/3178) - Fix permanent fetching tokens... when read/write proxy tab is active - [#3178](https://github.com/poanetwork/blockscout/pull/3178) - Fix unavailable navbar menu when read/write proxy tab is active From 20f3aab0cb4f94012a37c81a0017d019105e986a Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Thu, 9 Jul 2020 16:13:33 +0300 Subject: [PATCH 52/79] Address logs decoding fix --- .../templates/transaction_log/_logs.html.eex | 2 +- .../views/transaction_log_view.ex | 4 +- apps/explorer/lib/explorer/chain/log.ex | 51 ++++++++----------- .../explorer/test/explorer/chain/log_test.exs | 35 ++++++------- 4 files changed, 42 insertions(+), 50 deletions(-) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex index df2380b666..0d958b938c 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex @@ -1,5 +1,5 @@
    - <% decoded_result = decode(@log, @transaction, @log.address) %> + <% decoded_result = decode(@log, @transaction) %> <%= case decoded_result do %> <%= {:error, :contract_not_verified, _cadidates} -> %>
    diff --git a/apps/block_scout_web/lib/block_scout_web/views/transaction_log_view.ex b/apps/block_scout_web/lib/block_scout_web/views/transaction_log_view.ex index 762908ac18..50d406433c 100644 --- a/apps/block_scout_web/lib/block_scout_web/views/transaction_log_view.ex +++ b/apps/block_scout_web/lib/block_scout_web/views/transaction_log_view.ex @@ -4,7 +4,7 @@ defmodule BlockScoutWeb.TransactionLogView do alias Explorer.Chain.Log - def decode(log, transaction, address) do - Log.decode(log, transaction, address) + def decode(log, transaction) do + Log.decode(log, transaction) end end diff --git a/apps/explorer/lib/explorer/chain/log.ex b/apps/explorer/lib/explorer/chain/log.ex index 063796f734..7887fb0be0 100644 --- a/apps/explorer/lib/explorer/chain/log.ex +++ b/apps/explorer/lib/explorer/chain/log.ex @@ -119,25 +119,35 @@ defmodule Explorer.Chain.Log do @doc """ Decode transaction log data. """ - def decode(_log, %Transaction{to_address: nil}), do: {:error, :no_to_address} - def decode(log, transaction = %Transaction{to_address: %{smart_contract: %{abi: abi, address_hash: address_hash}}}) - when not is_nil(abi) do - full_abi = Chain.combine_proxy_implementation_abi(address_hash, abi) + def decode(log, transaction) do + address_options = [ + necessity_by_association: %{ + :smart_contract => :optional + } + ] - with {:ok, selector, mapping} <- find_and_decode(full_abi, log, transaction), - identifier <- Base.encode16(selector.method_id, case: :lower), - text <- function_call(selector.function, mapping), - do: {:ok, identifier, text, mapping} + case Chain.find_contract_address(log.address_hash, address_options, true) do + {:ok, %{smart_contract: %{abi: abi}}} -> + full_abi = Chain.combine_proxy_implementation_abi(log.address_hash, abi) + + with {:ok, selector, mapping} <- find_and_decode(full_abi, log, transaction), + identifier <- Base.encode16(selector.method_id, case: :lower), + text <- function_call(selector.function, mapping), + do: {:ok, identifier, text, mapping} + + _ -> + find_candidates(log, transaction) + end end - def decode(log, transaction) do + defp find_candidates(log, transaction) do case log.first_topic do "0x" <> hex_part -> case Integer.parse(hex_part, 16) do {number, ""} -> <> = :binary.encode_unsigned(number) - find_candidates(method_id, log, transaction) + find_candidates_query(method_id, log, transaction) _ -> {:error, :could_not_decode} @@ -148,26 +158,7 @@ defmodule Explorer.Chain.Log do end end - def decode(log, transaction, %Address{hash: address_hash}) do - address_options = [ - necessity_by_association: %{ - :smart_contract => :optional - } - ] - - with {:ok, %{smart_contract: %{abi: abi}}} <- Chain.find_contract_address(address_hash, address_options, true) do - full_abi = Chain.combine_proxy_implementation_abi(address_hash, abi) - - with {:ok, selector, mapping} <- find_and_decode(full_abi, log, transaction), - identifier <- Base.encode16(selector.method_id, case: :lower), - text <- function_call(selector.function, mapping), - do: {:ok, identifier, text, mapping} - end - end - - def decode(_log, _transaction, nil), do: {:error, :no_to_address} - - defp find_candidates(method_id, log, transaction) do + defp find_candidates_query(method_id, log, transaction) do candidates_query = from( contract_method in ContractMethod, diff --git a/apps/explorer/test/explorer/chain/log_test.exs b/apps/explorer/test/explorer/chain/log_test.exs index 3619476f6c..e0f0fa7c14 100644 --- a/apps/explorer/test/explorer/chain/log_test.exs +++ b/apps/explorer/test/explorer/chain/log_test.exs @@ -58,29 +58,29 @@ defmodule Explorer.Chain.LogTest do end test "that a contract call transaction that has a verified contract returns the decoded input data" do - smart_contract = - insert(:smart_contract, - abi: [ - %{ - "anonymous" => false, - "inputs" => [ - %{"indexed" => true, "name" => "_from_human", "type" => "string"}, - %{"indexed" => false, "name" => "_number", "type" => "uint256"}, - %{"indexed" => true, "name" => "_belly", "type" => "bool"} - ], - "name" => "WantsPets", - "type" => "event" - } - ] - ) + to_address = insert(:address, contract_code: "0x") + + insert(:smart_contract, + abi: [ + %{ + "anonymous" => false, + "inputs" => [ + %{"indexed" => true, "name" => "_from_human", "type" => "string"}, + %{"indexed" => false, "name" => "_number", "type" => "uint256"}, + %{"indexed" => true, "name" => "_belly", "type" => "bool"} + ], + "name" => "WantsPets", + "type" => "event" + } + ], + address_hash: to_address.hash + ) topic1 = "0x" <> Base.encode16(:keccakf1600.hash(:sha3_256, "WantsPets(string,uint256,bool)"), case: :lower) topic2 = "0x" <> Base.encode16(:keccakf1600.hash(:sha3_256, "bob"), case: :lower) topic3 = "0x0000000000000000000000000000000000000000000000000000000000000001" data = "0x0000000000000000000000000000000000000000000000000000000000000000" - to_address = insert(:address, smart_contract: smart_contract) - transaction = :transaction_to_verified_contract |> insert(to_address: to_address) @@ -88,6 +88,7 @@ defmodule Explorer.Chain.LogTest do log = insert(:log, + address: to_address, transaction: transaction, first_topic: topic1, second_topic: topic2, From de143d9bebf5c75c718e23e271c5dae1b15821c1 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Fri, 10 Jul 2020 12:06:23 +0300 Subject: [PATCH 53/79] Improve decode log/method view --- .../templates/transaction_log/_logs.html.eex | 25 ++++++++-------- apps/block_scout_web/priv/gettext/default.pot | 30 +++++++++---------- .../priv/gettext/en/LC_MESSAGES/default.po | 30 +++++++++---------- 3 files changed, 42 insertions(+), 43 deletions(-) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex index 0d958b938c..cd30449d7a 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex @@ -50,17 +50,19 @@
    - " class="table thead-light table-bordered"> +
    " class="table thead-light table-bordered"> - - - - + + + <%= for {name, type, indexed?, value} <- mapping do %> - + + + <% end %> @@ -194,4 +192,5 @@ + diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot index 904669752d..8f1016a187 100644 --- a/apps/block_scout_web/priv/gettext/default.pot +++ b/apps/block_scout_web/priv/gettext/default.pot @@ -451,8 +451,8 @@ msgstr "" #: lib/block_scout_web/templates/address_logs/_logs.html.eex:66 #: lib/block_scout_web/templates/address_logs/_logs.html.eex:119 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:31 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:69 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:122 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:71 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:120 msgid "Copy Value" msgstr "" @@ -482,9 +482,9 @@ msgstr "" #: lib/block_scout_web/templates/address_logs/_logs.html.eex:109 #: lib/block_scout_web/templates/address_logs/_logs.html.eex:175 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:21 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:59 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:112 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:179 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:58 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:110 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:177 msgid "Data" msgstr "" @@ -494,7 +494,7 @@ msgstr "" #: lib/block_scout_web/templates/address_logs/_logs.html.eex:90 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:32 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:40 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:93 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:91 msgid "Decoded" msgstr "" @@ -935,8 +935,8 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/_logs.html.eex:55 #: lib/block_scout_web/templates/address_logs/_logs.html.eex:108 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:58 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:111 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:57 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:109 msgid "Indexed?" msgstr "" @@ -1028,7 +1028,7 @@ msgstr "" #: lib/block_scout_web/templates/address_logs/_logs.html.eex:50 #: lib/block_scout_web/templates/address_logs/_logs.html.eex:103 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:53 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:106 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:104 msgid "Log Data" msgstr "" @@ -1094,8 +1094,8 @@ msgstr "" #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:52 #: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:59 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:19 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:56 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:109 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:55 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:107 msgid "Name" msgstr "" @@ -1456,7 +1456,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/_logs.html.eex:145 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:149 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:147 msgid "Topics" msgstr "" @@ -1516,8 +1516,8 @@ msgstr "" #: lib/block_scout_web/templates/address_logs/_logs.html.eex:54 #: lib/block_scout_web/templates/address_logs/_logs.html.eex:107 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:20 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:57 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:110 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:56 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:108 msgid "Type" msgstr "" @@ -1776,7 +1776,7 @@ msgid "Loading chart" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:189 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:187 msgid "Log Index" 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 904669752d..8f1016a187 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 @@ -451,8 +451,8 @@ msgstr "" #: lib/block_scout_web/templates/address_logs/_logs.html.eex:66 #: lib/block_scout_web/templates/address_logs/_logs.html.eex:119 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:31 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:69 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:122 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:71 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:120 msgid "Copy Value" msgstr "" @@ -482,9 +482,9 @@ msgstr "" #: lib/block_scout_web/templates/address_logs/_logs.html.eex:109 #: lib/block_scout_web/templates/address_logs/_logs.html.eex:175 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:21 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:59 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:112 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:179 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:58 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:110 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:177 msgid "Data" msgstr "" @@ -494,7 +494,7 @@ msgstr "" #: lib/block_scout_web/templates/address_logs/_logs.html.eex:90 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:32 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:40 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:93 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:91 msgid "Decoded" msgstr "" @@ -935,8 +935,8 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/_logs.html.eex:55 #: lib/block_scout_web/templates/address_logs/_logs.html.eex:108 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:58 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:111 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:57 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:109 msgid "Indexed?" msgstr "" @@ -1028,7 +1028,7 @@ msgstr "" #: lib/block_scout_web/templates/address_logs/_logs.html.eex:50 #: lib/block_scout_web/templates/address_logs/_logs.html.eex:103 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:53 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:106 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:104 msgid "Log Data" msgstr "" @@ -1094,8 +1094,8 @@ msgstr "" #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:52 #: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:59 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:19 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:56 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:109 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:55 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:107 msgid "Name" msgstr "" @@ -1456,7 +1456,7 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/_logs.html.eex:145 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:149 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:147 msgid "Topics" msgstr "" @@ -1516,8 +1516,8 @@ msgstr "" #: lib/block_scout_web/templates/address_logs/_logs.html.eex:54 #: lib/block_scout_web/templates/address_logs/_logs.html.eex:107 #: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:20 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:57 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:110 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:56 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:108 msgid "Type" msgstr "" @@ -1776,7 +1776,7 @@ msgid "Loading chart" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:189 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:187 msgid "Log Index" msgstr "" From 83c794b4e4324dbb14ae80127077d47ff6d8270b Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Fri, 10 Jul 2020 12:17:30 +0300 Subject: [PATCH 54/79] Add CHANGELOG entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f4a918d2ae..034605b333 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - [#3184](https://github.com/poanetwork/blockscout/pull/3184) - Apps navbar menu item ### Fixes +- [#3190](https://github.com/poanetwork/blockscout/pull/3190) - Contract log/method decoded view improvements: eliminate horizontal scroll, remove excess borders, whitespaces - [#3185](https://github.com/poanetwork/blockscout/pull/3185) - Transaction page: decoding logs from nested contracts calls - [#3178](https://github.com/poanetwork/blockscout/pull/3178) - Fix permanent fetching tokens... when read/write proxy tab is active - [#3178](https://github.com/poanetwork/blockscout/pull/3178) - Fix unavailable navbar menu when read/write proxy tab is active From 06e0232d619fc7601f75dc62a352902e84c6f88b Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Fri, 10 Jul 2020 13:27:46 +0300 Subject: [PATCH 55/79] Refine decoding view of contract method, log on transaction page, refactoring --- .../templates/address_logs/_logs.html.eex | 79 +------------------ .../templates/log/_data_decoded_view.html.eex | 37 +++++++++ .../transaction/_decoded_input_body.html.eex | 42 +++++----- .../templates/transaction_log/_logs.html.eex | 79 +------------------ .../lib/block_scout_web/views/log_view.ex | 3 + apps/block_scout_web/priv/gettext/default.pot | 54 +++++-------- .../priv/gettext/en/LC_MESSAGES/default.po | 54 +++++-------- 7 files changed, 100 insertions(+), 248 deletions(-) create mode 100644 apps/block_scout_web/lib/block_scout_web/templates/log/_data_decoded_view.html.eex create mode 100644 apps/block_scout_web/lib/block_scout_web/views/log_view.ex diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_logs/_logs.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_logs/_logs.html.eex index 945049ace6..870c61310b 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/address_logs/_logs.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/address_logs/_logs.html.eex @@ -46,45 +46,7 @@
    <%= gettext "Name" %><%= gettext "Type" %><%= gettext "Indexed?" %><%= gettext "Name" %><%= gettext "Type" %><%= gettext "Indexed?" %> <%= gettext "Data" %>
    + <%= name %><%= type %><%= indexed? %> <%= case BlockScoutWeb.ABIEncodedValueView.copy_text(type, value) do %> <% :error -> %> <%= nil %> @@ -71,18 +73,14 @@ data-clipboard-text="<%= copy_text %>" data-placement="top" data-toggle="tooltip" + style="float: left;height:20px" > - + <% end %> - - <%= name %> - <%= type %> - <%= indexed? %> - - 
    <%= BlockScoutWeb.ABIEncodedValueView.value_html(type, value) %>
    + 
    <%= BlockScoutWeb.ABIEncodedValueView.value_html(type, value) %>
    <%= text %>
    -
    - " class="table thead-light table-bordered"> - - - - - - - - <%= for {name, type, indexed?, value} <- mapping do %> - - - - - - - - <% end %> -
    <%= gettext "Name" %><%= gettext "Type" %><%= gettext "Indexed?" %><%= gettext "Data" %>
    - <%= case BlockScoutWeb.ABIEncodedValueView.copy_text(type, value) do %> - <% :error -> %> - <%= nil %> - <% copy_text -> %> - - - - - - <% end %> - <%= name %><%= type %><%= indexed? %> - 
    <%= BlockScoutWeb.ABIEncodedValueView.value_html(type, value) %>
    -
    -
    + <%= render BlockScoutWeb.LogView, "_data_decoded_view.html", mapping: mapping %> <% {:error, :contract_not_verified, results} -> %> <%= for {:ok, method_id, text, mapping} <- results do %>
    <%= gettext "Decoded" %>
    @@ -99,44 +61,7 @@ <%= text %> -
    - " class="table thead-light table-bordered"> - - - - - - - - <%= for {name, type, indexed?, value} <- mapping do %> - - - - - - - - <% end %> -
    <%= gettext "Name" %><%= gettext "Type" %><%= gettext "Indexed?" %><%= gettext "Data" %>
    - <%= case BlockScoutWeb.ABIEncodedValueView.copy_text(type, value) do %> - <% :error -> %> - <%= nil %> - <% copy_text -> %> - - - - - - <% end %> - <%= name %><%= type %><%= indexed? %> - 
    <%= BlockScoutWeb.ABIEncodedValueView.value_html(type, value) %>
    -
    + <%= render BlockScoutWeb.LogView, "_data_decoded_view.html", mapping: mapping %>
    <% end %> <% _ -> %> diff --git a/apps/block_scout_web/lib/block_scout_web/templates/log/_data_decoded_view.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/log/_data_decoded_view.html.eex new file mode 100644 index 0000000000..3c0fdaaa59 --- /dev/null +++ b/apps/block_scout_web/lib/block_scout_web/templates/log/_data_decoded_view.html.eex @@ -0,0 +1,37 @@ +
    + " class="table thead-light table-bordered"> + + + + + + + <%= for {name, type, indexed?, value} <- @mapping do %> + + + + + + + <% end %> +
    <%= gettext "Name" %><%= gettext "Type" %><%= gettext "Indexed?" %><%= gettext "Data" %>
    <%= name %><%= type %><%= indexed? %> + <%= case BlockScoutWeb.ABIEncodedValueView.copy_text(type, value) do %> + <% :error -> %> + <%= nil %> + <% copy_text -> %> + + + + + + <% end %> + 
    <%= BlockScoutWeb.ABIEncodedValueView.value_html(type, value) %>
    +
    +
    \ No newline at end of file diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex index 7f3b04aa86..0efca70238 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex @@ -15,41 +15,39 @@
    " class="table thead-light table-bordered"> - <%= for {name, type, value} <- @mapping do %> - - diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex index cd30449d7a..01b479e2bf 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex @@ -49,43 +49,7 @@
    <%= gettext "Name" %> <%= gettext "Type" %> <%= gettext "Data" %>
    - <%= case BlockScoutWeb.ABIEncodedValueView.copy_text(type, value) do %> - <% :error -> %> - <%= nil %> - <% copy_text -> %> - - - - - - <% end %> - <%= name %> <%= type %> + <%= case BlockScoutWeb.ABIEncodedValueView.value_html(type, value) do %> <% :error -> %>
    <%= gettext "Error rendering value" %>
    - <% value -> %> - 
    <%= value %>
    + <% _value -> %> + <%= case BlockScoutWeb.ABIEncodedValueView.copy_text(type, value) do %> + <% :error -> %> + <%= nil %> + <% copy_text -> %> + + + + + + <% end %> + 
    <%= BlockScoutWeb.ABIEncodedValueView.value_html(type, value) %>
    <% end %>
    <%= text %>
    -
    - " class="table thead-light table-bordered"> - - - - - - - <%= for {name, type, indexed?, value} <- mapping do %> - - - - - - - <% end %> -
    <%= gettext "Name" %><%= gettext "Type" %><%= gettext "Indexed?" %><%= gettext "Data" %>
    <%= name %><%= type %><%= indexed? %> - <%= case BlockScoutWeb.ABIEncodedValueView.copy_text(type, value) do %> - <% :error -> %> - <%= nil %> - <% copy_text -> %> - - - - - - <% end %> - 
    <%= BlockScoutWeb.ABIEncodedValueView.value_html(type, value) %>
    -
    -
    + <%= render BlockScoutWeb.LogView, "_data_decoded_view.html", mapping: mapping %> <% {:error, :contract_not_verified, results} -> %> <%= for {:ok, method_id, text, mapping} <- results do %>
    <%= gettext "Decoded" %>
    @@ -100,45 +64,7 @@ <%= text %> -
    - " class="table thead-light table-bordered"> - - - - - - - - <%= for {name, type, indexed?, value} <- mapping do %> - - - - - - - - <% end %> -
    <%= gettext "Name" %><%= gettext "Type" %><%= gettext "Indexed?" %><%= gettext "Data" %>
    - <%= case BlockScoutWeb.ABIEncodedValueView.copy_text(type, value) do %> - <% :error -> %> - <%= nil %> - <% copy_text -> %> - - - - - - <% end %> - <%= name %><%= type %><%= indexed? %> - 
    <%= BlockScoutWeb.ABIEncodedValueView.value_html(type, value) %>
    -
    -
    + <%= render BlockScoutWeb.LogView, "_data_decoded_view.html", mapping: mapping %> <% end %> <% _ -> %> <%= nil %> @@ -192,5 +118,4 @@
    -
    diff --git a/apps/block_scout_web/lib/block_scout_web/views/log_view.ex b/apps/block_scout_web/lib/block_scout_web/views/log_view.ex new file mode 100644 index 0000000000..fe12ba9cce --- /dev/null +++ b/apps/block_scout_web/lib/block_scout_web/views/log_view.ex @@ -0,0 +1,3 @@ +defmodule BlockScoutWeb.LogView do + use BlockScoutWeb, :view +end diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot index 8f1016a187..772a87c386 100644 --- a/apps/block_scout_web/priv/gettext/default.pot +++ b/apps/block_scout_web/priv/gettext/default.pot @@ -448,11 +448,8 @@ msgid "Difficulty" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:66 -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:119 -#: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:31 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:71 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:120 +#: lib/block_scout_web/templates/log/_data_decoded_view.html.eex:20 +#: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:38 msgid "Copy Value" msgstr "" @@ -478,23 +475,20 @@ msgid "Curl" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:56 -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:109 -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:175 -#: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:21 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:58 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:110 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:177 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:100 +#: lib/block_scout_web/templates/log/_data_decoded_view.html.eex:7 +#: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:20 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:103 msgid "Data" msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/_logs.html.eex:31 #: lib/block_scout_web/templates/address_logs/_logs.html.eex:37 -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:90 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:52 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:32 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:40 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:91 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:55 msgid "Decoded" msgstr "" @@ -605,7 +599,7 @@ msgid "Enter the Solidity Contract Code" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:49 +#: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:30 msgid "Error rendering value" msgstr "" @@ -933,10 +927,7 @@ msgid "If you have just submitted this transaction please wait for at least 30 s msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:55 -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:108 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:57 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:109 +#: lib/block_scout_web/templates/log/_data_decoded_view.html.eex:6 msgid "Indexed?" msgstr "" @@ -1025,10 +1016,7 @@ msgid "Loading...." msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:50 -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:103 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:53 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:104 +#: lib/block_scout_web/templates/log/_data_decoded_view.html.eex:2 msgid "Log Data" msgstr "" @@ -1089,13 +1077,10 @@ msgid "Must be set to:" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:53 -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:106 #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:52 #: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:59 -#: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:19 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:55 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:107 +#: lib/block_scout_web/templates/log/_data_decoded_view.html.eex:4 +#: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:18 msgid "Name" msgstr "" @@ -1455,8 +1440,8 @@ msgid "Topic" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:145 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:147 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:70 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:73 msgid "Topics" msgstr "" @@ -1513,11 +1498,8 @@ msgid "Twitter" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:54 -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:107 -#: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:20 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:56 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:108 +#: lib/block_scout_web/templates/log/_data_decoded_view.html.eex:5 +#: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:19 msgid "Type" msgstr "" @@ -1776,7 +1758,7 @@ msgid "Loading chart" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:187 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:113 msgid "Log Index" 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 8f1016a187..772a87c386 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 @@ -448,11 +448,8 @@ msgid "Difficulty" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:66 -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:119 -#: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:31 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:71 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:120 +#: lib/block_scout_web/templates/log/_data_decoded_view.html.eex:20 +#: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:38 msgid "Copy Value" msgstr "" @@ -478,23 +475,20 @@ msgid "Curl" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:56 -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:109 -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:175 -#: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:21 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:58 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:110 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:177 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:100 +#: lib/block_scout_web/templates/log/_data_decoded_view.html.eex:7 +#: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:20 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:103 msgid "Data" msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/_logs.html.eex:31 #: lib/block_scout_web/templates/address_logs/_logs.html.eex:37 -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:90 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:52 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:32 #: lib/block_scout_web/templates/transaction_log/_logs.html.eex:40 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:91 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:55 msgid "Decoded" msgstr "" @@ -605,7 +599,7 @@ msgid "Enter the Solidity Contract Code" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:49 +#: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:30 msgid "Error rendering value" msgstr "" @@ -933,10 +927,7 @@ msgid "If you have just submitted this transaction please wait for at least 30 s msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:55 -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:108 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:57 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:109 +#: lib/block_scout_web/templates/log/_data_decoded_view.html.eex:6 msgid "Indexed?" msgstr "" @@ -1025,10 +1016,7 @@ msgid "Loading...." msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:50 -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:103 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:53 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:104 +#: lib/block_scout_web/templates/log/_data_decoded_view.html.eex:2 msgid "Log Data" msgstr "" @@ -1089,13 +1077,10 @@ msgid "Must be set to:" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:53 -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:106 #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:52 #: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:59 -#: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:19 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:55 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:107 +#: lib/block_scout_web/templates/log/_data_decoded_view.html.eex:4 +#: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:18 msgid "Name" msgstr "" @@ -1455,8 +1440,8 @@ msgid "Topic" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:145 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:147 +#: lib/block_scout_web/templates/address_logs/_logs.html.eex:70 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:73 msgid "Topics" msgstr "" @@ -1513,11 +1498,8 @@ msgid "Twitter" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:54 -#: lib/block_scout_web/templates/address_logs/_logs.html.eex:107 -#: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:20 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:56 -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:108 +#: lib/block_scout_web/templates/log/_data_decoded_view.html.eex:5 +#: lib/block_scout_web/templates/transaction/_decoded_input_body.html.eex:19 msgid "Type" msgstr "" @@ -1776,7 +1758,7 @@ msgid "Loading chart" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:187 +#: lib/block_scout_web/templates/transaction_log/_logs.html.eex:113 msgid "Log Index" msgstr "" From 3c4a1e1ccff57e79c8c01d085dc240ba26712bd3 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Mon, 13 Jul 2020 17:27:46 +0300 Subject: [PATCH 56/79] Handle empty block author reward --- apps/indexer/lib/indexer/block/fetcher.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/indexer/lib/indexer/block/fetcher.ex b/apps/indexer/lib/indexer/block/fetcher.ex index 1792b941ea..40ed68c6f6 100644 --- a/apps/indexer/lib/indexer/block/fetcher.ex +++ b/apps/indexer/lib/indexer/block/fetcher.ex @@ -434,7 +434,7 @@ defmodule Indexer.Block.Fetcher do {:ok, beneficiary_address} = Chain.string_to_address_hash(beneficiary.address_hash) "0x" <> minted_hex = beneficiary.reward - {minted, _} = Integer.parse(minted_hex, 16) + {minted, _} = if minted_hex == "", do: {0, ""}, else: Integer.parse(minted_hex, 16) if block_miner_payout_address && beneficiary_address.bytes == block_miner_payout_address.bytes do gas_payment = gas_payment(beneficiary, transactions_by_block_number) From eb56871768872750fe2614ca81beb01800b8ab80 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Mon, 13 Jul 2020 17:53:50 +0300 Subject: [PATCH 57/79] Fix non-interactive navbar at not found page --- .../lib/block_scout_web/templates/transaction/not_found.html.eex | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction/not_found.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction/not_found.html.eex index c34d84824a..97f721ec05 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/transaction/not_found.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction/not_found.html.eex @@ -30,4 +30,5 @@     <%= gettext("Back Home") %>
    + \ No newline at end of file From 47a9eda847aa30dbeb86bd6e5aca1c21b14baca6 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Mon, 13 Jul 2020 17:59:42 +0300 Subject: [PATCH 58/79] Add CHANGELOG entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b0517efbe..e044d4dcee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - [#3145](https://github.com/poanetwork/blockscout/pull/3145) - Pending txs per address API endpoint ### Fixes +- [#3192](https://github.com/poanetwork/blockscout/pull/3192) - Dropdown menu doesn't open at "not found" page - [#3190](https://github.com/poanetwork/blockscout/pull/3190) - Contract log/method decoded view improvements: eliminate horizontal scroll, remove excess borders, whitespaces - [#3185](https://github.com/poanetwork/blockscout/pull/3185) - Transaction page: decoding logs from nested contracts calls - [#3178](https://github.com/poanetwork/blockscout/pull/3178) - Fix permanent fetching tokens... when read/write proxy tab is active From f989004544f0935be3f836be026c1e70fb46628b Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Mon, 13 Jul 2020 23:31:47 +0300 Subject: [PATCH 59/79] Raw trace copy button --- .../transaction_raw_trace/index.html.eex | 17 ++++++++++++++++- apps/block_scout_web/priv/gettext/default.pot | 5 +++++ .../priv/gettext/en/LC_MESSAGES/default.po | 5 +++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction_raw_trace/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction_raw_trace/index.html.eex index 0d973adf5d..0c0f265405 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/transaction_raw_trace/index.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction_raw_trace/index.html.eex @@ -4,7 +4,22 @@
    <%= render BlockScoutWeb.TransactionView, "_tabs.html", assigns %>
    -

    <%= gettext "Raw Trace" %>

    +

    <%= gettext "Raw Trace" %> + + + + + +

    <%= if Enum.count(@internal_transactions) > 0 do %> 
    <%= for {line, number} <- raw_traces_with_lines(@internal_transactions) do %>
    <%= line %>
    <% end %>
    <% else %> diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot index 772a87c386..2f43e29128 100644 --- a/apps/block_scout_web/priv/gettext/default.pot +++ b/apps/block_scout_web/priv/gettext/default.pot @@ -1933,3 +1933,8 @@ msgstr "" #: lib/block_scout_web/templates/layout/_topnav.html.eex:112 msgid "Apps" msgstr "" + +#, elixir-format +#: lib/block_scout_web/templates/transaction_raw_trace/index.html.eex:15 +msgid "Copy Raw Trace" +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 772a87c386..0a0fb4c0f3 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 @@ -1933,3 +1933,8 @@ msgstr "" #: lib/block_scout_web/templates/layout/_topnav.html.eex:112 msgid "Apps" msgstr "" + +#, elixir-format, fuzzy +#: lib/block_scout_web/templates/transaction_raw_trace/index.html.eex:15 +msgid "Copy Raw Trace" +msgstr "" From 367882b1bc0c9cb9f4194d52c748ec1787af21c7 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Mon, 13 Jul 2020 23:33:42 +0300 Subject: [PATCH 60/79] Add CHANGELOG entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e044d4dcee..35a3e103f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## Current ### Features +- [#3193](https://github.com/poanetwork/blockscout/pull/3193) - Raw trace copy button - [#3184](https://github.com/poanetwork/blockscout/pull/3184) - Apps navbar menu item - [#3145](https://github.com/poanetwork/blockscout/pull/3145) - Pending txs per address API endpoint From a053ef94e0b4fecf89fae188eeb1d0514cc01713 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Mon, 13 Jul 2020 23:54:15 +0300 Subject: [PATCH 61/79] Update npm deps --- apps/block_scout_web/assets/package-lock.json | 6 +++--- apps/block_scout_web/assets/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json index f7e09418ae..eddfdd0d74 100644 --- a/apps/block_scout_web/assets/package-lock.json +++ b/apps/block_scout_web/assets/package-lock.json @@ -8906,9 +8906,9 @@ } }, "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" + "version": "4.17.19", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", + "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==" }, "lodash.memoize": { "version": "4.1.2", diff --git a/apps/block_scout_web/assets/package.json b/apps/block_scout_web/assets/package.json index 47b990f54b..a4804472e3 100644 --- a/apps/block_scout_web/assets/package.json +++ b/apps/block_scout_web/assets/package.json @@ -30,7 +30,7 @@ "highlightjs-solidity": "^1.0.8", "humps": "^2.0.1", "jquery": "^3.4.0", - "lodash": "^4.17.15", + "lodash": "^4.17.19", "moment": "^2.24.0", "nanomorph": "^5.4.0", "numeral": "^2.0.6", From 3382fb43a1d95d76c4bc30042954999ba710fdab Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Mon, 13 Jul 2020 23:55:19 +0300 Subject: [PATCH 62/79] Update node version in Circle CI config --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0c3c342019..b501855677 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -233,7 +233,7 @@ jobs: eslint: docker: # Ensure .tool-versions matches - - image: circleci/node:12.16.1-browsers-legacy + - image: circleci/node:12.18.2-browsers-legacy working_directory: ~/app @@ -275,7 +275,7 @@ jobs: jest: docker: # Ensure .tool-versions matches - - image: circleci/node:12.16.1-browsers-legacy + - image: circleci/node:12.18.2-browsers-legacy working_directory: ~/app From 0a0bd31abce48828ab8cbd9285dbb098c31cd42f Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Thu, 16 Jul 2020 00:02:43 +0300 Subject: [PATCH 63/79] Show compilation error at conntract verification --- .dialyzer-ignore | 1 + CHANGELOG.md | 1 + .../lib/explorer/chain/smart_contract.ex | 35 +++++++++++-------- .../lib/explorer/smart_contract/publisher.ex | 10 ++++-- .../smart_contract/solidity/code_compiler.ex | 4 ++- .../lib/explorer/smart_contract/verifier.ex | 10 +++++- 6 files changed, 42 insertions(+), 19 deletions(-) diff --git a/.dialyzer-ignore b/.dialyzer-ignore index 527272ec2d..79554ff44f 100644 --- a/.dialyzer-ignore +++ b/.dialyzer-ignore @@ -6,6 +6,7 @@ apps/ethereum_jsonrpc/lib/ethereum_jsonrpc.ex:400: Function timestamp_to_datetim lib/explorer/repo/prometheus_logger.ex:8 lib/block_scout_web/views/layout_view.ex:175 lib/explorer/smart_contract/publisher_worker.ex:6 +lib/explorer/smart_contract/verifier.ex:82 apps/explorer/lib/explorer/repo/prometheus_logger.ex:8: Function microseconds_time/1 has no local return apps/explorer/lib/explorer/repo/prometheus_logger.ex:8: The call 'Elixir.System':convert_time_unit(__@1::any(),'native','microseconds') breaks the contract (integer(),time_unit() | 'native',time_unit() | 'native') -> integer() lib/block_scout_web/views/layout_view.ex:172: The call 'Elixir.Poison.Parser':'parse!'(any(),#{'keys':='atoms!'}) will never return since the success typing is (binary() | maybe_improper_list(binary() | maybe_improper_list(any(),binary() | []) | byte(),binary() | []),[{atom(),_}]) -> 'false' | 'nil' | 'true' | binary() | ['false' | 'nil' | 'true' | binary() | [any()] | number() | map()] | number() | map() and the contract is (iodata(),'Elixir.Keyword':t()) -> t() diff --git a/CHANGELOG.md b/CHANGELOG.md index 35a3e103f0..016b8234a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## Current ### Features +- [#3199](https://github.com/poanetwork/blockscout/pull/3199) - Show compilation error at contract verification - [#3193](https://github.com/poanetwork/blockscout/pull/3193) - Raw trace copy button - [#3184](https://github.com/poanetwork/blockscout/pull/3184) - Apps navbar menu item - [#3145](https://github.com/poanetwork/blockscout/pull/3145) - Pending txs per address API endpoint diff --git a/apps/explorer/lib/explorer/chain/smart_contract.ex b/apps/explorer/lib/explorer/chain/smart_contract.ex index 9d4c03134a..72c2d78b2b 100644 --- a/apps/explorer/lib/explorer/chain/smart_contract.ex +++ b/apps/explorer/lib/explorer/chain/smart_contract.ex @@ -255,20 +255,26 @@ defmodule Explorer.Chain.SmartContract do |> prepare_changes(&upsert_contract_methods/1) end - def invalid_contract_changeset(%__MODULE__{} = smart_contract, attrs, error) do - smart_contract - |> cast(attrs, [ - :name, - :compiler_version, - :optimization, - :contract_source_code, - :address_hash, - :evm_version, - :optimization_runs, - :constructor_arguments - ]) - |> validate_required([:name, :compiler_version, :optimization, :address_hash]) - |> add_error(:contract_source_code, error_message(error)) + def invalid_contract_changeset(%__MODULE__{} = smart_contract, attrs, error, error_message) do + validated = + smart_contract + |> cast(attrs, [ + :name, + :compiler_version, + :optimization, + :contract_source_code, + :address_hash, + :evm_version, + :optimization_runs, + :constructor_arguments + ]) + |> validate_required([:name, :compiler_version, :optimization, :address_hash]) + + if error_message do + add_error(validated, :contract_source_code, error_message(error, error_message)) + else + add_error(validated, :contract_source_code, error_message(error)) + end end def add_submitted_comment(code, inserted_at) when is_binary(code) do @@ -331,4 +337,5 @@ defmodule Explorer.Chain.SmartContract do defp error_message(:constructor_arguments), do: "Constructor arguments do not match, please try again." defp error_message(:name), do: "Wrong contract name, please try again." defp error_message(_), do: "There was an error validating your contract, please try again." + defp error_message(:compilation, error_message), do: "There was an error compiling your contract: #{error_message}" end diff --git a/apps/explorer/lib/explorer/smart_contract/publisher.ex b/apps/explorer/lib/explorer/smart_contract/publisher.ex index 28769d2604..24c51b2d24 100644 --- a/apps/explorer/lib/explorer/smart_contract/publisher.ex +++ b/apps/explorer/lib/explorer/smart_contract/publisher.ex @@ -37,7 +37,10 @@ defmodule Explorer.SmartContract.Publisher do publish_smart_contract(address_hash, params_with_external_libaries, abi) {:error, error} -> - {:error, unverified_smart_contract(address_hash, params_with_external_libaries, error)} + {:error, unverified_smart_contract(address_hash, params_with_external_libaries, error, nil)} + + {:error, error, error_message} -> + {:error, unverified_smart_contract(address_hash, params_with_external_libaries, error, error_message)} end end @@ -47,14 +50,15 @@ defmodule Explorer.SmartContract.Publisher do Chain.create_smart_contract(attrs, attrs.external_libraries) end - defp unverified_smart_contract(address_hash, params, error) do + defp unverified_smart_contract(address_hash, params, error, error_message) do attrs = attributes(address_hash, params) changeset = SmartContract.invalid_contract_changeset( %SmartContract{address_hash: address_hash}, attrs, - error + error, + error_message ) %{changeset | action: :insert} diff --git a/apps/explorer/lib/explorer/smart_contract/solidity/code_compiler.ex b/apps/explorer/lib/explorer/smart_contract/solidity/code_compiler.ex index 3b83cafed6..4e72e8a5de 100644 --- a/apps/explorer/lib/explorer/smart_contract/solidity/code_compiler.ex +++ b/apps/explorer/lib/explorer/smart_contract/solidity/code_compiler.ex @@ -116,7 +116,9 @@ defmodule Explorer.SmartContract.Solidity.CodeCompiler do error -> error = parse_error(error) Logger.warn(["There was an error compiling a provided contract: ", inspect(error)]) - {:error, :compilation} + {:error, [first_error | _]} = error + %{"message" => error_message} = first_error + {:error, :compilation, error_message} end else {:error, :compilation} diff --git a/apps/explorer/lib/explorer/smart_contract/verifier.ex b/apps/explorer/lib/explorer/smart_contract/verifier.ex index 439f8f9757..ecb32fd588 100644 --- a/apps/explorer/lib/explorer/smart_contract/verifier.ex +++ b/apps/explorer/lib/explorer/smart_contract/verifier.ex @@ -28,7 +28,11 @@ defmodule Explorer.SmartContract.Verifier do latest_evm_version = List.last(CodeCompiler.allowed_evm_versions()) evm_version = Map.get(params, "evm_version", latest_evm_version) - Enum.reduce([evm_version | previous_evm_versions(evm_version)], false, fn version, acc -> + all_versions = [evm_version | previous_evm_versions(evm_version)] + + all_versions_extra = all_versions ++ [evm_version] + + Enum.reduce(all_versions_extra, false, fn version, acc -> case acc do {:ok, _} = result -> result @@ -75,6 +79,10 @@ defmodule Explorer.SmartContract.Verifier do defp compare_bytecodes({:error, :name}, _, _, _, _, _), do: {:error, :name} defp compare_bytecodes({:error, _}, _, _, _, _, _), do: {:error, :compilation} + defp compare_bytecodes({:error, _, error_message}, _, _, _, _, _) do + {:error, :compilation, error_message} + end + # credo:disable-for-next-line /Complexity/ defp compare_bytecodes( {:ok, %{"abi" => abi, "bytecode" => bytecode}}, From dc4c404faeded73cbccc41b9c9428138fd48846c Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Thu, 16 Jul 2020 18:58:25 +0300 Subject: [PATCH 64/79] Connect to Metamask button --- CHANGELOG.md | 1 + .../assets/js/lib/smart_contract/functions.js | 14 ++++++++- .../assets/js/lib/smart_contract/write.js | 29 +++++++++++++++++-- .../controllers/smart_contract_controller.ex | 3 +- .../smart_contract/_functions.html.eex | 3 ++ apps/block_scout_web/priv/gettext/default.pot | 10 +++---- .../priv/gettext/en/LC_MESSAGES/default.po | 12 ++++---- 7 files changed, 57 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 016b8234a9..fb89d9329c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - [#3145](https://github.com/poanetwork/blockscout/pull/3145) - Pending txs per address API endpoint ### Fixes +- [#3201](https://github.com/poanetwork/blockscout/pull/3201) - Connect to Metamask button - [#3192](https://github.com/poanetwork/blockscout/pull/3192) - Dropdown menu doesn't open at "not found" page - [#3190](https://github.com/poanetwork/blockscout/pull/3190) - Contract log/method decoded view improvements: eliminate horizontal scroll, remove excess borders, whitespaces - [#3185](https://github.com/poanetwork/blockscout/pull/3185) - Transaction page: decoding logs from nested contracts calls diff --git a/apps/block_scout_web/assets/js/lib/smart_contract/functions.js b/apps/block_scout_web/assets/js/lib/smart_contract/functions.js index fc168d04f9..245b23183d 100644 --- a/apps/block_scout_web/assets/js/lib/smart_contract/functions.js +++ b/apps/block_scout_web/assets/js/lib/smart_contract/functions.js @@ -1,6 +1,6 @@ import $ from 'jquery' import ethNetProps from 'eth-net-props' -import { walletEnabled, getCurrentAccount } from './write.js' +import { walletEnabled, connectToWallet, getCurrentAccount, hideConnectButton } from './write.js' import { openErrorModal, openWarningModal, openSuccessModal, openModalWithMessage } from '../modals.js' import '../../pages/address' @@ -19,6 +19,18 @@ const loadFunctions = (element) => { response => $element.html(response) ) .done(function () { + const $connect = $('[connect-metamask]') + + if (hideConnectButton()) { + $connect.addClass('hidden') + } else { + $connect.removeClass('hidden') + } + + $connect.on('click', () => { + connectToWallet() + }) + $('[data-function]').each((_, element) => { readWriteFunction(element) }) diff --git a/apps/block_scout_web/assets/js/lib/smart_contract/write.js b/apps/block_scout_web/assets/js/lib/smart_contract/write.js index bb0c709eda..c74b2a0bc4 100644 --- a/apps/block_scout_web/assets/js/lib/smart_contract/write.js +++ b/apps/block_scout_web/assets/js/lib/smart_contract/write.js @@ -3,10 +3,10 @@ import Web3 from 'web3' export const walletEnabled = () => { if (window.ethereum) { window.web3 = new Web3(window.ethereum) - if (window.ethereum._state && window.ethereum._state.isUnlocked) { // Nifty Wallet + if (window.ethereum.isUnlocked && window.ethereum.isNiftyWallet) { // Nifty Wallet window.web3 = new Web3(window.web3.currentProvider) return Promise.resolve(true) - } else if (window.ethereum._state && window.ethereum._state.isUnlocked === false) { // Nifty Wallet + } else if (window.ethereum.isUnlocked === false && window.ethereum.isNiftyWallet) { // Nifty Wallet return Promise.resolve(false) } else { window.ethereum.enable() @@ -21,9 +21,34 @@ export const walletEnabled = () => { } } +export const connectToWallet = () => { + if (window.ethereum) { + window.ethereum.enable() + } +} + export const getCurrentAccount = async () => { const accounts = await window.web3.eth.getAccounts() const account = accounts[0] ? accounts[0].toLowerCase() : null return account } + +export const hideConnectButton = () => { + if (window.ethereum) { + window.web3 = new Web3(window.ethereum) + if (window.ethereum.isNiftyWallet) { + return true + } else if (window.ethereum.isMetaMask) { + if (window.ethereum.selectedAddress) { + return true + } else { + return false + } + } else { + return true + } + } else { + return false + } +} diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/smart_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/smart_contract_controller.ex index 142005e8b6..8496b4117a 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/smart_contract_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/smart_contract_controller.ex @@ -58,7 +58,8 @@ defmodule BlockScoutWeb.SmartContractController do contract_abi: contract_abi, implementation_address: implementation_address_hash_string, implementation_abi: implementation_abi, - contract_type: contract_type + contract_type: contract_type, + action: action ) else :error -> diff --git a/apps/block_scout_web/lib/block_scout_web/templates/smart_contract/_functions.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/smart_contract/_functions.html.eex index 41c993cc29..a947312ab5 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/smart_contract/_functions.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/smart_contract/_functions.html.eex @@ -1,3 +1,6 @@ +<%= if @action== "write" do %> + +<% end %> <%= if @contract_type == "proxy" do %>

    Implementation address:

    <%= link( diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot index 2f43e29128..12ef88e1a0 100644 --- a/apps/block_scout_web/priv/gettext/default.pot +++ b/apps/block_scout_web/priv/gettext/default.pot @@ -562,8 +562,8 @@ msgid "ERC-721 " msgstr "" #, elixir-format -#: lib/block_scout_web/templates/smart_contract/_functions.html.eex:40 -#: lib/block_scout_web/templates/smart_contract/_functions.html.eex:75 +#: lib/block_scout_web/templates/smart_contract/_functions.html.eex:43 +#: lib/block_scout_web/templates/smart_contract/_functions.html.eex:78 msgid "ETH" msgstr "" @@ -1180,7 +1180,7 @@ msgid "QR Code" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/smart_contract/_functions.html.eex:44 +#: lib/block_scout_web/templates/smart_contract/_functions.html.eex:47 msgid "Query" msgstr "" @@ -1631,7 +1631,7 @@ msgid "View transaction %{transaction} on %{subnetwork}" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/smart_contract/_functions.html.eex:74 +#: lib/block_scout_web/templates/smart_contract/_functions.html.eex:77 msgid "WEI" msgstr "" @@ -1919,7 +1919,7 @@ msgid "Waiting for transaction's confirmation..." msgstr "" #, elixir-format -#: lib/block_scout_web/templates/smart_contract/_functions.html.eex:44 +#: lib/block_scout_web/templates/smart_contract/_functions.html.eex:47 msgid "Write" 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 0a0fb4c0f3..12ef88e1a0 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 @@ -562,8 +562,8 @@ msgid "ERC-721 " msgstr "" #, elixir-format -#: lib/block_scout_web/templates/smart_contract/_functions.html.eex:40 -#: lib/block_scout_web/templates/smart_contract/_functions.html.eex:75 +#: lib/block_scout_web/templates/smart_contract/_functions.html.eex:43 +#: lib/block_scout_web/templates/smart_contract/_functions.html.eex:78 msgid "ETH" msgstr "" @@ -1180,7 +1180,7 @@ msgid "QR Code" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/smart_contract/_functions.html.eex:44 +#: lib/block_scout_web/templates/smart_contract/_functions.html.eex:47 msgid "Query" msgstr "" @@ -1631,7 +1631,7 @@ msgid "View transaction %{transaction} on %{subnetwork}" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/smart_contract/_functions.html.eex:74 +#: lib/block_scout_web/templates/smart_contract/_functions.html.eex:77 msgid "WEI" msgstr "" @@ -1919,7 +1919,7 @@ msgid "Waiting for transaction's confirmation..." msgstr "" #, elixir-format -#: lib/block_scout_web/templates/smart_contract/_functions.html.eex:44 +#: lib/block_scout_web/templates/smart_contract/_functions.html.eex:47 msgid "Write" msgstr "" @@ -1934,7 +1934,7 @@ msgstr "" msgid "Apps" msgstr "" -#, elixir-format, fuzzy +#, elixir-format #: lib/block_scout_web/templates/transaction_raw_trace/index.html.eex:15 msgid "Copy Raw Trace" msgstr "" From dcb474ebe08aec23160f25e5f435a41890acfbaa Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Fri, 17 Jul 2020 14:54:54 +0300 Subject: [PATCH 65/79] Add top marging for implementation address container --- apps/block_scout_web/assets/css/components/_card.scss | 4 ++++ .../templates/smart_contract/_functions.html.eex | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/block_scout_web/assets/css/components/_card.scss b/apps/block_scout_web/assets/css/components/_card.scss index e25d436cdd..0896bb403d 100644 --- a/apps/block_scout_web/assets/css/components/_card.scss +++ b/apps/block_scout_web/assets/css/components/_card.scss @@ -258,6 +258,10 @@ $card-tab-icon-color-active: #fff !default; } } +.implementation-container { + margin-top: 10px; +} + .implementation-title { float: left; margin-right: 5px; diff --git a/apps/block_scout_web/lib/block_scout_web/templates/smart_contract/_functions.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/smart_contract/_functions.html.eex index a947312ab5..be83b63ca1 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/smart_contract/_functions.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/smart_contract/_functions.html.eex @@ -2,7 +2,7 @@ <% end %> <%= if @contract_type == "proxy" do %> -
    +

    Implementation address:

    <%= link( @implementation_address, to: address_path(@conn, :show, @implementation_address) From 406a6003fae609912999123de0b8a9be41910904 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Fri, 17 Jul 2020 17:18:31 +0300 Subject: [PATCH 66/79] Fix verification with experimental features enabled --- .../lib/explorer/smart_contract/verifier.ex | 102 ++++++++++ .../verifier/constructor_arguments.ex | 178 ++++++++++++++++++ 2 files changed, 280 insertions(+) diff --git a/apps/explorer/lib/explorer/smart_contract/verifier.ex b/apps/explorer/lib/explorer/smart_contract/verifier.ex index ecb32fd588..6092a39c87 100644 --- a/apps/explorer/lib/explorer/smart_contract/verifier.ex +++ b/apps/explorer/lib/explorer/smart_contract/verifier.ex @@ -15,8 +15,10 @@ defmodule Explorer.SmartContract.Verifier do @metadata_hash_prefix_0_4_23 "a165627a7a72305820" @metadata_hash_prefix_0_5_10 "a265627a7a72305820" @metadata_hash_prefix_0_5_11 "a265627a7a72315820" + @metadata_hash_prefix_0_5_16 "a365627a7a72315820" @metadata_hash_prefix_0_6_0 "a264697066735822" + @experimental "6c6578706572696d656e74616cf5" @metadata_hash_common_suffix "64736f6c63" def evaluate_authenticity(_, %{"name" => ""}), do: {:error, :name} @@ -230,6 +232,20 @@ defmodule Explorer.SmartContract.Verifier do @metadata_hash_prefix_0_5_11 <> <> <> + @experimental <> + @metadata_hash_common_suffix <> + "43" <> <> <> "0032" <> _constructor_arguments -> + do_extract_bytecode_and_metadata_hash_output(metadata_hash, extracted, compiler_version) + + @metadata_hash_prefix_0_5_11 <> + <> <> + @metadata_hash_common_suffix <> + "7826" <> <> <> "0057" <> _constructor_arguments -> + do_extract_bytecode_and_metadata_hash_output(metadata_hash, extracted, compiler_version) + + @metadata_hash_prefix_0_5_11 <> + <> <> + @experimental <> @metadata_hash_common_suffix <> "7826" <> <> <> "0057" <> _constructor_arguments -> do_extract_bytecode_and_metadata_hash_output(metadata_hash, extracted, compiler_version) @@ -242,6 +258,20 @@ defmodule Explorer.SmartContract.Verifier do @metadata_hash_prefix_0_5_11 <> <> <> + @experimental <> + @metadata_hash_common_suffix <> + "7827" <> <> <> "0057" <> _constructor_arguments -> + do_extract_bytecode_and_metadata_hash_output(metadata_hash, extracted, compiler_version) + + @metadata_hash_prefix_0_5_11 <> + <> <> + @metadata_hash_common_suffix <> + "7828" <> <> <> "0058" <> _constructor_arguments -> + do_extract_bytecode_and_metadata_hash_output(metadata_hash, extracted, compiler_version) + + @metadata_hash_prefix_0_5_11 <> + <> <> + @experimental <> @metadata_hash_common_suffix <> "7828" <> <> <> "0058" <> _constructor_arguments -> do_extract_bytecode_and_metadata_hash_output(metadata_hash, extracted, compiler_version) @@ -252,6 +282,78 @@ defmodule Explorer.SmartContract.Verifier do "7829" <> <> <> "0059" <> _constructor_arguments -> do_extract_bytecode_and_metadata_hash_output(metadata_hash, extracted, compiler_version) + @metadata_hash_prefix_0_5_11 <> + <> <> + @experimental <> + @metadata_hash_common_suffix <> + "7829" <> <> <> "0059" <> _constructor_arguments -> + do_extract_bytecode_and_metadata_hash_output(metadata_hash, extracted, compiler_version) + + @metadata_hash_prefix_0_5_16 <> + <> <> + @metadata_hash_common_suffix <> + "43" <> <> <> "0032" <> _constructor_arguments -> + do_extract_bytecode_and_metadata_hash_output(metadata_hash, extracted, compiler_version) + + @metadata_hash_prefix_0_5_16 <> + <> <> + @experimental <> + @metadata_hash_common_suffix <> + "43" <> <> <> "0040" <> _constructor_arguments -> + do_extract_bytecode_and_metadata_hash_output(metadata_hash, extracted, compiler_version) + + @metadata_hash_prefix_0_5_16 <> + <> <> + @metadata_hash_common_suffix <> + "7826" <> <> <> "0057" <> _constructor_arguments -> + do_extract_bytecode_and_metadata_hash_output(metadata_hash, extracted, compiler_version) + + @metadata_hash_prefix_0_5_16 <> + <> <> + @experimental <> + @metadata_hash_common_suffix <> + "7826" <> <> <> "0057" <> _constructor_arguments -> + do_extract_bytecode_and_metadata_hash_output(metadata_hash, extracted, compiler_version) + + @metadata_hash_prefix_0_5_16 <> + <> <> + @metadata_hash_common_suffix <> + "7827" <> <> <> "0057" <> _constructor_arguments -> + do_extract_bytecode_and_metadata_hash_output(metadata_hash, extracted, compiler_version) + + @metadata_hash_prefix_0_5_16 <> + <> <> + @experimental <> + @metadata_hash_common_suffix <> + "7827" <> <> <> "0057" <> _constructor_arguments -> + do_extract_bytecode_and_metadata_hash_output(metadata_hash, extracted, compiler_version) + + @metadata_hash_prefix_0_5_16 <> + <> <> + @metadata_hash_common_suffix <> + "7828" <> <> <> "0058" <> _constructor_arguments -> + do_extract_bytecode_and_metadata_hash_output(metadata_hash, extracted, compiler_version) + + @metadata_hash_prefix_0_5_16 <> + <> <> + @experimental <> + @metadata_hash_common_suffix <> + "7828" <> <> <> "0058" <> _constructor_arguments -> + do_extract_bytecode_and_metadata_hash_output(metadata_hash, extracted, compiler_version) + + @metadata_hash_prefix_0_5_16 <> + <> <> + @metadata_hash_common_suffix <> + "7829" <> <> <> "0059" <> _constructor_arguments -> + do_extract_bytecode_and_metadata_hash_output(metadata_hash, extracted, compiler_version) + + @metadata_hash_prefix_0_5_16 <> + <> <> + @experimental <> + @metadata_hash_common_suffix <> + "7829" <> <> <> "0059" <> _constructor_arguments -> + do_extract_bytecode_and_metadata_hash_output(metadata_hash, extracted, compiler_version) + # Solidity >= 0.6.0 https://github.com/ethereum/solidity/blob/develop/Changelog.md#060-2019-12-17 # https://github.com/ethereum/solidity/blob/26b700771e9cc9c956f0503a05de69a1be427963/docs/metadata.rst#encoding-of-the-metadata-hash-in-the-bytecode # IPFS is used instead of Swarm diff --git a/apps/explorer/lib/explorer/smart_contract/verifier/constructor_arguments.ex b/apps/explorer/lib/explorer/smart_contract/verifier/constructor_arguments.ex index 8edc758693..9bdaed7206 100644 --- a/apps/explorer/lib/explorer/smart_contract/verifier/constructor_arguments.ex +++ b/apps/explorer/lib/explorer/smart_contract/verifier/constructor_arguments.ex @@ -9,8 +9,10 @@ defmodule Explorer.SmartContract.Verifier.ConstructorArguments do @metadata_hash_prefix_0_4_23 "a165627a7a72305820" @metadata_hash_prefix_0_5_10 "a265627a7a72305820" @metadata_hash_prefix_0_5_11 "a265627a7a72315820" + @metadata_hash_prefix_0_5_16 "a365627a7a72315820" @metadata_hash_prefix_0_6_0 "a264697066735822" + @experimental "6c6578706572696d656e74616cf5" @metadata_hash_common_suffix "64736f6c63" def verify(address_hash, contract_code, arguments_data, contract_source_code, contract_name) do @@ -120,6 +122,18 @@ defmodule Explorer.SmartContract.Verifier.ConstructorArguments do @metadata_hash_prefix_0_5_11 ) + @metadata_hash_prefix_0_5_11 <> + <<_::binary-size(64)>> <> + @experimental <> + @metadata_hash_common_suffix <> "43" <> <<_::binary-size(6)>> <> "0032" <> constructor_arguments -> + split_constructor_arguments_and_extract_check_func( + constructor_arguments, + check_func, + contract_source_code, + contract_name, + @experimental <> @metadata_hash_prefix_0_5_11 + ) + @metadata_hash_prefix_0_5_11 <> <<_::binary-size(64)>> <> @metadata_hash_common_suffix <> "7826" <> <<_::binary-size(76)>> <> "0057" <> constructor_arguments -> @@ -131,6 +145,18 @@ defmodule Explorer.SmartContract.Verifier.ConstructorArguments do @metadata_hash_prefix_0_5_11 ) + @metadata_hash_prefix_0_5_11 <> + <<_::binary-size(64)>> <> + @experimental <> + @metadata_hash_common_suffix <> "7826" <> <<_::binary-size(76)>> <> "0057" <> constructor_arguments -> + split_constructor_arguments_and_extract_check_func( + constructor_arguments, + check_func, + contract_source_code, + contract_name, + @experimental <> @metadata_hash_prefix_0_5_11 + ) + @metadata_hash_prefix_0_5_11 <> <<_::binary-size(64)>> <> @metadata_hash_common_suffix <> "7827" <> <<_::binary-size(78)>> <> "0057" <> constructor_arguments -> @@ -142,6 +168,18 @@ defmodule Explorer.SmartContract.Verifier.ConstructorArguments do @metadata_hash_prefix_0_5_11 ) + @metadata_hash_prefix_0_5_11 <> + <<_::binary-size(64)>> <> + @experimental <> + @metadata_hash_common_suffix <> "7827" <> <<_::binary-size(78)>> <> "0057" <> constructor_arguments -> + split_constructor_arguments_and_extract_check_func( + constructor_arguments, + check_func, + contract_source_code, + contract_name, + @experimental <> @metadata_hash_prefix_0_5_11 + ) + @metadata_hash_prefix_0_5_11 <> <<_::binary-size(64)>> <> @metadata_hash_common_suffix <> "7828" <> <<_::binary-size(80)>> <> "0058" <> constructor_arguments -> @@ -153,6 +191,18 @@ defmodule Explorer.SmartContract.Verifier.ConstructorArguments do @metadata_hash_prefix_0_5_11 ) + @metadata_hash_prefix_0_5_11 <> + <<_::binary-size(64)>> <> + @experimental <> + @metadata_hash_common_suffix <> "7828" <> <<_::binary-size(80)>> <> "0058" <> constructor_arguments -> + split_constructor_arguments_and_extract_check_func( + constructor_arguments, + check_func, + contract_source_code, + contract_name, + @experimental <> @metadata_hash_prefix_0_5_11 + ) + @metadata_hash_prefix_0_5_11 <> <<_::binary-size(64)>> <> @metadata_hash_common_suffix <> "7829" <> <<_::binary-size(82)>> <> "0059" <> constructor_arguments -> @@ -164,6 +214,134 @@ defmodule Explorer.SmartContract.Verifier.ConstructorArguments do @metadata_hash_prefix_0_5_11 ) + @metadata_hash_prefix_0_5_11 <> + <<_::binary-size(64)>> <> + @experimental <> + @metadata_hash_common_suffix <> "7829" <> <<_::binary-size(82)>> <> "0059" <> constructor_arguments -> + split_constructor_arguments_and_extract_check_func( + constructor_arguments, + check_func, + contract_source_code, + contract_name, + @experimental <> @metadata_hash_prefix_0_5_11 + ) + + # ABIEncoder V2 + @metadata_hash_prefix_0_5_16 <> + <<_::binary-size(64)>> <> + @metadata_hash_common_suffix <> "43" <> <<_::binary-size(6)>> <> "0032" <> constructor_arguments -> + split_constructor_arguments_and_extract_check_func( + constructor_arguments, + check_func, + contract_source_code, + contract_name, + @metadata_hash_prefix_0_5_16 + ) + + @metadata_hash_prefix_0_5_16 <> + <<_::binary-size(64)>> <> + @experimental <> + @metadata_hash_common_suffix <> "43" <> <<_::binary-size(6)>> <> "0032" <> constructor_arguments -> + split_constructor_arguments_and_extract_check_func( + constructor_arguments, + check_func, + contract_source_code, + contract_name, + @experimental <> @metadata_hash_prefix_0_5_16 + ) + + @metadata_hash_prefix_0_5_16 <> + <<_::binary-size(64)>> <> + @metadata_hash_common_suffix <> "7826" <> <<_::binary-size(76)>> <> "0057" <> constructor_arguments -> + split_constructor_arguments_and_extract_check_func( + constructor_arguments, + check_func, + contract_source_code, + contract_name, + @metadata_hash_prefix_0_5_16 + ) + + @metadata_hash_prefix_0_5_16 <> + <<_::binary-size(64)>> <> + @experimental <> + @metadata_hash_common_suffix <> "7826" <> <<_::binary-size(76)>> <> "0057" <> constructor_arguments -> + split_constructor_arguments_and_extract_check_func( + constructor_arguments, + check_func, + contract_source_code, + contract_name, + @experimental <> @metadata_hash_prefix_0_5_16 + ) + + @metadata_hash_prefix_0_5_16 <> + <<_::binary-size(64)>> <> + @metadata_hash_common_suffix <> "7827" <> <<_::binary-size(78)>> <> "0057" <> constructor_arguments -> + split_constructor_arguments_and_extract_check_func( + constructor_arguments, + check_func, + contract_source_code, + contract_name, + @metadata_hash_prefix_0_5_16 + ) + + @metadata_hash_prefix_0_5_16 <> + <<_::binary-size(64)>> <> + @experimental <> + @metadata_hash_common_suffix <> "7827" <> <<_::binary-size(78)>> <> "0057" <> constructor_arguments -> + split_constructor_arguments_and_extract_check_func( + constructor_arguments, + check_func, + contract_source_code, + contract_name, + @experimental <> @metadata_hash_prefix_0_5_16 + ) + + @metadata_hash_prefix_0_5_16 <> + <<_::binary-size(64)>> <> + @metadata_hash_common_suffix <> "7828" <> <<_::binary-size(80)>> <> "0058" <> constructor_arguments -> + split_constructor_arguments_and_extract_check_func( + constructor_arguments, + check_func, + contract_source_code, + contract_name, + @metadata_hash_prefix_0_5_16 + ) + + @metadata_hash_prefix_0_5_16 <> + <<_::binary-size(64)>> <> + @experimental <> + @metadata_hash_common_suffix <> "7828" <> <<_::binary-size(80)>> <> "0058" <> constructor_arguments -> + split_constructor_arguments_and_extract_check_func( + constructor_arguments, + check_func, + contract_source_code, + contract_name, + @experimental <> @metadata_hash_prefix_0_5_16 + ) + + @metadata_hash_prefix_0_5_16 <> + <<_::binary-size(64)>> <> + @metadata_hash_common_suffix <> "7829" <> <<_::binary-size(82)>> <> "0059" <> constructor_arguments -> + split_constructor_arguments_and_extract_check_func( + constructor_arguments, + check_func, + contract_source_code, + contract_name, + @metadata_hash_prefix_0_5_16 + ) + + @metadata_hash_prefix_0_5_16 <> + <<_::binary-size(64)>> <> + @experimental <> + @metadata_hash_common_suffix <> "7829" <> <<_::binary-size(82)>> <> "0059" <> constructor_arguments -> + split_constructor_arguments_and_extract_check_func( + constructor_arguments, + check_func, + contract_source_code, + contract_name, + @experimental <> @metadata_hash_prefix_0_5_16 + ) + # Solidity >= 0.6.0 https://github.com/ethereum/solidity/blob/develop/Changelog.md#060-2019-12-17 # https://github.com/ethereum/solidity/blob/26b700771e9cc9c956f0503a05de69a1be427963/docs/metadata.rst#encoding-of-the-metadata-hash-in-the-bytecode # IPFS is used instead of Swarm From b94e8332af784f885487a01237ec24b52b134f6c Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Fri, 17 Jul 2020 17:23:47 +0300 Subject: [PATCH 67/79] Add CHANGELOG entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 016b8234a9..ad167e82c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - [#3145](https://github.com/poanetwork/blockscout/pull/3145) - Pending txs per address API endpoint ### Fixes +- [#3202](https://github.com/poanetwork/blockscout/pull/3202) - Fix contracts verification with experimental features enabled - [#3192](https://github.com/poanetwork/blockscout/pull/3192) - Dropdown menu doesn't open at "not found" page - [#3190](https://github.com/poanetwork/blockscout/pull/3190) - Contract log/method decoded view improvements: eliminate horizontal scroll, remove excess borders, whitespaces - [#3185](https://github.com/poanetwork/blockscout/pull/3185) - Transaction page: decoding logs from nested contracts calls From abc381af58f785022569d606ec65fed64ddd6851 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Mon, 20 Jul 2020 09:20:12 +0300 Subject: [PATCH 68/79] Improve get mined blocks query performance: remove grouping by number, timestamp --- apps/explorer/lib/explorer/etherscan.ex | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/explorer/lib/explorer/etherscan.ex b/apps/explorer/lib/explorer/etherscan.ex index 174e25b11a..eb7f743ad4 100644 --- a/apps/explorer/lib/explorer/etherscan.ex +++ b/apps/explorer/lib/explorer/etherscan.ex @@ -271,8 +271,6 @@ defmodule Explorer.Etherscan do b in Block, where: b.miner_hash == ^address_hash, order_by: [desc: b.number], - group_by: b.number, - group_by: b.timestamp, limit: ^merged_options.page_size, offset: ^offset(merged_options), select: %{ From 9600f3d23d4d813e7036aebd843a1337c4ae4d6e Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Mon, 20 Jul 2020 09:24:25 +0300 Subject: [PATCH 69/79] Add CHANGELOG entry --- CHANGELOG.md | 1 + .../verifier/constructor_arguments.ex | 100 +++++++++--------- 2 files changed, 51 insertions(+), 50 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ef164d824..530c2a2223 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - [#3145](https://github.com/poanetwork/blockscout/pull/3145) - Pending txs per address API endpoint ### Fixes +- [#3203](https://github.com/poanetwork/blockscout/pull/3203) - Improve "get mined blocks" query performance - [#3202](https://github.com/poanetwork/blockscout/pull/3202) - Fix contracts verification with experimental features enabled - [#3201](https://github.com/poanetwork/blockscout/pull/3201) - Connect to Metamask button - [#3192](https://github.com/poanetwork/blockscout/pull/3192) - Dropdown menu doesn't open at "not found" page diff --git a/apps/explorer/lib/explorer/smart_contract/verifier/constructor_arguments.ex b/apps/explorer/lib/explorer/smart_contract/verifier/constructor_arguments.ex index 9bdaed7206..ac66b14c6c 100644 --- a/apps/explorer/lib/explorer/smart_contract/verifier/constructor_arguments.ex +++ b/apps/explorer/lib/explorer/smart_contract/verifier/constructor_arguments.ex @@ -123,16 +123,16 @@ defmodule Explorer.SmartContract.Verifier.ConstructorArguments do ) @metadata_hash_prefix_0_5_11 <> - <<_::binary-size(64)>> <> - @experimental <> - @metadata_hash_common_suffix <> "43" <> <<_::binary-size(6)>> <> "0032" <> constructor_arguments -> - split_constructor_arguments_and_extract_check_func( - constructor_arguments, - check_func, - contract_source_code, - contract_name, - @experimental <> @metadata_hash_prefix_0_5_11 - ) + <<_::binary-size(64)>> <> + @experimental <> + @metadata_hash_common_suffix <> "43" <> <<_::binary-size(6)>> <> "0032" <> constructor_arguments -> + split_constructor_arguments_and_extract_check_func( + constructor_arguments, + check_func, + contract_source_code, + contract_name, + @experimental <> @metadata_hash_prefix_0_5_11 + ) @metadata_hash_prefix_0_5_11 <> <<_::binary-size(64)>> <> @@ -146,16 +146,16 @@ defmodule Explorer.SmartContract.Verifier.ConstructorArguments do ) @metadata_hash_prefix_0_5_11 <> - <<_::binary-size(64)>> <> - @experimental <> - @metadata_hash_common_suffix <> "7826" <> <<_::binary-size(76)>> <> "0057" <> constructor_arguments -> - split_constructor_arguments_and_extract_check_func( - constructor_arguments, - check_func, - contract_source_code, - contract_name, - @experimental <> @metadata_hash_prefix_0_5_11 - ) + <<_::binary-size(64)>> <> + @experimental <> + @metadata_hash_common_suffix <> "7826" <> <<_::binary-size(76)>> <> "0057" <> constructor_arguments -> + split_constructor_arguments_and_extract_check_func( + constructor_arguments, + check_func, + contract_source_code, + contract_name, + @experimental <> @metadata_hash_prefix_0_5_11 + ) @metadata_hash_prefix_0_5_11 <> <<_::binary-size(64)>> <> @@ -169,16 +169,16 @@ defmodule Explorer.SmartContract.Verifier.ConstructorArguments do ) @metadata_hash_prefix_0_5_11 <> - <<_::binary-size(64)>> <> - @experimental <> - @metadata_hash_common_suffix <> "7827" <> <<_::binary-size(78)>> <> "0057" <> constructor_arguments -> - split_constructor_arguments_and_extract_check_func( - constructor_arguments, - check_func, - contract_source_code, - contract_name, - @experimental <> @metadata_hash_prefix_0_5_11 - ) + <<_::binary-size(64)>> <> + @experimental <> + @metadata_hash_common_suffix <> "7827" <> <<_::binary-size(78)>> <> "0057" <> constructor_arguments -> + split_constructor_arguments_and_extract_check_func( + constructor_arguments, + check_func, + contract_source_code, + contract_name, + @experimental <> @metadata_hash_prefix_0_5_11 + ) @metadata_hash_prefix_0_5_11 <> <<_::binary-size(64)>> <> @@ -192,16 +192,16 @@ defmodule Explorer.SmartContract.Verifier.ConstructorArguments do ) @metadata_hash_prefix_0_5_11 <> - <<_::binary-size(64)>> <> - @experimental <> - @metadata_hash_common_suffix <> "7828" <> <<_::binary-size(80)>> <> "0058" <> constructor_arguments -> - split_constructor_arguments_and_extract_check_func( - constructor_arguments, - check_func, - contract_source_code, - contract_name, - @experimental <> @metadata_hash_prefix_0_5_11 - ) + <<_::binary-size(64)>> <> + @experimental <> + @metadata_hash_common_suffix <> "7828" <> <<_::binary-size(80)>> <> "0058" <> constructor_arguments -> + split_constructor_arguments_and_extract_check_func( + constructor_arguments, + check_func, + contract_source_code, + contract_name, + @experimental <> @metadata_hash_prefix_0_5_11 + ) @metadata_hash_prefix_0_5_11 <> <<_::binary-size(64)>> <> @@ -215,16 +215,16 @@ defmodule Explorer.SmartContract.Verifier.ConstructorArguments do ) @metadata_hash_prefix_0_5_11 <> - <<_::binary-size(64)>> <> - @experimental <> - @metadata_hash_common_suffix <> "7829" <> <<_::binary-size(82)>> <> "0059" <> constructor_arguments -> - split_constructor_arguments_and_extract_check_func( - constructor_arguments, - check_func, - contract_source_code, - contract_name, - @experimental <> @metadata_hash_prefix_0_5_11 - ) + <<_::binary-size(64)>> <> + @experimental <> + @metadata_hash_common_suffix <> "7829" <> <<_::binary-size(82)>> <> "0059" <> constructor_arguments -> + split_constructor_arguments_and_extract_check_func( + constructor_arguments, + check_func, + contract_source_code, + contract_name, + @experimental <> @metadata_hash_prefix_0_5_11 + ) # ABIEncoder V2 @metadata_hash_prefix_0_5_16 <> From 58636a5887f95ddd82c75dde6f2b03e3b844294e Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Mon, 20 Jul 2020 13:44:20 +0300 Subject: [PATCH 70/79] GraphQL Absinthe related packages update up to stable versions --- apps/block_scout_web/mix.exs | 8 ++++---- mix.lock | 28 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/apps/block_scout_web/mix.exs b/apps/block_scout_web/mix.exs index 39077461d0..7fbfc2f12a 100644 --- a/apps/block_scout_web/mix.exs +++ b/apps/block_scout_web/mix.exs @@ -60,13 +60,13 @@ defmodule BlockScoutWeb.Mixfile do defp deps do [ # GraphQL toolkit - {:absinthe, "~> 1.5.0-rc.2"}, + {:absinthe, "~> 1.5.2"}, # Integrates Absinthe subscriptions with Phoenix - {:absinthe_phoenix, "~> 1.5.0-rc.0"}, + {:absinthe_phoenix, "~> 1.5.0"}, # Plug support for Absinthe - {:absinthe_plug, "~> 1.5.0-rc.1"}, + {:absinthe_plug, "~> 1.5.0"}, # Absinthe support for the Relay framework - {:absinthe_relay, "~> 1.5.0-rc.0"}, + {:absinthe_relay, "~> 1.5"}, {:bypass, "~> 1.0", only: :test}, # To add (CORS)(https://www.w3.org/TR/cors/) {:cors_plug, "~> 2.0"}, diff --git a/mix.lock b/mix.lock index 598a6393c8..3c99ab9b4f 100644 --- a/mix.lock +++ b/mix.lock @@ -1,8 +1,8 @@ %{ - "absinthe": {:hex, :absinthe, "1.5.0-rc.2", "132ceb90783a39454cba1a043e833add5385036ed1e6fe8e889b85fc2b7cd89f", [:mix], [{:dataloader, "~> 1.0.0", [hex: :dataloader, repo: "hexpm", optional: true]}, {:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5", [hex: :nimble_parsec, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "4703b70fe80143db7e713c0913b41dc575bf34565d4db57e8bbd261379cad7ad"}, - "absinthe_phoenix": {:hex, :absinthe_phoenix, "1.5.0-rc.0", "63558295f77f09c9e412fa0a4ef92a66003eaf539821a810fd928c1c67a6005d", [:mix], [{:absinthe, "~> 1.5.0-rc.0", [hex: :absinthe, repo: "hexpm", optional: false]}, {:absinthe_plug, "~> 1.5.0-rc.0", [hex: :absinthe_plug, repo: "hexpm", optional: false]}, {:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.13", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 1.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}], "hexpm", "9a76cda02f19e25921796e5d9c3657bb2d8f5255efba51109272e83eed6073c6"}, - "absinthe_plug": {:hex, :absinthe_plug, "1.5.0-rc.1", "f6d8a7a74c42cb1547f9d62cf728b8aab960c5246b8415deb0cb1f5aac1fb671", [:mix], [{:absinthe, "~> 1.5.0-rc.2", [hex: :absinthe, repo: "hexpm", optional: false]}, {:plug, "~> 1.3.2 or ~> 1.4", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "c06e06748381563dddf6ea501b3330eab3141eb050455d10b43260a77eaa1d60"}, - "absinthe_relay": {:hex, :absinthe_relay, "1.5.0-rc.0", "99048f5a8239dbcecf6c600f6a2410e1b157832df01d3f4859bc804565ddf1bc", [:mix], [{:absinthe, "~> 1.5.0-rc.1", [hex: :absinthe, repo: "hexpm", optional: false]}, {:ecto, "~> 2.0 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}], "hexpm", "e0db315eb9cf735a257c70bac86838f14a747f1fe451226c210002abb48f4cf2"}, + "absinthe": {:hex, :absinthe, "1.5.2", "2f9449b0c135ea61c09c11968d3d4fe6abd5bed38cf9be1c6d6b7c5ec858cfa0", [:mix], [{:dataloader, "~> 1.0.0", [hex: :dataloader, repo: "hexpm", optional: true]}, {:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5", [hex: :nimble_parsec, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "669c84879629b7fffdc6cda9361ab9c81c9c7691e65418ba089b912a227963ac"}, + "absinthe_phoenix": {:hex, :absinthe_phoenix, "1.5.0", "70112d1bd4dff4eb63bf4a396c0c1d599c1812c99a7b2bfbfcc2fd2ac3f55c1d", [:mix], [{:absinthe, "~> 1.5.0", [hex: :absinthe, repo: "hexpm", optional: false]}, {:absinthe_plug, "~> 1.5.0", [hex: :absinthe_plug, repo: "hexpm", optional: false]}, {:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.13", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 1.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}], "hexpm", "bbe443e87079786c40a07e7159c326931beb1b2d722e73da2590152937655843"}, + "absinthe_plug": {:hex, :absinthe_plug, "1.5.0", "018ef544cf577339018d1f482404b4bed762e1b530c78be9de4bbb88a6f3a805", [:mix], [{:absinthe, "~> 1.5.0", [hex: :absinthe, repo: "hexpm", optional: false]}, {:plug, "~> 1.3.2 or ~> 1.4", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "4c160f4ce9a1233a4219a42de946e4e05d0e8733537cd5d8d20e7d4ef8d4b7c7"}, + "absinthe_relay": {:hex, :absinthe_relay, "1.5.0", "df4bc8891aa9d28dca31569d14c86c300a8c378a54fbc6e2ae9a45e5a3aa01fe", [:mix], [{:absinthe, "~> 1.5.0", [hex: :absinthe, repo: "hexpm", optional: false]}, {:ecto, "~> 2.0 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}], "hexpm", "173cc44ccbf77c98cb4d2f05847b4c66f9ce2f436db16403c95e062b252b6081"}, "accept": {:hex, :accept, "0.3.5", "b33b127abca7cc948bbe6caa4c263369abf1347cfa9d8e699c6d214660f10cd1", [:rebar3], [], "hexpm", "11b18c220bcc2eab63b5470c038ef10eb6783bcb1fcdb11aa4137defa5ac1bb8"}, "bcrypt_elixir": {:hex, :bcrypt_elixir, "1.1.1", "6b5560e47a02196ce5f0ab3f1d8265db79a23868c137e973b27afef928ed8006", [:make, :mix], [{:elixir_make, "~> 0.4", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "10f658be786bd2daaadcd45cc5b598da01d5bbc313da4d0e3efb2d6a511d896d"}, "benchee": {:hex, :benchee, "0.13.2", "30cd4ff5f593fdd218a9b26f3c24d580274f297d88ad43383afe525b1543b165", [:mix], [{:deep_merge, "~> 0.1", [hex: :deep_merge, repo: "hexpm", optional: false]}], "hexpm", "d8b3f1720073413c36a21e56a1d1112a4d67a9ad0ec900437efed08b39e515b2"}, @@ -18,8 +18,8 @@ "con_cache": {:hex, :con_cache, "0.13.1", "047e097ab2a8c6876e12d0c29e29a86d487b592df97b98e3e2abedad574e215d", [:mix], [], "hexpm", "d3c19f04153b691d7bfdb15bcfc3b8fea503b0b51635115393809af7eabe2f37"}, "connection": {:hex, :connection, "1.0.4", "a1cae72211f0eef17705aaededacac3eb30e6625b04a6117c1b2db6ace7d5976", [:mix], [], "hexpm", "4a0850c9be22a43af9920a71ab17c051f5f7d45c209e40269a1938832510e4d9"}, "cors_plug": {:hex, :cors_plug, "2.0.0", "238ddb479f92b38f6dc1ae44b8d81f0387f9519101a6da442d543ab70ee0e482", [:mix], [{:plug, "~> 1.3 or ~> 1.4 or ~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "118162367ef41448c9742ced8c8bc33ae2857d958d6b997e1db26402dd8c6f37"}, - "cowboy": {:hex, :cowboy, "2.6.3", "99aa50e94e685557cad82e704457336a453d4abcb77839ad22dbe71f311fcc06", [:rebar3], [{:cowlib, "~> 2.7.3", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "~> 1.7.1", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "e5580029080f3f1ad17436fb97b0d5ed2ed4e4815a96bac36b5a992e20f58db6"}, - "cowlib": {:hex, :cowlib, "2.7.3", "a7ffcd0917e6d50b4d5fb28e9e2085a0ceb3c97dea310505f7460ff5ed764ce9", [:rebar3], [], "hexpm", "1e1a3d176d52daebbecbbcdfd27c27726076567905c2a9d7398c54da9d225761"}, + "cowboy": {:hex, :cowboy, "2.8.0", "f3dc62e35797ecd9ac1b50db74611193c29815401e53bac9a5c0577bd7bc667d", [:rebar3], [{:cowlib, "~> 2.9.1", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "~> 1.7.1", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "4643e4fba74ac96d4d152c75803de6fad0b3fa5df354c71afdd6cbeeb15fac8a"}, + "cowlib": {:hex, :cowlib, "2.9.1", "61a6c7c50cf07fdd24b2f45b89500bb93b6686579b069a89f88cb211e1125c78", [:rebar3], [], "hexpm", "e4175dc240a70d996156160891e1c62238ede1729e45740bdd38064dad476170"}, "credo": {:hex, :credo, "1.1.2", "02b6422f3e659eb74b05aca3c20c1d8da0119a05ee82577a82e6c2938bf29f81", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "cd9322e9d391251ca3c4fac10ff0ce86ea4b99b3d9b34526ee2a7baa5928167d"}, "csv": {:hex, :csv, "2.3.1", "9ce11eff5a74a07baf3787b2b19dd798724d29a9c3a492a41df39f6af686da0e", [:mix], [{:parallel_stream, "~> 1.0.4", [hex: :parallel_stream, repo: "hexpm", optional: false]}], "hexpm", "86626e1c89a4ad9a96d0d9c638f9e88c2346b89b4ba1611988594ebe72b5d5ee"}, "dataloader": {:hex, :dataloader, "1.0.7", "58351b335673cf40601429bfed6c11fece6ce7ad169b2ac0f0fe83e716587391", [:mix], [{:ecto, ">= 0.0.0", [hex: :ecto, repo: "hexpm", optional: true]}], "hexpm", "12bf66478e4a5085d09dc96932d058c206ee8c219cc7691d12a40dc35c8cefaa"}, @@ -29,7 +29,7 @@ "deep_merge": {:hex, :deep_merge, "0.2.0", "c1050fa2edf4848b9f556fba1b75afc66608a4219659e3311d9c9427b5b680b3", [:mix], [], "hexpm", "e3bf435a54ed27b0ba3a01eb117ae017988804e136edcbe8a6a14c310daa966e"}, "dialyxir": {:hex, :dialyxir, "0.5.1", "b331b091720fd93e878137add264bac4f644e1ddae07a70bf7062c7862c4b952", [:mix], [], "hexpm", "6c32a70ed5d452c6650916555b1f96c79af5fc4bf286997f8b15f213de786f73"}, "earmark": {:hex, :earmark, "1.3.5", "0db71c8290b5bc81cb0101a2a507a76dca659513984d683119ee722828b424f6", [:mix], [], "hexpm", "762b999fd414fb41e297944228aa1de2cd4a3876a07f968c8b11d1e9a2190d07"}, - "ecto": {:hex, :ecto, "3.3.1", "82ab74298065bf0c64ca299f6c6785e68ea5d6b980883ee80b044499df35aba1", [:mix], [{:decimal, "~> 1.6", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "e6c614dfe3bcff2d575ce16d815dbd43f4ee1844599a83de1eea81976a31c174"}, + "ecto": {:hex, :ecto, "3.4.5", "2bcd262f57b2c888b0bd7f7a28c8a48aa11dc1a2c6a858e45dd8f8426d504265", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "8c6d1d4d524559e9b7a062f0498e2c206122552d63eacff0a6567ffe7a8e8691"}, "ecto_sql": {:hex, :ecto_sql, "3.3.2", "92804e0de69bb63e621273c3492252cb08a29475c05d40eeb6f41ad2d483cfd3", [:mix], [{:db_connection, "~> 2.2", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.3", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.3.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.15.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "b82d89d4e6a9f7f7f04783b07e8b0af968e0be2f01ee4b39047fe727c5c07471"}, "elixir_make": {:hex, :elixir_make, "0.6.0", "38349f3e29aff4864352084fc736fa7fa0f2995a819a737554f7ebd28b85aaab", [:mix], [], "hexpm", "d522695b93b7f0b4c0fcb2dfe73a6b905b1c301226a5a55cb42e5b14d509e050"}, "ex_abi": {:hex, :ex_abi, "0.4.0", "ff7e7f5b56c228b117e1f54e80c668a8f0424c275f233a50373548b70d99bd5c", [:mix], [{:exth_crypto, "~> 0.1.6", [hex: :exth_crypto, repo: "hexpm", optional: false]}], "hexpm", "2d33499de38c54531103e58530d0453863fb6149106327f691001873b0556e68"}, @@ -57,7 +57,7 @@ "html_entities": {:hex, :html_entities, "0.4.0", "f2fee876858cf6aaa9db608820a3209e45a087c5177332799592142b50e89a6b", [:mix], [], "hexpm", "3e3d7156a272950373ce5a4018b1490bea26676f8d6a7d409f6fac8568b8cb9a"}, "httpoison": {:hex, :httpoison, "1.6.2", "ace7c8d3a361cebccbed19c283c349b3d26991eff73a1eaaa8abae2e3c8089b6", [:mix], [{:hackney, "~> 1.15 and >= 1.15.2", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "aa2c74bd271af34239a3948779612f87df2422c2fdcfdbcec28d9c105f0773fe"}, "idna": {:hex, :idna, "6.0.0", "689c46cbcdf3524c44d5f3dde8001f364cd7608a99556d8fbd8239a5798d4c10", [:rebar3], [{:unicode_util_compat, "0.4.1", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "4bdd305eb64e18b0273864920695cb18d7a2021f31a11b9c5fbcd9a253f936e2"}, - "jason": {:hex, :jason, "1.1.2", "b03dedea67a99223a2eaf9f1264ce37154564de899fd3d8b9a21b1a6fd64afe7", [:mix], [{:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "fdf843bca858203ae1de16da2ee206f53416bbda5dc8c9e78f43243de4bc3afe"}, + "jason": {:hex, :jason, "1.2.1", "12b22825e22f468c02eb3e4b9985f3d0cb8dc40b9bd704730efa11abd2708c44", [:mix], [{:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "b659b8571deedf60f79c5a608e15414085fa141344e2716fbd6988a084b5f993"}, "jsx": {:hex, :jsx, "2.8.3", "a05252d381885240744d955fbe3cf810504eb2567164824e19303ea59eef62cf", [:mix, :rebar3], [], "hexpm", "fc3499fed7a726995aa659143a248534adc754ebd16ccd437cd93b649a95091f"}, "junit_formatter": {:hex, :junit_formatter, "3.0.1", "4ed76a50886717a6d683a978cec775abdcb88d9d51cfddd3d8fbf8e6af4625da", [:mix], [], "hexpm", "55ba8f459c0d2568bb6ca7c44f1b1384194773fce4d8bc99454fa40320664af9"}, "keccakf1600": {:hex, :keccakf1600_orig, "2.0.0", "0a7217ddb3ee8220d449bbf7575ec39d4e967099f220a91e3dfca4dbaef91963", [:rebar3], [], "hexpm", "bdbbb02d67bea35605f95d4e3de48203347374e414da7945c4f2f7fd13ffe632"}, @@ -77,19 +77,19 @@ "mox": {:hex, :mox, "0.5.1", "f86bb36026aac1e6f924a4b6d024b05e9adbed5c63e8daa069bd66fb3292165b", [:mix], [], "hexpm", "052346cf322311c49a0f22789f3698eea030eec09b8c47367f0686ef2634ae14"}, "msgpax": {:hex, :msgpax, "2.2.4", "7b3790ef684089076b63c0f08c2f4b079c6311daeb006b69e4ed2bf67518291e", [:mix], [{:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "b351b6d992d79624a8430a99d21a41b36b1b90edf84326a294e9f4a2de11f089"}, "nimble_csv": {:hex, :nimble_csv, "0.6.0", "a3673f26d41f986774fe6060e309615343d3cb83a6d435754d8b1fdbd5764879", [:mix], [], "hexpm", "b78e15f1c82fd963745ecc4073c47e1f0cdaf3622143342b8c30e9b5eaa546c6"}, - "nimble_parsec": {:hex, :nimble_parsec, "0.5.1", "c90796ecee0289dbb5ad16d3ad06f957b0cd1199769641c961cfe0b97db190e0", [:mix], [], "hexpm", "00e3ebdc821fb3a36957320d49e8f4bfa310d73ea31c90e5f925dc75e030da8f"}, + "nimble_parsec": {:hex, :nimble_parsec, "0.5.3", "def21c10a9ed70ce22754fdeea0810dafd53c2db3219a0cd54cf5526377af1c6", [:mix], [], "hexpm", "589b5af56f4afca65217a1f3eb3fee7e79b09c40c742fddc1c312b3ac0b3399f"}, "optimal": {:hex, :optimal, "0.3.6", "46bbf52fbbbd238cda81e02560caa84f93a53c75620f1fe19e81e4ae7b07d1dd", [:mix], [], "hexpm", "1a06ea6a653120226b35b283a1cd10039550f2c566edcdec22b29316d73640fd"}, "parallel_stream": {:hex, :parallel_stream, "1.0.6", "b967be2b23f0f6787fab7ed681b4c45a215a81481fb62b01a5b750fa8f30f76c", [:mix], [], "hexpm", "639b2e8749e11b87b9eb42f2ad325d161c170b39b288ac8d04c4f31f8f0823eb"}, "parse_trans": {:hex, :parse_trans, "3.3.0", "09765507a3c7590a784615cfd421d101aec25098d50b89d7aa1d66646bc571c1", [:rebar3], [], "hexpm", "17ef63abde837ad30680ea7f857dd9e7ced9476cdd7b0394432af4bfc241b960"}, "phoenix": {:hex, :phoenix, "1.4.0", "56fe9a809e0e735f3e3b9b31c1b749d4b436e466d8da627b8d82f90eaae714d2", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 1.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}], "hexpm", "22da8f659cf13d3ba73b767f66b8c389113ddf0ef7b94225cc84e94b85eac90e"}, "phoenix_ecto": {:hex, :phoenix_ecto, "4.0.0", "c43117a136e7399ea04ecaac73f8f23ee0ffe3e07acfcb8062fe5f4c9f0f6531", [:mix], [{:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.9", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "fe15d9fee5b82f5e64800502011ffe530650d42e1710ae9b14bc4c9be38bf303"}, "phoenix_form_awesomplete": {:hex, :phoenix_form_awesomplete, "0.1.5", "d09aade160b584e3428e1e095645482396f17bddda4f566f1118f12d2598d11c", [:mix], [{:phoenix_html, "~> 2.10", [hex: :phoenix_html, repo: "hexpm", optional: false]}], "hexpm", "acef2dbc638b5bcad92c11e41eb2b55d71f2596741a2f936717b8472196456ec"}, - "phoenix_html": {:hex, :phoenix_html, "2.13.3", "850e292ff6e204257f5f9c4c54a8cb1f6fbc16ed53d360c2b780a3d0ba333867", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "8b01b3d6d39731ab18aa548d928b5796166d2500755f553725cfe967bafba7d9"}, + "phoenix_html": {:hex, :phoenix_html, "2.14.2", "b8a3899a72050f3f48a36430da507dd99caf0ac2d06c77529b1646964f3d563e", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "58061c8dfd25da5df1ea0ca47c972f161beb6c875cd293917045b92ffe1bf617"}, "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.2.1", "274a4b07c4adbdd7785d45a8b0bb57634d0b4f45b18d2c508b26c0344bd59b8f", [: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", "41b4103a2fa282cfd747d377233baf213c648fdcc7928f432937676532490eee"}, "phoenix_pubsub": {:hex, :phoenix_pubsub, "1.1.2", "496c303bdf1b2e98a9d26e89af5bba3ab487ba3a3735f74bf1f4064d2a845a3e", [:mix], [], "hexpm", "1f13f9f0f3e769a667a6b6828d29dec37497a082d195cc52dbef401a9b69bf38"}, - "plug": {:hex, :plug, "1.8.3", "12d5f9796dc72e8ac9614e94bda5e51c4c028d0d428e9297650d09e15a684478", [:mix], [{:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "164baaeb382d19beee0ec484492aa82a9c8685770aee33b24ec727a0971b34d0"}, - "plug_cowboy": {:hex, :plug_cowboy, "2.1.0", "b75768153c3a8a9e8039d4b25bb9b14efbc58e9c4a6e6a270abff1cd30cbe320", [:mix], [{:cowboy, "~> 2.5", [hex: :cowboy, repo: "hexpm", optional: false]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "6cd8ddd1bd1fbfa54d3fc61d4719c2057dae67615395d58d40437a919a46f132"}, - "plug_crypto": {:hex, :plug_crypto, "1.0.0", "18e49317d3fa343f24620ed22795ec29d4a5e602d52d1513ccea0b07d8ea7d4d", [:mix], [], "hexpm", "73c1682f0e414cfb5d9b95c8e8cd6ffcfdae699e3b05e1db744e58b7be857759"}, + "plug": {:hex, :plug, "1.10.3", "c9cebe917637d8db0e759039cc106adca069874e1a9034fd6e3fdd427fd3c283", [:mix], [{:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "01f9037a2a1de1d633b5a881101e6a444bcabb1d386ca1e00bb273a1f1d9d939"}, + "plug_cowboy": {:hex, :plug_cowboy, "2.3.0", "149a50e05cb73c12aad6506a371cd75750c0b19a32f81866e1a323dda9e0e99d", [:mix], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "bc595a1870cef13f9c1e03df56d96804db7f702175e4ccacdb8fc75c02a7b97e"}, + "plug_crypto": {:hex, :plug_crypto, "1.1.2", "bdd187572cc26dbd95b87136290425f2b580a116d3fb1f564216918c9730d227", [:mix], [], "hexpm", "6b8b608f895b6ffcfad49c37c7883e8df98ae19c6a28113b02aa1e9c5b22d6b5"}, "poison": {:hex, :poison, "3.1.0", "d9eb636610e096f86f25d9a46f35a9facac35609a7591b3be3326e99a0484665", [:mix], [], "hexpm", "fec8660eb7733ee4117b85f55799fd3833eb769a6df71ccf8903e8dc5447cfce"}, "poolboy": {:hex, :poolboy, "1.5.2", "392b007a1693a64540cead79830443abf5762f5d30cf50bc95cb2c1aaafa006b", [:rebar3], [], "hexpm", "dad79704ce5440f3d5a3681c8590b9dc25d1a561e8f5a9c995281012860901e3"}, "postgrex": {:hex, :postgrex, "0.15.3", "5806baa8a19a68c4d07c7a624ccdb9b57e89cbc573f1b98099e3741214746ae4", [:mix], [{:connection, "~> 1.0", [hex: :connection, repo: "hexpm", optional: false]}, {:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "4737ce62a31747b4c63c12b20c62307e51bb4fcd730ca0c32c280991e0606c90"}, @@ -108,7 +108,7 @@ "spandex_ecto": {:hex, :spandex_ecto, "0.4.0", "deaeaddc11a35f1c551206c53d09bb93a0da5808dbef751430e465c8c7de01d3", [:mix], [{:spandex, "~> 2.2", [hex: :spandex, repo: "hexpm", optional: false]}], "hexpm", "ef6037134548bba7a3b0efe39d8fc1a0ff95b43d6a046f193a552d311a637a97"}, "spandex_phoenix": {:hex, :spandex_phoenix, "0.3.2", "e81889d80852a895cf62ce2e25181b15766d21e8647962e0a4458414b935feb3", [:mix], [{:plug, "~> 1.3", [hex: :plug, repo: "hexpm", optional: false]}, {:spandex, "~> 2.2", [hex: :spandex, repo: "hexpm", optional: false]}], "hexpm", "6e882bb64093889a73b7b77c426c1fd5651d072cd97e8f3e8d89d502d7b44b48"}, "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.5", "6eaf7ad16cb568bb01753dbbd7a95ff8b91c7979482b95f38443fe2c8852a79b", [:make, :mix, :rebar3], [], "hexpm", "13104d7897e38ed7f044c4de953a6c28597d1c952075eb2e328bc6d6f2bfc496"}, - "telemetry": {:hex, :telemetry, "0.4.1", "ae2718484892448a24470e6aa341bc847c3277bfb8d4e9289f7474d752c09c7f", [:rebar3], [], "hexpm", "4738382e36a0a9a2b6e25d67c960e40e1a2c95560b9f936d8e29de8cd858480f"}, + "telemetry": {:hex, :telemetry, "0.4.2", "2808c992455e08d6177322f14d3bdb6b625fbcfd233a73505870d8738a2f4599", [:rebar3], [], "hexpm", "2d1419bd9dda6a206d7b5852179511722e2b18812310d304620c7bd92a13fcef"}, "timex": {:hex, :timex, "3.6.1", "efdf56d0e67a6b956cc57774353b0329c8ab7726766a11547e529357ffdc1d56", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:gettext, "~> 0.10", [hex: :gettext, repo: "hexpm", optional: false]}, {:tzdata, "~> 0.1.8 or ~> 0.5 or ~> 1.0.0", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm", "f354efb2400dd7a80fd9eb6c8419068c4f632da4ac47f3d8822d6e33f08bc852"}, "tzdata": {:hex, :tzdata, "1.0.1", "f6027a331af7d837471248e62733c6ebee86a72e57c613aa071ebb1f750fc71a", [:mix], [{:hackney, "~> 1.0", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "cf1345dfbce6acdfd4e23cbb36e96e53d1981bc89181cd0b936f4f398f4c0b78"}, "unicode_util_compat": {:hex, :unicode_util_compat, "0.4.1", "d869e4c68901dd9531385bb0c8c40444ebf624e60b6962d95952775cac5e90cd", [:rebar3], [], "hexpm", "1d1848c40487cdb0b30e8ed975e34e025860c02e419cb615d255849f3427439d"}, From d77e8133236d39c3aade7b5b9b6e57711dfa971d Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Mon, 20 Jul 2020 13:48:56 +0300 Subject: [PATCH 71/79] Add CHANGELOG entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ef164d824..0476d06169 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ - [#3178](https://github.com/poanetwork/blockscout/pull/3178) - Fix unavailable navbar menu when read/write proxy tab is active ### Chore +- [#3204](https://github.com/poanetwork/blockscout/pull/3204) - GraphQL Absinthe related packages update up to stable versions - [#3180](https://github.com/poanetwork/blockscout/pull/3180) - Return correct status in verify API endpoint if contract verified - [#3180](https://github.com/poanetwork/blockscout/pull/3180) - Remove Kovan from the list of default chains From 572dff25f429bc6e76124195948e9affe52b9cf6 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Mon, 20 Jul 2020 14:32:12 +0300 Subject: [PATCH 72/79] Process GraphQL internal server error for address -> transactions query without first/last params --- .../lib/block_scout_web/schema/types.ex | 3 + .../verifier/constructor_arguments.ex | 100 +++++++++--------- mix.lock | 2 +- 3 files changed, 54 insertions(+), 51 deletions(-) diff --git a/apps/block_scout_web/lib/block_scout_web/schema/types.ex b/apps/block_scout_web/lib/block_scout_web/schema/types.ex index aabd84b9aa..2a8ed63d80 100644 --- a/apps/block_scout_web/lib/block_scout_web/schema/types.ex +++ b/apps/block_scout_web/lib/block_scout_web/schema/types.ex @@ -41,6 +41,9 @@ defmodule BlockScoutWeb.Schema.Types do %{last: last}, child_complexity -> last * child_complexity + + %{}, _child_complexity -> + 0 end) end end diff --git a/apps/explorer/lib/explorer/smart_contract/verifier/constructor_arguments.ex b/apps/explorer/lib/explorer/smart_contract/verifier/constructor_arguments.ex index 9bdaed7206..ac66b14c6c 100644 --- a/apps/explorer/lib/explorer/smart_contract/verifier/constructor_arguments.ex +++ b/apps/explorer/lib/explorer/smart_contract/verifier/constructor_arguments.ex @@ -123,16 +123,16 @@ defmodule Explorer.SmartContract.Verifier.ConstructorArguments do ) @metadata_hash_prefix_0_5_11 <> - <<_::binary-size(64)>> <> - @experimental <> - @metadata_hash_common_suffix <> "43" <> <<_::binary-size(6)>> <> "0032" <> constructor_arguments -> - split_constructor_arguments_and_extract_check_func( - constructor_arguments, - check_func, - contract_source_code, - contract_name, - @experimental <> @metadata_hash_prefix_0_5_11 - ) + <<_::binary-size(64)>> <> + @experimental <> + @metadata_hash_common_suffix <> "43" <> <<_::binary-size(6)>> <> "0032" <> constructor_arguments -> + split_constructor_arguments_and_extract_check_func( + constructor_arguments, + check_func, + contract_source_code, + contract_name, + @experimental <> @metadata_hash_prefix_0_5_11 + ) @metadata_hash_prefix_0_5_11 <> <<_::binary-size(64)>> <> @@ -146,16 +146,16 @@ defmodule Explorer.SmartContract.Verifier.ConstructorArguments do ) @metadata_hash_prefix_0_5_11 <> - <<_::binary-size(64)>> <> - @experimental <> - @metadata_hash_common_suffix <> "7826" <> <<_::binary-size(76)>> <> "0057" <> constructor_arguments -> - split_constructor_arguments_and_extract_check_func( - constructor_arguments, - check_func, - contract_source_code, - contract_name, - @experimental <> @metadata_hash_prefix_0_5_11 - ) + <<_::binary-size(64)>> <> + @experimental <> + @metadata_hash_common_suffix <> "7826" <> <<_::binary-size(76)>> <> "0057" <> constructor_arguments -> + split_constructor_arguments_and_extract_check_func( + constructor_arguments, + check_func, + contract_source_code, + contract_name, + @experimental <> @metadata_hash_prefix_0_5_11 + ) @metadata_hash_prefix_0_5_11 <> <<_::binary-size(64)>> <> @@ -169,16 +169,16 @@ defmodule Explorer.SmartContract.Verifier.ConstructorArguments do ) @metadata_hash_prefix_0_5_11 <> - <<_::binary-size(64)>> <> - @experimental <> - @metadata_hash_common_suffix <> "7827" <> <<_::binary-size(78)>> <> "0057" <> constructor_arguments -> - split_constructor_arguments_and_extract_check_func( - constructor_arguments, - check_func, - contract_source_code, - contract_name, - @experimental <> @metadata_hash_prefix_0_5_11 - ) + <<_::binary-size(64)>> <> + @experimental <> + @metadata_hash_common_suffix <> "7827" <> <<_::binary-size(78)>> <> "0057" <> constructor_arguments -> + split_constructor_arguments_and_extract_check_func( + constructor_arguments, + check_func, + contract_source_code, + contract_name, + @experimental <> @metadata_hash_prefix_0_5_11 + ) @metadata_hash_prefix_0_5_11 <> <<_::binary-size(64)>> <> @@ -192,16 +192,16 @@ defmodule Explorer.SmartContract.Verifier.ConstructorArguments do ) @metadata_hash_prefix_0_5_11 <> - <<_::binary-size(64)>> <> - @experimental <> - @metadata_hash_common_suffix <> "7828" <> <<_::binary-size(80)>> <> "0058" <> constructor_arguments -> - split_constructor_arguments_and_extract_check_func( - constructor_arguments, - check_func, - contract_source_code, - contract_name, - @experimental <> @metadata_hash_prefix_0_5_11 - ) + <<_::binary-size(64)>> <> + @experimental <> + @metadata_hash_common_suffix <> "7828" <> <<_::binary-size(80)>> <> "0058" <> constructor_arguments -> + split_constructor_arguments_and_extract_check_func( + constructor_arguments, + check_func, + contract_source_code, + contract_name, + @experimental <> @metadata_hash_prefix_0_5_11 + ) @metadata_hash_prefix_0_5_11 <> <<_::binary-size(64)>> <> @@ -215,16 +215,16 @@ defmodule Explorer.SmartContract.Verifier.ConstructorArguments do ) @metadata_hash_prefix_0_5_11 <> - <<_::binary-size(64)>> <> - @experimental <> - @metadata_hash_common_suffix <> "7829" <> <<_::binary-size(82)>> <> "0059" <> constructor_arguments -> - split_constructor_arguments_and_extract_check_func( - constructor_arguments, - check_func, - contract_source_code, - contract_name, - @experimental <> @metadata_hash_prefix_0_5_11 - ) + <<_::binary-size(64)>> <> + @experimental <> + @metadata_hash_common_suffix <> "7829" <> <<_::binary-size(82)>> <> "0059" <> constructor_arguments -> + split_constructor_arguments_and_extract_check_func( + constructor_arguments, + check_func, + contract_source_code, + contract_name, + @experimental <> @metadata_hash_prefix_0_5_11 + ) # ABIEncoder V2 @metadata_hash_prefix_0_5_16 <> diff --git a/mix.lock b/mix.lock index 3c99ab9b4f..8c1d11ce0e 100644 --- a/mix.lock +++ b/mix.lock @@ -29,7 +29,7 @@ "deep_merge": {:hex, :deep_merge, "0.2.0", "c1050fa2edf4848b9f556fba1b75afc66608a4219659e3311d9c9427b5b680b3", [:mix], [], "hexpm", "e3bf435a54ed27b0ba3a01eb117ae017988804e136edcbe8a6a14c310daa966e"}, "dialyxir": {:hex, :dialyxir, "0.5.1", "b331b091720fd93e878137add264bac4f644e1ddae07a70bf7062c7862c4b952", [:mix], [], "hexpm", "6c32a70ed5d452c6650916555b1f96c79af5fc4bf286997f8b15f213de786f73"}, "earmark": {:hex, :earmark, "1.3.5", "0db71c8290b5bc81cb0101a2a507a76dca659513984d683119ee722828b424f6", [:mix], [], "hexpm", "762b999fd414fb41e297944228aa1de2cd4a3876a07f968c8b11d1e9a2190d07"}, - "ecto": {:hex, :ecto, "3.4.5", "2bcd262f57b2c888b0bd7f7a28c8a48aa11dc1a2c6a858e45dd8f8426d504265", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "8c6d1d4d524559e9b7a062f0498e2c206122552d63eacff0a6567ffe7a8e8691"}, + "ecto": {:hex, :ecto, "3.3.4", "95b05c82ae91361475e5491c9f3ac47632f940b3f92ae3988ac1aad04989c5bb", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "9b96cbb83a94713731461ea48521b178b0e3863d310a39a3948c807266eebd69"}, "ecto_sql": {:hex, :ecto_sql, "3.3.2", "92804e0de69bb63e621273c3492252cb08a29475c05d40eeb6f41ad2d483cfd3", [:mix], [{:db_connection, "~> 2.2", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.3", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.3.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.15.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "b82d89d4e6a9f7f7f04783b07e8b0af968e0be2f01ee4b39047fe727c5c07471"}, "elixir_make": {:hex, :elixir_make, "0.6.0", "38349f3e29aff4864352084fc736fa7fa0f2995a819a737554f7ebd28b85aaab", [:mix], [], "hexpm", "d522695b93b7f0b4c0fcb2dfe73a6b905b1c301226a5a55cb42e5b14d509e050"}, "ex_abi": {:hex, :ex_abi, "0.4.0", "ff7e7f5b56c228b117e1f54e80c668a8f0424c275f233a50373548b70d99bd5c", [:mix], [{:exth_crypto, "~> 0.1.6", [hex: :exth_crypto, repo: "hexpm", optional: false]}], "hexpm", "2d33499de38c54531103e58530d0453863fb6149106327f691001873b0556e68"}, From 2829310bec7a39c9ddc77df823b1bd0a8f4f146d Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Wed, 22 Jul 2020 14:25:41 +0300 Subject: [PATCH 73/79] Update Elixir version: 1.10.2 -> 1.10.3 --- .circleci/config.yml | 24 ++++++++++++------------ .tool-versions | 4 ++-- docker/Dockerfile | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b501855677..c7596f7d60 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ jobs: build: docker: # Ensure .tool-versions matches - - image: circleci/elixir:1.10.2-node-browsers + - image: circleci/elixir:1.10.3-node-browsers environment: MIX_ENV: test # match POSTGRES_PASSWORD for postgres image below @@ -133,7 +133,7 @@ jobs: check_formatted: docker: # Ensure .tool-versions matches - - image: circleci/elixir:1.10.2 + - image: circleci/elixir:1.10.3 environment: MIX_ENV: test @@ -147,7 +147,7 @@ jobs: credo: docker: # Ensure .tool-versions matches - - image: circleci/elixir:1.10.2 + - image: circleci/elixir:1.10.3 environment: MIX_ENV: test @@ -181,7 +181,7 @@ jobs: dialyzer: docker: # Ensure .tool-versions matches - - image: circleci/elixir:1.10.2 + - image: circleci/elixir:1.10.3 environment: MIX_ENV: test @@ -251,7 +251,7 @@ jobs: gettext: docker: # Ensure .tool-versions matches - - image: circleci/elixir:1.10.2 + - image: circleci/elixir:1.10.3 environment: MIX_ENV: test @@ -290,7 +290,7 @@ jobs: release: docker: # Ensure .tool-versions matches - - image: circleci/elixir:1.10.2 + - image: circleci/elixir:1.10.3 environment: MIX_ENV: prod @@ -316,7 +316,7 @@ jobs: sobelow: docker: # Ensure .tool-versions matches - - image: circleci/elixir:1.10.2 + - image: circleci/elixir:1.10.3 environment: MIX_ENV: test @@ -340,7 +340,7 @@ jobs: # test_geth_http_websocket: # docker: # # Ensure .tool-versions matches - # - image: circleci/elixir:1.10.2-node-browsers + # - image: circleci/elixir:1.10.3-node-browsers # environment: # MIX_ENV: test # # match POSTGRES_PASSWORD for postgres image below @@ -394,7 +394,7 @@ jobs: # test_geth_mox: # docker: # # Ensure .tool-versions matches - # - image: circleci/elixir:1.10.2-node-browsers + # - image: circleci/elixir:1.10.3-node-browsers # environment: # MIX_ENV: test # # match POSTGRES_PASSWORD for postgres image below @@ -448,7 +448,7 @@ jobs: # test_parity_http_websocket: # docker: # # Ensure .tool-versions matches - # - image: circleci/elixir:1.10.2-node-browsers + # - image: circleci/elixir:1.10.3-node-browsers # environment: # MIX_ENV: test # # match POSTGRES_PASSWORD for postgres image below @@ -502,7 +502,7 @@ jobs: test_parity_mox: docker: # Ensure .tool-versions matches - - image: circleci/elixir:1.10.2-node-browsers + - image: circleci/elixir:1.10.3-node-browsers environment: MIX_ENV: test # match POSTGRES_PASSWORD for postgres image below @@ -556,7 +556,7 @@ jobs: coveralls_merge: docker: # Ensure .tool-versions matches - - image: circleci/elixir:1.10.2 + - image: circleci/elixir:1.10.3 environment: MIX_ENV: test diff --git a/.tool-versions b/.tool-versions index 58096bf647..aa447f03b3 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,3 +1,3 @@ -elixir 1.10.2 +elixir 1.10.3 erlang 22.2 -nodejs 12.14.1 +nodejs 12.18.2 diff --git a/docker/Dockerfile b/docker/Dockerfile index 37895e3bc1..382d6f5758 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM bitwalker/alpine-elixir-phoenix:1.10.2 +FROM bitwalker/alpine-elixir-phoenix:1.10.3 RUN apk --no-cache --update add alpine-sdk gmp-dev automake libtool inotify-tools autoconf python From 532268e23fc0f0f7262cba4d95573aa5f0dc3045 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Wed, 22 Jul 2020 14:26:52 +0300 Subject: [PATCH 74/79] Add CHANGELOG entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef3094b38e..5f6c9d4d1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ - [#3178](https://github.com/poanetwork/blockscout/pull/3178) - Fix unavailable navbar menu when read/write proxy tab is active ### Chore +- [#3206](https://github.com/poanetwork/blockscout/pull/3206) - Update Elixir version: 1.10.2 -> 1.10.3 - [#3204](https://github.com/poanetwork/blockscout/pull/3204) - GraphQL Absinthe related packages update up to stable versions - [#3180](https://github.com/poanetwork/blockscout/pull/3180) - Return correct status in verify API endpoint if contract verified - [#3180](https://github.com/poanetwork/blockscout/pull/3180) - Remove Kovan from the list of default chains From cefa80697f5fc3e8c83c7a9a4991c132f1ef1459 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Wed, 22 Jul 2020 15:39:43 +0300 Subject: [PATCH 75/79] Update deps --- apps/block_scout_web/mix.exs | 4 ++-- mix.exs | 6 ++++++ mix.lock | 8 ++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/apps/block_scout_web/mix.exs b/apps/block_scout_web/mix.exs index 7fbfc2f12a..c34a7ee7b8 100644 --- a/apps/block_scout_web/mix.exs +++ b/apps/block_scout_web/mix.exs @@ -99,8 +99,8 @@ defmodule BlockScoutWeb.Mixfile do {:logger_file_backend, "~> 0.0.10"}, {:math, "~> 0.3.0"}, {:mock, "~> 0.3.0", only: [:test], runtime: false}, - {:phoenix, "== 1.4.0"}, - {:phoenix_ecto, "~> 4.0"}, + {:phoenix, "== 1.4.17"}, + {:phoenix_ecto, "~> 4.1"}, {:phoenix_html, "~> 2.10"}, {:phoenix_live_reload, "~> 1.2", only: [:dev]}, {:phoenix_pubsub, "~> 1.0"}, diff --git a/mix.exs b/mix.exs index ada5ee6831..1aeb236452 100644 --- a/mix.exs +++ b/mix.exs @@ -72,6 +72,12 @@ defmodule BlockScout.Mixfile do # and cannot be accessed from applications inside the apps folder defp deps do [ + {:db_connection, "~> 2.2.2"}, + {:phoenix, "~> 1.4"}, + {:ecto, "~> 3.3.4"}, + {:phoenix_ecto, "~> 4.1"}, + {:phoenix_live_reload, "~> 1.2"}, + {:ecto_sql, "~> 3.3"}, # Documentation {:ex_doc, "~> 0.19.0", only: [:dev]}, # Code coverage diff --git a/mix.lock b/mix.lock index 8c1d11ce0e..65440fac68 100644 --- a/mix.lock +++ b/mix.lock @@ -23,7 +23,7 @@ "credo": {:hex, :credo, "1.1.2", "02b6422f3e659eb74b05aca3c20c1d8da0119a05ee82577a82e6c2938bf29f81", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "cd9322e9d391251ca3c4fac10ff0ce86ea4b99b3d9b34526ee2a7baa5928167d"}, "csv": {:hex, :csv, "2.3.1", "9ce11eff5a74a07baf3787b2b19dd798724d29a9c3a492a41df39f6af686da0e", [:mix], [{:parallel_stream, "~> 1.0.4", [hex: :parallel_stream, repo: "hexpm", optional: false]}], "hexpm", "86626e1c89a4ad9a96d0d9c638f9e88c2346b89b4ba1611988594ebe72b5d5ee"}, "dataloader": {:hex, :dataloader, "1.0.7", "58351b335673cf40601429bfed6c11fece6ce7ad169b2ac0f0fe83e716587391", [:mix], [{:ecto, ">= 0.0.0", [hex: :ecto, repo: "hexpm", optional: true]}], "hexpm", "12bf66478e4a5085d09dc96932d058c206ee8c219cc7691d12a40dc35c8cefaa"}, - "db_connection": {:hex, :db_connection, "2.2.0", "e923e88887cd60f9891fd324ac5e0290954511d090553c415fbf54be4c57ee63", [:mix], [{:connection, "~> 1.0.2", [hex: :connection, repo: "hexpm", optional: false]}], "hexpm", "bdf196feedfa6b83071e808b2b086fb113f8a1c4c7761f6eff6fe4b96aba0086"}, + "db_connection": {:hex, :db_connection, "2.2.2", "3bbca41b199e1598245b716248964926303b5d4609ff065125ce98bcd368939e", [:mix], [{:connection, "~> 1.0.2", [hex: :connection, repo: "hexpm", optional: false]}], "hexpm", "642af240d8a8affb93b4ba5a6fcd2bbcbdc327e1a524b825d383711536f8070c"}, "decimal": {:hex, :decimal, "1.8.1", "a4ef3f5f3428bdbc0d35374029ffcf4ede8533536fa79896dd450168d9acdf3c", [:mix], [], "hexpm", "3cb154b00225ac687f6cbd4acc4b7960027c757a5152b369923ead9ddbca7aec"}, "decorator": {:hex, :decorator, "1.3.0", "6203dbd6e4e519a21a079e2a74e50fddaf03e80be22711b92eb4cd410173abea", [:mix], [], "hexpm", "1fde31b23897e529b44d72d798489e1c6d45936f106812a8df80180779afafb4"}, "deep_merge": {:hex, :deep_merge, "0.2.0", "c1050fa2edf4848b9f556fba1b75afc66608a4219659e3311d9c9427b5b680b3", [:mix], [], "hexpm", "e3bf435a54ed27b0ba3a01eb117ae017988804e136edcbe8a6a14c310daa966e"}, @@ -81,11 +81,11 @@ "optimal": {:hex, :optimal, "0.3.6", "46bbf52fbbbd238cda81e02560caa84f93a53c75620f1fe19e81e4ae7b07d1dd", [:mix], [], "hexpm", "1a06ea6a653120226b35b283a1cd10039550f2c566edcdec22b29316d73640fd"}, "parallel_stream": {:hex, :parallel_stream, "1.0.6", "b967be2b23f0f6787fab7ed681b4c45a215a81481fb62b01a5b750fa8f30f76c", [:mix], [], "hexpm", "639b2e8749e11b87b9eb42f2ad325d161c170b39b288ac8d04c4f31f8f0823eb"}, "parse_trans": {:hex, :parse_trans, "3.3.0", "09765507a3c7590a784615cfd421d101aec25098d50b89d7aa1d66646bc571c1", [:rebar3], [], "hexpm", "17ef63abde837ad30680ea7f857dd9e7ced9476cdd7b0394432af4bfc241b960"}, - "phoenix": {:hex, :phoenix, "1.4.0", "56fe9a809e0e735f3e3b9b31c1b749d4b436e466d8da627b8d82f90eaae714d2", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 1.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}], "hexpm", "22da8f659cf13d3ba73b767f66b8c389113ddf0ef7b94225cc84e94b85eac90e"}, - "phoenix_ecto": {:hex, :phoenix_ecto, "4.0.0", "c43117a136e7399ea04ecaac73f8f23ee0ffe3e07acfcb8062fe5f4c9f0f6531", [:mix], [{:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.9", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "fe15d9fee5b82f5e64800502011ffe530650d42e1710ae9b14bc4c9be38bf303"}, + "phoenix": {:hex, :phoenix, "1.4.17", "1b1bd4cff7cfc87c94deaa7d60dd8c22e04368ab95499483c50640ef3bd838d8", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 1.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.8.1 or ~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "3a8e5d7a3d76d452bb5fb86e8b7bd115f737e4f8efe202a463d4aeb4a5809611"}, + "phoenix_ecto": {:hex, :phoenix_ecto, "4.1.0", "a044d0756d0464c5a541b4a0bf4bcaf89bffcaf92468862408290682c73ae50d", [:mix], [{:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.9", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "c5e666a341ff104d0399d8f0e4ff094559b2fde13a5985d4cb5023b2c2ac558b"}, "phoenix_form_awesomplete": {:hex, :phoenix_form_awesomplete, "0.1.5", "d09aade160b584e3428e1e095645482396f17bddda4f566f1118f12d2598d11c", [:mix], [{:phoenix_html, "~> 2.10", [hex: :phoenix_html, repo: "hexpm", optional: false]}], "hexpm", "acef2dbc638b5bcad92c11e41eb2b55d71f2596741a2f936717b8472196456ec"}, "phoenix_html": {:hex, :phoenix_html, "2.14.2", "b8a3899a72050f3f48a36430da507dd99caf0ac2d06c77529b1646964f3d563e", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "58061c8dfd25da5df1ea0ca47c972f161beb6c875cd293917045b92ffe1bf617"}, - "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.2.1", "274a4b07c4adbdd7785d45a8b0bb57634d0b4f45b18d2c508b26c0344bd59b8f", [: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", "41b4103a2fa282cfd747d377233baf213c648fdcc7928f432937676532490eee"}, + "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.2.4", "940c0344b1d66a2e46eef02af3a70e0c5bb45a4db0bf47917add271b76cd3914", [: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", "38f9308357dea4cc77f247e216da99fcb0224e05ada1469167520bed4cb8cccd"}, "phoenix_pubsub": {:hex, :phoenix_pubsub, "1.1.2", "496c303bdf1b2e98a9d26e89af5bba3ab487ba3a3735f74bf1f4064d2a845a3e", [:mix], [], "hexpm", "1f13f9f0f3e769a667a6b6828d29dec37497a082d195cc52dbef401a9b69bf38"}, "plug": {:hex, :plug, "1.10.3", "c9cebe917637d8db0e759039cc106adca069874e1a9034fd6e3fdd427fd3c283", [:mix], [{:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "01f9037a2a1de1d633b5a881101e6a444bcabb1d386ca1e00bb273a1f1d9d939"}, "plug_cowboy": {:hex, :plug_cowboy, "2.3.0", "149a50e05cb73c12aad6506a371cd75750c0b19a32f81866e1a323dda9e0e99d", [:mix], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "bc595a1870cef13f9c1e03df56d96804db7f702175e4ccacdb8fc75c02a7b97e"}, From 024823cd3b1b4a82aa7ad54b610e557f01161378 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Wed, 22 Jul 2020 16:49:30 +0300 Subject: [PATCH 76/79] Fix read contract bytes array type --- CHANGELOG.md | 1 + .../lib/explorer/smart_contract/reader.ex | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f6c9d4d1d..e43bd0c1f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - [#3145](https://github.com/poanetwork/blockscout/pull/3145) - Pending txs per address API endpoint ### Fixes +- [#3207](https://github.com/poanetwork/blockscout/pull/3207) - Fix read contract bytes array type output - [#3203](https://github.com/poanetwork/blockscout/pull/3203) - Improve "get mined blocks" query performance - [#3202](https://github.com/poanetwork/blockscout/pull/3202) - Fix contracts verification with experimental features enabled - [#3201](https://github.com/poanetwork/blockscout/pull/3201) - Connect to Metamask button diff --git a/apps/explorer/lib/explorer/smart_contract/reader.ex b/apps/explorer/lib/explorer/smart_contract/reader.ex index 72eef9aa95..de04329147 100644 --- a/apps/explorer/lib/explorer/smart_contract/reader.ex +++ b/apps/explorer/lib/explorer/smart_contract/reader.ex @@ -321,8 +321,19 @@ defmodule Explorer.SmartContract.Reader do Map.put_new(output, "value", bytes_to_string(value)) end - defp new_value(%{"type" => "bytes" <> _number} = output, values, index) do - Map.put_new(output, "value", bytes_to_string(Enum.at(values, index))) + defp new_value(%{"type" => "bytes" <> number_rest} = output, values, index) do + if String.contains?(number_rest, "[]") do + values_array = Enum.at(values, index) + + values_array_formatted = + Enum.map(values_array, fn value -> + bytes_to_string(value) + end) + + Map.put_new(output, "value", values_array_formatted) + else + Map.put_new(output, "value", bytes_to_string(Enum.at(values, index))) + end end defp new_value(%{"type" => "bytes"} = output, values, index) do From d91ce12faea7a323998be35dcaf3815e876302e5 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Wed, 22 Jul 2020 18:09:49 +0300 Subject: [PATCH 77/79] Fix view for read contract --- apps/block_scout_web/assets/css/_helpers.scss | 4 ++++ .../templates/smart_contract/_functions.html.eex | 2 +- apps/explorer/lib/explorer/smart_contract/reader.ex | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/apps/block_scout_web/assets/css/_helpers.scss b/apps/block_scout_web/assets/css/_helpers.scss index f6e6669dda..47338f1331 100644 --- a/apps/block_scout_web/assets/css/_helpers.scss +++ b/apps/block_scout_web/assets/css/_helpers.scss @@ -33,3 +33,7 @@ .hidden { display: none!important; } + +.word-break-all { + word-break: break-all; +} diff --git a/apps/block_scout_web/lib/block_scout_web/templates/smart_contract/_functions.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/smart_contract/_functions.html.eex index be83b63ca1..169f1b61ce 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/smart_contract/_functions.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/smart_contract/_functions.html.eex @@ -60,7 +60,7 @@

    <% else %> - + <%= if outputs?(function["outputs"]) do %> <%= for output <- function["outputs"] do %> <%= if address?(output["type"]) do %> diff --git a/apps/explorer/lib/explorer/smart_contract/reader.ex b/apps/explorer/lib/explorer/smart_contract/reader.ex index de04329147..a3bcfeb9df 100644 --- a/apps/explorer/lib/explorer/smart_contract/reader.ex +++ b/apps/explorer/lib/explorer/smart_contract/reader.ex @@ -330,7 +330,9 @@ defmodule Explorer.SmartContract.Reader do bytes_to_string(value) end) - Map.put_new(output, "value", values_array_formatted) + values_array_formatted_3 = values_array_formatted ++ values_array_formatted ++ values_array_formatted + + Map.put_new(output, "value", values_array_formatted_3) else Map.put_new(output, "value", bytes_to_string(Enum.at(values, index))) end From f0cdc94980b36a10d15a1bc77f038c59c2fecd2a Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Wed, 22 Jul 2020 18:53:06 +0300 Subject: [PATCH 78/79] GraphQL: fix innternal server error at request of internal transactions at address --- CHANGELOG.md | 1 + apps/block_scout_web/lib/block_scout_web/schema/types.ex | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e43bd0c1f7..80646ceac1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - [#3145](https://github.com/poanetwork/blockscout/pull/3145) - Pending txs per address API endpoint ### Fixes +- [#3209](https://github.com/poanetwork/blockscout/pull/3209) - GraphQL: fix internal server error at request of internal transactions at address - [#3207](https://github.com/poanetwork/blockscout/pull/3207) - Fix read contract bytes array type output - [#3203](https://github.com/poanetwork/blockscout/pull/3203) - Improve "get mined blocks" query performance - [#3202](https://github.com/poanetwork/blockscout/pull/3202) - Fix contracts verification with experimental features enabled diff --git a/apps/block_scout_web/lib/block_scout_web/schema/types.ex b/apps/block_scout_web/lib/block_scout_web/schema/types.ex index 2a8ed63d80..f1ecbbbe20 100644 --- a/apps/block_scout_web/lib/block_scout_web/schema/types.ex +++ b/apps/block_scout_web/lib/block_scout_web/schema/types.ex @@ -156,6 +156,9 @@ defmodule BlockScoutWeb.Schema.Types do %{last: last}, child_complexity -> last * child_complexity + + %{}, _child_complexity -> + 0 end) end end From d1459bf6fc851f0d7269a60d1a14c4cbd51e4b64 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Wed, 22 Jul 2020 19:40:32 +0300 Subject: [PATCH 79/79] Add CHANGELOG entry --- CHANGELOG.md | 1 + mix.exs | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80646ceac1..6290920e7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ - [#3178](https://github.com/poanetwork/blockscout/pull/3178) - Fix unavailable navbar menu when read/write proxy tab is active ### Chore +- [#3210](https://github.com/poanetwork/blockscout/pull/3210) - Update Phoenix up to 1.4.17 - [#3206](https://github.com/poanetwork/blockscout/pull/3206) - Update Elixir version: 1.10.2 -> 1.10.3 - [#3204](https://github.com/poanetwork/blockscout/pull/3204) - GraphQL Absinthe related packages update up to stable versions - [#3180](https://github.com/poanetwork/blockscout/pull/3180) - Return correct status in verify API endpoint if contract verified diff --git a/mix.exs b/mix.exs index 1aeb236452..ada5ee6831 100644 --- a/mix.exs +++ b/mix.exs @@ -72,12 +72,6 @@ defmodule BlockScout.Mixfile do # and cannot be accessed from applications inside the apps folder defp deps do [ - {:db_connection, "~> 2.2.2"}, - {:phoenix, "~> 1.4"}, - {:ecto, "~> 3.3.4"}, - {:phoenix_ecto, "~> 4.1"}, - {:phoenix_live_reload, "~> 1.2"}, - {:ecto_sql, "~> 3.3"}, # Documentation {:ex_doc, "~> 0.19.0", only: [:dev]}, # Code coverage