From ee3a819c3f1731cf76ce430e333843b615038923 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Fri, 24 Apr 2020 10:04:35 +0300 Subject: [PATCH 01/15] 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/15] 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 0404df18b907dbe25d347ae906c10da3f6677cc0 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Mon, 8 Jun 2020 13:30:06 +0300 Subject: [PATCH 03/15] 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 04/15] 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 27964a5e3d32de771d4a19f7895471191ca1b8e1 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Tue, 9 Jun 2020 14:14:34 +0300 Subject: [PATCH 05/15] 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 06/15] 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 07/15] 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 08/15] 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 09/15] 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 10/15] 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 11/15] 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 12/15] 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 13/15] 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 14/15] 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 15/15] 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