From 0c7c7163ebec3c9b14cdfbc4fd35535a5263f3f9 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Tue, 9 Jul 2019 15:56:12 +0300
Subject: [PATCH 01/56] set timeout for loading message on the main page

---
 .../assets/js/lib/market_history_chart.js          |  1 +
 apps/block_scout_web/assets/js/pages/chain.js      | 14 ++++++++++++--
 .../block_scout_web/templates/chain/show.html.eex  |  8 ++++----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/apps/block_scout_web/assets/js/lib/market_history_chart.js b/apps/block_scout_web/assets/js/lib/market_history_chart.js
index 615f888d8a..61c2b4695a 100644
--- a/apps/block_scout_web/assets/js/lib/market_history_chart.js
+++ b/apps/block_scout_web/assets/js/lib/market_history_chart.js
@@ -148,6 +148,7 @@ export function createMarketHistoryChart (el) {
 }
 
 $('[data-chart-error-message]').on('click', _event => {
+  $('[data-chart-loading-message]').removeAttr('hidden')
   $('[data-chart-loading-message]').show()
   $('[data-chart-error-message]').hide()
   createMarketHistoryChart($('[data-chart="marketHistoryChart"]')[0])
diff --git a/apps/block_scout_web/assets/js/pages/chain.js b/apps/block_scout_web/assets/js/pages/chain.js
index f4cd0e6628..cf596e0a5f 100644
--- a/apps/block_scout_web/assets/js/pages/chain.js
+++ b/apps/block_scout_web/assets/js/pages/chain.js
@@ -211,7 +211,10 @@ const elements = {
   '[data-selector="chain-block-list"] [data-selector="loading-message"]': {
     render ($el, state, oldState) {
       if (state.blocksLoading) {
-        $el.show()
+        setTimeout(function(){
+          $el.removeAttr('hidden')
+          $el.show()
+        }, 1000)
       } else {
         $el.hide()
       }
@@ -224,7 +227,14 @@ const elements = {
   },
   '[data-selector="transactions-list"] [data-selector="loading-message"]': {
     render ($el, state, oldState) {
-      $el.toggle(state.transactionsLoading)
+      if (state.transactionsLoading) {
+        setTimeout(function(){
+          $el.removeAttr('hidden')
+          $el.show()
+        }, 1000)
+      } else {
+        $el.hide()
+      }
     }
   },
   '[data-selector="transactions-list"]': {
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/chain/show.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/chain/show.html.eex
index 0c29001697..146d84f3c5 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/chain/show.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/chain/show.html.eex
@@ -5,7 +5,7 @@
       <div class="dashboard-banner-network-graph">
         <!-- Graph -->
         <div class="dashboard-banner-chart">
-          <div data-chart-loading-message class="tile tile-muted text-center mt-5">
+          <div hidden data-chart-loading-message class="tile tile-muted text-center mt-5">
             <span class="loading-spinner-small mr-2">
               <span class="loading-spinner-block-1"></span>
               <span class="loading-spinner-block-2"></span>
@@ -91,8 +91,8 @@
             <%= gettext "Something went wrong, click to reload." %>
           </span>
         </button>
-        <div data-selector="loading-message" class="tile tile-muted text-center mt-3 w-100">
-          <span class="loading-spinner-small mr-2">
+        <div hidden data-selector="loading-message" class="tile tile-muted text-center mt-3 w-100" >
+          <span  class="loading-spinner-small mr-2">
             <span class="loading-spinner-block-1"></span>
             <span class="loading-spinner-block-2"></span>
           </span>
@@ -117,7 +117,7 @@
             <%= gettext "Something went wrong, click to retry." %>
           </span>
         </button>
-        <div data-selector="loading-message" class="tile tile-muted text-center mt-3">
+        <div hidden data-selector="loading-message" class="tile tile-muted text-center mt-3">
           <span class="loading-spinner-small mr-2">
             <span class="loading-spinner-block-1"></span>
             <span class="loading-spinner-block-2"></span>

From a519102486356d3bee9c808a71f4520b3a601ea0 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Tue, 9 Jul 2019 15:59:48 +0300
Subject: [PATCH 02/56] add CHANGELOG entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c18c34df3..c18d304a86 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### Features
 
 - [#2294](https://github.com/poanetwork/blockscout/pull/2294) - add healthy block period checking endpoint
+- [#2324](https://github.com/poanetwork/blockscout/pull/2324) - set timeout for loading message on the main page
 
 ### Fixes
 - [#2310](https://github.com/poanetwork/blockscout/pull/2310) - parse url for api docs

From 5337641daad2db3634fd80b53c9db2eb0ee896b9 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Tue, 9 Jul 2019 16:01:33 +0300
Subject: [PATCH 03/56] fix js style

---
 apps/block_scout_web/assets/js/pages/chain.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/block_scout_web/assets/js/pages/chain.js b/apps/block_scout_web/assets/js/pages/chain.js
index cf596e0a5f..435a580188 100644
--- a/apps/block_scout_web/assets/js/pages/chain.js
+++ b/apps/block_scout_web/assets/js/pages/chain.js
@@ -211,7 +211,7 @@ const elements = {
   '[data-selector="chain-block-list"] [data-selector="loading-message"]': {
     render ($el, state, oldState) {
       if (state.blocksLoading) {
-        setTimeout(function(){
+        setTimeout(function () {
           $el.removeAttr('hidden')
           $el.show()
         }, 1000)
@@ -228,7 +228,7 @@ const elements = {
   '[data-selector="transactions-list"] [data-selector="loading-message"]': {
     render ($el, state, oldState) {
       if (state.transactionsLoading) {
-        setTimeout(function(){
+        setTimeout(function () {
           $el.removeAttr('hidden')
           $el.show()
         }, 1000)

From 8662a053e32ef03389103a6385185b02ea7e8342 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Fri, 12 Jul 2019 13:05:46 +0300
Subject: [PATCH 04/56] fix CR issues

---
 apps/block_scout_web/assets/js/lib/market_history_chart.js | 4 +++-
 apps/block_scout_web/assets/js/pages/chain.js              | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/block_scout_web/assets/js/lib/market_history_chart.js b/apps/block_scout_web/assets/js/lib/market_history_chart.js
index 61c2b4695a..ae70a1b5d1 100644
--- a/apps/block_scout_web/assets/js/lib/market_history_chart.js
+++ b/apps/block_scout_web/assets/js/lib/market_history_chart.js
@@ -129,6 +129,9 @@ class MarketHistoryChart {
 export function createMarketHistoryChart (el) {
   const dataPath = el.dataset.market_history_chart_path
   const $chartLoading = $('[data-chart-loading-message]')
+
+  $chartLoading.removeAttr('hidden')
+
   const $chartError = $('[data-chart-error-message]')
   const chart = new MarketHistoryChart(el, 0, [])
   $.getJSON(dataPath, {type: 'JSON'})
@@ -148,7 +151,6 @@ export function createMarketHistoryChart (el) {
 }
 
 $('[data-chart-error-message]').on('click', _event => {
-  $('[data-chart-loading-message]').removeAttr('hidden')
   $('[data-chart-loading-message]').show()
   $('[data-chart-error-message]').hide()
   createMarketHistoryChart($('[data-chart="marketHistoryChart"]')[0])
diff --git a/apps/block_scout_web/assets/js/pages/chain.js b/apps/block_scout_web/assets/js/pages/chain.js
index 435a580188..f0586ef796 100644
--- a/apps/block_scout_web/assets/js/pages/chain.js
+++ b/apps/block_scout_web/assets/js/pages/chain.js
@@ -210,7 +210,7 @@ const elements = {
   },
   '[data-selector="chain-block-list"] [data-selector="loading-message"]': {
     render ($el, state, oldState) {
-      if (state.blocksLoading) {
+      if (state && state.blocksLoading) {
         setTimeout(function () {
           $el.removeAttr('hidden')
           $el.show()
@@ -227,7 +227,7 @@ const elements = {
   },
   '[data-selector="transactions-list"] [data-selector="loading-message"]': {
     render ($el, state, oldState) {
-      if (state.transactionsLoading) {
+      if (state && state.transactionsLoading) {
         setTimeout(function () {
           $el.removeAttr('hidden')
           $el.show()

From 60cd238adf322085fe787494694fafcc3c7ed245 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Tue, 16 Jul 2019 11:15:41 +0300
Subject: [PATCH 05/56] add logs pagination stub

---
 apps/explorer/lib/explorer/etherscan/logs.ex | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/apps/explorer/lib/explorer/etherscan/logs.ex b/apps/explorer/lib/explorer/etherscan/logs.ex
index 9e9d70ae02..921ae1bcdb 100644
--- a/apps/explorer/lib/explorer/etherscan/logs.ex
+++ b/apps/explorer/lib/explorer/etherscan/logs.ex
@@ -38,6 +38,8 @@ defmodule Explorer.Etherscan.Logs do
     :type
   ]
 
+  @default_paging_options %{block_number: nil, transaction_index: nil}
+
   @doc """
   Gets a list of logs that meet the criteria in a given filter map.
 
@@ -68,7 +70,9 @@ defmodule Explorer.Etherscan.Logs do
 
   """
   @spec list_logs(map()) :: [map()]
-  def list_logs(%{address_hash: address_hash} = filter) when not is_nil(address_hash) do
+  def list_logs(filter, paging_options \\ @default_paging_options)
+
+  def list_logs(%{address_hash: address_hash} = filter, paging_options) when not is_nil(address_hash) do
     prepared_filter = Map.merge(@base_filter, filter)
 
     logs_query = where_topic_match(Log, prepared_filter)
@@ -134,14 +138,16 @@ defmodule Explorer.Etherscan.Logs do
         )
       end
 
-    Repo.all(query_with_consensus)
+    query_with_consensus
+    |> page_logs(paging_options)
+    |> Repo.all()
   end
 
   # Since address_hash was not present, we know that a
   # topic filter has been applied, so we use a different
   # query that is optimized for a logs filter over an
   # address_hash
-  def list_logs(filter) do
+  def list_logs(filter, paging_options) do
     prepared_filter = Map.merge(@base_filter, filter)
 
     logs_query = where_topic_match(Log, prepared_filter)
@@ -182,7 +188,9 @@ defmodule Explorer.Etherscan.Logs do
         select_merge: map(log, ^@log_fields)
       )
 
-    Repo.all(query_with_block_transaction_data)
+    query_with_block_transaction_data
+    |> page_logs(paging_options)
+    |> Repo.all()
   end
 
   @topics [
@@ -231,4 +239,6 @@ defmodule Explorer.Etherscan.Logs do
   end
 
   defp where_multiple_topics_match(query, _, _, _), do: query
+
+  defp page_logs(query, _paging_options), do: query
 end

From 3ede158963bed9f4dd7001c8fd5e650ed95843a6 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Tue, 16 Jul 2019 11:16:30 +0300
Subject: [PATCH 06/56] move eth rpc logic to separate module from controller

---
 .../controllers/api/rpc/eth_controller.ex     | 323 +-----------------
 .../controllers/api_docs_controller.ex        |   4 +-
 apps/explorer/lib/explorer/eth_rpc.ex         | 322 +++++++++++++++++
 3 files changed, 328 insertions(+), 321 deletions(-)
 create mode 100644 apps/explorer/lib/explorer/eth_rpc.ex

diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/eth_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/eth_controller.ex
index bb386940b1..26ffd5e47f 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/eth_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/eth_controller.ex
@@ -1,38 +1,10 @@
 defmodule BlockScoutWeb.API.RPC.EthController do
   use BlockScoutWeb, :controller
 
-  alias Ecto.Type, as: EctoType
-  alias Explorer.{Chain, Repo}
-  alias Explorer.Chain.{Block, Data, Hash, Hash.Address, Wei}
-  alias Explorer.Etherscan.Logs
-
-  @methods %{
-    "eth_getBalance" => %{
-      action: :eth_get_balance,
-      notes: """
-      the `earliest` parameter will not work as expected currently, because genesis block balances
-      are not currently imported
-      """
-    },
-    "eth_getLogs" => %{
-      action: :eth_get_logs,
-      notes: """
-      Will never return more than 1000 log entries.
-      """
-    }
-  }
-
-  @index_to_word %{
-    0 => "first",
-    1 => "second",
-    2 => "third",
-    3 => "fourth"
-  }
-
-  def methods, do: @methods
+  alias Explorer.EthRPC
 
   def eth_request(%{body_params: %{"_json" => requests}} = conn, _) when is_list(requests) do
-    responses = responses(requests)
+    responses = EthRPC.responses(requests)
 
     conn
     |> put_status(200)
@@ -40,7 +12,7 @@ defmodule BlockScoutWeb.API.RPC.EthController do
   end
 
   def eth_request(%{body_params: %{"_json" => request}} = conn, _) do
-    [response] = responses([request])
+    [response] = EthRPC.responses([request])
 
     conn
     |> put_status(200)
@@ -59,297 +31,10 @@ defmodule BlockScoutWeb.API.RPC.EthController do
         _ -> request
       end
 
-    [response] = responses([decoded_request])
+    [response] = EthRPC.responses([decoded_request])
 
     conn
     |> put_status(200)
     |> render("response.json", %{response: response})
   end
-
-  def eth_get_balance(address_param, block_param \\ nil) do
-    with {:address, {:ok, address}} <- {:address, Chain.string_to_address_hash(address_param)},
-         {:block, {:ok, block}} <- {:block, block_param(block_param)},
-         {:balance, {:ok, balance}} <- {:balance, Chain.get_balance_as_of_block(address, block)} do
-      {:ok, Wei.hex_format(balance)}
-    else
-      {:address, :error} ->
-        {:error, "Query parameter 'address' is invalid"}
-
-      {:block, :error} ->
-        {:error, "Query parameter 'block' is invalid"}
-
-      {:balance, {:error, :not_found}} ->
-        {:error, "Balance not found"}
-    end
-  end
-
-  def eth_get_logs(filter_options) do
-    with {:ok, address_or_topic_params} <- address_or_topic_params(filter_options),
-         {:ok, from_block_param, to_block_param} <- logs_blocks_filter(filter_options),
-         {:ok, from_block} <- cast_block(from_block_param),
-         {:ok, to_block} <- cast_block(to_block_param) do
-      filter =
-        address_or_topic_params
-        |> Map.put(:from_block, from_block)
-        |> Map.put(:to_block, to_block)
-        |> Map.put(:allow_non_consensus, true)
-
-      {:ok, filter |> Logs.list_logs() |> Enum.map(&render_log/1)}
-    else
-      {:error, message} when is_bitstring(message) ->
-        {:error, message}
-
-      {:error, :empty} ->
-        {:ok, []}
-
-      _ ->
-        {:error, "Something went wrong."}
-    end
-  end
-
-  defp render_log(log) do
-    topics =
-      Enum.reject(
-        [log.first_topic, log.second_topic, log.third_topic, log.fourth_topic],
-        &is_nil/1
-      )
-
-    %{
-      "address" => to_string(log.address_hash),
-      "blockHash" => to_string(log.block_hash),
-      "blockNumber" => Integer.to_string(log.block_number, 16),
-      "data" => to_string(log.data),
-      "logIndex" => Integer.to_string(log.index, 16),
-      "removed" => log.block_consensus == false,
-      "topics" => topics,
-      "transactionHash" => to_string(log.transaction_hash),
-      "transactionIndex" => log.transaction_index,
-      "transactionLogIndex" => log.index,
-      "type" => "mined"
-    }
-  end
-
-  defp cast_block("0x" <> hexadecimal_digits = input) do
-    case Integer.parse(hexadecimal_digits, 16) do
-      {integer, ""} -> {:ok, integer}
-      _ -> {:error, input <> " is not a valid block number"}
-    end
-  end
-
-  defp cast_block(integer) when is_integer(integer), do: {:ok, integer}
-  defp cast_block(_), do: {:error, "invalid block number"}
-
-  defp address_or_topic_params(filter_options) do
-    address_param = Map.get(filter_options, "address")
-    topics_param = Map.get(filter_options, "topics")
-
-    with {:ok, address} <- validate_address(address_param),
-         {:ok, topics} <- validate_topics(topics_param) do
-      address_and_topics(address, topics)
-    end
-  end
-
-  defp address_and_topics(nil, nil), do: {:error, "Must supply one of address and topics"}
-  defp address_and_topics(address, nil), do: {:ok, %{address_hash: address}}
-  defp address_and_topics(nil, topics), do: {:ok, topics}
-  defp address_and_topics(address, topics), do: {:ok, Map.put(topics, :address_hash, address)}
-
-  defp validate_address(nil), do: {:ok, nil}
-
-  defp validate_address(address) do
-    case Address.cast(address) do
-      {:ok, address} -> {:ok, address}
-      :error -> {:error, "invalid address"}
-    end
-  end
-
-  defp validate_topics(nil), do: {:ok, nil}
-  defp validate_topics([]), do: []
-
-  defp validate_topics(topics) when is_list(topics) do
-    topics
-    |> Stream.with_index()
-    |> Enum.reduce({:ok, %{}}, fn {topic, index}, {:ok, acc} ->
-      case cast_topics(topic) do
-        {:ok, data} ->
-          with_filter = Map.put(acc, String.to_existing_atom("#{@index_to_word[index]}_topic"), data)
-
-          {:ok, add_operator(with_filter, index)}
-
-        :error ->
-          {:error, "invalid topics"}
-      end
-    end)
-  end
-
-  defp add_operator(filters, 0), do: filters
-
-  defp add_operator(filters, index) do
-    Map.put(filters, String.to_existing_atom("topic#{index - 1}_#{index}_opr"), "and")
-  end
-
-  defp cast_topics(topics) when is_list(topics) do
-    case EctoType.cast({:array, Data}, topics) do
-      {:ok, data} -> {:ok, Enum.map(data, &to_string/1)}
-      :error -> :error
-    end
-  end
-
-  defp cast_topics(topic) do
-    case Data.cast(topic) do
-      {:ok, data} -> {:ok, to_string(data)}
-      :error -> :error
-    end
-  end
-
-  defp responses(requests) do
-    Enum.map(requests, fn request ->
-      with {:id, {:ok, id}} <- {:id, Map.fetch(request, "id")},
-           {:request, {:ok, result}} <- {:request, do_eth_request(request)} do
-        format_success(result, id)
-      else
-        {:id, :error} -> format_error("id is a required field", 0)
-        {:request, {:error, message}} -> format_error(message, Map.get(request, "id"))
-      end
-    end)
-  end
-
-  defp logs_blocks_filter(filter_options) do
-    with {:filter, %{"blockHash" => block_hash_param}} <- {:filter, filter_options},
-         {:block_hash, {:ok, block_hash}} <- {:block_hash, Hash.Full.cast(block_hash_param)},
-         {:block, %{number: number}} <- {:block, Repo.get(Block, block_hash)} do
-      {:ok, number, number}
-    else
-      {:filter, filters} ->
-        from_block = Map.get(filters, "fromBlock", "latest")
-        to_block = Map.get(filters, "toBlock", "latest")
-
-        max_block_number =
-          if from_block == "latest" || to_block == "latest" do
-            max_consensus_block_number()
-          end
-
-        pending_block_number =
-          if from_block == "pending" || to_block == "pending" do
-            max_non_consensus_block_number(max_block_number)
-          end
-
-        if is_nil(pending_block_number) && from_block == "pending" && to_block == "pending" do
-          {:error, :empty}
-        else
-          to_block_numbers(from_block, to_block, max_block_number, pending_block_number)
-        end
-
-      {:block, _} ->
-        {:error, "Invalid Block Hash"}
-
-      {:block_hash, _} ->
-        {:error, "Invalid Block Hash"}
-    end
-  end
-
-  defp to_block_numbers(from_block, to_block, max_block_number, pending_block_number) do
-    actual_pending_block_number = pending_block_number || max_block_number
-
-    with {:ok, from} <-
-           to_block_number(from_block, max_block_number, actual_pending_block_number),
-         {:ok, to} <- to_block_number(to_block, max_block_number, actual_pending_block_number) do
-      {:ok, from, to}
-    end
-  end
-
-  defp to_block_number(integer, _, _) when is_integer(integer), do: {:ok, integer}
-  defp to_block_number("latest", max_block_number, _), do: {:ok, max_block_number || 0}
-  defp to_block_number("earliest", _, _), do: {:ok, 0}
-  defp to_block_number("pending", max_block_number, nil), do: {:ok, max_block_number || 0}
-  defp to_block_number("pending", _, pending), do: {:ok, pending}
-
-  defp to_block_number("0x" <> number, _, _) do
-    case Integer.parse(number, 16) do
-      {integer, ""} -> {:ok, integer}
-      _ -> {:error, "invalid block number"}
-    end
-  end
-
-  defp to_block_number(number, _, _) when is_bitstring(number) do
-    case Integer.parse(number, 16) do
-      {integer, ""} -> {:ok, integer}
-      _ -> {:error, "invalid block number"}
-    end
-  end
-
-  defp to_block_number(_, _, _), do: {:error, "invalid block number"}
-
-  defp max_non_consensus_block_number(max) do
-    case Chain.max_non_consensus_block_number(max) do
-      {:ok, number} -> number
-      _ -> nil
-    end
-  end
-
-  defp max_consensus_block_number do
-    case Chain.max_consensus_block_number() do
-      {:ok, number} -> number
-      _ -> nil
-    end
-  end
-
-  defp format_success(result, id) do
-    %{result: result, id: id}
-  end
-
-  defp format_error(message, id) do
-    %{error: message, id: id}
-  end
-
-  defp do_eth_request(%{"jsonrpc" => rpc_version}) when rpc_version != "2.0" do
-    {:error, "invalid rpc version"}
-  end
-
-  defp do_eth_request(%{"jsonrpc" => "2.0", "method" => method, "params" => params})
-       when is_list(params) do
-    with {:ok, action} <- get_action(method),
-         {:correct_arity, true} <-
-           {:correct_arity, :erlang.function_exported(__MODULE__, action, Enum.count(params))} do
-      apply(__MODULE__, action, params)
-    else
-      {:correct_arity, _} ->
-        {:error, "Incorrect number of params."}
-
-      _ ->
-        {:error, "Action not found."}
-    end
-  end
-
-  defp do_eth_request(%{"params" => _params, "method" => _}) do
-    {:error, "Invalid params. Params must be a list."}
-  end
-
-  defp do_eth_request(_) do
-    {:error, "Method, params, and jsonrpc, are all required parameters."}
-  end
-
-  defp get_action(action) do
-    case Map.get(@methods, action) do
-      %{action: action} ->
-        {:ok, action}
-
-      _ ->
-        :error
-    end
-  end
-
-  defp block_param("latest"), do: {:ok, :latest}
-  defp block_param("earliest"), do: {:ok, :earliest}
-  defp block_param("pending"), do: {:ok, :pending}
-
-  defp block_param(string_integer) when is_bitstring(string_integer) do
-    case Integer.parse(string_integer) do
-      {integer, ""} -> {:ok, integer}
-      _ -> :error
-    end
-  end
-
-  defp block_param(nil), do: {:ok, :latest}
-  defp block_param(_), do: :error
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api_docs_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api_docs_controller.ex
index 9309884d5c..4a658c409e 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api_docs_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api_docs_controller.ex
@@ -1,8 +1,8 @@
 defmodule BlockScoutWeb.APIDocsController do
   use BlockScoutWeb, :controller
 
-  alias BlockScoutWeb.API.RPC.EthController
   alias BlockScoutWeb.Etherscan
+  alias Explorer.EthRPC
 
   def index(conn, _params) do
     conn
@@ -12,7 +12,7 @@ defmodule BlockScoutWeb.APIDocsController do
 
   def eth_rpc(conn, _params) do
     conn
-    |> assign(:documentation, EthController.methods())
+    |> assign(:documentation, EthRPC.methods())
     |> render("eth_rpc.html")
   end
 end
diff --git a/apps/explorer/lib/explorer/eth_rpc.ex b/apps/explorer/lib/explorer/eth_rpc.ex
new file mode 100644
index 0000000000..4aa7aaf187
--- /dev/null
+++ b/apps/explorer/lib/explorer/eth_rpc.ex
@@ -0,0 +1,322 @@
+defmodule Explorer.EthRPC do
+  @moduledoc """
+  Ethreum JSON RPC methods logic implementation.
+  """
+
+  alias Ecto.Type, as: EctoType
+  alias Explorer.{Chain, Repo}
+  alias Explorer.Chain.{Block, Data, Hash, Hash.Address, Wei}
+  alias Explorer.Etherscan.Logs
+
+  @methods %{
+    "eth_getBalance" => %{
+      action: :eth_get_balance,
+      notes: """
+      the `earliest` parameter will not work as expected currently, because genesis block balances
+      are not currently imported
+      """
+    },
+    "eth_getLogs" => %{
+      action: :eth_get_logs,
+      notes: """
+      Will never return more than 1000 log entries.
+      """
+    }
+  }
+
+  @index_to_word %{
+    0 => "first",
+    1 => "second",
+    2 => "third",
+    3 => "fourth"
+  }
+
+  def responses(requests) do
+    Enum.map(requests, fn request ->
+      with {:id, {:ok, id}} <- {:id, Map.fetch(request, "id")},
+           {:request, {:ok, result}} <- {:request, do_eth_request(request)} do
+        format_success(result, id)
+      else
+        {:id, :error} -> format_error("id is a required field", 0)
+        {:request, {:error, message}} -> format_error(message, Map.get(request, "id"))
+      end
+    end)
+  end
+
+  def eth_get_balance(address_param, block_param \\ nil) do
+    with {:address, {:ok, address}} <- {:address, Chain.string_to_address_hash(address_param)},
+         {:block, {:ok, block}} <- {:block, block_param(block_param)},
+         {:balance, {:ok, balance}} <- {:balance, Chain.get_balance_as_of_block(address, block)} do
+      {:ok, Wei.hex_format(balance)}
+    else
+      {:address, :error} ->
+        {:error, "Query parameter 'address' is invalid"}
+
+      {:block, :error} ->
+        {:error, "Query parameter 'block' is invalid"}
+
+      {:balance, {:error, :not_found}} ->
+        {:error, "Balance not found"}
+    end
+  end
+
+  def eth_get_logs(filter_options) do
+    with {:ok, address_or_topic_params} <- address_or_topic_params(filter_options),
+         {:ok, from_block_param, to_block_param} <- logs_blocks_filter(filter_options),
+         {:ok, from_block} <- cast_block(from_block_param),
+         {:ok, to_block} <- cast_block(to_block_param) do
+      filter =
+        address_or_topic_params
+        |> Map.put(:from_block, from_block)
+        |> Map.put(:to_block, to_block)
+        |> Map.put(:allow_non_consensus, true)
+
+      {:ok, filter |> Logs.list_logs() |> Enum.map(&render_log/1)}
+    else
+      {:error, message} when is_bitstring(message) ->
+        {:error, message}
+
+      {:error, :empty} ->
+        {:ok, []}
+
+      _ ->
+        {:error, "Something went wrong."}
+    end
+  end
+
+  defp render_log(log) do
+    topics =
+      Enum.reject(
+        [log.first_topic, log.second_topic, log.third_topic, log.fourth_topic],
+        &is_nil/1
+      )
+
+    %{
+      "address" => to_string(log.address_hash),
+      "blockHash" => to_string(log.block_hash),
+      "blockNumber" => Integer.to_string(log.block_number, 16),
+      "data" => to_string(log.data),
+      "logIndex" => Integer.to_string(log.index, 16),
+      "removed" => log.block_consensus == false,
+      "topics" => topics,
+      "transactionHash" => to_string(log.transaction_hash),
+      "transactionIndex" => log.transaction_index,
+      "transactionLogIndex" => log.index,
+      "type" => "mined"
+    }
+  end
+
+  defp cast_block("0x" <> hexadecimal_digits = input) do
+    case Integer.parse(hexadecimal_digits, 16) do
+      {integer, ""} -> {:ok, integer}
+      _ -> {:error, input <> " is not a valid block number"}
+    end
+  end
+
+  defp cast_block(integer) when is_integer(integer), do: {:ok, integer}
+  defp cast_block(_), do: {:error, "invalid block number"}
+
+  defp address_or_topic_params(filter_options) do
+    address_param = Map.get(filter_options, "address")
+    topics_param = Map.get(filter_options, "topics")
+
+    with {:ok, address} <- validate_address(address_param),
+         {:ok, topics} <- validate_topics(topics_param) do
+      address_and_topics(address, topics)
+    end
+  end
+
+  defp address_and_topics(nil, nil), do: {:error, "Must supply one of address and topics"}
+  defp address_and_topics(address, nil), do: {:ok, %{address_hash: address}}
+  defp address_and_topics(nil, topics), do: {:ok, topics}
+  defp address_and_topics(address, topics), do: {:ok, Map.put(topics, :address_hash, address)}
+
+  defp validate_address(nil), do: {:ok, nil}
+
+  defp validate_address(address) do
+    case Address.cast(address) do
+      {:ok, address} -> {:ok, address}
+      :error -> {:error, "invalid address"}
+    end
+  end
+
+  defp validate_topics(nil), do: {:ok, nil}
+  defp validate_topics([]), do: []
+
+  defp validate_topics(topics) when is_list(topics) do
+    topics
+    |> Stream.with_index()
+    |> Enum.reduce({:ok, %{}}, fn {topic, index}, {:ok, acc} ->
+      case cast_topics(topic) do
+        {:ok, data} ->
+          with_filter = Map.put(acc, String.to_existing_atom("#{@index_to_word[index]}_topic"), data)
+
+          {:ok, add_operator(with_filter, index)}
+
+        :error ->
+          {:error, "invalid topics"}
+      end
+    end)
+  end
+
+  defp add_operator(filters, 0), do: filters
+
+  defp add_operator(filters, index) do
+    Map.put(filters, String.to_existing_atom("topic#{index - 1}_#{index}_opr"), "and")
+  end
+
+  defp cast_topics(topics) when is_list(topics) do
+    case EctoType.cast({:array, Data}, topics) do
+      {:ok, data} -> {:ok, Enum.map(data, &to_string/1)}
+      :error -> :error
+    end
+  end
+
+  defp cast_topics(topic) do
+    case Data.cast(topic) do
+      {:ok, data} -> {:ok, to_string(data)}
+      :error -> :error
+    end
+  end
+
+  defp logs_blocks_filter(filter_options) do
+    with {:filter, %{"blockHash" => block_hash_param}} <- {:filter, filter_options},
+         {:block_hash, {:ok, block_hash}} <- {:block_hash, Hash.Full.cast(block_hash_param)},
+         {:block, %{number: number}} <- {:block, Repo.get(Block, block_hash)} do
+      {:ok, number, number}
+    else
+      {:filter, filters} ->
+        from_block = Map.get(filters, "fromBlock", "latest")
+        to_block = Map.get(filters, "toBlock", "latest")
+
+        max_block_number =
+          if from_block == "latest" || to_block == "latest" do
+            max_consensus_block_number()
+          end
+
+        pending_block_number =
+          if from_block == "pending" || to_block == "pending" do
+            max_non_consensus_block_number(max_block_number)
+          end
+
+        if is_nil(pending_block_number) && from_block == "pending" && to_block == "pending" do
+          {:error, :empty}
+        else
+          to_block_numbers(from_block, to_block, max_block_number, pending_block_number)
+        end
+
+      {:block, _} ->
+        {:error, "Invalid Block Hash"}
+
+      {:block_hash, _} ->
+        {:error, "Invalid Block Hash"}
+    end
+  end
+
+  defp to_block_numbers(from_block, to_block, max_block_number, pending_block_number) do
+    actual_pending_block_number = pending_block_number || max_block_number
+
+    with {:ok, from} <-
+           to_block_number(from_block, max_block_number, actual_pending_block_number),
+         {:ok, to} <- to_block_number(to_block, max_block_number, actual_pending_block_number) do
+      {:ok, from, to}
+    end
+  end
+
+  defp to_block_number(integer, _, _) when is_integer(integer), do: {:ok, integer}
+  defp to_block_number("latest", max_block_number, _), do: {:ok, max_block_number || 0}
+  defp to_block_number("earliest", _, _), do: {:ok, 0}
+  defp to_block_number("pending", max_block_number, nil), do: {:ok, max_block_number || 0}
+  defp to_block_number("pending", _, pending), do: {:ok, pending}
+
+  defp to_block_number("0x" <> number, _, _) do
+    case Integer.parse(number, 16) do
+      {integer, ""} -> {:ok, integer}
+      _ -> {:error, "invalid block number"}
+    end
+  end
+
+  defp to_block_number(number, _, _) when is_bitstring(number) do
+    case Integer.parse(number, 16) do
+      {integer, ""} -> {:ok, integer}
+      _ -> {:error, "invalid block number"}
+    end
+  end
+
+  defp to_block_number(_, _, _), do: {:error, "invalid block number"}
+
+  defp max_non_consensus_block_number(max) do
+    case Chain.max_non_consensus_block_number(max) do
+      {:ok, number} -> number
+      _ -> nil
+    end
+  end
+
+  defp max_consensus_block_number do
+    case Chain.max_consensus_block_number() do
+      {:ok, number} -> number
+      _ -> nil
+    end
+  end
+
+  defp format_success(result, id) do
+    %{result: result, id: id}
+  end
+
+  defp format_error(message, id) do
+    %{error: message, id: id}
+  end
+
+  defp do_eth_request(%{"jsonrpc" => rpc_version}) when rpc_version != "2.0" do
+    {:error, "invalid rpc version"}
+  end
+
+  defp do_eth_request(%{"jsonrpc" => "2.0", "method" => method, "params" => params})
+       when is_list(params) do
+    with {:ok, action} <- get_action(method),
+         {:correct_arity, true} <-
+           {:correct_arity, :erlang.function_exported(__MODULE__, action, Enum.count(params))} do
+      apply(__MODULE__, action, params)
+    else
+      {:correct_arity, _} ->
+        {:error, "Incorrect number of params."}
+
+      _ ->
+        {:error, "Action not found."}
+    end
+  end
+
+  defp do_eth_request(%{"params" => _params, "method" => _}) do
+    {:error, "Invalid params. Params must be a list."}
+  end
+
+  defp do_eth_request(_) do
+    {:error, "Method, params, and jsonrpc, are all required parameters."}
+  end
+
+  defp get_action(action) do
+    case Map.get(@methods, action) do
+      %{action: action} ->
+        {:ok, action}
+
+      _ ->
+        :error
+    end
+  end
+
+  defp block_param("latest"), do: {:ok, :latest}
+  defp block_param("earliest"), do: {:ok, :earliest}
+  defp block_param("pending"), do: {:ok, :pending}
+
+  defp block_param(string_integer) when is_bitstring(string_integer) do
+    case Integer.parse(string_integer) do
+      {integer, ""} -> {:ok, integer}
+      _ -> :error
+    end
+  end
+
+  defp block_param(nil), do: {:ok, :latest}
+  defp block_param(_), do: :error
+
+  def methods, do: @methods
+end

From 9a95541797901a4bf029c4fea79f9f46f979b947 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Tue, 16 Jul 2019 12:30:01 +0300
Subject: [PATCH 07/56] sort records for pagination

---
 apps/explorer/lib/explorer/etherscan/logs.ex | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/apps/explorer/lib/explorer/etherscan/logs.ex b/apps/explorer/lib/explorer/etherscan/logs.ex
index 921ae1bcdb..fa3ea646c3 100644
--- a/apps/explorer/lib/explorer/etherscan/logs.ex
+++ b/apps/explorer/lib/explorer/etherscan/logs.ex
@@ -5,7 +5,7 @@ defmodule Explorer.Etherscan.Logs do
 
   """
 
-  import Ecto.Query, only: [from: 2, where: 3, subquery: 1]
+  import Ecto.Query, only: [from: 2, where: 3, subquery: 1, order_by: 3]
 
   alias Explorer.Chain.{Block, InternalTransaction, Log, Transaction}
   alias Explorer.Repo
@@ -38,7 +38,7 @@ defmodule Explorer.Etherscan.Logs do
     :type
   ]
 
-  @default_paging_options %{block_number: nil, transaction_index: nil}
+  @default_paging_options %{block_number: nil, transaction_index: nil, log_index: nil}
 
   @doc """
   Gets a list of logs that meet the criteria in a given filter map.
@@ -240,5 +240,18 @@ defmodule Explorer.Etherscan.Logs do
 
   defp where_multiple_topics_match(query, _, _, _), do: query
 
-  defp page_logs(query, _paging_options), do: query
+  defp page_logs(query, %{block_number: nil, transaction_index: nil, log_index: nil}) do
+    query
+    |> order_by([log], asc: log.index)
+  end
+
+  defp page_logs(query, %{block_number: block_number, transaction_index: transaction_index, log_index: log_index}) do
+    sorted_query = order_by(query, [log], asc: log.index)
+
+    from(data in sorted_query,
+      where:
+        data.index > ^log_index and data.block_number >= ^block_number and
+          data.transaction_index >= ^transaction_index
+    )
+  end
 end

From 9ada146563c784f949e6915bada1bc630b7b1fb4 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Tue, 16 Jul 2019 12:44:53 +0300
Subject: [PATCH 08/56] add pagination test

---
 .../test/explorer/etherscan/logs_test.exs     | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/apps/explorer/test/explorer/etherscan/logs_test.exs b/apps/explorer/test/explorer/etherscan/logs_test.exs
index 00050db6f4..a8efb71ac9 100644
--- a/apps/explorer/test/explorer/etherscan/logs_test.exs
+++ b/apps/explorer/test/explorer/etherscan/logs_test.exs
@@ -158,6 +158,46 @@ defmodule Explorer.Etherscan.LogsTest do
       assert found_log.transaction_hash == transaction_block1.hash
     end
 
+    test "paginates logs" do
+      contract_address = insert(:contract_address)
+
+      transaction =
+        %Transaction{block: block} =
+        :transaction
+        |> insert(to_address: contract_address)
+        |> with_block()
+
+      inserted_records = insert_list(2000, :log, address: contract_address, transaction: transaction)
+
+      filter = %{
+        from_block: block.number,
+        to_block: block.number,
+        address_hash: contract_address.hash
+      }
+
+      first_found_logs = Logs.list_logs(filter)
+
+      assert Enum.count(first_found_logs) == 1_000
+
+      last_record = List.last(first_found_logs)
+
+      next_page_params = %{
+        log_index: last_record.index,
+        transaction_index: last_record.transaction_index,
+        block_number: transaction.block_number
+      }
+
+      second_found_logs = Logs.list_logs(filter, next_page_params)
+
+      assert Enum.count(second_found_logs) == 1_000
+
+      all_found_logs = first_found_logs ++ second_found_logs
+
+      Enum.all?(inserted_records, fn record ->
+        Enum.any?(all_found_logs, fn found_log -> found_log.index == record.index end)
+      end)
+    end
+
     test "with a valid topic{x}" do
       contract_address = insert(:contract_address)
 

From a137af13dccd4e580526fd319418692cc599e2ca Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Tue, 16 Jul 2019 13:38:58 +0300
Subject: [PATCH 09/56] add pagination params to endpoint

---
 .../api/rpc/eth_controller_test.exs           | 48 +++++++++++++++++++
 apps/explorer/lib/explorer/eth_rpc.ex         | 25 +++++++++-
 apps/explorer/lib/explorer/etherscan/logs.ex  |  2 +
 3 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs
index 1b9273c66c..dafaed6bb3 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs
@@ -125,6 +125,54 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do
       assert [%{"data" => "0x010101"}, %{"data" => "0x020202"}] = Enum.sort_by(response["result"], &Map.get(&1, "data"))
     end
 
+    test "paginates logs", %{conn: conn, api_params: api_params} do
+      contract_address = insert(:contract_address)
+
+      transaction =
+        :transaction
+        |> insert(to_address: contract_address)
+        |> with_block()
+
+      inserted_records =
+        insert_list(2000, :log, address: contract_address, transaction: transaction, first_topic: "0x01")
+
+      params = params(api_params, [%{"address" => to_string(contract_address), "topics" => [["0x01"]]}])
+
+      assert response =
+               conn
+               |> post("/api/eth_rpc", params)
+               |> json_response(200)
+
+      assert Enum.count(response["result"]) == 1000
+
+      next_page_params = %{
+        "block_number" => transaction.block_number,
+        "transaction_index" => transaction.index,
+        "log_index" => 999
+      }
+
+      new_params =
+        params(api_params, [
+          %{"paging_options" => next_page_params, "address" => to_string(contract_address), "topics" => [["0x01"]]}
+        ])
+
+      assert new_response =
+               conn
+               |> post("/api/eth_rpc", new_params)
+               |> json_response(200)
+
+      assert Enum.count(response["result"]) == 1000
+
+      all_found_logs = response["result"] ++ new_response["result"]
+
+      assert Enum.all?(inserted_records, fn record ->
+               Enum.any?(all_found_logs, fn found_log ->
+                 {index, ""} = Integer.parse(found_log["logIndex"], 16)
+                 record.index == index
+               end)
+             end)
+    end
+
     test "with a matching address and multiple topic matches in different positions", %{
       conn: conn,
       api_params: api_params
diff --git a/apps/explorer/lib/explorer/eth_rpc.ex b/apps/explorer/lib/explorer/eth_rpc.ex
index 4aa7aaf187..0bd07849d5 100644
--- a/apps/explorer/lib/explorer/eth_rpc.ex
+++ b/apps/explorer/lib/explorer/eth_rpc.ex
@@ -64,14 +64,20 @@ defmodule Explorer.EthRPC do
     with {:ok, address_or_topic_params} <- address_or_topic_params(filter_options),
          {:ok, from_block_param, to_block_param} <- logs_blocks_filter(filter_options),
          {:ok, from_block} <- cast_block(from_block_param),
-         {:ok, to_block} <- cast_block(to_block_param) do
+         {:ok, to_block} <- cast_block(to_block_param),
+         {:ok, paging_options} <- paging_options(filter_options["paging_options"]) do
       filter =
         address_or_topic_params
         |> Map.put(:from_block, from_block)
         |> Map.put(:to_block, to_block)
         |> Map.put(:allow_non_consensus, true)
 
-      {:ok, filter |> Logs.list_logs() |> Enum.map(&render_log/1)}
+      logs =
+        filter
+        |> Logs.list_logs(paging_options)
+        |> Enum.map(&render_log/1)
+
+      {:ok, logs}
     else
       {:error, message} when is_bitstring(message) ->
         {:error, message}
@@ -213,6 +219,21 @@ defmodule Explorer.EthRPC do
     end
   end
 
+  defp paging_options(%{
+         "log_index" => log_index,
+         "transaction_index" => transaction_index,
+         "block_number" => block_number
+       }) do
+    {:ok,
+     %{
+       log_index: log_index,
+       transaction_index: transaction_index,
+       block_number: block_number
+     }}
+  end
+
+  defp paging_options(_), do: {:ok, nil}
+
   defp to_block_numbers(from_block, to_block, max_block_number, pending_block_number) do
     actual_pending_block_number = pending_block_number || max_block_number
 
diff --git a/apps/explorer/lib/explorer/etherscan/logs.ex b/apps/explorer/lib/explorer/etherscan/logs.ex
index fa3ea646c3..67b754156d 100644
--- a/apps/explorer/lib/explorer/etherscan/logs.ex
+++ b/apps/explorer/lib/explorer/etherscan/logs.ex
@@ -73,6 +73,7 @@ defmodule Explorer.Etherscan.Logs do
   def list_logs(filter, paging_options \\ @default_paging_options)
 
   def list_logs(%{address_hash: address_hash} = filter, paging_options) when not is_nil(address_hash) do
+    paging_options = if is_nil(paging_options), do: @default_paging_options, else: paging_options
     prepared_filter = Map.merge(@base_filter, filter)
 
     logs_query = where_topic_match(Log, prepared_filter)
@@ -148,6 +149,7 @@ defmodule Explorer.Etherscan.Logs do
   # query that is optimized for a logs filter over an
   # address_hash
   def list_logs(filter, paging_options) do
+    paging_options = if is_nil(paging_options), do: @default_paging_options, else: paging_options
     prepared_filter = Map.merge(@base_filter, filter)
 
     logs_query = where_topic_match(Log, prepared_filter)

From 48db99478719563ad4bf5e6ef1eb8382c31c6a19 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Tue, 16 Jul 2019 13:42:43 +0300
Subject: [PATCH 10/56] fix conflicts

---
 apps/explorer/lib/explorer/eth_rpc.ex | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/explorer/lib/explorer/eth_rpc.ex b/apps/explorer/lib/explorer/eth_rpc.ex
index 0bd07849d5..6acb7f523f 100644
--- a/apps/explorer/lib/explorer/eth_rpc.ex
+++ b/apps/explorer/lib/explorer/eth_rpc.ex
@@ -14,12 +14,18 @@ defmodule Explorer.EthRPC do
       notes: """
       the `earliest` parameter will not work as expected currently, because genesis block balances
       are not currently imported
+      """,
+      example: """
+      {"id": 0, "jsonrpc": "2.0", "method": "eth_getBalance", "params": ["0x0000000000000000000000000000000000000007", "2"]}
       """
     },
     "eth_getLogs" => %{
       action: :eth_get_logs,
       notes: """
       Will never return more than 1000 log entries.
+      """,
+      example: """
+      {"id": 0, "jsonrpc": "2.0", "method": "eth_getLogs", "params": [{"address": "0x0000000000000000000000000000000000000026","topics": ["0x01"]}]}
       """
     }
   }

From 8e23dc553425c767dc684cd991a9275d3bdf8a83 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Tue, 16 Jul 2019 13:53:34 +0300
Subject: [PATCH 11/56] fix test

---
 .../controllers/api/rpc/eth_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/eth_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs
index dafaed6bb3..f6fc4b79d1 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs
@@ -148,7 +148,7 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do
       next_page_params = %{
         "block_number" => transaction.block_number,
         "transaction_index" => transaction.index,
-        "log_index" => 999
+        "log_index" => 1000
       }
 
       new_params =
@@ -168,6 +168,7 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do
       assert Enum.all?(inserted_records, fn record ->
                Enum.any?(all_found_logs, fn found_log ->
                  {index, ""} = Integer.parse(found_log["logIndex"], 16)
+
                  record.index == index
                end)
              end)

From 2d2bdfc4ed3ad5a41dfe2041b849e7b02950a15b Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Tue, 16 Jul 2019 14:02:21 +0300
Subject: [PATCH 12/56] add note about pagination params

---
 apps/explorer/lib/explorer/eth_rpc.ex | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/explorer/lib/explorer/eth_rpc.ex b/apps/explorer/lib/explorer/eth_rpc.ex
index 6acb7f523f..aaec38f4f6 100644
--- a/apps/explorer/lib/explorer/eth_rpc.ex
+++ b/apps/explorer/lib/explorer/eth_rpc.ex
@@ -22,7 +22,8 @@ defmodule Explorer.EthRPC do
     "eth_getLogs" => %{
       action: :eth_get_logs,
       notes: """
-      Will never return more than 1000 log entries.
+      Will never return more than 1000 log entries.\n
+      For this reason, you can use pagination options to request the next page. Pagination options params: {"block_number": 1, "transaction_index": 0, "log_index": 1} which include parameters from the last log received from the previous request.
       """,
       example: """
       {"id": 0, "jsonrpc": "2.0", "method": "eth_getLogs", "params": [{"address": "0x0000000000000000000000000000000000000026","topics": ["0x01"]}]}

From 75a7a1d496b4f737c21ca57aec955d59b5e1a525 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Tue, 16 Jul 2019 14:09:34 +0300
Subject: [PATCH 13/56] use dynamic log index

---
 .../controllers/api/rpc/eth_controller_test.exs               | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs
index f6fc4b79d1..d611d519ad 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs
@@ -145,10 +145,12 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do
 
       assert Enum.count(response["result"]) == 1000
 
+      {last_log_index, ""} = Integer.parse(List.last(response["result"])["logIndex"], 16)
+
       next_page_params = %{
         "block_number" => transaction.block_number,
         "transaction_index" => transaction.index,
-        "log_index" => 1000
+        "log_index" => last_log_index
       }
 
       new_params =

From 4ea795d1b1f6e1f3925732ae6cb8efff9e3f1b46 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Tue, 16 Jul 2019 14:12:28 +0300
Subject: [PATCH 14/56] add forgotten assert

---
 apps/explorer/test/explorer/etherscan/logs_test.exs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/explorer/test/explorer/etherscan/logs_test.exs b/apps/explorer/test/explorer/etherscan/logs_test.exs
index a8efb71ac9..d1d3f8151c 100644
--- a/apps/explorer/test/explorer/etherscan/logs_test.exs
+++ b/apps/explorer/test/explorer/etherscan/logs_test.exs
@@ -193,7 +193,7 @@ defmodule Explorer.Etherscan.LogsTest do
 
       all_found_logs = first_found_logs ++ second_found_logs
 
-      Enum.all?(inserted_records, fn record ->
+      assert Enum.all?(inserted_records, fn record ->
         Enum.any?(all_found_logs, fn found_log -> found_log.index == record.index end)
       end)
     end

From 1c344bcf99c441fd67124d2dac41082c32674d47 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Tue, 16 Jul 2019 14:19:30 +0300
Subject: [PATCH 15/56] mix format

---
 apps/explorer/test/explorer/etherscan/logs_test.exs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/explorer/test/explorer/etherscan/logs_test.exs b/apps/explorer/test/explorer/etherscan/logs_test.exs
index d1d3f8151c..490dce199d 100644
--- a/apps/explorer/test/explorer/etherscan/logs_test.exs
+++ b/apps/explorer/test/explorer/etherscan/logs_test.exs
@@ -194,8 +194,8 @@ defmodule Explorer.Etherscan.LogsTest do
       all_found_logs = first_found_logs ++ second_found_logs
 
       assert Enum.all?(inserted_records, fn record ->
-        Enum.any?(all_found_logs, fn found_log -> found_log.index == record.index end)
-      end)
+               Enum.any?(all_found_logs, fn found_log -> found_log.index == record.index end)
+             end)
     end
 
     test "with a valid topic{x}" do

From 1f2ab38b28a4f186c8990fcebbc13ab6e385eda2 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Tue, 16 Jul 2019 16:40:05 +0300
Subject: [PATCH 16/56] add CHANGELOG entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7cd9165b22..abd6928bfd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## Current
 
 ### Features
+- [#2366)(https://github.com/poanetwork/blockscout/pull/2366) - paginate eth logs
 - [#2352](https://github.com/poanetwork/blockscout/pull/2352) - Fetch rewards in parallel with transactions
 - [#2294](https://github.com/poanetwork/blockscout/pull/2294) - add healthy block period checking endpoint
 

From 9bc027daff059cd293a266ce0e17a691d85234f8 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Wed, 17 Jul 2019 13:31:58 +0300
Subject: [PATCH 17/56] decode constructor arguments for verified smart
 contracts

---
 .../templates/address_contract/index.html.eex |  2 +-
 .../views/address_contract_view.ex            | 32 +++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex
index 32f77425ca..3916d227de 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex
@@ -49,7 +49,7 @@
           <%= if @address.smart_contract.constructor_arguments do %>
             <dl class="row">
               <dt class="col-sm-4 col-md-2 text-muted"><%= gettext "Constructor arguments" %></dt>
-              <dd class="col-sm-8 col-md-10"><%= @address.smart_contract.constructor_arguments %></dd>
+              <dd class="col-sm-8 col-md-10"><%= format_constructor_arguments(@address.smart_contract) %></dd>
             </dl>
           <% end %>
         </div>
diff --git a/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex b/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex
index 5de263f820..ae9b15b0d8 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex
@@ -1,6 +1,7 @@
 defmodule BlockScoutWeb.AddressContractView do
   use BlockScoutWeb, :view
 
+  alias ABI.{FunctionSelector, TypeDecoder}
   alias Explorer.Chain.{Address, Data, InternalTransaction}
 
   def render("scripts.html", %{conn: conn}) do
@@ -21,6 +22,37 @@ defmodule BlockScoutWeb.AddressContractView do
   def format_optimization_text(true), do: gettext("true")
   def format_optimization_text(false), do: gettext("false")
 
+  def format_constructor_arguments(contract) do
+    constructor_abi = Enum.find(contract.abi, fn el -> el["type"] == "constructor" && el["inputs"] != [] end)
+
+    input_types = Enum.map(constructor_abi["inputs"], &FunctionSelector.parse_specification_type/1)
+
+    contract.constructor_arguments
+    |> decode_data(input_types)
+    |> Enum.reduce("", fn val, acc ->
+      formatted_val =
+        if is_binary(val) do
+          Base.encode16(val)
+        else
+          val
+        end
+
+      "#{acc}#{formatted_val}\n"
+    end)
+  rescue
+    _ -> contract.constructor_arguments
+  end
+
+  defp decode_data("0x" <> encoded_data, types) do
+    decode_data(encoded_data, types)
+  end
+
+  defp decode_data(encoded_data, types) do
+    encoded_data
+    |> Base.decode16!(case: :mixed)
+    |> TypeDecoder.decode_raw(types)
+  end
+
   def format_external_libraries(libraries) do
     Enum.reduce(libraries, "", fn %{name: name, address_hash: address_hash}, acc ->
       acc <> name <> " : " <> address_hash <> "\n"

From 5cdd291803e4fad7b794f5869d11a284c547928c Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Wed, 17 Jul 2019 14:07:34 +0300
Subject: [PATCH 18/56] change view

---
 .../templates/address_contract/index.html.eex | 19 +++++++------
 .../views/address_contract_view.ex            | 27 ++++++++++---------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex
index 3916d227de..79ca3f4d93 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex
@@ -46,14 +46,17 @@
               <dd class="col-sm-8 col-md-10"><%= @address.smart_contract.optimization_runs %></dd>
             </dl>
           <% end %>
-          <%= if @address.smart_contract.constructor_arguments do %>
-            <dl class="row">
-              <dt class="col-sm-4 col-md-2 text-muted"><%= gettext "Constructor arguments" %></dt>
-              <dd class="col-sm-8 col-md-10"><%= format_constructor_arguments(@address.smart_contract) %></dd>
-            </dl>
-          <% end %>
-        </div>
-        <hr/>
+        <%= if @address.smart_contract.constructor_arguments do %>
+          <section>
+            <div class="d-flex justify-content-between align-items-baseline">
+              <h3><%= gettext "Constructor Arguments" %></h3>
+            </div>
+            <div class="tile tile-muted mb-4">
+              <pre class="pre-wrap pre-scrollable"><code class="nohighlight"><%= format_constructor_arguments(@address.smart_contract) %></code>
+              </pre>
+            </div>
+          </section>
+        <% end %>
         <section>
           <div class="d-flex justify-content-between align-items-baseline">
             <h3><%= gettext "Contract source code" %></h3>
diff --git a/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex b/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex
index ae9b15b0d8..69ca3406e1 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex
@@ -27,18 +27,21 @@ defmodule BlockScoutWeb.AddressContractView do
 
     input_types = Enum.map(constructor_abi["inputs"], &FunctionSelector.parse_specification_type/1)
 
-    contract.constructor_arguments
-    |> decode_data(input_types)
-    |> Enum.reduce("", fn val, acc ->
-      formatted_val =
-        if is_binary(val) do
-          Base.encode16(val)
-        else
-          val
-        end
-
-      "#{acc}#{formatted_val}\n"
-    end)
+    {_, result} =
+      contract.constructor_arguments
+      |> decode_data(input_types)
+      |> Enum.reduce({0, "#{contract.constructor_arguments}\n\n"}, fn val, {count, acc} ->
+        formatted_val =
+          if is_binary(val) do
+            Base.encode16(val)
+          else
+            val
+          end
+
+        {count + 1, "#{acc}Arg [#{count}] : #{formatted_val}\n"}
+      end)
+
+    result
   rescue
     _ -> contract.constructor_arguments
   end

From 593b7786364bebd08df7cf7ba83b713c1a1b6127 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Wed, 17 Jul 2019 14:09:48 +0300
Subject: [PATCH 19/56] fix gettext

---
 apps/block_scout_web/priv/gettext/default.pot | 36 +++++++++----------
 .../priv/gettext/en/LC_MESSAGES/default.po    | 36 +++++++++----------
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index 8217a39d9c..e54087e2a6 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -258,7 +258,7 @@ msgid "Connection Lost, click to load newer validations"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:71
+#: lib/block_scout_web/templates/address_contract/index.html.eex:74
 msgid "Contract ABI"
 msgstr ""
 
@@ -296,7 +296,7 @@ msgid "Contract name:"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:59
+#: lib/block_scout_web/templates/address_contract/index.html.eex:62
 msgid "Contract source code"
 msgstr ""
 
@@ -999,7 +999,7 @@ msgid "at"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/views/address_contract_view.ex:22
+#: lib/block_scout_web/views/address_contract_view.ex:23
 msgid "false"
 msgstr ""
 
@@ -1017,7 +1017,7 @@ msgid "string"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/views/address_contract_view.ex:21
+#: lib/block_scout_web/views/address_contract_view.ex:22
 msgid "true"
 msgstr ""
 
@@ -1405,17 +1405,17 @@ msgid "Support"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:73
+#: lib/block_scout_web/templates/address_contract/index.html.eex:76
 msgid "Copy ABI"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:89
+#: lib/block_scout_web/templates/address_contract/index.html.eex:92
 msgid "Copy Contract Creation Code"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:61
+#: lib/block_scout_web/templates/address_contract/index.html.eex:64
 msgid "Copy Source Code"
 msgstr ""
 
@@ -1585,27 +1585,27 @@ msgid "Block Details"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:101
+#: lib/block_scout_web/templates/address_contract/index.html.eex:104
 msgid "Contract Byte Code"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:87
+#: lib/block_scout_web/templates/address_contract/index.html.eex:90
 msgid "Contract Creation Code"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:93
+#: lib/block_scout_web/templates/address_contract/index.html.eex:96
 msgid "Contracts that self destruct in their constructors have no contract code published and cannot be verified."
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:103
+#: lib/block_scout_web/templates/address_contract/index.html.eex:106
 msgid "Copy Contract Byte Code"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:94
+#: lib/block_scout_web/templates/address_contract/index.html.eex:97
 msgid "Displaying the init data provided of the creating transaction."
 msgstr ""
 
@@ -1753,11 +1753,6 @@ msgstr ""
 msgid "Change Network"
 msgstr ""
 
-#, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:51
-msgid "Constructor arguments"
-msgstr ""
-
 #, elixir-format
 #: lib/block_scout_web/views/transaction_view.ex:44
 msgid "ERC-20 "
@@ -1769,7 +1764,7 @@ msgid "ERC-721 "
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:116
+#: lib/block_scout_web/templates/address_contract/index.html.eex:119
 msgid "External libraries"
 msgstr ""
 
@@ -1802,3 +1797,8 @@ msgstr ""
 #: lib/block_scout_web/templates/address_contract_verification/new.html.eex:4
 msgid "Connection Lost"
 msgstr ""
+
+#, elixir-format
+#: lib/block_scout_web/templates/address_contract/index.html.eex:52
+msgid "Constructor Arguments"
+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 b58c06af59..475b5a28ce 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
@@ -258,7 +258,7 @@ msgid "Connection Lost, click to load newer validations"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:71
+#: lib/block_scout_web/templates/address_contract/index.html.eex:74
 msgid "Contract ABI"
 msgstr ""
 
@@ -296,7 +296,7 @@ msgid "Contract name:"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:59
+#: lib/block_scout_web/templates/address_contract/index.html.eex:62
 msgid "Contract source code"
 msgstr ""
 
@@ -999,7 +999,7 @@ msgid "at"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/views/address_contract_view.ex:22
+#: lib/block_scout_web/views/address_contract_view.ex:23
 msgid "false"
 msgstr ""
 
@@ -1017,7 +1017,7 @@ msgid "string"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/views/address_contract_view.ex:21
+#: lib/block_scout_web/views/address_contract_view.ex:22
 msgid "true"
 msgstr ""
 
@@ -1405,17 +1405,17 @@ msgid "Support"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:73
+#: lib/block_scout_web/templates/address_contract/index.html.eex:76
 msgid "Copy ABI"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:89
+#: lib/block_scout_web/templates/address_contract/index.html.eex:92
 msgid "Copy Contract Creation Code"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:61
+#: lib/block_scout_web/templates/address_contract/index.html.eex:64
 msgid "Copy Source Code"
 msgstr ""
 
@@ -1585,27 +1585,27 @@ msgid "Block Details"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:101
+#: lib/block_scout_web/templates/address_contract/index.html.eex:104
 msgid "Contract Byte Code"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:87
+#: lib/block_scout_web/templates/address_contract/index.html.eex:90
 msgid "Contract Creation Code"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:93
+#: lib/block_scout_web/templates/address_contract/index.html.eex:96
 msgid "Contracts that self destruct in their constructors have no contract code published and cannot be verified."
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:103
+#: lib/block_scout_web/templates/address_contract/index.html.eex:106
 msgid "Copy Contract Byte Code"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:94
+#: lib/block_scout_web/templates/address_contract/index.html.eex:97
 msgid "Displaying the init data provided of the creating transaction."
 msgstr ""
 
@@ -1753,11 +1753,6 @@ msgstr ""
 msgid "Change Network"
 msgstr ""
 
-#, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:51
-msgid "Constructor arguments"
-msgstr ""
-
 #, elixir-format
 #: lib/block_scout_web/views/transaction_view.ex:44
 msgid "ERC-20 "
@@ -1769,7 +1764,7 @@ msgid "ERC-721 "
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:116
+#: lib/block_scout_web/templates/address_contract/index.html.eex:119
 msgid "External libraries"
 msgstr ""
 
@@ -1802,3 +1797,8 @@ msgstr ""
 #: lib/block_scout_web/templates/address_contract_verification/new.html.eex:4
 msgid "Connection Lost"
 msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/block_scout_web/templates/address_contract/index.html.eex:52
+msgid "Constructor Arguments"
+msgstr ""

From 4fdc1ffe3fa7e312baad192de5c7f45b42f6debb Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Wed, 17 Jul 2019 14:15:26 +0300
Subject: [PATCH 20/56] add CHANGELOG entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7cd9165b22..8eb66fbcb3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## Current
 
 ### Features
+- [#2374](https://github.com/poanetwork/blockscout/pull/2374) - decode constructor arguments for verified smart contracts
 - [#2352](https://github.com/poanetwork/blockscout/pull/2352) - Fetch rewards in parallel with transactions
 - [#2294](https://github.com/poanetwork/blockscout/pull/2294) - add healthy block period checking endpoint
 

From ced45c965f4166276c07dd1edb0057f39fbd5b5e Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Thu, 18 Jul 2019 11:19:37 +0300
Subject: [PATCH 21/56] add types

---
 .../lib/block_scout_web/views/address_contract_view.ex     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex b/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex
index 69ca3406e1..37dd6bbd1b 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex
@@ -30,15 +30,16 @@ defmodule BlockScoutWeb.AddressContractView do
     {_, result} =
       contract.constructor_arguments
       |> decode_data(input_types)
-      |> Enum.reduce({0, "#{contract.constructor_arguments}\n\n"}, fn val, {count, acc} ->
+      |> Enum.zip(constructor_abi["inputs"])
+      |> Enum.reduce({0, "#{contract.constructor_arguments}\n\n"}, fn {val, %{"type" => type}}, {count, acc} ->
         formatted_val =
           if is_binary(val) do
-            Base.encode16(val)
+            Base.encode16(val, case: :lower)
           else
             val
           end
 
-        {count + 1, "#{acc}Arg [#{count}] : #{formatted_val}\n"}
+        {count + 1, "#{acc}Arg [#{count}] (#{type}) : #{formatted_val}\n"}
       end)
 
     result

From 89eebe02df001342e88bb3b2431a8f3b24f3811f Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Thu, 18 Jul 2019 12:21:38 +0300
Subject: [PATCH 22/56] hilight variable type

---
 .../block_scout_web/templates/address_contract/index.html.eex   | 2 +-
 .../lib/block_scout_web/views/address_contract_view.ex          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex
index 79ca3f4d93..ccc36d2917 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex
@@ -52,7 +52,7 @@
               <h3><%= gettext "Constructor Arguments" %></h3>
             </div>
             <div class="tile tile-muted mb-4">
-              <pre class="pre-wrap pre-scrollable"><code class="nohighlight"><%= format_constructor_arguments(@address.smart_contract) %></code>
+              <pre class="pre-wrap pre-scrollable"><code class="nohighlight"><%= raw(format_constructor_arguments(@address.smart_contract)) %></code>
               </pre>
             </div>
           </section>
diff --git a/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex b/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex
index 37dd6bbd1b..9e85d9f3e6 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex
@@ -39,7 +39,7 @@ defmodule BlockScoutWeb.AddressContractView do
             val
           end
 
-        {count + 1, "#{acc}Arg [#{count}] (#{type}) : #{formatted_val}\n"}
+        {count + 1, "#{acc}Arg [#{count}] (<span style=\"color:#e2725b;\">#{type}</span>) : #{formatted_val}\n"}
       end)
 
     result

From e1698734e849b5f84b213c4aa43d9de8afc57f5f Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Thu, 18 Jul 2019 12:39:37 +0300
Subject: [PATCH 23/56] highlight external libraries

---
 .../block_scout_web/templates/address_contract/index.html.eex | 2 +-
 .../lib/block_scout_web/views/address_contract_view.ex        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex
index ccc36d2917..65270b5eba 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex
@@ -119,7 +119,7 @@
               <h3><%= gettext "External libraries" %></h3>
             </div>
             <div class="tile tile-muted mb-4">
-              <pre class="pre-wrap pre-scrollable"><code class="nohighlight"><%= format_external_libraries(@address.smart_contract.external_libraries) %></code>
+              <pre class="pre-wrap pre-scrollable"><code class="nohighlight"><%= raw(format_external_libraries(@address.smart_contract.external_libraries)) %></code>
               </pre>
             </div>
           </section>
diff --git a/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex b/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex
index 9e85d9f3e6..38823dba8d 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex
@@ -39,7 +39,7 @@ defmodule BlockScoutWeb.AddressContractView do
             val
           end
 
-        {count + 1, "#{acc}Arg [#{count}] (<span style=\"color:#e2725b;\">#{type}</span>) : #{formatted_val}\n"}
+        {count + 1, "#{acc}Arg [#{count}] (<b>#{type}</b>) : #{formatted_val}\n"}
       end)
 
     result
@@ -59,7 +59,7 @@ defmodule BlockScoutWeb.AddressContractView do
 
   def format_external_libraries(libraries) do
     Enum.reduce(libraries, "", fn %{name: name, address_hash: address_hash}, acc ->
-      acc <> name <> " : " <> address_hash <> "\n"
+      "#{acc}<span style=\"color:#e2725b;\">#{name}</span> : #{address_hash}  \n"
     end)
   end
 

From 65492905df40f4d5c566be8513ba4fea906f3027 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Thu, 18 Jul 2019 12:41:45 +0300
Subject: [PATCH 24/56] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index abd6928bfd..e450270bee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 ## Current
 
 ### Features
-- [#2366)(https://github.com/poanetwork/blockscout/pull/2366) - paginate eth logs
+- [#2366](https://github.com/poanetwork/blockscout/pull/2366) - paginate eth logs
 - [#2352](https://github.com/poanetwork/blockscout/pull/2352) - Fetch rewards in parallel with transactions
 - [#2294](https://github.com/poanetwork/blockscout/pull/2294) - add healthy block period checking endpoint
 

From 9919d404c82759d24046b7a314de53807d1395c5 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Thu, 18 Jul 2019 12:54:07 +0300
Subject: [PATCH 25/56] fix CR issues

---
 apps/explorer/lib/explorer/eth_rpc.ex        | 10 ++++++----
 apps/explorer/lib/explorer/etherscan/logs.ex |  8 ++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/apps/explorer/lib/explorer/eth_rpc.ex b/apps/explorer/lib/explorer/eth_rpc.ex
index aaec38f4f6..31e711d9fa 100644
--- a/apps/explorer/lib/explorer/eth_rpc.ex
+++ b/apps/explorer/lib/explorer/eth_rpc.ex
@@ -72,7 +72,7 @@ defmodule Explorer.EthRPC do
          {:ok, from_block_param, to_block_param} <- logs_blocks_filter(filter_options),
          {:ok, from_block} <- cast_block(from_block_param),
          {:ok, to_block} <- cast_block(to_block_param),
-         {:ok, paging_options} <- paging_options(filter_options["paging_options"]) do
+         {:ok, paging_options} <- paging_options(filter_options) do
       filter =
         address_or_topic_params
         |> Map.put(:from_block, from_block)
@@ -227,9 +227,11 @@ defmodule Explorer.EthRPC do
   end
 
   defp paging_options(%{
-         "log_index" => log_index,
-         "transaction_index" => transaction_index,
-         "block_number" => block_number
+         "paging_options" => %{
+           "log_index" => log_index,
+           "transaction_index" => transaction_index,
+           "block_number" => block_number
+         }
        }) do
     {:ok,
      %{
diff --git a/apps/explorer/lib/explorer/etherscan/logs.ex b/apps/explorer/lib/explorer/etherscan/logs.ex
index 67b754156d..336eae106b 100644
--- a/apps/explorer/lib/explorer/etherscan/logs.ex
+++ b/apps/explorer/lib/explorer/etherscan/logs.ex
@@ -140,6 +140,7 @@ defmodule Explorer.Etherscan.Logs do
       end
 
     query_with_consensus
+    |> order_by([log], asc: log.index)
     |> page_logs(paging_options)
     |> Repo.all()
   end
@@ -191,6 +192,7 @@ defmodule Explorer.Etherscan.Logs do
       )
 
     query_with_block_transaction_data
+    |> order_by([log], asc: log.index)
     |> page_logs(paging_options)
     |> Repo.all()
   end
@@ -244,13 +246,11 @@ defmodule Explorer.Etherscan.Logs do
 
   defp page_logs(query, %{block_number: nil, transaction_index: nil, log_index: nil}) do
     query
-    |> order_by([log], asc: log.index)
   end
 
   defp page_logs(query, %{block_number: block_number, transaction_index: transaction_index, log_index: log_index}) do
-    sorted_query = order_by(query, [log], asc: log.index)
-
-    from(data in sorted_query,
+    from(
+      data in query,
       where:
         data.index > ^log_index and data.block_number >= ^block_number and
           data.transaction_index >= ^transaction_index

From c79f134244e531ff75d68116c88fe92f9541af06 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Thu, 18 Jul 2019 18:54:29 +0300
Subject: [PATCH 26/56] fix conflicts

---
 .../templates/address_contract/index.html.eex | 21 ++++++++-------
 apps/block_scout_web/priv/gettext/default.pot | 24 ++++++++---------
 .../priv/gettext/en/LC_MESSAGES/default.po    | 26 +++++++++----------
 3 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex
index 5d9f230436..e8d6501e02 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address_contract/index.html.eex
@@ -46,17 +46,18 @@
               <dd class="col-sm-8 col-md-10"><%= @address.smart_contract.evm_version %></dd>
             </dl>
           <% end %>
-          <dl class="row">
-            <dt class="col-sm-4 col-md-2 text-muted"><%= gettext "Optimization enabled" %></dt>
-            <dd class="col-sm-8 col-md-10"><%= format_optimization_text(@address.smart_contract.optimization) %></dd>
-          </dl>
-          <%= if @address.smart_contract.optimization && @address.smart_contract.optimization_runs do %>
-            <dl class="row">
-              <dt class="col-sm-4 col-md-2 text-muted"><%= gettext "Optimization runs" %></dt>
-              <dd class="col-sm-8 col-md-10"><%= @address.smart_contract.optimization_runs %></dd>
-            </dl>
-          <% end %>
         <hr/>
+        <%= if @address.smart_contract.constructor_arguments do %>
+          <section>
+            <div class="d-flex justify-content-between align-items-baseline">
+              <h3><%= gettext "Constructor Arguments" %></h3>
+            </div>
+            <div class="tile tile-muted mb-4">
+              <pre class="pre-wrap pre-scrollable"><code class="nohighlight"><%= raw(format_constructor_arguments(@address.smart_contract)) %></code>
+              </pre>
+            </div>
+          </section>
+        <% end %>
         <section>
           <div class="d-flex justify-content-between align-items-baseline">
             <h3><%= gettext "Contract source code" %></h3>
diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index 9df0dc9761..f9a0a3fdf0 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -258,7 +258,7 @@ msgid "Connection Lost, click to load newer validations"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:74
+#: lib/block_scout_web/templates/address_contract/index.html.eex:75
 msgid "Contract ABI"
 msgstr ""
 
@@ -296,7 +296,7 @@ msgid "Contract name:"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:62
+#: lib/block_scout_web/templates/address_contract/index.html.eex:63
 msgid "Contract source code"
 msgstr ""
 
@@ -1407,17 +1407,17 @@ msgid "Support"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:76
+#: lib/block_scout_web/templates/address_contract/index.html.eex:77
 msgid "Copy ABI"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:92
+#: lib/block_scout_web/templates/address_contract/index.html.eex:93
 msgid "Copy Contract Creation Code"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:64
+#: lib/block_scout_web/templates/address_contract/index.html.eex:65
 msgid "Copy Source Code"
 msgstr ""
 
@@ -1587,27 +1587,27 @@ msgid "Block Details"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:104
+#: lib/block_scout_web/templates/address_contract/index.html.eex:105
 msgid "Contract Byte Code"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:90
+#: lib/block_scout_web/templates/address_contract/index.html.eex:91
 msgid "Contract Creation Code"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:96
+#: lib/block_scout_web/templates/address_contract/index.html.eex:97
 msgid "Contracts that self destruct in their constructors have no contract code published and cannot be verified."
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:106
+#: lib/block_scout_web/templates/address_contract/index.html.eex:107
 msgid "Copy Contract Byte Code"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:97
+#: lib/block_scout_web/templates/address_contract/index.html.eex:98
 msgid "Displaying the init data provided of the creating transaction."
 msgstr ""
 
@@ -1766,7 +1766,7 @@ msgid "ERC-721 "
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:119
+#: lib/block_scout_web/templates/address_contract/index.html.eex:120
 msgid "External libraries"
 msgstr ""
 
@@ -1801,6 +1801,6 @@ msgid "Connection Lost"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:52
+#: lib/block_scout_web/templates/address_contract/index.html.eex:53
 msgid "Constructor Arguments"
 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 283d55813f..9d448b5a70 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
@@ -258,7 +258,7 @@ msgid "Connection Lost, click to load newer validations"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:74
+#: lib/block_scout_web/templates/address_contract/index.html.eex:75
 msgid "Contract ABI"
 msgstr ""
 
@@ -296,7 +296,7 @@ msgid "Contract name:"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:62
+#: lib/block_scout_web/templates/address_contract/index.html.eex:63
 msgid "Contract source code"
 msgstr ""
 
@@ -1407,17 +1407,17 @@ msgid "Support"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:76
+#: lib/block_scout_web/templates/address_contract/index.html.eex:77
 msgid "Copy ABI"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:92
+#: lib/block_scout_web/templates/address_contract/index.html.eex:93
 msgid "Copy Contract Creation Code"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:64
+#: lib/block_scout_web/templates/address_contract/index.html.eex:65
 msgid "Copy Source Code"
 msgstr ""
 
@@ -1587,27 +1587,27 @@ msgid "Block Details"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:104
+#: lib/block_scout_web/templates/address_contract/index.html.eex:105
 msgid "Contract Byte Code"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:90
+#: lib/block_scout_web/templates/address_contract/index.html.eex:91
 msgid "Contract Creation Code"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:96
+#: lib/block_scout_web/templates/address_contract/index.html.eex:97
 msgid "Contracts that self destruct in their constructors have no contract code published and cannot be verified."
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:106
+#: lib/block_scout_web/templates/address_contract/index.html.eex:107
 msgid "Copy Contract Byte Code"
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:97
+#: lib/block_scout_web/templates/address_contract/index.html.eex:98
 msgid "Displaying the init data provided of the creating transaction."
 msgstr ""
 
@@ -1766,7 +1766,7 @@ msgid "ERC-721 "
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_contract/index.html.eex:119
+#: lib/block_scout_web/templates/address_contract/index.html.eex:120
 msgid "External libraries"
 msgstr ""
 
@@ -1800,7 +1800,7 @@ msgstr ""
 msgid "Connection Lost"
 msgstr ""
 
-#, elixir-format, fuzzy
-#: lib/block_scout_web/templates/address_contract/index.html.eex:52
+#, elixir-format
+#: lib/block_scout_web/templates/address_contract/index.html.eex:53
 msgid "Constructor Arguments"
 msgstr ""

From 9cfc0c6594a139a15dc39e13baca1402438886df Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Thu, 18 Jul 2019 19:17:12 +0300
Subject: [PATCH 27/56] generic showLoader function, fix: loader is shown
 inside the chart every time before the chart rendered even if wait less than
 1 sec

---
 .../assets/js/lib/market_history_chart.js     |  5 ++++-
 apps/block_scout_web/assets/js/lib/utils.js   | 13 ++++++++++++
 apps/block_scout_web/assets/js/pages/chain.js | 20 +++----------------
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/apps/block_scout_web/assets/js/lib/market_history_chart.js b/apps/block_scout_web/assets/js/lib/market_history_chart.js
index ae70a1b5d1..d54d998580 100644
--- a/apps/block_scout_web/assets/js/lib/market_history_chart.js
+++ b/apps/block_scout_web/assets/js/lib/market_history_chart.js
@@ -4,6 +4,7 @@ import humps from 'humps'
 import numeral from 'numeral'
 import { formatUsdValue } from '../lib/currency'
 import sassVariables from '../../css/app.scss'
+import { showLoader } from '../lib/utils'
 
 const config = {
   type: 'line',
@@ -130,7 +131,8 @@ export function createMarketHistoryChart (el) {
   const dataPath = el.dataset.market_history_chart_path
   const $chartLoading = $('[data-chart-loading-message]')
 
-  $chartLoading.removeAttr('hidden')
+  const isTimeout = true
+  const timeoutID = showLoader(isTimeout, $chartLoading)
 
   const $chartError = $('[data-chart-error-message]')
   const chart = new MarketHistoryChart(el, 0, [])
@@ -146,6 +148,7 @@ export function createMarketHistoryChart (el) {
     })
     .always(() => {
       $chartLoading.hide()
+      clearTimeout(timeoutID)
     })
   return chart
 }
diff --git a/apps/block_scout_web/assets/js/lib/utils.js b/apps/block_scout_web/assets/js/lib/utils.js
index d3bd6e84d1..28481e9d83 100644
--- a/apps/block_scout_web/assets/js/lib/utils.js
+++ b/apps/block_scout_web/assets/js/lib/utils.js
@@ -11,3 +11,16 @@ export function batchChannel (func) {
     debouncedFunc()
   }
 }
+
+export function showLoader (isTimeout, loader) {
+  if (isTimeout) {
+    const timeout = setTimeout(function () {
+      loader.removeAttr('hidden')
+      loader.show()
+    }, 1000)
+    return timeout
+  } else {
+    loader.hide()
+    return null
+  }
+}
diff --git a/apps/block_scout_web/assets/js/pages/chain.js b/apps/block_scout_web/assets/js/pages/chain.js
index f0586ef796..23d6fc4223 100644
--- a/apps/block_scout_web/assets/js/pages/chain.js
+++ b/apps/block_scout_web/assets/js/pages/chain.js
@@ -5,7 +5,7 @@ import numeral from 'numeral'
 import socket from '../socket'
 import { exchangeRateChannel, formatUsdValue } from '../lib/currency'
 import { createStore, connectElements } from '../lib/redux_helpers.js'
-import { batchChannel } from '../lib/utils'
+import { batchChannel, showLoader } from '../lib/utils'
 import listMorph from '../lib/list_morph'
 import { createMarketHistoryChart } from '../lib/market_history_chart'
 
@@ -210,14 +210,7 @@ const elements = {
   },
   '[data-selector="chain-block-list"] [data-selector="loading-message"]': {
     render ($el, state, oldState) {
-      if (state && state.blocksLoading) {
-        setTimeout(function () {
-          $el.removeAttr('hidden')
-          $el.show()
-        }, 1000)
-      } else {
-        $el.hide()
-      }
+      showLoader(state.blocksLoading, $el)
     }
   },
   '[data-selector="transactions-list"] [data-selector="error-message"]': {
@@ -227,14 +220,7 @@ const elements = {
   },
   '[data-selector="transactions-list"] [data-selector="loading-message"]': {
     render ($el, state, oldState) {
-      if (state && state.transactionsLoading) {
-        setTimeout(function () {
-          $el.removeAttr('hidden')
-          $el.show()
-        }, 1000)
-      } else {
-        $el.hide()
-      }
+      showLoader(state.transactionsLoading, $el)
     }
   },
   '[data-selector="transactions-list"]': {

From f187402f5e5cf08081947af7be5b62de71e081a8 Mon Sep 17 00:00:00 2001
From: Michael Ira Krufky <mkrufky@gmail.com>
Date: Thu, 18 Jul 2019 14:00:01 -0400
Subject: [PATCH 28/56] docker/Dockerfile: pin
 bitwalker/alpine-elixir-phoenix:1.9.0

---
 docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 73501a9b9d..f73c4b34f0 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM bitwalker/alpine-elixir-phoenix
+FROM bitwalker/alpine-elixir-phoenix:1.9.0
 
 RUN apk --no-cache --update add alpine-sdk gmp-dev automake libtool inotify-tools autoconf python
 

From 268b39815e81e5fe3e04c23d7699a0d850bf71c9 Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 19 Jul 2019 13:22:40 +0300
Subject: [PATCH 29/56] Drastically reduce lodash lib

---
 CHANGELOG.md                                  |  1 +
 .../__tests__/pages/pending_transactions.js   |  1 -
 .../assets/js/lib/async_listing_load.js       |  7 +++--
 .../assets/js/lib/infinite_scroll_helpers.js  |  4 +--
 .../assets/js/lib/list_morph.js               | 29 +++++++++++--------
 .../assets/js/lib/redux_helpers.js            | 10 ++++---
 apps/block_scout_web/assets/js/lib/utils.js   |  4 +--
 .../assets/js/pages/address.js                |  4 +--
 .../assets/js/pages/address/coin_balances.js  |  4 +--
 .../js/pages/address/internal_transactions.js |  4 +--
 .../assets/js/pages/address/logs.js           |  4 +--
 .../assets/js/pages/address/transactions.js   |  4 +--
 .../assets/js/pages/address/validations.js    |  4 +--
 .../block_scout_web/assets/js/pages/blocks.js | 19 +++++++-----
 apps/block_scout_web/assets/js/pages/chain.js | 18 +++++++-----
 .../assets/js/pages/pending_transactions.js   |  4 +--
 .../assets/js/pages/transaction.js            |  4 +--
 .../assets/js/pages/transactions.js           |  4 +--
 .../assets/js/pages/verification_form.js      |  4 +--
 apps/block_scout_web/assets/webpack.config.js |  2 +-
 20 files changed, 76 insertions(+), 59 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9c8934f3d..b5dfb7a6fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - [#2294](https://github.com/poanetwork/blockscout/pull/2294) - add healthy block period checking endpoint
 
 ### Fixes
+- [#2389](https://github.com/poanetwork/blockscout/pull/2389) - Reduce Lodash lib size (86% of lib methods are not used)
 - [#2378](https://github.com/poanetwork/blockscout/pull/2378) - Page performance: exclude moment.js localization files except EN, remove unused css
 - [#2368](https://github.com/poanetwork/blockscout/pull/2368) - add two columns of smart contract info
 - [#2375](https://github.com/poanetwork/blockscout/pull/2375) - Update created_contract_code_indexed_at on transaction import conflict
diff --git a/apps/block_scout_web/assets/__tests__/pages/pending_transactions.js b/apps/block_scout_web/assets/__tests__/pages/pending_transactions.js
index e9f7fc941d..ddbf84ce7d 100644
--- a/apps/block_scout_web/assets/__tests__/pages/pending_transactions.js
+++ b/apps/block_scout_web/assets/__tests__/pages/pending_transactions.js
@@ -1,4 +1,3 @@
-import _ from 'lodash'
 import { reducer, initialState } from '../../js/pages/pending_transactions'
 
 test('CHANNEL_DISCONNECTED', () => {
diff --git a/apps/block_scout_web/assets/js/lib/async_listing_load.js b/apps/block_scout_web/assets/js/lib/async_listing_load.js
index 8610d901f6..8477a7d728 100644
--- a/apps/block_scout_web/assets/js/lib/async_listing_load.js
+++ b/apps/block_scout_web/assets/js/lib/async_listing_load.js
@@ -1,5 +1,6 @@
 import $ from 'jquery'
-import _ from 'lodash'
+import map from 'lodash/map'
+import merge from 'lodash/merge'
 import URI from 'urijs'
 import humps from 'humps'
 import listMorph from '../lib/list_morph'
@@ -164,7 +165,7 @@ export const elements = {
 
       if (state.itemKey) {
         const container = $el[0]
-        const newElements = _.map(state.items, (item) => $(item)[0])
+        const newElements = map(state.items, (item) => $(item)[0])
         listMorph(container, newElements, { key: state.itemKey })
         return
       }
@@ -244,7 +245,7 @@ export const elements = {
  * adding or removing with the correct animation. Check list_morph.js for more informantion.
  */
 export function createAsyncLoadStore (reducer, initialState, itemKey) {
-  const state = _.merge(asyncInitialState, initialState)
+  const state = merge(asyncInitialState, initialState)
   const store = createStore(reduceReducers(asyncReducer, reducer, state))
 
   if (typeof itemKey !== 'undefined') {
diff --git a/apps/block_scout_web/assets/js/lib/infinite_scroll_helpers.js b/apps/block_scout_web/assets/js/lib/infinite_scroll_helpers.js
index 45b278ae4d..b7fbb940a2 100644
--- a/apps/block_scout_web/assets/js/lib/infinite_scroll_helpers.js
+++ b/apps/block_scout_web/assets/js/lib/infinite_scroll_helpers.js
@@ -1,5 +1,5 @@
 import $ from 'jquery'
-import _ from 'lodash'
+import omit from 'lodash/omit'
 import humps from 'humps'
 import { connectElements } from './redux_helpers.js'
 
@@ -12,7 +12,7 @@ const initialState = {
 function infiniteScrollReducer (state = initialState, action) {
   switch (action.type) {
     case 'INFINITE_SCROLL_ELEMENTS_LOAD': {
-      return Object.assign({}, state, _.omit(action, 'type'))
+      return Object.assign({}, state, omit(action, 'type'))
     }
     case 'LOADING_NEXT_PAGE': {
       return Object.assign({}, state, {
diff --git a/apps/block_scout_web/assets/js/lib/list_morph.js b/apps/block_scout_web/assets/js/lib/list_morph.js
index 175acb7c3f..6cdfea3e3f 100644
--- a/apps/block_scout_web/assets/js/lib/list_morph.js
+++ b/apps/block_scout_web/assets/js/lib/list_morph.js
@@ -1,5 +1,10 @@
 import $ from 'jquery'
-import _ from 'lodash'
+import map from 'lodash/map'
+import get from 'lodash/get'
+import noop from 'lodash/noop'
+import find from 'lodash/find'
+import intersectionBy from 'lodash/intersectionBy'
+import differenceBy from 'lodash/differenceBy'
 import morph from 'nanomorph'
 import { updateAllAges } from './from_now'
 
@@ -25,12 +30,12 @@ import { updateAllAges } from './from_now'
 export default function (container, newElements, { key, horizontal } = {}) {
   if (!container) return
   const oldElements = $(container).children().get()
-  let currentList = _.map(oldElements, (el) => ({ id: _.get(el, key), el }))
-  const newList = _.map(newElements, (el) => ({ id: _.get(el, key), el }))
-  const overlap = _.intersectionBy(newList, currentList, 'id').map(({ id, el }) => ({ id, el: updateAllAges($(el))[0] }))
+  let currentList = map(oldElements, (el) => ({ id: get(el, key), el }))
+  const newList = map(newElements, (el) => ({ id: get(el, key), el }))
+  const overlap = intersectionBy(newList, currentList, 'id').map(({ id, el }) => ({ id, el: updateAllAges($(el))[0] }))
 
   // remove old items
-  const removals = _.differenceBy(currentList, newList, 'id')
+  const removals = differenceBy(currentList, newList, 'id')
   let canAnimate = !horizontal && removals.length <= 1
   removals.forEach(({ el }) => {
     if (!canAnimate) return el.remove()
@@ -38,7 +43,7 @@ export default function (container, newElements, { key, horizontal } = {}) {
     $el.addClass('shrink-out')
     setTimeout(() => { slideUpRemove($el) }, 400)
   })
-  currentList = _.differenceBy(currentList, removals, 'id')
+  currentList = differenceBy(currentList, removals, 'id')
 
   // update kept items
   currentList = currentList.map(({ el }, i) => ({
@@ -47,14 +52,14 @@ export default function (container, newElements, { key, horizontal } = {}) {
   }))
 
   // add new items
-  const finalList = newList.map(({ id, el }) => _.get(_.find(currentList, { id }), 'el', el)).reverse()
+  const finalList = newList.map(({ id, el }) => get(find(currentList, { id }), 'el', el)).reverse()
   canAnimate = !horizontal
   finalList.forEach((el, i) => {
     if (el.parentElement) return
-    if (!canAnimate) return container.insertBefore(el, _.get(finalList, `[${i - 1}]`))
+    if (!canAnimate) return container.insertBefore(el, get(finalList, `[${i - 1}]`))
     canAnimate = false
-    if (!_.get(finalList, `[${i - 1}]`)) return slideDownAppend($(container), el)
-    slideDownBefore($(_.get(finalList, `[${i - 1}]`)), el)
+    if (!get(finalList, `[${i - 1}]`)) return slideDownAppend($(container), el)
+    slideDownBefore($(get(finalList, `[${i - 1}]`)), el)
   })
 }
 
@@ -80,7 +85,7 @@ function slideUpRemove ($el) {
   })
 }
 
-function smarterSlideDown ($el, { insert = _.noop } = {}) {
+function smarterSlideDown ($el, { insert = noop } = {}) {
   if (!$el.length) return
   const originalScrollHeight = document.body.scrollHeight
   const scrollPosition = window.scrollY
@@ -100,7 +105,7 @@ function smarterSlideDown ($el, { insert = _.noop } = {}) {
   }
 }
 
-function smarterSlideUp ($el, { complete = _.noop } = {}) {
+function smarterSlideUp ($el, { complete = noop } = {}) {
   if (!$el.length) return
   const originalScrollHeight = document.body.scrollHeight
   const scrollPosition = window.scrollY
diff --git a/apps/block_scout_web/assets/js/lib/redux_helpers.js b/apps/block_scout_web/assets/js/lib/redux_helpers.js
index fdf7c659b3..35dcc65b2c 100644
--- a/apps/block_scout_web/assets/js/lib/redux_helpers.js
+++ b/apps/block_scout_web/assets/js/lib/redux_helpers.js
@@ -1,5 +1,7 @@
 import $ from 'jquery'
-import _ from 'lodash'
+import reduce from 'lodash/reduce'
+import isObject from 'lodash/isObject'
+import forIn from 'lodash/forIn'
 import { createStore as reduxCreateStore } from 'redux'
 
 /**
@@ -97,17 +99,17 @@ export function createStore (reducer) {
  */
 export function connectElements ({ elements, store, action = 'ELEMENTS_LOAD' }) {
   function loadElements () {
-    return _.reduce(elements, (pageLoadParams, { load }, selector) => {
+    return reduce(elements, (pageLoadParams, { load }, selector) => {
       if (!load) return pageLoadParams
       const $el = $(selector)
       if (!$el.length) return pageLoadParams
       const morePageLoadParams = load($el, store)
-      return _.isObject(morePageLoadParams) ? Object.assign(pageLoadParams, morePageLoadParams) : pageLoadParams
+      return isObject(morePageLoadParams) ? Object.assign(pageLoadParams, morePageLoadParams) : pageLoadParams
     }, {})
   }
 
   function renderElements (state, oldState) {
-    _.forIn(elements, ({ render }, selector) => {
+    forIn(elements, ({ render }, selector) => {
       if (!render) return
       const $el = $(selector)
       if (!$el.length) return
diff --git a/apps/block_scout_web/assets/js/lib/utils.js b/apps/block_scout_web/assets/js/lib/utils.js
index d3bd6e84d1..e275580812 100644
--- a/apps/block_scout_web/assets/js/lib/utils.js
+++ b/apps/block_scout_web/assets/js/lib/utils.js
@@ -1,8 +1,8 @@
-import _ from 'lodash'
+import debounce from 'lodash/debounce'
 
 export function batchChannel (func) {
   let msgs = []
-  const debouncedFunc = _.debounce(() => {
+  const debouncedFunc = debounce(() => {
     func.apply(this, [msgs])
     msgs = []
   }, 1000, { maxWait: 5000 })
diff --git a/apps/block_scout_web/assets/js/pages/address.js b/apps/block_scout_web/assets/js/pages/address.js
index 5b35a0b9d7..ddafbcb1e2 100644
--- a/apps/block_scout_web/assets/js/pages/address.js
+++ b/apps/block_scout_web/assets/js/pages/address.js
@@ -1,5 +1,5 @@
 import $ from 'jquery'
-import _ from 'lodash'
+import omit from 'lodash/omit'
 import URI from 'urijs'
 import humps from 'humps'
 import numeral from 'numeral'
@@ -25,7 +25,7 @@ export function reducer (state = initialState, action) {
   switch (action.type) {
     case 'PAGE_LOAD':
     case 'ELEMENTS_LOAD': {
-      return Object.assign({}, state, _.omit(action, 'type'))
+      return Object.assign({}, state, omit(action, 'type'))
     }
     case 'CHANNEL_DISCONNECTED': {
       if (state.beyondPageOne) return state
diff --git a/apps/block_scout_web/assets/js/pages/address/coin_balances.js b/apps/block_scout_web/assets/js/pages/address/coin_balances.js
index 8c0100d3d2..b4523a6c64 100644
--- a/apps/block_scout_web/assets/js/pages/address/coin_balances.js
+++ b/apps/block_scout_web/assets/js/pages/address/coin_balances.js
@@ -1,5 +1,5 @@
 import $ from 'jquery'
-import _ from 'lodash'
+import omit from 'lodash/omit'
 import humps from 'humps'
 import socket from '../../socket'
 import { connectElements } from '../../lib/redux_helpers.js'
@@ -14,7 +14,7 @@ export function reducer (state, action) {
   switch (action.type) {
     case 'PAGE_LOAD':
     case 'ELEMENTS_LOAD': {
-      return Object.assign({}, state, _.omit(action, 'type'))
+      return Object.assign({}, state, omit(action, 'type'))
     }
     case 'CHANNEL_DISCONNECTED': {
       if (state.beyondPageOne) return state
diff --git a/apps/block_scout_web/assets/js/pages/address/internal_transactions.js b/apps/block_scout_web/assets/js/pages/address/internal_transactions.js
index aa95278c71..6c3d503256 100644
--- a/apps/block_scout_web/assets/js/pages/address/internal_transactions.js
+++ b/apps/block_scout_web/assets/js/pages/address/internal_transactions.js
@@ -1,5 +1,5 @@
 import $ from 'jquery'
-import _ from 'lodash'
+import omit from 'lodash/omit'
 import humps from 'humps'
 import numeral from 'numeral'
 import socket from '../../socket'
@@ -20,7 +20,7 @@ export function reducer (state, action) {
   switch (action.type) {
     case 'PAGE_LOAD':
     case 'ELEMENTS_LOAD': {
-      return Object.assign({}, state, _.omit(action, 'type'))
+      return Object.assign({}, state, omit(action, 'type'))
     }
     case 'CHANNEL_DISCONNECTED': {
       if (state.beyondPageOne) return state
diff --git a/apps/block_scout_web/assets/js/pages/address/logs.js b/apps/block_scout_web/assets/js/pages/address/logs.js
index 5b4cf8aecd..5c9bed9da2 100644
--- a/apps/block_scout_web/assets/js/pages/address/logs.js
+++ b/apps/block_scout_web/assets/js/pages/address/logs.js
@@ -1,5 +1,5 @@
 import $ from 'jquery'
-import _ from 'lodash'
+import omit from 'lodash/omit'
 import humps from 'humps'
 import { connectElements } from '../../lib/redux_helpers.js'
 import { createAsyncLoadStore } from '../../lib/async_listing_load'
@@ -13,7 +13,7 @@ export function reducer (state, action) {
   switch (action.type) {
     case 'PAGE_LOAD':
     case 'ELEMENTS_LOAD': {
-      return Object.assign({}, state, _.omit(action, 'type'))
+      return Object.assign({}, state, omit(action, 'type'))
     }
     case 'START_SEARCH': {
       return Object.assign({}, state, {pagesStack: [], isSearch: true})
diff --git a/apps/block_scout_web/assets/js/pages/address/transactions.js b/apps/block_scout_web/assets/js/pages/address/transactions.js
index be70dcc3ba..ecd604e2d5 100644
--- a/apps/block_scout_web/assets/js/pages/address/transactions.js
+++ b/apps/block_scout_web/assets/js/pages/address/transactions.js
@@ -1,5 +1,5 @@
 import $ from 'jquery'
-import _ from 'lodash'
+import omit from 'lodash/omit'
 import URI from 'urijs'
 import humps from 'humps'
 import { subscribeChannel } from '../../socket'
@@ -16,7 +16,7 @@ export function reducer (state, action) {
   switch (action.type) {
     case 'PAGE_LOAD':
     case 'ELEMENTS_LOAD': {
-      return Object.assign({}, state, _.omit(action, 'type'))
+      return Object.assign({}, state, omit(action, 'type'))
     }
     case 'CHANNEL_DISCONNECTED': {
       if (state.beyondPageOne) return state
diff --git a/apps/block_scout_web/assets/js/pages/address/validations.js b/apps/block_scout_web/assets/js/pages/address/validations.js
index 6aca07a98b..d2456a183e 100644
--- a/apps/block_scout_web/assets/js/pages/address/validations.js
+++ b/apps/block_scout_web/assets/js/pages/address/validations.js
@@ -1,5 +1,5 @@
 import $ from 'jquery'
-import _ from 'lodash'
+import omit from 'lodash/omit'
 import humps from 'humps'
 import socket from '../../socket'
 import { connectElements } from '../../lib/redux_helpers.js'
@@ -14,7 +14,7 @@ export function reducer (state = initialState, action) {
   switch (action.type) {
     case 'PAGE_LOAD':
     case 'ELEMENTS_LOAD': {
-      return Object.assign({}, state, _.omit(action, 'type'))
+      return Object.assign({}, state, omit(action, 'type'))
     }
     case 'CHANNEL_DISCONNECTED': {
       return Object.assign({}, state, { channelDisconnected: true })
diff --git a/apps/block_scout_web/assets/js/pages/blocks.js b/apps/block_scout_web/assets/js/pages/blocks.js
index 2103c18a89..4d9bdc05d9 100644
--- a/apps/block_scout_web/assets/js/pages/blocks.js
+++ b/apps/block_scout_web/assets/js/pages/blocks.js
@@ -1,5 +1,10 @@
 import $ from 'jquery'
-import _ from 'lodash'
+import omit from 'lodash/omit'
+import last from 'lodash/last'
+import min from 'lodash/min'
+import max from 'lodash/max'
+import keys from 'lodash/keys'
+import rangeRight from 'lodash/rangeRight'
 import humps from 'humps'
 import socket from '../socket'
 import { connectElements } from '../lib/redux_helpers.js'
@@ -14,7 +19,7 @@ export const blockReducer = withMissingBlocks(baseReducer)
 function baseReducer (state = initialState, action) {
   switch (action.type) {
     case 'ELEMENTS_LOAD': {
-      return Object.assign({}, state, _.omit(action, 'type'))
+      return Object.assign({}, state, omit(action, 'type'))
     }
     case 'CHANNEL_DISCONNECTED': {
       return Object.assign({}, state, {
@@ -25,7 +30,7 @@ function baseReducer (state = initialState, action) {
       if (state.channelDisconnected || state.beyondPageOne || state.blockType !== 'block') return state
 
       const blockNumber = getBlockNumber(action.msg.blockHtml)
-      const minBlock = getBlockNumber(_.last(state.items))
+      const minBlock = getBlockNumber(last(state.items))
 
       if (state.items.length && blockNumber < minBlock) return state
 
@@ -62,12 +67,12 @@ function withMissingBlocks (reducer) {
       return acc
     }, {})
 
-    const blockNumbers = _(blockNumbersToItems).keys().map(x => parseInt(x, 10)).value()
-    const minBlock = _.min(blockNumbers)
-    const maxBlock = _.max(blockNumbers)
+    const blockNumbers = keys(blockNumbersToItems).map(x => parseInt(x, 10))
+    const minBlock = min(blockNumbers)
+    const maxBlock = max(blockNumbers)
 
     return Object.assign({}, result, {
-      items: _.rangeRight(minBlock, maxBlock + 1)
+      items: rangeRight(minBlock, maxBlock + 1)
         .map((blockNumber) => blockNumbersToItems[blockNumber] || placeHolderBlock(blockNumber))
     })
   }
diff --git a/apps/block_scout_web/assets/js/pages/chain.js b/apps/block_scout_web/assets/js/pages/chain.js
index f4cd0e6628..154c73e455 100644
--- a/apps/block_scout_web/assets/js/pages/chain.js
+++ b/apps/block_scout_web/assets/js/pages/chain.js
@@ -1,5 +1,9 @@
 import $ from 'jquery'
-import _ from 'lodash'
+import omit from 'lodash/omit'
+import first from 'lodash/first'
+import rangeRight from 'lodash/rangeRight'
+import find from 'lodash/find'
+import map from 'lodash/map'
 import humps from 'humps'
 import numeral from 'numeral'
 import socket from '../socket'
@@ -33,7 +37,7 @@ export const reducer = withMissingBlocks(baseReducer)
 function baseReducer (state = initialState, action) {
   switch (action.type) {
     case 'ELEMENTS_LOAD': {
-      return Object.assign({}, state, _.omit(action, 'type'))
+      return Object.assign({}, state, omit(action, 'type'))
     }
     case 'RECEIVED_NEW_ADDRESS_COUNT': {
       return Object.assign({}, state, {
@@ -122,12 +126,12 @@ function withMissingBlocks (reducer) {
 
     if (!result.blocks || result.blocks.length < 2) return result
 
-    const maxBlock = _.first(result.blocks).blockNumber
+    const maxBlock = first(result.blocks).blockNumber
     const minBlock = maxBlock - (result.blocks.length - 1)
 
     return Object.assign({}, result, {
-      blocks: _.rangeRight(minBlock, maxBlock + 1)
-        .map((blockNumber) => _.find(result.blocks, ['blockNumber', blockNumber]) || {
+      blocks: rangeRight(minBlock, maxBlock + 1)
+        .map((blockNumber) => find(result.blocks, ['blockNumber', blockNumber]) || {
           blockNumber,
           chainBlockHtml: placeHolderBlock(blockNumber)
         })
@@ -194,7 +198,7 @@ const elements = {
       const container = $el[0]
 
       if (state.blocksLoading === false) {
-        const blocks = _.map(state.blocks, ({ chainBlockHtml }) => $(chainBlockHtml)[0])
+        const blocks = map(state.blocks, ({ chainBlockHtml }) => $(chainBlockHtml)[0])
         listMorph(container, blocks, { key: 'dataset.blockNumber', horizontal: true })
       }
     }
@@ -234,7 +238,7 @@ const elements = {
     render ($el, state, oldState) {
       if (oldState.transactions === state.transactions) return
       const container = $el[0]
-      const newElements = _.map(state.transactions, ({ transactionHtml }) => $(transactionHtml)[0])
+      const newElements = map(state.transactions, ({ transactionHtml }) => $(transactionHtml)[0])
       listMorph(container, newElements, { key: 'dataset.identifierHash' })
     }
   },
diff --git a/apps/block_scout_web/assets/js/pages/pending_transactions.js b/apps/block_scout_web/assets/js/pages/pending_transactions.js
index 1cbb5d47d0..711f7c4343 100644
--- a/apps/block_scout_web/assets/js/pages/pending_transactions.js
+++ b/apps/block_scout_web/assets/js/pages/pending_transactions.js
@@ -1,5 +1,5 @@
 import $ from 'jquery'
-import _ from 'lodash'
+import omit from 'lodash/omit'
 import humps from 'humps'
 import numeral from 'numeral'
 import socket from '../socket'
@@ -20,7 +20,7 @@ export const initialState = {
 export function reducer (state = initialState, action) {
   switch (action.type) {
     case 'ELEMENTS_LOAD': {
-      return Object.assign({}, state, _.omit(action, 'type'))
+      return Object.assign({}, state, omit(action, 'type'))
     }
     case 'CHANNEL_DISCONNECTED': {
       return Object.assign({}, state, {
diff --git a/apps/block_scout_web/assets/js/pages/transaction.js b/apps/block_scout_web/assets/js/pages/transaction.js
index cd247d530a..139d1f527c 100644
--- a/apps/block_scout_web/assets/js/pages/transaction.js
+++ b/apps/block_scout_web/assets/js/pages/transaction.js
@@ -1,5 +1,5 @@
 import $ from 'jquery'
-import _ from 'lodash'
+import omit from 'lodash/omit'
 import humps from 'humps'
 import numeral from 'numeral'
 import socket from '../socket'
@@ -13,7 +13,7 @@ export const initialState = {
 export function reducer (state = initialState, action) {
   switch (action.type) {
     case 'ELEMENTS_LOAD': {
-      return Object.assign({}, state, _.omit(action, 'type'))
+      return Object.assign({}, state, omit(action, 'type'))
     }
     case 'RECEIVED_NEW_BLOCK': {
       if ((action.msg.blockNumber - state.blockNumber) > state.confirmations) {
diff --git a/apps/block_scout_web/assets/js/pages/transactions.js b/apps/block_scout_web/assets/js/pages/transactions.js
index a6c038166b..f528f760c4 100644
--- a/apps/block_scout_web/assets/js/pages/transactions.js
+++ b/apps/block_scout_web/assets/js/pages/transactions.js
@@ -1,5 +1,5 @@
 import $ from 'jquery'
-import _ from 'lodash'
+import omit from 'lodash/omit'
 import humps from 'humps'
 import numeral from 'numeral'
 import socket from '../socket'
@@ -18,7 +18,7 @@ export const initialState = {
 export function reducer (state = initialState, action) {
   switch (action.type) {
     case 'ELEMENTS_LOAD': {
-      return Object.assign({}, state, _.omit(action, 'type'))
+      return Object.assign({}, state, omit(action, 'type'))
     }
     case 'CHANNEL_DISCONNECTED': {
       return Object.assign({}, state, {
diff --git a/apps/block_scout_web/assets/js/pages/verification_form.js b/apps/block_scout_web/assets/js/pages/verification_form.js
index 619a8e1326..10504c144c 100644
--- a/apps/block_scout_web/assets/js/pages/verification_form.js
+++ b/apps/block_scout_web/assets/js/pages/verification_form.js
@@ -1,5 +1,5 @@
 import $ from 'jquery'
-import _ from 'lodash'
+import omit from 'lodash/omit'
 import URI from 'urijs'
 import humps from 'humps'
 import { subscribeChannel } from '../socket'
@@ -15,7 +15,7 @@ export function reducer (state = initialState, action) {
   switch (action.type) {
     case 'PAGE_LOAD':
     case 'ELEMENTS_LOAD': {
-      return Object.assign({}, state, _.omit(action, 'type'))
+      return Object.assign({}, state, omit(action, 'type'))
     }
     case 'CHANNEL_DISCONNECTED': {
       if (state.beyondPageOne) return state
diff --git a/apps/block_scout_web/assets/webpack.config.js b/apps/block_scout_web/assets/webpack.config.js
index 08a2f410e7..d7d504678d 100644
--- a/apps/block_scout_web/assets/webpack.config.js
+++ b/apps/block_scout_web/assets/webpack.config.js
@@ -1,7 +1,7 @@
 const path = require('path');
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
-const { ContextReplacementPlugin } = require('webpack')
+const { ContextReplacementPlugin } = require('webpack');
 const glob = require("glob");
 
 function transpileViewScript(file) {

From ba2fb3557b776cbd72914b50937836af5957aec1 Mon Sep 17 00:00:00 2001
From: pasqu4le <pasqu4le@gmail.com>
Date: Fri, 19 Jul 2019 14:01:52 +0200
Subject: [PATCH 30/56] Improve controllers queries

Problem: after #2111, #2249, #2216 and #2305 a few remaining controllers still have not been checked for possible improvements.

Solution: check them and remove unnecessary preloads and queries.
---
 .../address_contract_controller.ex            |  12 +-
 .../address_read_contract_controller.ex       |  12 +-
 .../controllers/api/rpc/block_controller.ex   |   3 +-
 .../controllers/chain_controller.ex           |  12 +-
 apps/explorer/lib/explorer/chain.ex           |  47 ++++----
 .../lib/explorer/smart_contract/reader.ex     | 104 ++++++++++--------
 apps/explorer/test/explorer/chain_test.exs    |  14 ++-
 .../explorer/smart_contract/reader_test.exs   |   2 +-
 8 files changed, 131 insertions(+), 75 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_controller.ex
index bc4df8c4be..5db900b12b 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_contract_controller.ex
@@ -8,8 +8,18 @@ defmodule BlockScoutWeb.AddressContractController do
   alias Indexer.Fetcher.CoinBalanceOnDemand
 
   def index(conn, %{"address_id" => address_hash_string}) do
+    address_options = [
+      necessity_by_association: %{
+        :contracts_creation_internal_transaction => :optional,
+        :names => :optional,
+        :smart_contract => :optional,
+        :token => :optional,
+        :contracts_creation_transaction => :optional
+      }
+    ]
+
     with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string),
-         {:ok, address} <- Chain.find_contract_address(address_hash) do
+         {:ok, address} <- Chain.find_contract_address(address_hash, address_options, true) do
       render(
         conn,
         "index.html",
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_read_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_read_contract_controller.ex
index d57aa30807..0849689dce 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_read_contract_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_read_contract_controller.ex
@@ -15,8 +15,18 @@ defmodule BlockScoutWeb.AddressReadContractController do
   import BlockScoutWeb.AddressController, only: [transaction_count: 1, validation_count: 1]
 
   def index(conn, %{"address_id" => address_hash_string}) do
+    address_options = [
+      necessity_by_association: %{
+        :contracts_creation_internal_transaction => :optional,
+        :names => :optional,
+        :smart_contract => :optional,
+        :token => :optional,
+        :contracts_creation_transaction => :optional
+      }
+    ]
+
     with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string),
-         {:ok, address} <- Chain.find_contract_address(address_hash) do
+         {:ok, address} <- Chain.find_contract_address(address_hash, address_options, true) do
       render(
         conn,
         "index.html",
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/block_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/block_controller.ex
index 91569a96da..16d73d420f 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/block_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/block_controller.ex
@@ -8,8 +8,7 @@ defmodule BlockScoutWeb.API.RPC.BlockController do
   def getblockreward(conn, params) do
     with {:block_param, {:ok, unsafe_block_number}} <- {:block_param, Map.fetch(params, "blockno")},
          {:ok, block_number} <- ChainWeb.param_to_block_number(unsafe_block_number),
-         block_options = [necessity_by_association: %{transactions: :optional}],
-         {:ok, block} <- Chain.number_to_block(block_number, block_options) do
+         {:ok, block} <- Chain.number_to_block(block_number) do
       reward = Chain.block_reward(block)
 
       render(conn, :block_reward, block: block, reward: reward)
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/chain_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/chain_controller.ex
index 40a0fd3bbb..2c16cd1b03 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/chain_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/chain_controller.ex
@@ -2,7 +2,7 @@ defmodule BlockScoutWeb.ChainController do
   use BlockScoutWeb, :controller
 
   alias BlockScoutWeb.ChainView
-  alias Explorer.{Chain, PagingOptions, Repo}
+  alias Explorer.{Chain, PagingOptions}
   alias Explorer.Chain.{Address, Block, Transaction}
   alias Explorer.Chain.Supply.RSK
   alias Explorer.Counters.AverageBlockTime
@@ -72,9 +72,15 @@ defmodule BlockScoutWeb.ChainController do
   def chain_blocks(conn, _params) do
     if ajax?(conn) do
       blocks =
-        [paging_options: %PagingOptions{page_size: 4}]
+        [
+          paging_options: %PagingOptions{page_size: 4},
+          necessity_by_association: %{
+            [miner: :names] => :optional,
+            :transactions => :optional,
+            :rewards => :optional
+          }
+        ]
         |> Chain.list_blocks()
-        |> Repo.preload([[miner: :names], :transactions, :rewards])
         |> Enum.map(fn block ->
           %{
             chain_block_html:
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 17116658bf..59836a90a6 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -930,29 +930,40 @@ defmodule Explorer.Chain do
     Repo.all(query)
   end
 
-  @spec find_contract_address(Hash.t()) :: {:ok, Address.t()} | {:error, :not_found}
-  def find_contract_address(%Hash{byte_count: unquote(Hash.Address.byte_count())} = hash) do
+  @doc """
+  Finds an `t:Explorer.Chain.Address.t/0` that has the provided `t:Explorer.Chain.Address.t/0` `hash` and a contract.
+
+  ## Options
+
+    * `:necessity_by_association` - use to load `t:association/0` as `:required` or `:optional`.  If an association is
+      `:required`, and the `t:Explorer.Chain.Address.t/0` has no associated record for that association,
+      then the `t:Explorer.Chain.Address.t/0` will not be included in the list.
+
+  Optionally it also accepts a boolean to fetch the `has_decompiled_code?` virtual field or not
+
+  """
+  @spec find_contract_address(Hash.Address.t(), [necessity_by_association_option], boolean()) ::
+          {:ok, Address.t()} | {:error, :not_found}
+  def find_contract_address(
+        %Hash{byte_count: unquote(Hash.Address.byte_count())} = hash,
+        options \\ [],
+        query_decompiled_code_flag \\ false
+      ) do
+    necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
+
     query =
       from(
         address in Address,
-        preload: [
-          :contracts_creation_internal_transaction,
-          :names,
-          :smart_contract,
-          :token,
-          :contracts_creation_transaction
-        ],
         where: address.hash == ^hash and not is_nil(address.contract_code)
       )
 
-    query_with_decompiled_flag = with_decompiled_code_flag(query, hash)
-
-    address = Repo.one(query_with_decompiled_flag)
-
-    if address do
-      {:ok, address}
-    else
-      {:error, :not_found}
+    query
+    |> join_associations(necessity_by_association)
+    |> with_decompiled_code_flag(hash, query_decompiled_code_flag)
+    |> Repo.one()
+    |> case do
+      nil -> {:error, :not_found}
+      address -> {:ok, address}
     end
   end
 
@@ -3276,8 +3287,6 @@ defmodule Explorer.Chain do
 
   defp staking_pool_filter(query, _), do: query
 
-  defp with_decompiled_code_flag(query, hash, use_option \\ true)
-
   defp with_decompiled_code_flag(query, _hash, false), do: query
 
   defp with_decompiled_code_flag(query, hash, true) do
diff --git a/apps/explorer/lib/explorer/smart_contract/reader.ex b/apps/explorer/lib/explorer/smart_contract/reader.ex
index 72b40f55a4..cc3aae5e83 100644
--- a/apps/explorer/lib/explorer/smart_contract/reader.ex
+++ b/apps/explorer/lib/explorer/smart_contract/reader.ex
@@ -8,7 +8,7 @@ defmodule Explorer.SmartContract.Reader do
 
   alias EthereumJSONRPC.Contract
   alias Explorer.Chain
-  alias Explorer.Chain.Hash
+  alias Explorer.Chain.{Hash, SmartContract}
 
   @typedoc """
   Map of functions to call with the values for the function to be called with.
@@ -34,6 +34,8 @@ defmodule Explorer.SmartContract.Reader do
   @doc """
   Queries the contract functions on the blockchain and returns the call results.
 
+  Optionally accepts the abi if it has already been fetched.
+
   ## Examples
 
   Note that for this example to work the database must be up to date with the
@@ -57,14 +59,20 @@ defmodule Explorer.SmartContract.Reader do
       )
       # => %{"sum" => {:error, "Data overflow encoding int, data `abc` cannot fit in 256 bits"}}
   """
-  @spec query_verified_contract(Hash.Address.t(), functions()) :: functions_results()
-  def query_verified_contract(address_hash, functions) do
+  @spec query_verified_contract(Hash.Address.t(), functions(), SmartContract.abi() | nil) :: functions_results()
+  def query_verified_contract(address_hash, functions, mabi \\ nil) do
     contract_address = Hash.to_string(address_hash)
 
     abi =
-      address_hash
-      |> Chain.address_hash_to_smart_contract()
-      |> Map.get(:abi)
+      case mabi do
+        nil ->
+          address_hash
+          |> Chain.address_hash_to_smart_contract()
+          |> Map.get(:abi)
+
+        _ ->
+          mabi
+      end
 
     query_contract(contract_address, abi, functions)
   end
@@ -156,41 +164,41 @@ defmodule Explorer.SmartContract.Reader do
   """
   @spec read_only_functions(Hash.t()) :: [%{}]
   def read_only_functions(contract_address_hash) do
-    contract_address_hash
-    |> Chain.address_hash_to_smart_contract()
-    |> Map.get(:abi, [])
-    |> Enum.filter(& &1["constant"])
-    |> fetch_current_value_from_blockchain(contract_address_hash, [])
-    |> Enum.reverse()
-  end
-
-  def fetch_current_value_from_blockchain(
-        [%{"inputs" => []} = function | tail],
-        contract_address_hash,
-        acc
-      ) do
-    values =
-      fetch_from_blockchain(contract_address_hash, %{
-        name: function["name"],
-        args: function["inputs"],
-        outputs: function["outputs"]
-      })
+    abi =
+      contract_address_hash
+      |> Chain.address_hash_to_smart_contract()
+      |> Map.get(:abi)
 
-    formatted = Map.replace!(function, "outputs", values)
+    case abi do
+      nil ->
+        []
 
-    fetch_current_value_from_blockchain(tail, contract_address_hash, [formatted | acc])
+      _ ->
+        abi
+        |> Enum.filter(& &1["constant"])
+        |> Enum.map(&fetch_current_value_from_blockchain(&1, abi, contract_address_hash))
+    end
   end
 
-  def fetch_current_value_from_blockchain([function | tail], contract_address_hash, acc) do
-    values = link_outputs_and_values(%{}, Map.get(function, "outputs", []), function["name"])
+  defp fetch_current_value_from_blockchain(function, abi, contract_address_hash) do
+    values =
+      case function do
+        %{"inputs" => []} ->
+          name = function["name"]
+          args = function["inputs"]
+          outputs = function["outputs"]
+
+          contract_address_hash
+          |> query_verified_contract(%{name => normalize_args(args)}, abi)
+          |> link_outputs_and_values(outputs, name)
 
-    formatted = Map.replace!(function, "outputs", values)
+        _ ->
+          link_outputs_and_values(%{}, Map.get(function, "outputs", []), function["name"])
+      end
 
-    fetch_current_value_from_blockchain(tail, contract_address_hash, [formatted | acc])
+    Map.replace!(function, "outputs", values)
   end
 
-  def fetch_current_value_from_blockchain([], _contract_address_hash, acc), do: acc
-
   @doc """
   Fetches the blockchain value of a function that requires arguments.
   """
@@ -201,23 +209,27 @@ defmodule Explorer.SmartContract.Reader do
 
   @spec query_function(Hash.t(), %{name: String.t(), args: [term()]}) :: [%{}]
   def query_function(contract_address_hash, %{name: name, args: args}) do
-    function =
+    abi =
       contract_address_hash
       |> Chain.address_hash_to_smart_contract()
-      |> Map.get(:abi, [])
-      |> Enum.filter(fn function -> function["name"] == name end)
-      |> List.first()
-
-    fetch_from_blockchain(contract_address_hash, %{
-      name: name,
-      args: args,
-      outputs: function["outputs"]
-    })
-  end
+      |> Map.get(:abi)
+
+    outputs =
+      case abi do
+        nil ->
+          nil
+
+        _ ->
+          function =
+            abi
+            |> Enum.filter(fn function -> function["name"] == name end)
+            |> List.first()
+
+          function["outputs"]
+      end
 
-  defp fetch_from_blockchain(contract_address_hash, %{name: name, args: args, outputs: outputs}) do
     contract_address_hash
-    |> query_verified_contract(%{name => normalize_args(args)})
+    |> query_verified_contract(%{name => normalize_args(args)}, abi)
     |> link_outputs_and_values(outputs, name)
   end
 
diff --git a/apps/explorer/test/explorer/chain_test.exs b/apps/explorer/test/explorer/chain_test.exs
index 38e61dee7d..fc4f3eab85 100644
--- a/apps/explorer/test/explorer/chain_test.exs
+++ b/apps/explorer/test/explorer/chain_test.exs
@@ -2480,7 +2480,17 @@ defmodule Explorer.ChainTest do
         insert(:address, contract_code: Factory.data("contract_code"), smart_contract: nil, names: [])
         |> Repo.preload([:contracts_creation_internal_transaction, :contracts_creation_transaction, :token])
 
-      response = Chain.find_contract_address(address.hash)
+      options = [
+        necessity_by_association: %{
+          :contracts_creation_internal_transaction => :optional,
+          :names => :optional,
+          :smart_contract => :optional,
+          :token => :optional,
+          :contracts_creation_transaction => :optional
+        }
+      ]
+
+      response = Chain.find_contract_address(address.hash, options, true)
 
       assert response == {:ok, address}
     end
@@ -2527,7 +2537,7 @@ defmodule Explorer.ChainTest do
     end
 
     test "with block without transactions", %{block: block, emission_reward: emission_reward} do
-      assert emission_reward.reward == Chain.block_reward(block)
+      assert emission_reward.reward == Chain.block_reward(block.number)
     end
   end
 
diff --git a/apps/explorer/test/explorer/smart_contract/reader_test.exs b/apps/explorer/test/explorer/smart_contract/reader_test.exs
index ab63b74d1e..82f0a54385 100644
--- a/apps/explorer/test/explorer/smart_contract/reader_test.exs
+++ b/apps/explorer/test/explorer/smart_contract/reader_test.exs
@@ -102,7 +102,7 @@ defmodule Explorer.SmartContract.ReaderTest do
     end
   end
 
-  describe "query_verified_contract/2" do
+  describe "query_verified_contract/3" do
     test "correctly returns the results of the smart contract functions" do
       hash =
         :smart_contract

From d528d4d1f5857318c45ea1720fc4ba61843ff072 Mon Sep 17 00:00:00 2001
From: pasqu4le <pasqu4le@gmail.com>
Date: Fri, 19 Jul 2019 14:41:00 +0200
Subject: [PATCH 31/56] Reduce chain function input to hashes (or ids) where
 possible

Problem: a lot of function take an entity as an parameter, but only use its hash/id.
This makes tracing the necessary scope of functions harder and is one of the cause for unnecessary queries/code execution.

Solution: refactor these functions to take only a hash (or an id).
---
 .../controllers/api/rpc/block_controller.ex   |  2 +-
 .../api/rpc/transaction_controller.ex         |  2 +-
 .../block_transaction_controller.ex           |  4 +-
 ...saction_internal_transaction_controller.ex |  2 +-
 .../controllers/transaction_log_controller.ex |  2 +-
 .../transaction_raw_trace_controller.ex       |  2 +-
 .../transaction_token_transfer_controller.ex  |  2 +-
 apps/explorer/lib/explorer/chain.ex           | 48 ++++++----------
 apps/explorer/test/explorer/chain_test.exs    | 56 +++++++++----------
 9 files changed, 54 insertions(+), 66 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/block_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/block_controller.ex
index 16d73d420f..835e19bf3e 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/block_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/rpc/block_controller.ex
@@ -9,7 +9,7 @@ defmodule BlockScoutWeb.API.RPC.BlockController do
     with {:block_param, {:ok, unsafe_block_number}} <- {:block_param, Map.fetch(params, "blockno")},
          {:ok, block_number} <- ChainWeb.param_to_block_number(unsafe_block_number),
          {:ok, block} <- Chain.number_to_block(block_number) do
-      reward = Chain.block_reward(block)
+      reward = Chain.block_reward(block_number)
 
       render(conn, :block_reward, block: block, reward: reward)
     else
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 344dbe1037..565ea4b6a5 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
@@ -10,7 +10,7 @@ defmodule BlockScoutWeb.API.RPC.TransactionController do
          {:format, {:ok, transaction_hash}} <- to_transaction_hash(txhash_param),
          {:transaction, {:ok, transaction}} <- transaction_from_hash(transaction_hash),
          paging_options <- paging_options(params) do
-      logs = Chain.transaction_to_logs(transaction, paging_options)
+      logs = Chain.transaction_to_logs(transaction_hash, paging_options)
       {logs, next_page} = split_list_by_page(logs)
 
       render(conn, :gettxinfo, %{
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/block_transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/block_transaction_controller.ex
index 15b06f1edd..a1e4cbeb09 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/block_transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/block_transaction_controller.ex
@@ -26,7 +26,7 @@ defmodule BlockScoutWeb.BlockTransactionController do
           paging_options(params)
         )
 
-      transactions_plus_one = Chain.block_to_transactions(block, full_options)
+      transactions_plus_one = Chain.block_to_transactions(block.hash, full_options)
 
       {transactions, next_page} = split_list_by_page(transactions_plus_one)
 
@@ -89,7 +89,7 @@ defmodule BlockScoutWeb.BlockTransactionController do
                :rewards => :optional
              }
            ) do
-      block_transaction_count = Chain.block_to_transaction_count(block)
+      block_transaction_count = Chain.block_to_transaction_count(block.hash)
 
       render(
         conn,
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_internal_transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_internal_transaction_controller.ex
index 159d144cdd..ae847b374d 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_internal_transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_internal_transaction_controller.ex
@@ -24,7 +24,7 @@ defmodule BlockScoutWeb.TransactionInternalTransactionController do
           paging_options(params)
         )
 
-      internal_transactions_plus_one = Chain.transaction_to_internal_transactions(transaction, full_options)
+      internal_transactions_plus_one = Chain.transaction_to_internal_transactions(hash, full_options)
 
       {internal_transactions, next_page} = split_list_by_page(internal_transactions_plus_one)
 
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_log_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_log_controller.ex
index 0a87d12493..a4bd12d66b 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_log_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_log_controller.ex
@@ -22,7 +22,7 @@ defmodule BlockScoutWeb.TransactionLogController do
           paging_options(params)
         )
 
-      logs_plus_one = Chain.transaction_to_logs(transaction, full_options)
+      logs_plus_one = Chain.transaction_to_logs(transaction_hash, full_options)
 
       {logs, next_page} = split_list_by_page(logs_plus_one)
 
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_raw_trace_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_raw_trace_controller.ex
index 3d090e8a9b..250a6b4442 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_raw_trace_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_raw_trace_controller.ex
@@ -19,7 +19,7 @@ defmodule BlockScoutWeb.TransactionRawTraceController do
                :token_transfers => :optional
              }
            ) do
-      internal_transactions = Chain.transaction_to_internal_transactions(transaction)
+      internal_transactions = Chain.transaction_to_internal_transactions(hash)
 
       render(
         conn,
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_token_transfer_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_token_transfer_controller.ex
index cfb215da3e..5f4a9c8229 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_token_transfer_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_token_transfer_controller.ex
@@ -24,7 +24,7 @@ defmodule BlockScoutWeb.TransactionTokenTransferController do
           paging_options(params)
         )
 
-      token_transfers_plus_one = Chain.transaction_to_token_transfers(transaction, full_options)
+      token_transfers_plus_one = Chain.transaction_to_token_transfers(hash, full_options)
 
       {token_transfers, next_page} = split_list_by_page(token_transfers_plus_one)
 
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 59836a90a6..2c40f6bbc1 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -364,8 +364,8 @@ defmodule Explorer.Chain do
 
   Uncles are not currently accounted for.
   """
-  @spec block_reward(Block.t()) :: Wei.t()
-  def block_reward(%Block{number: block_number}) do
+  @spec block_reward(Block.block_number()) :: Wei.t()
+  def block_reward(block_number) do
     query =
       from(
         block in Block,
@@ -415,8 +415,8 @@ defmodule Explorer.Chain do
       `:key` (a tuple of the lowest/oldest `{index}`) and. Results will be the transactions older than
       the `index` that are passed.
   """
-  @spec block_to_transactions(Block.t(), [paging_options | necessity_by_association_option]) :: [Transaction.t()]
-  def block_to_transactions(%Block{hash: block_hash}, options \\ []) when is_list(options) do
+  @spec block_to_transactions(Hash.Full.t(), [paging_options | necessity_by_association_option]) :: [Transaction.t()]
+  def block_to_transactions(block_hash, options \\ []) when is_list(options) do
     necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
 
     options
@@ -432,8 +432,8 @@ defmodule Explorer.Chain do
   @doc """
   Counts the number of `t:Explorer.Chain.Transaction.t/0` in the `block`.
   """
-  @spec block_to_transaction_count(Block.t()) :: non_neg_integer()
-  def block_to_transaction_count(%Block{hash: block_hash}) do
+  @spec block_to_transaction_count(Hash.Full.t()) :: non_neg_integer()
+  def block_to_transaction_count(block_hash) do
     query =
       from(
         transaction in Transaction,
@@ -843,7 +843,7 @@ defmodule Explorer.Chain do
   Returns `{:error, :not_found}` if there is no address by that hash present.
   Returns `{:error, :no_balance}` if there is no balance for that address at that block.
   """
-  @spec get_balance_as_of_block(Hash.Address.t(), integer | :earliest | :latest | :pending) ::
+  @spec get_balance_as_of_block(Hash.Address.t(), Block.block_number() | :earliest | :latest | :pending) ::
           {:ok, Wei.t()} | {:error, :no_balance} | {:error, :not_found}
   def get_balance_as_of_block(address, block) when is_integer(block) do
     coin_balance_query =
@@ -967,7 +967,7 @@ defmodule Explorer.Chain do
     end
   end
 
-  @spec find_decompiled_contract_address(Hash.t()) :: {:ok, Address.t()} | {:error, :not_found}
+  @spec find_decompiled_contract_address(Hash.Address.t()) :: {:ok, Address.t()} | {:error, :not_found}
   def find_decompiled_contract_address(%Hash{byte_count: unquote(Hash.Address.byte_count())} = hash) do
     query =
       from(
@@ -2220,14 +2220,10 @@ defmodule Explorer.Chain do
 
   """
 
-  @spec transaction_to_internal_transactions(Transaction.t(), [paging_options | necessity_by_association_option]) :: [
+  @spec transaction_to_internal_transactions(Hash.Full.t(), [paging_options | necessity_by_association_option]) :: [
           InternalTransaction.t()
         ]
-  def transaction_to_internal_transactions(
-        %Transaction{hash: %Hash{byte_count: unquote(Hash.Full.byte_count())} = hash},
-        options \\ []
-      )
-      when is_list(options) do
+  def transaction_to_internal_transactions(hash, options \\ []) when is_list(options) do
     necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
     paging_options = Keyword.get(options, :paging_options, @default_paging_options)
 
@@ -2255,12 +2251,8 @@ defmodule Explorer.Chain do
       the `index` that are passed.
 
   """
-  @spec transaction_to_logs(Transaction.t(), [paging_options | necessity_by_association_option]) :: [Log.t()]
-  def transaction_to_logs(
-        %Transaction{hash: %Hash{byte_count: unquote(Hash.Full.byte_count())} = transaction_hash},
-        options \\ []
-      )
-      when is_list(options) do
+  @spec transaction_to_logs(Hash.Full.t(), [paging_options | necessity_by_association_option]) :: [Log.t()]
+  def transaction_to_logs(transaction_hash, options \\ []) when is_list(options) do
     necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
     paging_options = Keyword.get(options, :paging_options, @default_paging_options)
 
@@ -2287,14 +2279,10 @@ defmodule Explorer.Chain do
       the `index` that are passed.
 
   """
-  @spec transaction_to_token_transfers(Transaction.t(), [paging_options | necessity_by_association_option]) :: [
+  @spec transaction_to_token_transfers(Hash.Full.t(), [paging_options | necessity_by_association_option]) :: [
           TokenTransfer.t()
         ]
-  def transaction_to_token_transfers(
-        %Transaction{hash: %Hash{byte_count: unquote(Hash.Full.byte_count())} = transaction_hash},
-        options \\ []
-      )
-      when is_list(options) do
+  def transaction_to_token_transfers(transaction_hash, options \\ []) when is_list(options) do
     necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
     paging_options = Keyword.get(options, :paging_options, @default_paging_options)
 
@@ -2521,16 +2509,16 @@ defmodule Explorer.Chain do
     |> repo.insert(on_conflict: :nothing, conflict_target: [:address_hash, :name])
   end
 
-  @spec address_hash_to_address_with_source_code(%Explorer.Chain.Hash{}) :: %Explorer.Chain.Address{} | nil
-  def address_hash_to_address_with_source_code(%Explorer.Chain.Hash{} = address_hash) do
+  @spec address_hash_to_address_with_source_code(Hash.Address.t()) :: Address.t() | nil
+  def address_hash_to_address_with_source_code(address_hash) do
     case Repo.get(Address, address_hash) do
       nil -> nil
       address -> Repo.preload(address, [:smart_contract, :decompiled_smart_contracts])
     end
   end
 
-  @spec address_hash_to_smart_contract(%Explorer.Chain.Hash{}) :: %Explorer.Chain.SmartContract{} | nil
-  def address_hash_to_smart_contract(%Explorer.Chain.Hash{} = address_hash) do
+  @spec address_hash_to_smart_contract(Hash.Address.t()) :: SmartContract.t() | nil
+  def address_hash_to_smart_contract(address_hash) do
     query =
       from(
         smart_contract in SmartContract,
diff --git a/apps/explorer/test/explorer/chain_test.exs b/apps/explorer/test/explorer/chain_test.exs
index fc4f3eab85..5ee506982b 100644
--- a/apps/explorer/test/explorer/chain_test.exs
+++ b/apps/explorer/test/explorer/chain_test.exs
@@ -630,7 +630,7 @@ defmodule Explorer.ChainTest do
 
       assert Repo.aggregate(Transaction, :count, :hash) == 0
 
-      assert [] = Chain.block_to_transactions(block)
+      assert [] = Chain.block_to_transactions(block.hash)
     end
 
     test "with transactions" do
@@ -639,7 +639,7 @@ defmodule Explorer.ChainTest do
         |> insert()
         |> with_block()
 
-      assert [%Transaction{hash: ^transaction_hash}] = Chain.block_to_transactions(block)
+      assert [%Transaction{hash: ^transaction_hash}] = Chain.block_to_transactions(block.hash)
     end
 
     test "with transactions can be paginated by {index}" do
@@ -657,7 +657,7 @@ defmodule Explorer.ChainTest do
         |> with_block(block)
 
       assert second_page_hashes ==
-               block
+               block.hash
                |> Chain.block_to_transactions(paging_options: %PagingOptions{key: {index}, page_size: 50})
                |> Enum.map(& &1.hash)
                |> Enum.reverse()
@@ -683,7 +683,7 @@ defmodule Explorer.ChainTest do
         token: token
       )
 
-      fetched_transaction = List.first(Explorer.Chain.block_to_transactions(block))
+      fetched_transaction = List.first(Explorer.Chain.block_to_transactions(block.hash))
       assert fetched_transaction.hash == transaction.hash
       assert length(fetched_transaction.token_transfers) == 2
     end
@@ -693,7 +693,7 @@ defmodule Explorer.ChainTest do
     test "without transactions" do
       block = insert(:block)
 
-      assert Chain.block_to_transaction_count(block) == 0
+      assert Chain.block_to_transaction_count(block.hash) == 0
     end
 
     test "with transactions" do
@@ -702,7 +702,7 @@ defmodule Explorer.ChainTest do
         |> insert()
         |> with_block()
 
-      assert Chain.block_to_transaction_count(block) == 1
+      assert Chain.block_to_transaction_count(block.hash) == 1
     end
   end
 
@@ -2090,7 +2090,7 @@ defmodule Explorer.ChainTest do
     test "with transaction without internal transactions" do
       transaction = insert(:transaction)
 
-      assert [] = Chain.transaction_to_internal_transactions(transaction)
+      assert [] = Chain.transaction_to_internal_transactions(transaction.hash)
     end
 
     test "with transaction with internal transactions returns all internal transactions for a given transaction hash" do
@@ -2117,7 +2117,7 @@ defmodule Explorer.ChainTest do
           transaction_index: transaction.index
         )
 
-      results = [internal_transaction | _] = Chain.transaction_to_internal_transactions(transaction)
+      results = [internal_transaction | _] = Chain.transaction_to_internal_transactions(transaction.hash)
 
       assert 2 == length(results)
 
@@ -2151,7 +2151,7 @@ defmodule Explorer.ChainTest do
                  to_address: %Ecto.Association.NotLoaded{},
                  transaction: %Transaction{block: %Ecto.Association.NotLoaded{}}
                }
-             ] = Chain.transaction_to_internal_transactions(transaction)
+             ] = Chain.transaction_to_internal_transactions(transaction.hash)
 
       assert [
                %InternalTransaction{
@@ -2161,7 +2161,7 @@ defmodule Explorer.ChainTest do
                }
              ] =
                Chain.transaction_to_internal_transactions(
-                 transaction,
+                 transaction.hash,
                  necessity_by_association: %{
                    :from_address => :optional,
                    :to_address => :optional,
@@ -2183,7 +2183,7 @@ defmodule Explorer.ChainTest do
         transaction_index: transaction.index
       )
 
-      result = Chain.transaction_to_internal_transactions(transaction)
+      result = Chain.transaction_to_internal_transactions(transaction.hash)
 
       assert Enum.empty?(result)
     end
@@ -2202,7 +2202,7 @@ defmodule Explorer.ChainTest do
           transaction_index: transaction.index
         )
 
-      actual = Enum.at(Chain.transaction_to_internal_transactions(transaction), 0)
+      actual = Enum.at(Chain.transaction_to_internal_transactions(transaction.hash), 0)
 
       assert {actual.transaction_hash, actual.index} == {expected.transaction_hash, expected.index}
     end
@@ -2222,7 +2222,7 @@ defmodule Explorer.ChainTest do
           transaction_index: transaction.index
         )
 
-      actual = Enum.at(Chain.transaction_to_internal_transactions(transaction), 0)
+      actual = Enum.at(Chain.transaction_to_internal_transactions(transaction.hash), 0)
 
       assert {actual.transaction_hash, actual.index} == {expected.transaction_hash, expected.index}
     end
@@ -2243,7 +2243,7 @@ defmodule Explorer.ChainTest do
           transaction_index: transaction.index
         )
 
-      actual = Enum.at(Chain.transaction_to_internal_transactions(transaction), 0)
+      actual = Enum.at(Chain.transaction_to_internal_transactions(transaction.hash), 0)
 
       assert {actual.transaction_hash, actual.index} == {expected.transaction_hash, expected.index}
     end
@@ -2271,7 +2271,7 @@ defmodule Explorer.ChainTest do
         )
 
       result =
-        transaction
+        transaction.hash
         |> Chain.transaction_to_internal_transactions()
         |> Enum.map(&{&1.transaction_hash, &1.index})
 
@@ -2301,17 +2301,17 @@ defmodule Explorer.ChainTest do
         )
 
       assert [{first_transaction_hash, first_index}, {second_transaction_hash, second_index}] ==
-               transaction
+               transaction.hash
                |> Chain.transaction_to_internal_transactions(paging_options: %PagingOptions{key: {-1}, page_size: 2})
                |> Enum.map(&{&1.transaction_hash, &1.index})
 
       assert [{first_transaction_hash, first_index}] ==
-               transaction
+               transaction.hash
                |> Chain.transaction_to_internal_transactions(paging_options: %PagingOptions{key: {-1}, page_size: 1})
                |> Enum.map(&{&1.transaction_hash, &1.index})
 
       assert [{second_transaction_hash, second_index}] ==
-               transaction
+               transaction.hash
                |> Chain.transaction_to_internal_transactions(paging_options: %PagingOptions{key: {0}, page_size: 2})
                |> Enum.map(&{&1.transaction_hash, &1.index})
     end
@@ -2321,7 +2321,7 @@ defmodule Explorer.ChainTest do
     test "without logs" do
       transaction = insert(:transaction)
 
-      assert [] = Chain.transaction_to_logs(transaction)
+      assert [] = Chain.transaction_to_logs(transaction.hash)
     end
 
     test "with logs" do
@@ -2332,7 +2332,7 @@ defmodule Explorer.ChainTest do
 
       %Log{transaction_hash: transaction_hash, index: index} = insert(:log, transaction: transaction)
 
-      assert [%Log{transaction_hash: ^transaction_hash, index: ^index}] = Chain.transaction_to_logs(transaction)
+      assert [%Log{transaction_hash: ^transaction_hash, index: ^index}] = Chain.transaction_to_logs(transaction.hash)
     end
 
     test "with logs can be paginated" do
@@ -2349,7 +2349,7 @@ defmodule Explorer.ChainTest do
         |> Enum.map(& &1.index)
 
       assert second_page_indexes ==
-               transaction
+               transaction.hash
                |> Chain.transaction_to_logs(paging_options: %PagingOptions{key: {log.index}, page_size: 50})
                |> Enum.map(& &1.index)
     end
@@ -2364,7 +2364,7 @@ defmodule Explorer.ChainTest do
 
       assert [%Log{address: %Address{}, transaction: %Transaction{}}] =
                Chain.transaction_to_logs(
-                 transaction,
+                 transaction.hash,
                  necessity_by_association: %{
                    address: :optional,
                    transaction: :optional
@@ -2376,7 +2376,7 @@ defmodule Explorer.ChainTest do
                  address: %Ecto.Association.NotLoaded{},
                  transaction: %Ecto.Association.NotLoaded{}
                }
-             ] = Chain.transaction_to_logs(transaction)
+             ] = Chain.transaction_to_logs(transaction.hash)
     end
   end
 
@@ -2384,7 +2384,7 @@ defmodule Explorer.ChainTest do
     test "without token transfers" do
       transaction = insert(:transaction)
 
-      assert [] = Chain.transaction_to_token_transfers(transaction)
+      assert [] = Chain.transaction_to_token_transfers(transaction.hash)
     end
 
     test "with token transfers" do
@@ -2397,7 +2397,7 @@ defmodule Explorer.ChainTest do
         insert(:token_transfer, transaction: transaction)
 
       assert [%TokenTransfer{transaction_hash: ^transaction_hash, log_index: ^log_index}] =
-               Chain.transaction_to_token_transfers(transaction)
+               Chain.transaction_to_token_transfers(transaction.hash)
     end
 
     test "token transfers necessity_by_association loads associations" do
@@ -2410,7 +2410,7 @@ defmodule Explorer.ChainTest do
 
       assert [%TokenTransfer{token: %Token{}, transaction: %Transaction{}}] =
                Chain.transaction_to_token_transfers(
-                 transaction,
+                 transaction.hash,
                  necessity_by_association: %{
                    token: :optional,
                    transaction: :optional
@@ -2422,7 +2422,7 @@ defmodule Explorer.ChainTest do
                  token: %Ecto.Association.NotLoaded{},
                  transaction: %Ecto.Association.NotLoaded{}
                }
-             ] = Chain.transaction_to_token_transfers(transaction)
+             ] = Chain.transaction_to_token_transfers(transaction.hash)
     end
   end
 
@@ -2533,7 +2533,7 @@ defmodule Explorer.ChainTest do
         |> Decimal.add(Decimal.new(3))
         |> Wei.from(:wei)
 
-      assert expected == Chain.block_reward(block)
+      assert expected == Chain.block_reward(block.number)
     end
 
     test "with block without transactions", %{block: block, emission_reward: emission_reward} do

From 2a7cfead5a43cd9d344015bd25901a99fd18d181 Mon Sep 17 00:00:00 2001
From: pasqu4le <pasqu4le@gmail.com>
Date: Fri, 19 Jul 2019 17:28:06 +0200
Subject: [PATCH 32/56] Check only for existence when possible

Problem: some controller retrieves entire entities from the database when it only needs to check their existence.

Solution: provide Exploerer.Chain functions to check for existence and use them where possible.
---
 .../address_coin_balance_controller.ex        |   6 +-
 .../controllers/address_logs_controller.ex    |   8 +-
 .../decompiled_smart_contract_controller.ex   |  21 +-
 .../v1/verified_smart_contract_controller.ex  |  21 +-
 .../controllers/smart_contract_controller.ex  |   4 +-
 .../controllers/transaction_controller.ex     |   6 +-
 ...saction_internal_transaction_controller.ex |   6 +-
 .../transaction_token_transfer_controller.ex  |   7 +-
 apps/explorer/lib/explorer/chain.ex           | 199 ++++++++++++++++++
 9 files changed, 224 insertions(+), 54 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_coin_balance_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_coin_balance_controller.ex
index 33a01959c9..9267c0dcab 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_coin_balance_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_coin_balance_controller.ex
@@ -16,7 +16,7 @@ defmodule BlockScoutWeb.AddressCoinBalanceController do
 
   def index(conn, %{"address_id" => address_hash_string, "type" => "JSON"} = params) do
     with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string),
-         {:ok, address} <- Chain.hash_to_address(address_hash, [], false) do
+         :ok <- Chain.check_address_exists(address_hash) do
       full_options = paging_options(params)
 
       coin_balances_plus_one = Chain.address_to_coin_balances(address_hash, full_options)
@@ -32,7 +32,7 @@ defmodule BlockScoutWeb.AddressCoinBalanceController do
             address_coin_balance_path(
               conn,
               :index,
-              address,
+              address_hash,
               Map.delete(next_page_params, "type")
             )
         end
@@ -52,7 +52,7 @@ defmodule BlockScoutWeb.AddressCoinBalanceController do
       :error ->
         unprocessable_entity(conn)
 
-      {:error, :not_found} ->
+      :not_found ->
         not_found(conn)
     end
   end
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_logs_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_logs_controller.ex
index e349ecd9ef..9e05643187 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_logs_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_logs_controller.ex
@@ -16,7 +16,7 @@ defmodule BlockScoutWeb.AddressLogsController do
 
   def index(conn, %{"address_id" => address_hash_string, "type" => "JSON"} = params) do
     with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string),
-         {:ok, address} <- Chain.hash_to_address(address_hash, [], false) do
+         :ok <- Chain.check_address_exists(address_hash) do
       logs_plus_one = Chain.address_to_logs(address_hash, paging_options(params))
       {results, next_page} = split_list_by_page(logs_plus_one)
 
@@ -26,7 +26,7 @@ defmodule BlockScoutWeb.AddressLogsController do
             nil
 
           next_page_params ->
-            address_logs_path(conn, :index, address, Map.delete(next_page_params, "type"))
+            address_logs_path(conn, :index, address_hash, Map.delete(next_page_params, "type"))
         end
 
       items =
@@ -74,7 +74,7 @@ defmodule BlockScoutWeb.AddressLogsController do
 
   def search_logs(conn, %{"topic" => topic, "address_id" => address_hash_string} = params) do
     with {:ok, address_hash} <- Chain.string_to_address_hash(address_hash_string),
-         {:ok, address} <- Chain.hash_to_address(address_hash, [], false) do
+         :ok <- Chain.check_address_exists(address_hash) do
       topic = String.trim(topic)
 
       formatted_topic = if String.starts_with?(topic, "0x"), do: topic, else: "0x" <> topic
@@ -89,7 +89,7 @@ defmodule BlockScoutWeb.AddressLogsController do
             nil
 
           next_page_params ->
-            address_logs_path(conn, :index, address, Map.delete(next_page_params, "type"))
+            address_logs_path(conn, :index, address_hash, Map.delete(next_page_params, "type"))
         end
 
       items =
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v1/decompiled_smart_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v1/decompiled_smart_contract_controller.ex
index 1eec849380..7b783b9761 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v1/decompiled_smart_contract_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v1/decompiled_smart_contract_controller.ex
@@ -7,8 +7,9 @@ defmodule BlockScoutWeb.API.V1.DecompiledSmartContractController do
   def create(conn, params) do
     if auth_token(conn) == actual_token() do
       with {:ok, hash} <- validate_address_hash(params["address_hash"]),
-           :ok <- smart_contract_exists?(hash),
-           :ok <- decompiled_contract_exists?(params["address_hash"], params["decompiler_version"]) do
+           :ok <- Chain.check_address_exists(hash),
+           {:contract, :not_found} <-
+             {:contract, Chain.check_decompiled_contract_exists(params["address_hash"], params["decompiler_version"])} do
         case Chain.create_decompiled_smart_contract(params) do
           {:ok, decompiled_smart_contract} ->
             send_resp(conn, :created, Jason.encode!(decompiled_smart_contract))
@@ -29,7 +30,7 @@ defmodule BlockScoutWeb.API.V1.DecompiledSmartContractController do
         :not_found ->
           send_resp(conn, :unprocessable_entity, encode(%{error: "address is not found"}))
 
-        :contract_exists ->
+        {:contract, :ok} ->
           send_resp(
             conn,
             :unprocessable_entity,
@@ -41,13 +42,6 @@ defmodule BlockScoutWeb.API.V1.DecompiledSmartContractController do
     end
   end
 
-  defp smart_contract_exists?(address_hash) do
-    case Chain.hash_to_address(address_hash) do
-      {:ok, _address} -> :ok
-      _ -> :not_found
-    end
-  end
-
   defp validate_address_hash(address_hash) do
     case Address.cast(address_hash) do
       {:ok, hash} -> {:ok, hash}
@@ -55,13 +49,6 @@ defmodule BlockScoutWeb.API.V1.DecompiledSmartContractController do
     end
   end
 
-  defp decompiled_contract_exists?(address_hash, decompiler_version) do
-    case Chain.decompiled_code(address_hash, decompiler_version) do
-      {:ok, _} -> :contract_exists
-      _ -> :ok
-    end
-  end
-
   defp auth_token(conn) do
     case get_req_header(conn, "auth_token") do
       [token] -> token
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/api/v1/verified_smart_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/api/v1/verified_smart_contract_controller.ex
index 50334a1a45..8b3d3d71eb 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/api/v1/verified_smart_contract_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/api/v1/verified_smart_contract_controller.ex
@@ -7,8 +7,8 @@ defmodule BlockScoutWeb.API.V1.VerifiedSmartContractController do
 
   def create(conn, params) do
     with {:ok, hash} <- validate_address_hash(params["address_hash"]),
-         :ok <- smart_contract_exists?(hash),
-         :ok <- verified_smart_contract_exists?(hash) do
+         :ok <- Chain.check_address_exists(hash),
+         {:contract, :not_found} <- {:contract, Chain.check_verified_smart_contract_exists(hash)} do
       external_libraries = fetch_external_libraries(params)
 
       case Publisher.publish(hash, params, external_libraries) do
@@ -31,7 +31,7 @@ defmodule BlockScoutWeb.API.V1.VerifiedSmartContractController do
       :not_found ->
         send_resp(conn, :unprocessable_entity, encode(%{error: "address is not found"}))
 
-      :contract_exists ->
+      {:contract, :ok} ->
         send_resp(
           conn,
           :unprocessable_entity,
@@ -40,13 +40,6 @@ defmodule BlockScoutWeb.API.V1.VerifiedSmartContractController do
     end
   end
 
-  defp smart_contract_exists?(address_hash) do
-    case Chain.hash_to_address(address_hash) do
-      {:ok, _address} -> :ok
-      _ -> :not_found
-    end
-  end
-
   defp validate_address_hash(address_hash) do
     case Address.cast(address_hash) do
       {:ok, hash} -> {:ok, hash}
@@ -54,14 +47,6 @@ defmodule BlockScoutWeb.API.V1.VerifiedSmartContractController do
     end
   end
 
-  defp verified_smart_contract_exists?(address_hash) do
-    if Chain.address_hash_to_smart_contract(address_hash) do
-      :contract_exists
-    else
-      :ok
-    end
-  end
-
   defp encode(data) do
     Jason.encode!(data)
   end
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/smart_contract_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/smart_contract_controller.ex
index 70ec6219f3..311feb4591 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/smart_contract_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/smart_contract_controller.ex
@@ -33,7 +33,7 @@ defmodule BlockScoutWeb.SmartContractController do
   def show(conn, params) do
     with true <- ajax?(conn),
          {:ok, address_hash} <- Chain.string_to_address_hash(params["id"]),
-         {:ok, _address} <- Chain.find_contract_address(address_hash),
+         :ok <- Chain.check_contract_address_exists(address_hash),
          outputs =
            Reader.query_function(
              address_hash,
@@ -51,7 +51,7 @@ defmodule BlockScoutWeb.SmartContractController do
       :error ->
         unprocessable_entity(conn)
 
-      {:error, :not_found} ->
+      :not_found ->
         not_found(conn)
 
       _ ->
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_controller.ex
index 1bedf97c1d..3f849c0e7c 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_controller.ex
@@ -62,15 +62,15 @@ defmodule BlockScoutWeb.TransactionController do
 
   def show(conn, %{"id" => id}) do
     with {:ok, transaction_hash} <- Chain.string_to_transaction_hash(id),
-         {:ok, %Chain.Transaction{} = transaction} <- Chain.hash_to_transaction(transaction_hash) do
-      if Chain.transaction_has_token_transfers?(transaction.hash) do
+         :ok <- Chain.check_transaction_exists(transaction_hash) do
+      if Chain.transaction_has_token_transfers?(transaction_hash) do
         redirect(conn, to: transaction_token_transfer_path(conn, :index, id))
       else
         redirect(conn, to: transaction_internal_transaction_path(conn, :index, id))
       end
     else
       :error -> conn |> put_status(422) |> render("invalid.html", transaction_hash: id)
-      {:error, :not_found} -> conn |> put_status(404) |> render("not_found.html", transaction_hash: id)
+      :not_found -> conn |> put_status(404) |> render("not_found.html", transaction_hash: id)
     end
   end
 end
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_internal_transaction_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_internal_transaction_controller.ex
index ae847b374d..ca154a0136 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_internal_transaction_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_internal_transaction_controller.ex
@@ -10,7 +10,7 @@ defmodule BlockScoutWeb.TransactionInternalTransactionController do
 
   def index(conn, %{"transaction_id" => hash_string, "type" => "JSON"} = params) do
     with {:ok, hash} <- Chain.string_to_transaction_hash(hash_string),
-         {:ok, transaction} <- Chain.hash_to_transaction(hash) do
+         :ok <- Chain.check_transaction_exists(hash) do
       full_options =
         Keyword.merge(
           [
@@ -37,7 +37,7 @@ defmodule BlockScoutWeb.TransactionInternalTransactionController do
             transaction_internal_transaction_path(
               conn,
               :index,
-              transaction,
+              hash,
               Map.delete(next_page_params, "type")
             )
         end
@@ -66,7 +66,7 @@ defmodule BlockScoutWeb.TransactionInternalTransactionController do
         |> put_view(TransactionView)
         |> render("invalid.html", transaction_hash: hash_string)
 
-      {:error, :not_found} ->
+      :not_found ->
         conn
         |> put_status(404)
         |> put_view(TransactionView)
diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_token_transfer_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_token_transfer_controller.ex
index 5f4a9c8229..585a01301f 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_token_transfer_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_token_transfer_controller.ex
@@ -10,8 +10,7 @@ defmodule BlockScoutWeb.TransactionTokenTransferController do
 
   def index(conn, %{"transaction_id" => hash_string, "type" => "JSON"} = params) do
     with {:ok, hash} <- Chain.string_to_transaction_hash(hash_string),
-         {:ok, transaction} <-
-           Chain.hash_to_transaction(hash) do
+         :ok <- Chain.check_transaction_exists(hash) do
       full_options =
         Keyword.merge(
           [
@@ -34,7 +33,7 @@ defmodule BlockScoutWeb.TransactionTokenTransferController do
             nil
 
           next_page_params ->
-            transaction_token_transfer_path(conn, :index, transaction, Map.delete(next_page_params, "type"))
+            transaction_token_transfer_path(conn, :index, hash, Map.delete(next_page_params, "type"))
         end
 
       items =
@@ -62,7 +61,7 @@ defmodule BlockScoutWeb.TransactionTokenTransferController do
         |> put_view(TransactionView)
         |> render("invalid.html", transaction_hash: hash_string)
 
-      {:error, :not_found} ->
+      :not_found ->
         conn
         |> put_status(404)
         |> put_view(TransactionView)
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 2c40f6bbc1..0e01212c37 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -3297,4 +3297,203 @@ defmodule Explorer.Chain do
     |> Base.decode16!(case: :mixed)
     |> TypeDecoder.decode_raw(types)
   end
+
+  @doc """
+  Checks if an `t:Explorer.Chain.Address.t/0` with the given `hash` exists.
+
+  Returns `:ok` if found
+
+      iex> {:ok, %Explorer.Chain.Address{hash: hash}} = Explorer.Chain.create_address(
+      ...>   %{hash: "0x5aaeb6053f3e94c9b9a09f33669435e7ef1beaed"}
+      ...> )
+      iex> Explorer.Chain.check_address_exists(hash)
+      :ok
+
+  Returns `:not_found` if not found
+
+      iex> {:ok, hash} = Explorer.Chain.string_to_address_hash("0x5aaeb6053f3e94c9b9a09f33669435e7ef1beaed")
+      iex> Explorer.Chain.check_address_exists(hash)
+      :not_found
+
+  """
+  @spec check_address_exists(Hash.Address.t()) :: :ok | :not_found
+  def check_address_exists(address_hash) do
+    address_hash
+    |> address_exists?()
+    |> boolean_to_check_result()
+  end
+
+  @doc """
+  Checks if an `t:Explorer.Chain.Address.t/0` with the given `hash` exists.
+
+  Returns `true` if found
+
+      iex> {:ok, %Explorer.Chain.Address{hash: hash}} = Explorer.Chain.create_address(
+      ...>   %{hash: "0x5aaeb6053f3e94c9b9a09f33669435e7ef1beaed"}
+      ...> )
+      iex> Explorer.Chain.address_exists?(hash)
+      true
+
+  Returns `false` if not found
+
+      iex> {:ok, hash} = Explorer.Chain.string_to_address_hash("0x5aaeb6053f3e94c9b9a09f33669435e7ef1beaed")
+      iex> Explorer.Chain.address_exists?(hash)
+      false
+
+  """
+  @spec address_exists?(Hash.Address.t()) :: boolean()
+  def address_exists?(address_hash) do
+    query =
+      from(
+        address in Address,
+        where: address.hash == ^address_hash
+      )
+
+    Repo.exists?(query)
+  end
+
+  @doc """
+  Checks if it exists an `t:Explorer.Chain.Address.t/0` that has the provided
+  `t:Explorer.Chain.Address.t/0` `hash` and a contract.
+
+  Returns `:ok` if found and `:not_found` otherwise.
+  """
+  @spec check_contract_address_exists(Hash.Address.t()) :: :ok | :not_found
+  def check_contract_address_exists(address_hash) do
+    address_hash
+    |> contract_address_exists?()
+    |> boolean_to_check_result()
+  end
+
+  @doc """
+  Checks if it exists an `t:Explorer.Chain.Address.t/0` that has the provided
+  `t:Explorer.Chain.Address.t/0` `hash` and a contract.
+
+  Returns `true` if found and `false` otherwise.
+  """
+  @spec contract_address_exists?(Hash.Address.t()) :: boolean()
+  def contract_address_exists?(address_hash) do
+    query =
+      from(
+        address in Address,
+        where: address.hash == ^address_hash and not is_nil(address.contract_code)
+      )
+
+    Repo.exists?(query)
+  end
+
+  @doc """
+  Checks if it exists a `t:Explorer.Chain.DecompiledSmartContract.t/0` for the
+  `t:Explorer.Chain.Address.t/0` with the provided `hash` and with the provided version.
+
+  Returns `:ok` if found and `:not_found` otherwise.
+  """
+  @spec check_decompiled_contract_exists(Hash.Address.t(), String.t()) :: :ok | :not_found
+  def check_decompiled_contract_exists(address_hash, version) do
+    address_hash
+    |> decompiled_contract_exists?(version)
+    |> boolean_to_check_result()
+  end
+
+  @doc """
+  Checks if it exists a `t:Explorer.Chain.DecompiledSmartContract.t/0` for the
+  `t:Explorer.Chain.Address.t/0` with the provided `hash` and with the provided version.
+
+  Returns `true` if found and `false` otherwise.
+  """
+  @spec decompiled_contract_exists?(Hash.Address.t(), String.t()) :: boolean()
+  def decompiled_contract_exists?(address_hash, version) do
+    query =
+      from(contract in DecompiledSmartContract,
+        where: contract.address_hash == ^address_hash and contract.decompiler_version == ^version
+      )
+
+    Repo.exists?(query)
+  end
+
+  @doc """
+  Checks if it exists a verified `t:Explorer.Chain.SmartContract.t/0` for the
+  `t:Explorer.Chain.Address.t/0` with the provided `hash`.
+
+  Returns `:ok` if found and `:not_found` otherwise.
+  """
+  @spec check_verified_smart_contract_exists(Hash.Address.t()) :: :ok | :not_found
+  def check_verified_smart_contract_exists(address_hash) do
+    address_hash
+    |> verified_smart_contract_exists?()
+    |> boolean_to_check_result()
+  end
+
+  @doc """
+  Checks if it exists a verified `t:Explorer.Chain.SmartContract.t/0` for the
+  `t:Explorer.Chain.Address.t/0` with the provided `hash`.
+
+  Returns `true` if found and `false` otherwise.
+  """
+  @spec verified_smart_contract_exists?(Hash.Address.t()) :: boolean()
+  def verified_smart_contract_exists?(address_hash) do
+    query =
+      from(
+        smart_contract in SmartContract,
+        where: smart_contract.address_hash == ^address_hash
+      )
+
+    Repo.exists?(query)
+  end
+
+  @doc """
+  Checks if a `t:Explorer.Chain.Transaction.t/0` with the given `hash` exists.
+
+  Returns `:ok` if found
+
+      iex> %Transaction{hash: hash} = insert(:transaction)
+      iex> Explorer.Chain.check_transaction_exists(hash)
+      :ok
+
+  Returns `:not_found` if not found
+
+      iex> {:ok, hash} = Explorer.Chain.string_to_transaction_hash(
+      ...>   "0x9fc76417374aa880d4449a1f7f31ec597f00b1f6f3dd2d66f4c9c6c445836d8b"
+      ...> )
+      iex> Explorer.Chain.check_transaction_exists(hash)
+      :not_found
+  """
+  @spec check_transaction_exists(Hash.Full.t()) :: :ok | :not_found
+  def check_transaction_exists(hash) do
+    hash
+    |> transaction_exists?()
+    |> boolean_to_check_result()
+  end
+
+  @doc """
+  Checks if a `t:Explorer.Chain.Transaction.t/0` with the given `hash` exists.
+
+  Returns `true` if found
+
+      iex> %Transaction{hash: hash} = insert(:transaction)
+      iex> Explorer.Chain.transaction_exists?(hash)
+      true
+
+  Returns `false` if not found
+
+      iex> {:ok, hash} = Explorer.Chain.string_to_transaction_hash(
+      ...>   "0x9fc76417374aa880d4449a1f7f31ec597f00b1f6f3dd2d66f4c9c6c445836d8b"
+      ...> )
+      iex> Explorer.Chain.transaction_exists?(hash)
+      false
+  """
+  @spec transaction_exists?(Hash.Full.t()) :: boolean()
+  def transaction_exists?(hash) do
+    query =
+      from(
+        transaction in Transaction,
+        where: transaction.hash == ^hash
+      )
+
+    Repo.exists?(query)
+  end
+
+  defp boolean_to_check_result(true), do: :ok
+
+  defp boolean_to_check_result(false), do: :not_found
 end

From 4a46e6eec592e0b1aed26baa9cb3bcaa60e454cc Mon Sep 17 00:00:00 2001
From: pasqu4le <pasqu4le@gmail.com>
Date: Fri, 19 Jul 2019 17:58:47 +0200
Subject: [PATCH 33/56] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9c8934f3d..c295387ba5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## Current
 
 ### Features
+- [#2391](https://github.com/poanetwork/blockscout/pull/2391) - Controllers Improvements
 - [#2379](https://github.com/poanetwork/blockscout/pull/2379) - Disable network selector when is empty
 - [#2360](https://github.com/poanetwork/blockscout/pull/2360) - add default evm version to smart contract verification
 - [#2352](https://github.com/poanetwork/blockscout/pull/2352) - Fetch rewards in parallel with transactions

From f8c8d7aa6b73693fec9ba2905a904203c771534a Mon Sep 17 00:00:00 2001
From: maxgrapps <maxgrapps@gmail.com>
Date: Sat, 20 Jul 2019 12:09:49 +0300
Subject: [PATCH 34/56] added templates for table loader and tile loader

---
 .../assets/css/components/_stakes_table.scss  | 37 ++++++++
 .../assets/css/components/_tile.scss          | 46 ++++++++++
 .../templates/address/index.html.eex          |  2 +-
 .../templates/chain/show.html.eex             |  8 +-
 .../templates/loaders/_table-loader.eex       | 85 +++++++++++++++++++
 .../templates/loaders/_tile-loader.eex        | 72 ++++++++++++++++
 apps/block_scout_web/priv/gettext/default.pot |  1 -
 7 files changed, 242 insertions(+), 9 deletions(-)
 create mode 100644 apps/block_scout_web/lib/block_scout_web/templates/loaders/_table-loader.eex
 create mode 100644 apps/block_scout_web/lib/block_scout_web/templates/loaders/_tile-loader.eex

diff --git a/apps/block_scout_web/assets/css/components/_stakes_table.scss b/apps/block_scout_web/assets/css/components/_stakes_table.scss
index 79cdc20b38..1831dc4d5b 100644
--- a/apps/block_scout_web/assets/css/components/_stakes_table.scss
+++ b/apps/block_scout_web/assets/css/components/_stakes_table.scss
@@ -26,6 +26,43 @@ $stakes-table-cell-separation: 25px !default;
   }
 }
 
+// Loader
+.table-content-loader {
+  display: inline-block;
+  height: 24px;
+  width: 100%;
+  border-radius: 4px;
+  background-color: #f5f6fa;
+  overflow: hidden;
+  position: relative;
+  &:before {
+    width: inherit;
+    height: inherit;
+    content: '';
+    position: absolute;
+    background: linear-gradient(to right, #f5f6fa 2%, #eee 18%, #f5f6fa 33%);
+    animation-duration: 1.7s;
+    animation-fill-mode: forwards;
+    animation-iteration-count: infinite;
+    animation-timing-function: linear;
+    animation-name: placeholderAnimate;
+    background-size: 1300px;
+  }
+}
+
+@keyframes placeholderAnimate {
+  0%{ background-position: -650px 0; }
+  100% { background-position: 650px 0; }
+}
+
+.table-content-pseudo {
+  td {
+    &:last-child {
+      padding-right: 24px !important;
+    }
+  }
+}
+
 .stakes-table {
   min-width: fit-content;
   width: 100%;
diff --git a/apps/block_scout_web/assets/css/components/_tile.scss b/apps/block_scout_web/assets/css/components/_tile.scss
index 8965715727..7fb9112d40 100644
--- a/apps/block_scout_web/assets/css/components/_tile.scss
+++ b/apps/block_scout_web/assets/css/components/_tile.scss
@@ -351,3 +351,49 @@ $tile-body-a-color: #5959d8 !default;
     }
   }
 }
+
+// Loader
+.tile-type-loading {
+  background-color: #fff;
+  padding-top: 30px;
+  padding-bottom: 28px;
+}
+
+.tile-loader {
+  display: inline-block;
+  height: 20px;
+  width: 100%;
+  border-radius: 4px;
+  background-color: #f5f6fa;
+  overflow: hidden;
+  position: relative;
+  &:before {
+    width: inherit;
+    height: inherit;
+    content: '';
+    position: absolute;
+    background: linear-gradient(to right, #f5f6fa 2%, #eee 18%, #f5f6fa 33%);
+    animation-duration: 1.7s;
+    animation-fill-mode: forwards;
+    animation-iteration-count: infinite;
+    animation-timing-function: linear;
+    animation-name: tilePlaceholderAnimate;
+    background-size: 1300px;
+  }
+}
+
+.tile-label-loader {
+  height: 14px;
+  width: 80px;
+}
+
+.tile-address-loader {
+  & + .tile-address-loader {
+    margin-top: 6px;
+  }
+}
+
+@keyframes tilePlaceholderAnimate {
+  0%{ background-position: -650px 0; }
+  100% { background-position: 650px 0; }
+}
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address/index.html.eex
index 3aaab46ad5..68f586adb4 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address/index.html.eex
@@ -38,7 +38,7 @@
 					</tr>
 				</thead>
 				<tbody data-items data-selector="top-addresses-list">
-					
+					<!-- include table loader here -->
 				</tbody>
 			</table>
 		</div>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/chain/show.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/chain/show.html.eex
index 0c29001697..2848e23b55 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/chain/show.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/chain/show.html.eex
@@ -117,13 +117,7 @@
             <%= gettext "Something went wrong, click to retry." %>
           </span>
         </button>
-        <div data-selector="loading-message" class="tile tile-muted text-center mt-3">
-          <span class="loading-spinner-small mr-2">
-            <span class="loading-spinner-block-1"></span>
-            <span class="loading-spinner-block-2"></span>
-          </span>
-          <%= gettext("Loading...") %>
-        </div>
+        <!-- include tile loader here -->
       </span>
     </div>
   </div>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/loaders/_table-loader.eex b/apps/block_scout_web/lib/block_scout_web/templates/loaders/_table-loader.eex
new file mode 100644
index 0000000000..ac7cc71f56
--- /dev/null
+++ b/apps/block_scout_web/lib/block_scout_web/templates/loaders/_table-loader.eex
@@ -0,0 +1,85 @@
+<tr class="table-content-pseudo">
+  <td class="stakes-td">
+    <span class="table-content-loader"></span>
+  </td>
+  <td class="stakes-td">
+    <span class="table-content-loader"></span>
+  </td>
+  <td class="stakes-td">
+    <span class="table-content-loader"></span>
+  </td>
+  <td class="stakes-td">
+    <span class="table-content-loader"></span>
+  </td>
+  <td class="stakes-td">
+    <span class="table-content-loader"></span>
+  </td>
+</tr>
+<tr class="table-content-pseudo">
+  <td class="stakes-td">
+    <span class="table-content-loader"></span>
+  </td>
+  <td class="stakes-td">
+    <span class="table-content-loader"></span>
+  </td>
+  <td class="stakes-td">
+    <span class="table-content-loader"></span>
+  </td>
+  <td class="stakes-td">
+    <span class="table-content-loader"></span>
+  </td>
+  <td class="stakes-td">
+    <span class="table-content-loader"></span>
+  </td>
+</tr>
+<tr class="table-content-pseudo">
+  <td class="stakes-td">
+    <span class="table-content-loader"></span>
+  </td>
+  <td class="stakes-td">
+    <span class="table-content-loader"></span>
+  </td>
+  <td class="stakes-td">
+    <span class="table-content-loader"></span>
+  </td>
+  <td class="stakes-td">
+    <span class="table-content-loader"></span>
+  </td>
+  <td class="stakes-td">
+    <span class="table-content-loader"></span>
+  </td>
+</tr>
+<tr class="table-content-pseudo">
+  <td class="stakes-td">
+    <span class="table-content-loader"></span>
+  </td>
+  <td class="stakes-td">
+    <span class="table-content-loader"></span>
+  </td>
+  <td class="stakes-td">
+    <span class="table-content-loader"></span>
+  </td>
+  <td class="stakes-td">
+    <span class="table-content-loader"></span>
+  </td>
+  <td class="stakes-td">
+    <span class="table-content-loader"></span>
+  </td>
+</tr>
+<tr class="table-content-pseudo">
+  <td class="stakes-td">
+    <span class="table-content-loader"></span>
+  </td>
+  <td class="stakes-td">
+    <span class="table-content-loader"></span>
+  </td>
+  <td class="stakes-td">
+    <span class="table-content-loader"></span>
+  </td>
+  <td class="stakes-td">
+    <span class="table-content-loader"></span>
+  </td>
+  <td class="stakes-td">
+    <span class="table-content-loader"></span>
+  </td>
+</tr>
\ No newline at end of file
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/loaders/_tile-loader.eex b/apps/block_scout_web/lib/block_scout_web/templates/loaders/_tile-loader.eex
new file mode 100644
index 0000000000..134613a5d1
--- /dev/null
+++ b/apps/block_scout_web/lib/block_scout_web/templates/loaders/_tile-loader.eex
@@ -0,0 +1,72 @@
+<div data-selector="loading-message" class="tile tile-type-loading">
+  <div class="row tile-body">
+    <div class="tile-transaction-type-block col-md-2 d-flex flex-row flex-md-column">
+      <span class="tile-label">
+        <span class="tile-loader tile-label-loader"></span>
+      </span>
+      <span class="tile-status-label ml-2 ml-md-0">
+        <span class="tile-loader tile-label-loader"></span>
+      </span>
+    </div>
+    <div class="col-md-7 col-lg-8 d-flex flex-column pr-2 pr-sm-2 pr-md-0">
+      <span class="tile-loader tile-address-loader"></span>
+      <span class="tile-loader tile-address-loader"></span>
+    </div>
+    <div class="col-md-3 col-lg-2 d-flex flex-row flex-md-column flex-nowrap justify-content-center text-md-right mt-3 mt-md-0 tile-bottom">
+      <span class="mr-2 mr-md-0 order-1">
+        <span class="tile-loader tile-label-loader"></span>
+      </span>
+      <span class="mr-2 mr-md-0 order-2">
+        <span class="tile-loader tile-label-loader"></span>
+      </span>
+    </div>
+  </div>
+</div>
+<div data-selector="loading-message" class="tile tile-type-loading">
+  <div class="row tile-body">
+    <div class="tile-transaction-type-block col-md-2 d-flex flex-row flex-md-column">
+      <span class="tile-label">
+        <span class="tile-loader tile-label-loader"></span>
+      </span>
+      <span class="tile-status-label ml-2 ml-md-0">
+        <span class="tile-loader tile-label-loader"></span>
+      </span>
+    </div>
+    <div class="col-md-7 col-lg-8 d-flex flex-column pr-2 pr-sm-2 pr-md-0">
+      <span class="tile-loader tile-address-loader"></span>
+      <span class="tile-loader tile-address-loader"></span>
+    </div>
+    <div class="col-md-3 col-lg-2 d-flex flex-row flex-md-column flex-nowrap justify-content-center text-md-right mt-3 mt-md-0 tile-bottom">
+      <span class="mr-2 mr-md-0 order-1">
+        <span class="tile-loader tile-label-loader"></span>
+      </span>
+      <span class="mr-2 mr-md-0 order-2">
+        <span class="tile-loader tile-label-loader"></span>
+      </span>
+    </div>
+  </div>
+</div>
+<div data-selector="loading-message" class="tile tile-type-loading">
+  <div class="row tile-body">
+    <div class="tile-transaction-type-block col-md-2 d-flex flex-row flex-md-column">
+      <span class="tile-label">
+        <span class="tile-loader tile-label-loader"></span>
+      </span>
+      <span class="tile-status-label ml-2 ml-md-0">
+        <span class="tile-loader tile-label-loader"></span>
+      </span>
+    </div>
+    <div class="col-md-7 col-lg-8 d-flex flex-column pr-2 pr-sm-2 pr-md-0">
+      <span class="tile-loader tile-address-loader"></span>
+      <span class="tile-loader tile-address-loader"></span>
+    </div>
+    <div class="col-md-3 col-lg-2 d-flex flex-row flex-md-column flex-nowrap justify-content-center text-md-right mt-3 mt-md-0 tile-bottom">
+      <span class="mr-2 mr-md-0 order-1">
+        <span class="tile-loader tile-label-loader"></span>
+      </span>
+      <span class="mr-2 mr-md-0 order-2">
+        <span class="tile-loader tile-label-loader"></span>
+      </span>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index 61d7465f49..c29cc13ce2 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -1058,7 +1058,6 @@ msgstr ""
 #, elixir-format
 #: lib/block_scout_web/templates/address_read_contract/index.html.eex:14
 #: lib/block_scout_web/templates/chain/show.html.eex:99
-#: lib/block_scout_web/templates/chain/show.html.eex:125
 #: lib/block_scout_web/templates/tokens/read_contract/index.html.eex:21
 msgid "Loading..."
 msgstr ""

From 4a13b9120c15759f3c6d23e9bfaf500e850fa742 Mon Sep 17 00:00:00 2001
From: maxgrapps <50101080+maxgrapps@users.noreply.github.com>
Date: Sat, 20 Jul 2019 12:11:56 +0300
Subject: [PATCH 35/56] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9c8934f3d..33783ca62a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - [#2294](https://github.com/poanetwork/blockscout/pull/2294) - add healthy block period checking endpoint
 
 ### Fixes
+- [#2393](https://github.com/poanetwork/blockscout/pull/2393) - added templates for table loader and tile loader
 - [#2378](https://github.com/poanetwork/blockscout/pull/2378) - Page performance: exclude moment.js localization files except EN, remove unused css
 - [#2368](https://github.com/poanetwork/blockscout/pull/2368) - add two columns of smart contract info
 - [#2375](https://github.com/poanetwork/blockscout/pull/2375) - Update created_contract_code_indexed_at on transaction import conflict

From a31447d23b120101d690d55732ba18bf6c6b20fc Mon Sep 17 00:00:00 2001
From: maxgrapps <maxgrapps@gmail.com>
Date: Sat, 20 Jul 2019 13:53:23 +0300
Subject: [PATCH 36/56] new block loading animation

---
 .../assets/css/components/_tile.scss          | 168 +++++++++++++++++-
 .../templates/chain/_block.html.eex           | 167 +++++++++++++++++
 apps/block_scout_web/priv/gettext/default.pot |   6 +-
 3 files changed, 335 insertions(+), 6 deletions(-)

diff --git a/apps/block_scout_web/assets/css/components/_tile.scss b/apps/block_scout_web/assets/css/components/_tile.scss
index 8965715727..dbfd117875 100644
--- a/apps/block_scout_web/assets/css/components/_tile.scss
+++ b/apps/block_scout_web/assets/css/components/_tile.scss
@@ -339,9 +339,6 @@ $tile-body-a-color: #5959d8 !default;
         padding-left: 6px;
         padding-right: 6px;
       }
-      .tile-type-block {
-        overflow: hidden;
-      }
     }
     .row {
       @include media-breakpoint-down(lg) {
@@ -351,3 +348,168 @@ $tile-body-a-color: #5959d8 !default;
     }
   }
 }
+
+// Loading Animation
+
+@keyframes playBlockLoadingAnimation {
+  0%, 90% {
+    opacity: 1;
+  }
+  100% {
+    opacity: 0;
+  }
+}
+
+[data-selector="chain-block-list"] {
+  .col-lg-3:first-child {
+    .tile-type-block-animation {
+      animation: playBlockLoadingAnimation 2.1s linear forwards;
+    }
+  }
+}
+
+.fade-up-blocks-chain {
+  .tile-type-block {
+    position: relative;
+  }
+  .tile-type-block-animation {
+    opacity: 0;
+    position: absolute;
+    top: -1px;
+    left: -4px;
+    width: calc(100% + 5px);
+    height: calc(100% + 2px);
+    background-color: #F6F7F9;
+    border-radius: 4px;
+    overflow: hidden;
+    transition: .24s ease-out;
+    border-top: 1px solid #dee2e6;
+    border-right: 1px solid #dee2e6;
+    border-bottom: 1px solid #dee2e6;
+    pointer-events: none;
+    .tile-type-line-up {
+      position: absolute;
+      bottom: -1px;
+      left: 0;
+      height: calc(100% + 2px);
+      width: 4px;
+      background-color: $tile-type-block-color;
+      transform: scaleY(0);
+      transform-origin: center bottom;
+      animation: blockLoaderLine 2s linear forwards;
+      z-index: 2;
+    }
+    &:after {
+      content: "";
+      position: absolute;
+      top: 0;
+      left: 0;
+      bottom: 0;
+      width: 1px;
+      background-color: #dee2e6;
+    }
+  }
+}
+
+.cube-animation-title {
+  font-size: 12px;
+  color: #a3a9b5;
+  position: absolute;
+  bottom: 10px;
+  left: 50%;
+  transform: translateX(-50%);
+}
+
+.fade-up-blocks-chain:first-child {
+  .tile-type-block-animation {
+    opacity: 1;
+  }
+}
+
+@keyframes blockLoaderLine {
+  0% {
+    transform: scaleY(0);
+  }
+  100% {
+    transform: scaleY(1);
+  }
+}
+
+$cube-bezier: cubic-bezier(.25,.8,.25,1);
+$cube-quantity: 5;
+
+.cube-animation-wrapper {
+  width: 560px;
+  height: 290px;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%) scale(0.26);
+  svg {
+    width: 50px;
+    margin-top: -29px;
+
+    .side {
+      fill: $tile-type-block-color;
+      opacity: 1;
+
+      &:nth-of-type(2) {
+        fill: lighten($tile-type-block-color, 30);
+        opacity: 0.5;
+      }
+
+      &:nth-of-type(3) {
+        fill: lighten($tile-type-block-color, 80);
+        opacity: 0.5;
+      }
+    }
+  }
+
+  @while $cube-quantity > 0 {
+    .cube-animation-row:nth-of-type(#{$cube-quantity}) {
+      left: 25px * $cube-quantity;
+      top: 15px * $cube-quantity;
+    }
+    .cube-animation-column:nth-of-type(#{$cube-quantity}) {
+      position: relative;
+      top: 14px * $cube-quantity;
+      left: 25px * $cube-quantity;
+    }
+    .cube-animation-column:nth-of-type(#{$cube-quantity}) svg {
+      transform: translate3d(0,0,0);
+      animation: shrink-expand 2.8s $cube-bezier forwards;
+      animation-delay: -0.16s * $cube-quantity;
+    }
+
+    $cube-quantity: $cube-quantity - 1;
+  }
+}
+
+.cube-animation-center {
+  position: absolute;
+  top: 6%;
+  left: 20%;
+}
+
+.cube-animation-row {
+  display: flex;
+  flex-direction: row-reverse;
+  position: absolute;
+}
+
+.cube-animation-column {
+  display: flex;
+  flex-direction: column-reverse;
+}
+
+@keyframes shrink-expand {
+  0% {
+    transform: scale(0);
+  }
+  50% {
+    transform: scale(1);
+  }
+  100% {
+    transform: scale(0);
+  }
+}
\ No newline at end of file
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/chain/_block.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/chain/_block.html.eex
index 706d18ec47..729df59a3c 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/chain/_block.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/chain/_block.html.eex
@@ -1,5 +1,172 @@
 <div class="col-lg-3 fade-up-blocks-chain" data-selector="chain-block" data-block-number="<%= @block.number %>">
   <div class="tile tile-type-block n-p d-flex flex-column">
+    <div class="tile-type-block-animation">
+      <div class="tile-type-line-up"></div>
+      <span class="cube-animation-title">Block Validated, processing...</span>
+      <div class="cube-animation-wrapper">
+        <div class="cube-animation-center">
+          <div class="cube-animation-row">
+            <div class="cube-animation-column">
+              <svg class="cube" viewBox="0 0 86.6 100" x="0px" y="0px">
+                <polygon class="side" points="43.3,0 0,25 0,75 43.3,100 86.6,75 86.6,25 "></polygon>
+                <polygon class="side" points="86.6,25 43.3,50 43.3,100 86.6,75 "></polygon>
+                <polygon class="side" points="0,25 43.3,0 86.6,25 43.3,50 "></polygon>
+              </svg>
+              <svg class="cube" viewBox="0 0 86.6 100" x="0px" y="0px">
+                <polygon class="side" points="43.3,0 0,25 0,75 43.3,100 86.6,75 86.6,25 "></polygon>
+                <polygon class="side" points="86.6,25 43.3,50 43.3,100 86.6,75 "></polygon>
+                <polygon class="side" points="0,25 43.3,0 86.6,25 43.3,50 "></polygon>
+              </svg>
+              <svg class="cube" viewBox="0 0 86.6 100" x="0px" y="0px">
+                <polygon class="side" points="43.3,0 0,25 0,75 43.3,100 86.6,75 86.6,25 "></polygon>
+                <polygon class="side" points="86.6,25 43.3,50 43.3,100 86.6,75 "></polygon>
+                <polygon class="side" points="0,25 43.3,0 86.6,25 43.3,50 "></polygon>
+              </svg>
+            </div>
+            <div class="cube-animation-column">
+              <svg class="cube" viewBox="0 0 86.6 100" x="0px" y="0px">
+                <polygon class="side" points="43.3,0 0,25 0,75 43.3,100 86.6,75 86.6,25 "></polygon>
+                <polygon class="side" points="86.6,25 43.3,50 43.3,100 86.6,75 "></polygon>
+                <polygon class="side" points="0,25 43.3,0 86.6,25 43.3,50 "></polygon>
+              </svg>
+              <svg class="cube" viewBox="0 0 86.6 100" x="0px" y="0px">
+                <polygon class="side" points="43.3,0 0,25 0,75 43.3,100 86.6,75 86.6,25 "></polygon>
+                <polygon class="side" points="86.6,25 43.3,50 43.3,100 86.6,75 "></polygon>
+                <polygon class="side" points="0,25 43.3,0 86.6,25 43.3,50 "></polygon>
+              </svg>
+              <svg class="cube" viewBox="0 0 86.6 100" x="0px" y="0px">
+                <polygon class="side" points="43.3,0 0,25 0,75 43.3,100 86.6,75 86.6,25 "></polygon>
+                <polygon class="side" points="86.6,25 43.3,50 43.3,100 86.6,75 "></polygon>
+                <polygon class="side" points="0,25 43.3,0 86.6,25 43.3,50 "></polygon>
+              </svg>
+            </div>
+            <div class="cube-animation-column">
+              <svg class="cube" viewBox="0 0 86.6 100" x="0px" y="0px">
+                <polygon class="side" points="43.3,0 0,25 0,75 43.3,100 86.6,75 86.6,25 "></polygon>
+                <polygon class="side" points="86.6,25 43.3,50 43.3,100 86.6,75 "></polygon>
+                <polygon class="side" points="0,25 43.3,0 86.6,25 43.3,50 "></polygon>
+              </svg>
+              <svg class="cube" viewBox="0 0 86.6 100" x="0px" y="0px">
+                <polygon class="side" points="43.3,0 0,25 0,75 43.3,100 86.6,75 86.6,25 "></polygon>
+                <polygon class="side" points="86.6,25 43.3,50 43.3,100 86.6,75 "></polygon>
+                <polygon class="side" points="0,25 43.3,0 86.6,25 43.3,50 "></polygon>
+              </svg>
+              <svg class="cube" viewBox="0 0 86.6 100" x="0px" y="0px">
+                <polygon class="side" points="43.3,0 0,25 0,75 43.3,100 86.6,75 86.6,25 "></polygon>
+                <polygon class="side" points="86.6,25 43.3,50 43.3,100 86.6,75 "></polygon>
+                <polygon class="side" points="0,25 43.3,0 86.6,25 43.3,50 "></polygon>
+              </svg>
+            </div>
+          </div>
+          <div class="cube-animation-row">
+            <div class="cube-animation-column">
+              <svg class="cube" viewBox="0 0 86.6 100" x="0px" y="0px">
+                <polygon class="side" points="43.3,0 0,25 0,75 43.3,100 86.6,75 86.6,25 "></polygon>
+                <polygon class="side" points="86.6,25 43.3,50 43.3,100 86.6,75 "></polygon>
+                <polygon class="side" points="0,25 43.3,0 86.6,25 43.3,50 "></polygon>
+              </svg>
+              <svg class="cube" viewBox="0 0 86.6 100" x="0px" y="0px">
+                <polygon class="side" points="43.3,0 0,25 0,75 43.3,100 86.6,75 86.6,25 "></polygon>
+                <polygon class="side" points="86.6,25 43.3,50 43.3,100 86.6,75 "></polygon>
+                <polygon class="side" points="0,25 43.3,0 86.6,25 43.3,50 "></polygon>
+              </svg>
+              <svg class="cube" viewBox="0 0 86.6 100" x="0px" y="0px">
+                <polygon class="side" points="43.3,0 0,25 0,75 43.3,100 86.6,75 86.6,25 "></polygon>
+                <polygon class="side" points="86.6,25 43.3,50 43.3,100 86.6,75 "></polygon>
+                <polygon class="side" points="0,25 43.3,0 86.6,25 43.3,50 "></polygon>
+              </svg>
+            </div>
+            <div class="cube-animation-column">
+              <svg class="cube" viewBox="0 0 86.6 100" x="0px" y="0px">
+                <polygon class="side" points="43.3,0 0,25 0,75 43.3,100 86.6,75 86.6,25 "></polygon>
+                <polygon class="side" points="86.6,25 43.3,50 43.3,100 86.6,75 "></polygon>
+                <polygon class="side" points="0,25 43.3,0 86.6,25 43.3,50 "></polygon>
+              </svg>
+              <svg class="cube" viewBox="0 0 86.6 100" x="0px" y="0px">
+                <polygon class="side" points="43.3,0 0,25 0,75 43.3,100 86.6,75 86.6,25 "></polygon>
+                <polygon class="side" points="86.6,25 43.3,50 43.3,100 86.6,75 "></polygon>
+                <polygon class="side" points="0,25 43.3,0 86.6,25 43.3,50 "></polygon>
+              </svg>
+              <svg class="cube" viewBox="0 0 86.6 100" x="0px" y="0px">
+                <polygon class="side" points="43.3,0 0,25 0,75 43.3,100 86.6,75 86.6,25 "></polygon>
+                <polygon class="side" points="86.6,25 43.3,50 43.3,100 86.6,75 "></polygon>
+                <polygon class="side" points="0,25 43.3,0 86.6,25 43.3,50 "></polygon>
+              </svg>
+            </div>
+            <div class="cube-animation-column">
+              <svg class="cube" viewBox="0 0 86.6 100" x="0px" y="0px">
+                <polygon class="side" points="43.3,0 0,25 0,75 43.3,100 86.6,75 86.6,25 "></polygon>
+                <polygon class="side" points="86.6,25 43.3,50 43.3,100 86.6,75 "></polygon>
+                <polygon class="side" points="0,25 43.3,0 86.6,25 43.3,50 "></polygon>
+              </svg>
+              <svg class="cube" viewBox="0 0 86.6 100" x="0px" y="0px">
+                <polygon class="side" points="43.3,0 0,25 0,75 43.3,100 86.6,75 86.6,25 "></polygon>
+                <polygon class="side" points="86.6,25 43.3,50 43.3,100 86.6,75 "></polygon>
+                <polygon class="side" points="0,25 43.3,0 86.6,25 43.3,50 "></polygon>
+              </svg>
+              <svg class="cube" viewBox="0 0 86.6 100" x="0px" y="0px">
+                <polygon class="side" points="43.3,0 0,25 0,75 43.3,100 86.6,75 86.6,25 "></polygon>
+                <polygon class="side" points="86.6,25 43.3,50 43.3,100 86.6,75 "></polygon>
+                <polygon class="side" points="0,25 43.3,0 86.6,25 43.3,50 "></polygon>
+              </svg>
+            </div>
+          </div>
+          <div class="cube-animation-row">
+            <div class="cube-animation-column">
+              <svg class="cube" viewBox="0 0 86.6 100" x="0px" y="0px">
+                <polygon class="side" points="43.3,0 0,25 0,75 43.3,100 86.6,75 86.6,25 "></polygon>
+                <polygon class="side" points="86.6,25 43.3,50 43.3,100 86.6,75 "></polygon>
+                <polygon class="side" points="0,25 43.3,0 86.6,25 43.3,50 "></polygon>
+              </svg>
+              <svg class="cube" viewBox="0 0 86.6 100" x="0px" y="0px">
+                <polygon class="side" points="43.3,0 0,25 0,75 43.3,100 86.6,75 86.6,25 "></polygon>
+                <polygon class="side" points="86.6,25 43.3,50 43.3,100 86.6,75 "></polygon>
+                <polygon class="side" points="0,25 43.3,0 86.6,25 43.3,50 "></polygon>
+              </svg>
+              <svg class="cube" viewBox="0 0 86.6 100" x="0px" y="0px">
+                <polygon class="side" points="43.3,0 0,25 0,75 43.3,100 86.6,75 86.6,25 "></polygon>
+                <polygon class="side" points="86.6,25 43.3,50 43.3,100 86.6,75 "></polygon>
+                <polygon class="side" points="0,25 43.3,0 86.6,25 43.3,50 "></polygon>
+              </svg>
+            </div>
+            <div class="cube-animation-column">
+              <svg class="cube" viewBox="0 0 86.6 100" x="0px" y="0px">
+                <polygon class="side" points="43.3,0 0,25 0,75 43.3,100 86.6,75 86.6,25 "></polygon>
+                <polygon class="side" points="86.6,25 43.3,50 43.3,100 86.6,75 "></polygon>
+                <polygon class="side" points="0,25 43.3,0 86.6,25 43.3,50 "></polygon>
+              </svg>
+              <svg class="cube" viewBox="0 0 86.6 100" x="0px" y="0px">
+                <polygon class="side" points="43.3,0 0,25 0,75 43.3,100 86.6,75 86.6,25 "></polygon>
+                <polygon class="side" points="86.6,25 43.3,50 43.3,100 86.6,75 "></polygon>
+                <polygon class="side" points="0,25 43.3,0 86.6,25 43.3,50 "></polygon>
+              </svg>
+              <svg class="cube" viewBox="0 0 86.6 100" x="0px" y="0px">
+                <polygon class="side" points="43.3,0 0,25 0,75 43.3,100 86.6,75 86.6,25 "></polygon>
+                <polygon class="side" points="86.6,25 43.3,50 43.3,100 86.6,75 "></polygon>
+                <polygon class="side" points="0,25 43.3,0 86.6,25 43.3,50 "></polygon>
+              </svg>
+            </div>
+            <div class="cube-animation-column">
+              <svg class="cube" viewBox="0 0 86.6 100" x="0px" y="0px">
+                <polygon class="side" points="43.3,0 0,25 0,75 43.3,100 86.6,75 86.6,25 "></polygon>
+                <polygon class="side" points="86.6,25 43.3,50 43.3,100 86.6,75 "></polygon>
+                <polygon class="side" points="0,25 43.3,0 86.6,25 43.3,50 "></polygon>
+              </svg>
+              <svg class="cube" viewBox="0 0 86.6 100" x="0px" y="0px">
+                <polygon class="side" points="43.3,0 0,25 0,75 43.3,100 86.6,75 86.6,25 "></polygon>
+                <polygon class="side" points="86.6,25 43.3,50 43.3,100 86.6,75 "></polygon>
+                <polygon class="side" points="0,25 43.3,0 86.6,25 43.3,50 "></polygon>
+              </svg>
+              <svg class="cube" viewBox="0 0 86.6 100" x="0px" y="0px">
+                <polygon class="side" points="43.3,0 0,25 0,75 43.3,100 86.6,75 86.6,25 "></polygon>
+                <polygon class="side" points="86.6,25 43.3,50 43.3,100 86.6,75 "></polygon>
+                <polygon class="side" points="0,25 43.3,0 86.6,25 43.3,50 "></polygon>
+              </svg>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
     <%= link(
           @block,
           class: "tile-title",
diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index 61d7465f49..b8e56412a6 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -34,7 +34,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/block/overview.html.eex:21
-#: lib/block_scout_web/templates/chain/_block.html.eex:11
+#: lib/block_scout_web/templates/chain/_block.html.eex:178
 msgid "%{count} Transactions"
 msgstr ""
 
@@ -522,7 +522,7 @@ msgstr ""
 #, elixir-format
 #: lib/block_scout_web/templates/block/_tile.html.eex:38
 #: lib/block_scout_web/templates/block/overview.html.eex:121
-#: lib/block_scout_web/templates/chain/_block.html.eex:15
+#: lib/block_scout_web/templates/chain/_block.html.eex:182
 msgid "Miner"
 msgstr ""
 
@@ -1040,7 +1040,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/block/_tile.html.eex:47
-#: lib/block_scout_web/templates/chain/_block.html.eex:23
+#: lib/block_scout_web/templates/chain/_block.html.eex:190
 #: lib/block_scout_web/views/internal_transaction_view.ex:27
 msgid "Reward"
 msgstr ""

From b0984ce343afab8b37a500a1d3c2e5e0b59750be Mon Sep 17 00:00:00 2001
From: maxgrapps <50101080+maxgrapps@users.noreply.github.com>
Date: Sat, 20 Jul 2019 13:55:34 +0300
Subject: [PATCH 37/56] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9c8934f3d..5e1e9e2dc8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - [#2294](https://github.com/poanetwork/blockscout/pull/2294) - add healthy block period checking endpoint
 
 ### Fixes
+- [#2395](https://github.com/poanetwork/blockscout/pull/2395) - new block loading animation
 - [#2378](https://github.com/poanetwork/blockscout/pull/2378) - Page performance: exclude moment.js localization files except EN, remove unused css
 - [#2368](https://github.com/poanetwork/blockscout/pull/2368) - add two columns of smart contract info
 - [#2375](https://github.com/poanetwork/blockscout/pull/2375) - Update created_contract_code_indexed_at on transaction import conflict

From a78bf7923e7c4ccdb2d9bbc7de20d95f861bda21 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Mon, 22 Jul 2019 10:40:52 +0300
Subject: [PATCH 38/56] use variable names as in json rpc

---
 .../api/rpc/eth_controller_test.exs           |  6 ++--
 apps/explorer/lib/explorer/eth_rpc.ex         | 33 +++++++++++++------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs
index d611d519ad..3ec07ee446 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs
@@ -148,9 +148,9 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do
       {last_log_index, ""} = Integer.parse(List.last(response["result"])["logIndex"], 16)
 
       next_page_params = %{
-        "block_number" => transaction.block_number,
-        "transaction_index" => transaction.index,
-        "log_index" => last_log_index
+        "blockNumber" => Integer.to_string(transaction.block_number, 16),
+        "transactionIndex" => transaction.index,
+        "logIndex" => "#{last_log_index}"
       }
 
       new_params =
diff --git a/apps/explorer/lib/explorer/eth_rpc.ex b/apps/explorer/lib/explorer/eth_rpc.ex
index 31e711d9fa..fa97a75561 100644
--- a/apps/explorer/lib/explorer/eth_rpc.ex
+++ b/apps/explorer/lib/explorer/eth_rpc.ex
@@ -228,17 +228,21 @@ defmodule Explorer.EthRPC do
 
   defp paging_options(%{
          "paging_options" => %{
-           "log_index" => log_index,
-           "transaction_index" => transaction_index,
-           "block_number" => block_number
+           "logIndex" => log_index,
+           "transactionIndex" => transaction_index,
+           "blockNumber" => block_number
          }
-       }) do
-    {:ok,
-     %{
-       log_index: log_index,
-       transaction_index: transaction_index,
-       block_number: block_number
-     }}
+       })
+       when is_integer(transaction_index) do
+    with {:ok, parsed_block_number} <- to_block_number(block_number),
+         {parsed_log_index, ""} <- Integer.parse(log_index) do
+      {:ok,
+       %{
+         log_index: parsed_log_index,
+         transaction_index: transaction_index,
+         block_number: parsed_block_number
+       }}
+    end
   end
 
   defp paging_options(_), do: {:ok, nil}
@@ -275,6 +279,15 @@ defmodule Explorer.EthRPC do
 
   defp to_block_number(_, _, _), do: {:error, "invalid block number"}
 
+  defp to_block_number(number) when is_bitstring(number) do
+    case Integer.parse(number, 16) do
+      {integer, ""} -> {:ok, integer}
+      _ -> {:error, "invalid block number"}
+    end
+  end
+
+  defp to_block_number(_), do: {:error, "invalid block number"}
+
   defp max_non_consensus_block_number(max) do
     case Chain.max_non_consensus_block_number(max) do
       {:ok, number} -> number

From 993816e19e8f266a51083d257dfdc07cc1d7e3f5 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Mon, 22 Jul 2019 10:55:55 +0300
Subject: [PATCH 39/56] parse log index from hex

---
 .../controllers/api/rpc/eth_controller_test.exs        |  2 +-
 apps/explorer/lib/explorer/eth_rpc.ex                  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs
index 3ec07ee446..4b43909ac4 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/api/rpc/eth_controller_test.exs
@@ -150,7 +150,7 @@ defmodule BlockScoutWeb.API.RPC.EthControllerTest do
       next_page_params = %{
         "blockNumber" => Integer.to_string(transaction.block_number, 16),
         "transactionIndex" => transaction.index,
-        "logIndex" => "#{last_log_index}"
+        "logIndex" => Integer.to_string(last_log_index, 16)
       }
 
       new_params =
diff --git a/apps/explorer/lib/explorer/eth_rpc.ex b/apps/explorer/lib/explorer/eth_rpc.ex
index fa97a75561..6470e1b2af 100644
--- a/apps/explorer/lib/explorer/eth_rpc.ex
+++ b/apps/explorer/lib/explorer/eth_rpc.ex
@@ -234,8 +234,8 @@ defmodule Explorer.EthRPC do
          }
        })
        when is_integer(transaction_index) do
-    with {:ok, parsed_block_number} <- to_block_number(block_number),
-         {parsed_log_index, ""} <- Integer.parse(log_index) do
+    with {:ok, parsed_block_number} <- to_number(block_number, "invalid block number"),
+         {:ok, parsed_log_index} <- to_number(log_index, "invalid log index") do
       {:ok,
        %{
          log_index: parsed_log_index,
@@ -279,14 +279,14 @@ defmodule Explorer.EthRPC do
 
   defp to_block_number(_, _, _), do: {:error, "invalid block number"}
 
-  defp to_block_number(number) when is_bitstring(number) do
+  defp to_number(number, error_message) when is_bitstring(number) do
     case Integer.parse(number, 16) do
       {integer, ""} -> {:ok, integer}
-      _ -> {:error, "invalid block number"}
+      _ -> {:error, error_message}
     end
   end
 
-  defp to_block_number(_), do: {:error, "invalid block number"}
+  defp to_number(_, error_message), do: {:error, error_message}
 
   defp max_non_consensus_block_number(max) do
     case Chain.max_non_consensus_block_number(max) do

From 4eb63ebb6922314e20fb9f6b21bf6e38c0683171 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Mon, 22 Jul 2019 10:57:46 +0300
Subject: [PATCH 40/56] add new eth_getLogs example

---
 apps/explorer/lib/explorer/eth_rpc.ex | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/explorer/lib/explorer/eth_rpc.ex b/apps/explorer/lib/explorer/eth_rpc.ex
index 6470e1b2af..722a21e819 100644
--- a/apps/explorer/lib/explorer/eth_rpc.ex
+++ b/apps/explorer/lib/explorer/eth_rpc.ex
@@ -26,7 +26,13 @@ defmodule Explorer.EthRPC do
       For this reason, you can use pagination options to request the next page. Pagination options params: {"block_number": 1, "transaction_index": 0, "log_index": 1} which include parameters from the last log received from the previous request.
       """,
       example: """
-      {"id": 0, "jsonrpc": "2.0", "method": "eth_getLogs", "params": [{"address": "0x0000000000000000000000000000000000000026","topics": ["0x01"]}]}
+      {"id": 0, "jsonrpc": "2.0", "method": "eth_getLogs",
+       "params": [
+        {"address": "0xc78Be425090Dbd437532594D12267C5934Cc6c6f",
+         "paging_options": {"logIndex": "3D", "blockNumber": "6423AC", "transactionIndex": 53},
+         "fromBlock": "earliest",
+         "toBlock": "latest",
+         "topics": ["0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"]}]}
       """
     }
   }

From 3ba1057355080bd7be79d241e9092862564f2c1f Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Mon, 22 Jul 2019 11:06:23 +0300
Subject: [PATCH 41/56] update note

---
 apps/explorer/lib/explorer/eth_rpc.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/explorer/lib/explorer/eth_rpc.ex b/apps/explorer/lib/explorer/eth_rpc.ex
index 722a21e819..e0864ac279 100644
--- a/apps/explorer/lib/explorer/eth_rpc.ex
+++ b/apps/explorer/lib/explorer/eth_rpc.ex
@@ -23,7 +23,7 @@ defmodule Explorer.EthRPC do
       action: :eth_get_logs,
       notes: """
       Will never return more than 1000 log entries.\n
-      For this reason, you can use pagination options to request the next page. Pagination options params: {"block_number": 1, "transaction_index": 0, "log_index": 1} which include parameters from the last log received from the previous request.
+      For this reason, you can use pagination options to request the next page. Pagination options params: {"logIndex": "3D", "blockNumber": "6423AC", "transactionIndex": 53} which include parameters from the last log received from the previous request. These three parameters are required for pagination.
       """,
       example: """
       {"id": 0, "jsonrpc": "2.0", "method": "eth_getLogs",

From a7fd2883bff229e5ef6d32e603d1d0ab446de234 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Mon, 22 Jul 2019 12:13:19 +0300
Subject: [PATCH 42/56] show only one decoded candidate

---
 apps/explorer/lib/explorer/chain/transaction.ex | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/explorer/lib/explorer/chain/transaction.ex b/apps/explorer/lib/explorer/chain/transaction.ex
index 3b109504eb..78d162fa4e 100644
--- a/apps/explorer/lib/explorer/chain/transaction.ex
+++ b/apps/explorer/lib/explorer/chain/transaction.ex
@@ -416,7 +416,8 @@ defmodule Explorer.Chain.Transaction do
     candidates_query =
       from(
         contract_method in ContractMethod,
-        where: contract_method.identifier == ^method_id
+        where: contract_method.identifier == ^method_id,
+        limit: 1
       )
 
     candidates =

From a5b014da77fdbb4d5543eeda55fd19169889f71a Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Mon, 22 Jul 2019 12:15:23 +0300
Subject: [PATCH 43/56] add CHANGELOG entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9c8934f3d..5735ca0862 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - [#2294](https://github.com/poanetwork/blockscout/pull/2294) - add healthy block period checking endpoint
 
 ### Fixes
+- [#2398](https://github.com/poanetwork/blockscout/pull/2398) - show only one decoded candidate
 - [#2378](https://github.com/poanetwork/blockscout/pull/2378) - Page performance: exclude moment.js localization files except EN, remove unused css
 - [#2368](https://github.com/poanetwork/blockscout/pull/2368) - add two columns of smart contract info
 - [#2375](https://github.com/poanetwork/blockscout/pull/2375) - Update created_contract_code_indexed_at on transaction import conflict

From 8b06da3ccc291a294eb2171e7b0953b696e946e6 Mon Sep 17 00:00:00 2001
From: saneery <anatolyniky@gmail.com>
Date: Mon, 22 Jul 2019 13:38:54 +0300
Subject: [PATCH 44/56] Add env var to manage refreshing period of average
 block time

---
 apps/explorer/config/config.exs                      | 12 +++++++++++-
 .../lib/explorer/counters/average_block_time.ex      |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/apps/explorer/config/config.exs b/apps/explorer/config/config.exs
index defd5ae9e5..049d7a8a16 100644
--- a/apps/explorer/config/config.exs
+++ b/apps/explorer/config/config.exs
@@ -17,7 +17,17 @@ config :explorer,
     if(System.get_env("UNCLES_IN_AVERAGE_BLOCK_TIME") == "false", do: false, else: true),
   healthy_blocks_period: System.get_env("HEALTHY_BLOCKS_PERIOD") || :timer.minutes(5)
 
-config :explorer, Explorer.Counters.AverageBlockTime, enabled: true
+average_block_period =
+  try do
+    String.to_integer(System.get_env("AVERAGE_BLOCK_PERIOD"))
+  rescue
+    # 30 minutes
+    _ -> 30 * 60
+  end
+
+config :explorer, Explorer.Counters.AverageBlockTime,
+  enabled: true,
+  period: :timer.seconds(average_block_period)
 
 config :explorer, Explorer.Chain.Cache.BlockNumber, enabled: true
 
diff --git a/apps/explorer/lib/explorer/counters/average_block_time.ex b/apps/explorer/lib/explorer/counters/average_block_time.ex
index 233c15f8b3..1065ede2bd 100644
--- a/apps/explorer/lib/explorer/counters/average_block_time.ex
+++ b/apps/explorer/lib/explorer/counters/average_block_time.ex
@@ -11,7 +11,7 @@ defmodule Explorer.Counters.AverageBlockTime do
   alias Explorer.Repo
   alias Timex.Duration
 
-  @refresh_period 30 * 60 * 1_000
+  @refresh_period Application.get_env(:explorer, __MODULE__)[:period]
 
   @doc """
   Starts a process to periodically update the counter of the token holders.

From c03f6ac91cd7c83d424d8234216221e4a54001a7 Mon Sep 17 00:00:00 2001
From: saneery <anatolyniky@gmail.com>
Date: Mon, 22 Jul 2019 14:02:07 +0300
Subject: [PATCH 45/56] Add env var to manage price chart cache frequency
 update

---
 apps/explorer/config/config.exs                        | 10 ++++++++++
 .../lib/explorer/market/market_history_cache.ex        |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/apps/explorer/config/config.exs b/apps/explorer/config/config.exs
index 049d7a8a16..9880489138 100644
--- a/apps/explorer/config/config.exs
+++ b/apps/explorer/config/config.exs
@@ -116,6 +116,16 @@ config :spandex_ecto, SpandexEcto.EctoLogger,
   tracer: Explorer.Tracer,
   otp_app: :explorer
 
+market_history_cache_ttl =
+  try do
+    String.to_integer(System.get_env("MARKET_HISTORY_CACHE_TTL"))
+  rescue
+    # 6 hours
+    _ -> 60 * 60 * 6
+  end
+
+config :explorer, Explorer.Market.MarketHistoryCache, ttl: :timer.seconds(market_history_cache_ttl)
+
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
 import_config "#{Mix.env()}.exs"
diff --git a/apps/explorer/lib/explorer/market/market_history_cache.ex b/apps/explorer/lib/explorer/market/market_history_cache.ex
index 04b6193716..5cddb7707a 100644
--- a/apps/explorer/lib/explorer/market/market_history_cache.ex
+++ b/apps/explorer/lib/explorer/market/market_history_cache.ex
@@ -12,7 +12,7 @@ defmodule Explorer.Market.MarketHistoryCache do
   @last_update_key :last_update
   @history_key :history
   # 6 hours
-  @cache_period 1_000 * 60 * 60 * 6
+  @cache_period Application.get_env(:explorer, __MODULE__)[:ttl]
   @recent_days 30
 
   def fetch do

From 2757f706573e330f9b6497e101266ee01517ad80 Mon Sep 17 00:00:00 2001
From: saneery <anatolyniky@gmail.com>
Date: Mon, 22 Jul 2019 14:13:41 +0300
Subject: [PATCH 46/56] add changelog entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9c8934f3d..346c08f0f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@
 - [#2326](https://github.com/poanetwork/blockscout/pull/2326) - fix nested constructor arguments
 
 ### Chore
+- [#2401](https://github.com/poanetwork/blockscout/pull/2401) - add ENV vars to manage updating period of average block time and market history cache
 - [#2363](https://github.com/poanetwork/blockscout/pull/2363) - add parameters example for eth rpc
 - [#2342](https://github.com/poanetwork/blockscout/pull/2342) - Upgrade Postgres image version in Docker setup
 - [#2325](https://github.com/poanetwork/blockscout/pull/2325) - Reduce function input to address' hash only where possible

From b49bdec7523747f06d3bda20f85b99ba8b0a0da6 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Mon, 22 Jul 2019 16:34:31 +0300
Subject: [PATCH 47/56] fix external library style

---
 .../lib/block_scout_web/views/address_contract_view.ex          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex b/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex
index 38823dba8d..57c6e11da7 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/address_contract_view.ex
@@ -59,7 +59,7 @@ defmodule BlockScoutWeb.AddressContractView do
 
   def format_external_libraries(libraries) do
     Enum.reduce(libraries, "", fn %{name: name, address_hash: address_hash}, acc ->
-      "#{acc}<span style=\"color:#e2725b;\">#{name}</span> : #{address_hash}  \n"
+      "#{acc}<span class=\"hljs-title\">#{name}</span> : #{address_hash}  \n"
     end)
   end
 

From c2dec2ad27cc1449bd2cc29b619b0e7cbc0e1b55 Mon Sep 17 00:00:00 2001
From: saneery <anatolyniky@gmail.com>
Date: Mon, 22 Jul 2019 15:45:39 +0300
Subject: [PATCH 48/56] update env vars parsing in the config.exs

---
 apps/explorer/config/config.exs | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/apps/explorer/config/config.exs b/apps/explorer/config/config.exs
index 9880489138..606b5c6f0c 100644
--- a/apps/explorer/config/config.exs
+++ b/apps/explorer/config/config.exs
@@ -18,16 +18,14 @@ config :explorer,
   healthy_blocks_period: System.get_env("HEALTHY_BLOCKS_PERIOD") || :timer.minutes(5)
 
 average_block_period =
-  try do
-    String.to_integer(System.get_env("AVERAGE_BLOCK_PERIOD"))
-  rescue
-    # 30 minutes
-    _ -> 30 * 60
+  case Integer.parse(System.get_env("AVERAGE_BLOCK_PERIOD", "")) do
+    {secs, ""} -> :timer.seconds(secs)
+    _ -> :timer.minutes(30)
   end
 
 config :explorer, Explorer.Counters.AverageBlockTime,
   enabled: true,
-  period: :timer.seconds(average_block_period)
+  period: average_block_period
 
 config :explorer, Explorer.Chain.Cache.BlockNumber, enabled: true
 
@@ -117,14 +115,12 @@ config :spandex_ecto, SpandexEcto.EctoLogger,
   otp_app: :explorer
 
 market_history_cache_ttl =
-  try do
-    String.to_integer(System.get_env("MARKET_HISTORY_CACHE_TTL"))
-  rescue
-    # 6 hours
-    _ -> 60 * 60 * 6
+  case Integer.parse(System.get_env("MARKET_HISTORY_CACHE_TTL", "")) do
+    {secs, ""} -> :timer.seconds(secs)
+    _ -> :timer.hours(6)
   end
 
-config :explorer, Explorer.Market.MarketHistoryCache, ttl: :timer.seconds(market_history_cache_ttl)
+config :explorer, Explorer.Market.MarketHistoryCache, ttl: market_history_cache_ttl
 
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.

From 86d6ba97a16b12817cd4ba39d0a1dfefbd4917d5 Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 22 Jul 2019 20:23:03 +0300
Subject: [PATCH 49/56] Place loaders

---
 CHANGELOG.md                                  |  2 +-
 apps/block_scout_web/assets/package-lock.json | 41 ++++++++++++++-----
 .../templates/address/index.html.eex          |  2 +-
 .../address_coin_balance/index.html.eex       |  4 +-
 .../index.html.eex                            |  4 +-
 .../templates/address_logs/index.html.eex     |  4 +-
 .../templates/address_token/index.html.eex    |  4 +-
 .../address_token_transfer/index.html.eex     |  4 +-
 .../address_transaction/index.html.eex        |  4 +-
 .../address_validation/index.html.eex         |  4 +-
 .../templates/block/index.html.eex            |  4 +-
 .../block_transaction/index.html.eex          |  4 +-
 .../templates/chain/show.html.eex             |  1 -
 .../_table-loader.html.eex}                   |  0
 .../_tile-loader.html.eex}                    |  0
 .../pending_transaction/index.html.eex        |  9 +---
 .../templates/tokens/holder/index.html.eex    |  4 +-
 .../templates/tokens/inventory/index.html.eex |  4 +-
 .../templates/tokens/transfer/index.html.eex  |  4 +-
 .../templates/transaction/index.html.eex      |  4 +-
 .../index.html.eex                            |  4 +-
 .../templates/transaction_log/index.html.eex  |  4 +-
 .../transaction_token_transfer/index.html.eex |  4 +-
 apps/block_scout_web/priv/gettext/default.pot | 11 ++---
 .../priv/gettext/en/LC_MESSAGES/default.po    | 18 +++-----
 25 files changed, 91 insertions(+), 57 deletions(-)
 rename apps/block_scout_web/lib/block_scout_web/templates/{loaders/_table-loader.eex => common_components/_table-loader.html.eex} (100%)
 rename apps/block_scout_web/lib/block_scout_web/templates/{loaders/_tile-loader.eex => common_components/_tile-loader.html.eex} (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b7c01b4d4..21dafca1b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,9 +8,9 @@
 - [#2294](https://github.com/poanetwork/blockscout/pull/2294) - add healthy block period checking endpoint
 
 ### Fixes
+- [#2405](https://github.com/poanetwork/blockscout/pull/2405) - added templates for table loader and tile loader
 - [#2398](https://github.com/poanetwork/blockscout/pull/2398) - show only one decoded candidate
 - [#2395](https://github.com/poanetwork/blockscout/pull/2395) - new block loading animation
-- [#2393](https://github.com/poanetwork/blockscout/pull/2393) - added templates for table loader and tile loader
 - [#2389](https://github.com/poanetwork/blockscout/pull/2389) - Reduce Lodash lib size (86% of lib methods are not used)
 - [#2378](https://github.com/poanetwork/blockscout/pull/2378) - Page performance: exclude moment.js localization files except EN, remove unused css
 - [#2368](https://github.com/poanetwork/blockscout/pull/2368) - add two columns of smart contract info
diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index 22c6d216de..f20e753b49 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -3816,7 +3816,8 @@
           "version": "2.1.1",
           "resolved": false,
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -3840,13 +3841,15 @@
           "version": "1.0.0",
           "resolved": false,
           "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "resolved": false,
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -3863,19 +3866,22 @@
           "version": "1.1.0",
           "resolved": false,
           "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "resolved": false,
           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "resolved": false,
           "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4006,7 +4012,8 @@
           "version": "2.0.3",
           "resolved": false,
           "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4020,6 +4027,7 @@
           "resolved": false,
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -4036,6 +4044,7 @@
           "resolved": false,
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -4044,13 +4053,15 @@
           "version": "0.0.8",
           "resolved": false,
           "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "resolved": false,
           "integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -4071,6 +4082,7 @@
           "resolved": false,
           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -4159,7 +4171,8 @@
           "version": "1.0.1",
           "resolved": false,
           "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -4173,6 +4186,7 @@
           "resolved": false,
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -4268,7 +4282,8 @@
           "version": "5.1.1",
           "resolved": false,
           "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -4310,6 +4325,7 @@
           "resolved": false,
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -4331,6 +4347,7 @@
           "resolved": false,
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -4379,13 +4396,15 @@
           "version": "1.0.2",
           "resolved": false,
           "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
           "resolved": false,
           "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address/index.html.eex
index 68f586adb4..c594915d9f 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address/index.html.eex
@@ -38,7 +38,7 @@
 					</tr>
 				</thead>
 				<tbody data-items data-selector="top-addresses-list">
-					<!-- include table loader here -->
+					<%= render BlockScoutWeb.CommonComponentsView, "_table-loader.html" %>
 				</tbody>
 			</table>
 		</div>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_coin_balance/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_coin_balance/index.html.eex
index 6b9459f5b3..2e71dd22ca 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address_coin_balance/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address_coin_balance/index.html.eex
@@ -40,7 +40,9 @@
           </div>
         </div>
 
-        <div data-selector="coin-balances-list" data-items></div>
+        <div data-selector="coin-balances-list" data-items>
+          <%= render BlockScoutWeb.CommonComponentsView, "_tile-loader.html" %>
+        </div>
 
         <%= render BlockScoutWeb.CommonComponentsView, "_pagination_container.html", position: "bottom", cur_page_number: "1", show_pagination_limit: true, data_next_page_button: true, data_prev_page_button: true %>
 
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_internal_transaction/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_internal_transaction/index.html.eex
index 3bc2e7fe9b..f18638db0d 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address_internal_transaction/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address_internal_transaction/index.html.eex
@@ -66,7 +66,9 @@
           </div>
         </div>
 
-        <div data-items></div>
+        <div data-items>
+          <%= render BlockScoutWeb.CommonComponentsView, "_tile-loader.html" %>
+        </div>
 
         <%= render BlockScoutWeb.CommonComponentsView, "_pagination_container.html", position: "bottom", cur_page_number: "1", show_pagination_limit: true, data_next_page_button: true, data_prev_page_button: true %>
 
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_logs/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_logs/index.html.eex
index 3a44e0cb2d..fabbc7f7d8 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address_logs/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address_logs/index.html.eex
@@ -27,7 +27,9 @@
           </div>
         </div>
 
-        <div data-items></div>
+        <div data-items>
+          <%= render BlockScoutWeb.CommonComponentsView, "_tile-loader.html" %>
+        </div>
 
         <%= render BlockScoutWeb.CommonComponentsView, "_pagination_container.html", position: "bottom", cur_page_number: "1", show_pagination_limit: true, data_next_page_button: true, data_prev_page_button: true %>
 
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_token/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_token/index.html.eex
index 840d9cc1da..8510bdca64 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address_token/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address_token/index.html.eex
@@ -19,7 +19,9 @@
           </div>
         </div>
 
-        <div data-items></div>
+        <div data-items>
+          <%= render BlockScoutWeb.CommonComponentsView, "_tile-loader.html" %>
+        </div>
 
         <div class="transaction-bottom-panel">
           <div csv-download class="download-all-transactions">
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_token_transfer/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_token_transfer/index.html.eex
index c2ab502bf0..738d70883d 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address_token_transfer/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address_token_transfer/index.html.eex
@@ -21,7 +21,9 @@
           </span>
         </button>
 
-        <div data-items></div>
+        <div data-items>
+          <%= render BlockScoutWeb.CommonComponentsView, "_tile-loader.html" %>
+        </div>
 
         <%= render BlockScoutWeb.CommonComponentsView, "_pagination_container.html", position: "bottom", cur_page_number: "1", show_pagination_limit: true, data_next_page_button: true, data_prev_page_button: true %>
 
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_transaction/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_transaction/index.html.eex
index c3a4c94129..83c5454627 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address_transaction/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address_transaction/index.html.eex
@@ -65,7 +65,9 @@
           </div>
         </div>
 
-        <div data-items></div>
+        <div data-items>
+          <%= render BlockScoutWeb.CommonComponentsView, "_tile-loader.html" %>
+        </div>
 
         <div class="transaction-bottom-panel">
           <div class="download-all-transactions">
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_validation/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_validation/index.html.eex
index 3f85f03aba..03b37369bc 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address_validation/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address_validation/index.html.eex
@@ -22,7 +22,9 @@
             <%= gettext "Something went wrong, click to reload." %>
           </span>
         </button>
-        <div data-items data-selector="validations-list"></div>
+        <div data-items data-selector="validations-list">
+          <%= render BlockScoutWeb.CommonComponentsView, "_tile-loader.html" %>
+        </div>
 
         <%= render BlockScoutWeb.CommonComponentsView, "_pagination_container.html", position: "bottom", cur_page_number: "1", show_pagination_limit: true, data_next_page_button: true, data_prev_page_button: true %>
 
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/block/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/block/index.html.eex
index 92b91ce287..dd8a3ed093 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/block/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/block/index.html.eex
@@ -11,7 +11,9 @@
 
       <%= render BlockScoutWeb.CommonComponentsView, "_pagination_container.html", position: "top", cur_page_number: "1", show_pagination_limit: true, data_next_page_button: true, data_prev_page_button: true %>
 
-      <div data-items></div>
+      <div data-items>
+        <%= render BlockScoutWeb.CommonComponentsView, "_tile-loader.html" %>
+      </div>
       <div data-empty-response-message style="display: none;">
           <span><%= gettext "There are no blocks." %></span>
       </div>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/block_transaction/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/block_transaction/index.html.eex
index a497ab1b7e..e0847cac86 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/block_transaction/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/block_transaction/index.html.eex
@@ -29,7 +29,9 @@
           </div>
         </div>
 
-        <div data-items></div>
+        <div data-items>
+          <%= render BlockScoutWeb.CommonComponentsView, "_tile-loader.html" %>
+        </div>
 
         <%= render BlockScoutWeb.CommonComponentsView, "_pagination_container.html", position: "bottom", cur_page_number: "1", show_pagination_limit: true, data_next_page_button: true, data_prev_page_button: true %>
 
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/chain/show.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/chain/show.html.eex
index 2848e23b55..f0ffa52ca2 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/chain/show.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/chain/show.html.eex
@@ -117,7 +117,6 @@
             <%= gettext "Something went wrong, click to retry." %>
           </span>
         </button>
-        <!-- include tile loader here -->
       </span>
     </div>
   </div>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/loaders/_table-loader.eex b/apps/block_scout_web/lib/block_scout_web/templates/common_components/_table-loader.html.eex
similarity index 100%
rename from apps/block_scout_web/lib/block_scout_web/templates/loaders/_table-loader.eex
rename to apps/block_scout_web/lib/block_scout_web/templates/common_components/_table-loader.html.eex
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/loaders/_tile-loader.eex b/apps/block_scout_web/lib/block_scout_web/templates/common_components/_tile-loader.html.eex
similarity index 100%
rename from apps/block_scout_web/lib/block_scout_web/templates/loaders/_tile-loader.eex
rename to apps/block_scout_web/lib/block_scout_web/templates/common_components/_tile-loader.html.eex
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/pending_transaction/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/pending_transaction/index.html.eex
index 4c97be61e1..e819285629 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/pending_transaction/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/pending_transaction/index.html.eex
@@ -23,13 +23,8 @@
           <%= gettext "There are no pending transactions." %>
         </span>
       </div>
-      <div data-items data-selector="transactions-pending-list"></div>
-      <div data-loading-message class="tile tile-muted text-center mt-3" style="display: none;">
-        <span class="loading-spinner-small mr-2">
-          <span class="loading-spinner-block-1"></span>
-          <span class="loading-spinner-block-2"></span>
-        </span>
-        <%= gettext("Loading") %>...
+      <div data-items data-selector="transactions-pending-list">
+        <%= render BlockScoutWeb.CommonComponentsView, "_tile-loader.html" %>
       </div>
 
       <%= render BlockScoutWeb.CommonComponentsView, "_pagination_container.html", position: "bottom", cur_page_number: "1", show_pagination_limit: true, data_next_page_button: true, data_prev_page_button: true %>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/tokens/holder/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/tokens/holder/index.html.eex
index 3b24912dd5..8e83021c80 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/tokens/holder/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/tokens/holder/index.html.eex
@@ -28,7 +28,9 @@
           </div>
         </div>
 
-        <div data-items></div>
+        <div data-items>
+          <%= render BlockScoutWeb.CommonComponentsView, "_tile-loader.html" %>
+        </div>
 
         <%= render BlockScoutWeb.CommonComponentsView, "_pagination_container.html", position: "bottom", cur_page_number: "1", show_pagination_limit: true, data_next_page_button: true, data_prev_page_button: true %>
 
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/tokens/inventory/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/tokens/inventory/index.html.eex
index da834dbc88..1e78b11353 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/tokens/inventory/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/tokens/inventory/index.html.eex
@@ -27,7 +27,9 @@
           </div>
         </div>
 
-        <div data-items></div>
+        <div data-items>
+          <%= render BlockScoutWeb.CommonComponentsView, "_tile-loader.html" %>
+        </div>
 
         <%= render BlockScoutWeb.CommonComponentsView, "_pagination_container.html", position: "bottom", cur_page_number: "1", show_pagination_limit: true, data_next_page_button: true, data_prev_page_button: true %>
 
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/tokens/transfer/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/tokens/transfer/index.html.eex
index 980cc4b05a..addaa0c359 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/tokens/transfer/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/tokens/transfer/index.html.eex
@@ -26,7 +26,9 @@
           </span>
         </div>
 
-        <div data-items></div>
+        <div data-items>
+          <%= render BlockScoutWeb.CommonComponentsView, "_tile-loader.html" %>
+        </div>
 
         <%= render BlockScoutWeb.CommonComponentsView, "_pagination_container.html", position: "bottom", cur_page_number: "1", show_pagination_limit: true, data_next_page_button: true, data_prev_page_button: true %>
 
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction/index.html.eex
index 18928915f2..bce59eb00b 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/transaction/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction/index.html.eex
@@ -28,7 +28,9 @@
         </div>
       </div>
 
-      <div data-selector="transactions-list" data-items></div>
+      <div data-selector="transactions-list" data-items>
+        <%= render BlockScoutWeb.CommonComponentsView, "_tile-loader.html" %>
+      </div>
 
       <%= render BlockScoutWeb.CommonComponentsView, "_pagination_container.html", position: "bottom", cur_page_number: "1", show_pagination_limit: true, data_next_page_button: true, data_prev_page_button: true %>
 
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction_internal_transaction/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction_internal_transaction/index.html.eex
index e6623b4061..70162a3be8 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/transaction_internal_transaction/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction_internal_transaction/index.html.eex
@@ -16,7 +16,9 @@
         </div>
       </div>
 
-      <div data-items></div>
+      <div data-items>
+        <%= render BlockScoutWeb.CommonComponentsView, "_tile-loader.html" %>
+      </div>
 
       <%= render BlockScoutWeb.CommonComponentsView, "_pagination_container.html", position: "bottom", cur_page_number: "1", show_pagination_limit: true, data_next_page_button: true, data_prev_page_button: true %>
     </div>
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/index.html.eex
index 3c84e7c4f9..17f480b439 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/index.html.eex
@@ -19,7 +19,9 @@
           </div>
         </div>
 
-        <div data-items></div>
+        <div data-items>
+          <%= render BlockScoutWeb.CommonComponentsView, "_tile-loader.html" %>
+        </div>
 
         <%= render BlockScoutWeb.CommonComponentsView, "_pagination_container.html", position: "bottom", cur_page_number: "1", show_pagination_limit: true, data_next_page_button: true, data_prev_page_button: true %>
 
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction_token_transfer/index.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction_token_transfer/index.html.eex
index d40dedd414..8d356a450a 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/transaction_token_transfer/index.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction_token_transfer/index.html.eex
@@ -18,7 +18,9 @@
           </div>
         </div>
 
-        <div data-items></div>
+        <div data-items>
+          <%= render BlockScoutWeb.CommonComponentsView, "_tile-loader.html" %>
+        </div>
 
         <%= render BlockScoutWeb.CommonComponentsView, "_pagination_container.html", position: "bottom", cur_page_number: "1", show_pagination_limit: true, data_next_page_button: true, data_prev_page_button: true %>
 
diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index 7d8e592e3b..228501dc51 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -1077,11 +1077,6 @@ msgstr ""
 msgid "GraphQL"
 msgstr ""
 
-#, elixir-format
-#: lib/block_scout_web/templates/pending_transaction/index.html.eex:32
-msgid "Loading"
-msgstr ""
-
 #, elixir-format
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:73
 msgid "RPC"
@@ -1276,7 +1271,7 @@ msgid "There are no pending transactions."
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/block/index.html.eex:16
+#: lib/block_scout_web/templates/block/index.html.eex:18
 msgid "There are no blocks."
 msgstr ""
 
@@ -1744,8 +1739,8 @@ msgid "here."
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_token/index.html.eex:26
-#: lib/block_scout_web/templates/address_transaction/index.html.eex:72
+#: lib/block_scout_web/templates/address_token/index.html.eex:28
+#: lib/block_scout_web/templates/address_transaction/index.html.eex:74
 msgid "CSV"
 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 5333eb95aa..7c64c47de2 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
@@ -34,7 +34,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/block/overview.html.eex:21
-#: lib/block_scout_web/templates/chain/_block.html.eex:11
+#: lib/block_scout_web/templates/chain/_block.html.eex:178
 msgid "%{count} Transactions"
 msgstr ""
 
@@ -522,7 +522,7 @@ msgstr ""
 #, elixir-format
 #: lib/block_scout_web/templates/block/_tile.html.eex:38
 #: lib/block_scout_web/templates/block/overview.html.eex:121
-#: lib/block_scout_web/templates/chain/_block.html.eex:15
+#: lib/block_scout_web/templates/chain/_block.html.eex:182
 msgid "Miner"
 msgstr ""
 
@@ -1040,7 +1040,7 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/block/_tile.html.eex:47
-#: lib/block_scout_web/templates/chain/_block.html.eex:23
+#: lib/block_scout_web/templates/chain/_block.html.eex:190
 #: lib/block_scout_web/views/internal_transaction_view.ex:27
 msgid "Reward"
 msgstr ""
@@ -1058,7 +1058,6 @@ msgstr ""
 #, elixir-format
 #: lib/block_scout_web/templates/address_read_contract/index.html.eex:14
 #: lib/block_scout_web/templates/chain/show.html.eex:99
-#: lib/block_scout_web/templates/chain/show.html.eex:125
 #: lib/block_scout_web/templates/tokens/read_contract/index.html.eex:21
 msgid "Loading..."
 msgstr ""
@@ -1078,11 +1077,6 @@ msgstr ""
 msgid "GraphQL"
 msgstr ""
 
-#, elixir-format
-#: lib/block_scout_web/templates/pending_transaction/index.html.eex:32
-msgid "Loading"
-msgstr ""
-
 #, elixir-format
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:73
 msgid "RPC"
@@ -1277,7 +1271,7 @@ msgid "There are no pending transactions."
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/block/index.html.eex:16
+#: lib/block_scout_web/templates/block/index.html.eex:18
 msgid "There are no blocks."
 msgstr ""
 
@@ -1745,8 +1739,8 @@ msgid "here."
 msgstr ""
 
 #, elixir-format
-#: lib/block_scout_web/templates/address_token/index.html.eex:26
-#: lib/block_scout_web/templates/address_transaction/index.html.eex:72
+#: lib/block_scout_web/templates/address_token/index.html.eex:28
+#: lib/block_scout_web/templates/address_transaction/index.html.eex:74
 msgid "CSV"
 msgstr ""
 

From e93b71c0f367cc4868275704bd94a3ee13f7a739 Mon Sep 17 00:00:00 2001
From: saneery <anatolyniky@gmail.com>
Date: Tue, 23 Jul 2019 09:56:17 +0300
Subject: [PATCH 50/56] Rename cache ttl to cache period

---
 apps/explorer/config/config.exs                           | 8 ++++----
 apps/explorer/lib/explorer/market/market_history_cache.ex | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/explorer/config/config.exs b/apps/explorer/config/config.exs
index 606b5c6f0c..fed5124a2a 100644
--- a/apps/explorer/config/config.exs
+++ b/apps/explorer/config/config.exs
@@ -18,7 +18,7 @@ config :explorer,
   healthy_blocks_period: System.get_env("HEALTHY_BLOCKS_PERIOD") || :timer.minutes(5)
 
 average_block_period =
-  case Integer.parse(System.get_env("AVERAGE_BLOCK_PERIOD", "")) do
+  case Integer.parse(System.get_env("AVERAGE_BLOCK_CACHE_PERIOD", "")) do
     {secs, ""} -> :timer.seconds(secs)
     _ -> :timer.minutes(30)
   end
@@ -114,13 +114,13 @@ config :spandex_ecto, SpandexEcto.EctoLogger,
   tracer: Explorer.Tracer,
   otp_app: :explorer
 
-market_history_cache_ttl =
-  case Integer.parse(System.get_env("MARKET_HISTORY_CACHE_TTL", "")) do
+market_history_cache_period =
+  case Integer.parse(System.get_env("MARKET_HISTORY_CACHE_PERIOD", "")) do
     {secs, ""} -> :timer.seconds(secs)
     _ -> :timer.hours(6)
   end
 
-config :explorer, Explorer.Market.MarketHistoryCache, ttl: market_history_cache_ttl
+config :explorer, Explorer.Market.MarketHistoryCache, period: market_history_cache_period
 
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
diff --git a/apps/explorer/lib/explorer/market/market_history_cache.ex b/apps/explorer/lib/explorer/market/market_history_cache.ex
index 5cddb7707a..4ed3d9b7d2 100644
--- a/apps/explorer/lib/explorer/market/market_history_cache.ex
+++ b/apps/explorer/lib/explorer/market/market_history_cache.ex
@@ -12,7 +12,7 @@ defmodule Explorer.Market.MarketHistoryCache do
   @last_update_key :last_update
   @history_key :history
   # 6 hours
-  @cache_period Application.get_env(:explorer, __MODULE__)[:ttl]
+  @cache_period Application.get_env(:explorer, __MODULE__)[:period]
   @recent_days 30
 
   def fetch do

From 12bf6043d5b6745470ca807ba4e4cbf6ea56caa4 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Tue, 23 Jul 2019 10:57:19 +0300
Subject: [PATCH 51/56] preload smart contract for logs decoding

---
 .../block_scout_web/controllers/transaction_log_controller.ex   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_log_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_log_controller.ex
index 0a87d12493..20272b4311 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_log_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_log_controller.ex
@@ -11,7 +11,7 @@ defmodule BlockScoutWeb.TransactionLogController do
   def index(conn, %{"transaction_id" => transaction_hash_string, "type" => "JSON"} = params) do
     with {:ok, transaction_hash} <- Chain.string_to_transaction_hash(transaction_hash_string),
          {:ok, transaction} <-
-           Chain.hash_to_transaction(transaction_hash) do
+           Chain.hash_to_transaction(transaction_hash, [necessity_by_association: %{[to_address: :smart_contract] => :optional}]) do
       full_options =
         Keyword.merge(
           [

From ab64fc4b226ab905da4e0b7d10e34da1ec54ab56 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Tue, 23 Jul 2019 11:02:22 +0300
Subject: [PATCH 52/56] mix format

---
 .../block_scout_web/controllers/transaction_log_controller.ex | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_log_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_log_controller.ex
index 20272b4311..96d626b140 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/transaction_log_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/transaction_log_controller.ex
@@ -11,7 +11,9 @@ defmodule BlockScoutWeb.TransactionLogController do
   def index(conn, %{"transaction_id" => transaction_hash_string, "type" => "JSON"} = params) do
     with {:ok, transaction_hash} <- Chain.string_to_transaction_hash(transaction_hash_string),
          {:ok, transaction} <-
-           Chain.hash_to_transaction(transaction_hash, [necessity_by_association: %{[to_address: :smart_contract] => :optional}]) do
+           Chain.hash_to_transaction(transaction_hash,
+             necessity_by_association: %{[to_address: :smart_contract] => :optional}
+           ) do
       full_options =
         Keyword.merge(
           [

From b74e07decb4047020c4a4b83998d517225aa28b8 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Tue, 23 Jul 2019 11:04:47 +0300
Subject: [PATCH 53/56] add CHANGELOG entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b2dbee4bc..f03c39c275 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - [#2294](https://github.com/poanetwork/blockscout/pull/2294) - add healthy block period checking endpoint
 
 ### Fixes
+- [#2410](https://github.com/poanetwork/blockscout/pull/2410) - preload smart contract for logs decoding
 - [#2398](https://github.com/poanetwork/blockscout/pull/2398) - show only one decoded candidate
 - [#2395](https://github.com/poanetwork/blockscout/pull/2395) - new block loading animation
 - [#2389](https://github.com/poanetwork/blockscout/pull/2389) - Reduce Lodash lib size (86% of lib methods are not used)

From 80587f861ef920cb6a018a76b1b8114b7352d6d2 Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 23 Jul 2019 18:11:28 +0300
Subject: [PATCH 54/56] Remove brackets in market cap % view

---
 CHANGELOG.md                                                    | 1 +
 .../lib/block_scout_web/templates/address/_tile.html.eex        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 634e5ac697..1f9f4f9a55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@
 - [#2326](https://github.com/poanetwork/blockscout/pull/2326) - fix nested constructor arguments
 
 ### Chore
+- [#2418](https://github.com/poanetwork/blockscout/pull/2418) - Remove parentheses in market cap percentage
 - [#2401](https://github.com/poanetwork/blockscout/pull/2401) - add ENV vars to manage updating period of average block time and market history cache
 - [#2363](https://github.com/poanetwork/blockscout/pull/2363) - add parameters example for eth rpc
 - [#2342](https://github.com/poanetwork/blockscout/pull/2342) - Upgrade Postgres image version in Docker setup
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address/_tile.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address/_tile.html.eex
index 9680faa2a8..56f1a2bbb2 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address/_tile.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address/_tile.html.eex
@@ -21,7 +21,7 @@
   <td class="stakes-td color-lighten">
     <!-- percentage of coins from total supply -->
     <%= if @total_supply do %>
-      (<%= balance_percentage(@address, @total_supply) %>)
+      <%= balance_percentage(@address, @total_supply) %>
     <% end %>
   </td>
   <td class="stakes-td">

From ec31e82150330fc4bde05f0234b937319a5a872b Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 24 Jul 2019 11:09:44 +0300
Subject: [PATCH 55/56] Revert package-lock.json update

---
 apps/block_scout_web/assets/package-lock.json | 41 +++++--------------
 1 file changed, 11 insertions(+), 30 deletions(-)

diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json
index f20e753b49..22c6d216de 100644
--- a/apps/block_scout_web/assets/package-lock.json
+++ b/apps/block_scout_web/assets/package-lock.json
@@ -3816,8 +3816,7 @@
           "version": "2.1.1",
           "resolved": false,
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -3841,15 +3840,13 @@
           "version": "1.0.0",
           "resolved": false,
           "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "resolved": false,
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -3866,22 +3863,19 @@
           "version": "1.1.0",
           "resolved": false,
           "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "resolved": false,
           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "resolved": false,
           "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4012,8 +4006,7 @@
           "version": "2.0.3",
           "resolved": false,
           "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4027,7 +4020,6 @@
           "resolved": false,
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -4044,7 +4036,6 @@
           "resolved": false,
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -4053,15 +4044,13 @@
           "version": "0.0.8",
           "resolved": false,
           "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.2.4",
           "resolved": false,
           "integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -4082,7 +4071,6 @@
           "resolved": false,
           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -4171,8 +4159,7 @@
           "version": "1.0.1",
           "resolved": false,
           "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -4186,7 +4173,6 @@
           "resolved": false,
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -4282,8 +4268,7 @@
           "version": "5.1.1",
           "resolved": false,
           "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -4325,7 +4310,6 @@
           "resolved": false,
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -4347,7 +4331,6 @@
           "resolved": false,
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -4396,15 +4379,13 @@
           "version": "1.0.2",
           "resolved": false,
           "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.2",
           "resolved": false,
           "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },

From 11c9b16ef356d17edd229cc2962507abf814be3a Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Wed, 24 Jul 2019 11:26:14 +0300
Subject: [PATCH 56/56] Tile loader on the main page

---
 .../lib/block_scout_web/templates/chain/show.html.eex            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/block_scout_web/lib/block_scout_web/templates/chain/show.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/chain/show.html.eex
index 5e136a1007..69d1f8b6ed 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/chain/show.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/chain/show.html.eex
@@ -117,6 +117,7 @@
             <%= gettext "Something went wrong, click to retry." %>
           </span>
         </button>
+        <%= render BlockScoutWeb.CommonComponentsView, "_tile-loader.html" %>
       </span>
     </div>
   </div>