From a4a6d93834de12b1829836ec23ad08d9d71657eb Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Mon, 23 Sep 2019 12:04:19 +0300
Subject: [PATCH 01/28] get rid of json schema warnings

---
 apps/block_scout_web/mix.exs | 2 +-
 mix.lock                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/block_scout_web/mix.exs b/apps/block_scout_web/mix.exs
index de55cb0eb7..029819a202 100644
--- a/apps/block_scout_web/mix.exs
+++ b/apps/block_scout_web/mix.exs
@@ -131,7 +131,7 @@ defmodule BlockScoutWeb.Mixfile do
       # `:cowboy` `~> 2.0` and Phoenix 1.4 compatibility
       {:wobserver, "~> 0.2.0", github: "poanetwork/wobserver", branch: "support-https"},
       {:phoenix_form_awesomplete, "~> 0.1.4"},
-      {:ex_json_schema, "~> 0.6.1"}
+      {:ex_json_schema, "~> 0.6.2"}
     ]
   end
 
diff --git a/mix.lock b/mix.lock
index e0d75af01a..87f6e4e2f0 100644
--- a/mix.lock
+++ b/mix.lock
@@ -39,7 +39,7 @@
   "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.6.4", "5b1ac8451f889576bb29dee70412de1170974298727ab944aa4d17e91bdd3472", [:mix], [{:decimal, "~> 1.5", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.6", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, "~> 2.3", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm"},
   "ex_cldr_units": {:hex, :ex_cldr_units, "2.5.1", "0e65067a22a7c5146266c313d6333c2700868c32aa6d536f47c6c0d84aac3ac1", [:mix], [{:ex_cldr, "~> 2.6", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_lists, "~> 2.2", [hex: :ex_cldr_lists, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.6", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm"},
   "ex_doc": {:hex, :ex_doc, "0.19.3", "3c7b0f02851f5fc13b040e8e925051452e41248f685e40250d7e40b07b9f8c10", [:mix], [{:earmark, "~> 1.2", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.10", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm"},
-  "ex_json_schema": {:hex, :ex_json_schema, "0.6.1", "b57c0588385b8262b80f19d33d9b9b71fcd60d247691abf2635b57a03ec0ad44", [:mix], [], "hexpm"},
+  "ex_json_schema": {:hex, :ex_json_schema, "0.6.2", "de23d80478215987469c81688208fe0ff440ee0e0e6ae2268fcadbb2ff35df9d", [:mix], [], "hexpm"},
   "ex_machina": {:hex, :ex_machina, "2.3.0", "92a5ad0a8b10ea6314b876a99c8c9e3f25f4dde71a2a835845b136b9adaf199a", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}], "hexpm"},
   "ex_rlp": {:hex, :ex_rlp, "0.5.2", "7f4ce7bd55e543c054ce6d49629b01e9833c3462e3d547952be89865f39f2c58", [:mix], [], "hexpm"},
   "ex_utils": {:hex, :ex_utils, "0.1.7", "2c133e0bcdc49a858cf8dacf893308ebc05bc5fba501dc3d2935e65365ec0bf3", [:mix], [], "hexpm"},

From 2f584ef19a571650545ad74e1e58afa36ccf94d3 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Mon, 23 Sep 2019 12:08:08 +0300
Subject: [PATCH 02/28] add CHANGELOG entry

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6402a0acd..5a40460247 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,8 @@
 
 ### Chore
 
+- [#2723](https://github.com/poanetwork/blockscout/pull/2723) - get rid of ex_json_schema warnings
+
 
 ## 2.0.4-beta
 

From a5062595378ebb6fc7762d587a7c2c83e00a9010 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Tue, 24 Sep 2019 12:59:16 +0300
Subject: [PATCH 03/28] fix library verification

bytecode of a library contains address of a deployed library
---
 .../lib/explorer/smart_contract/verifier.ex   | 14 +++++++++-
 .../explorer/smart_contract/verifier_test.exs | 28 +++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/apps/explorer/lib/explorer/smart_contract/verifier.ex b/apps/explorer/lib/explorer/smart_contract/verifier.ex
index 4c2daa680c..4303cf5b6b 100644
--- a/apps/explorer/lib/explorer/smart_contract/verifier.ex
+++ b/apps/explorer/lib/explorer/smart_contract/verifier.ex
@@ -69,7 +69,8 @@ defmodule Explorer.SmartContract.Verifier do
     blockchain_bytecode_without_whisper = extract_bytecode(blockchain_bytecode)
 
     cond do
-      generated_bytecode != blockchain_bytecode_without_whisper ->
+      generated_bytecode != blockchain_bytecode_without_whisper &&
+          !try_library_verification(generated_bytecode, blockchain_bytecode_without_whisper) ->
         {:error, :generated_bytecode}
 
       has_constructor_with_params?(abi) &&
@@ -81,6 +82,17 @@ defmodule Explorer.SmartContract.Verifier do
     end
   end
 
+  defp try_library_verification(
+         "730000000000000000000000000000000000000000" <> bytecode,
+         <<_address::binary-size(42)>> <> bytecode
+       ) do
+    true
+  end
+
+  defp try_library_verification(_, _) do
+    false
+  end
+
   @doc """
   In order to discover the bytecode we need to remove the `swarm source` from
   the hash.
diff --git a/apps/explorer/test/explorer/smart_contract/verifier_test.exs b/apps/explorer/test/explorer/smart_contract/verifier_test.exs
index fba0622964..088820beea 100644
--- a/apps/explorer/test/explorer/smart_contract/verifier_test.exs
+++ b/apps/explorer/test/explorer/smart_contract/verifier_test.exs
@@ -144,6 +144,34 @@ defmodule Explorer.SmartContract.VerifierTest do
       assert abi != nil
     end
 
+    test "verifies a library" do
+      bytecode =
+        "0x7349f540c22cba15c47a08c235e20081474201a742301460806040526004361060335760003560e01c8063c2985578146038575b600080fd5b603e60b0565b6040805160208082528351818301528351919283929083019185019080838360005b8381101560765781810151838201526020016060565b50505050905090810190601f16801560a25780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b604080518082019091526003815262666f6f60e81b60208201529056fea265627a7a72315820174b282a3ef3b9778d79fbc2e4c36bc939c54dfaaaa51d3122ee6e648093844c64736f6c634300050b0032"
+
+      contract_address = insert(:contract_address, contract_code: bytecode)
+
+      code = """
+      pragma solidity 0.5.11;
+
+      library Foo {
+          function foo() external pure returns (string memory) {
+              return "foo";
+          }
+      }
+      """
+
+      params = %{
+        "contract_source_code" => code,
+        "compiler_version" => "v0.5.11+commit.c082d0b4",
+        "evm_version" => "default",
+        "name" => "Foo",
+        "optimization" => true
+      }
+
+      assert {:ok, %{abi: abi}} = Verifier.evaluate_authenticity(contract_address.hash, params)
+      assert abi != nil
+    end
+
     test "verifies smart contract compiled with Solidity 0.5.9 (includes new metadata in bytecode) with constructor args" do
       path = File.cwd!() <> "/test/support/fixture/smart_contract/solidity_0.5.9_smart_contract.sol"
       contract = File.read!(path)

From 6b442635ebe8123a8c2559737cfe72742aab0526 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Tue, 24 Sep 2019 13:02:24 +0300
Subject: [PATCH 04/28] add CHANGELOG entry

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c805d8f45..4a53de6a31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 - [#2663](https://github.com/poanetwork/blockscout/pull/2663) - Fetch address counters in parallel
 
 ### Fixes
+- [#2731](https://github.com/poanetwork/blockscout/pull/2731) - fix library verification
 - [#2718](https://github.com/poanetwork/blockscout/pull/2718) - Include all addresses taking part in transactions in wallets' addresses counter
 - [#2709](https://github.com/poanetwork/blockscout/pull/2709) - Fix stuck label and value for uncle block height
 - [#2707](https://github.com/poanetwork/blockscout/pull/2707) - fix for dashboard banner chart legend items

From ec20050a662e8a37c5506944b3e021fa2198e83f Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Tue, 24 Sep 2019 14:14:21 +0300
Subject: [PATCH 05/28] add comment

---
 apps/explorer/lib/explorer/smart_contract/verifier.ex | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/explorer/lib/explorer/smart_contract/verifier.ex b/apps/explorer/lib/explorer/smart_contract/verifier.ex
index 4303cf5b6b..ed1b6532c5 100644
--- a/apps/explorer/lib/explorer/smart_contract/verifier.ex
+++ b/apps/explorer/lib/explorer/smart_contract/verifier.ex
@@ -82,6 +82,7 @@ defmodule Explorer.SmartContract.Verifier do
     end
   end
 
+  # 730000000000000000000000000000000000000000 - default library address that returned by the compiler
   defp try_library_verification(
          "730000000000000000000000000000000000000000" <> bytecode,
          <<_address::binary-size(42)>> <> bytecode

From 624946a12bf090e1e02e47755e5fbf5fcc954319 Mon Sep 17 00:00:00 2001
From: pasqu4le <pasqu4le@gmail.com>
Date: Tue, 24 Sep 2019 19:13:26 +0200
Subject: [PATCH 06/28] Add pending transactions cache

---
 CHANGELOG.md                                  |  1 +
 .../block_scout_web/test/support/conn_case.ex |  2 +
 .../test/support/feature_case.ex              |  2 +
 apps/explorer/config/config.exs               |  4 ++
 apps/explorer/lib/explorer/application.ex     |  4 +-
 apps/explorer/lib/explorer/chain.ex           | 19 +++++++++
 .../chain/cache/pending_transactions.ex       | 42 +++++++++++++++++++
 .../explorer/chain/import/runner/blocks.ex    | 12 +-----
 .../chain/cache/pending_transactions_test.exs | 17 ++++++++
 apps/explorer/test/support/data_case.ex       |  2 +
 apps/indexer/lib/indexer/block/fetcher.ex     |  8 ++--
 .../indexer/fetcher/pending_transaction.ex    |  3 +-
 .../lib/indexer/fetcher/uncle_block.ex        |  8 ++--
 13 files changed, 106 insertions(+), 18 deletions(-)
 create mode 100644 apps/explorer/lib/explorer/chain/cache/pending_transactions.ex
 create mode 100644 apps/explorer/test/explorer/chain/cache/pending_transactions_test.exs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2311bc9d4c..68d65f4c69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## Current
 
 ### Features
+- [#2735](https://github.com/poanetwork/blockscout/pull/2735) - Add pending transactions cache
 - [#2717](https://github.com/poanetwork/blockscout/pull/2717) - Improve speed of nonconsensus data removal
 - [#2679](https://github.com/poanetwork/blockscout/pull/2679) - added fixed height for card chain blocks and card chain transactions
 - [#2678](https://github.com/poanetwork/blockscout/pull/2678) - fixed dashboard banner height bug
diff --git a/apps/block_scout_web/test/support/conn_case.ex b/apps/block_scout_web/test/support/conn_case.ex
index ed3f094c34..5540346d34 100644
--- a/apps/block_scout_web/test/support/conn_case.ex
+++ b/apps/block_scout_web/test/support/conn_case.ex
@@ -44,6 +44,8 @@ defmodule BlockScoutWeb.ConnCase do
     Supervisor.restart_child(Explorer.Supervisor, Explorer.Chain.Cache.Transactions.child_id())
     Supervisor.terminate_child(Explorer.Supervisor, Explorer.Chain.Cache.Accounts.child_id())
     Supervisor.restart_child(Explorer.Supervisor, Explorer.Chain.Cache.Accounts.child_id())
+    Supervisor.terminate_child(Explorer.Supervisor, Explorer.Chain.Cache.PendingTransactions.child_id())
+    Supervisor.restart_child(Explorer.Supervisor, Explorer.Chain.Cache.PendingTransactions.child_id())
 
     {:ok, conn: Phoenix.ConnTest.build_conn()}
   end
diff --git a/apps/block_scout_web/test/support/feature_case.ex b/apps/block_scout_web/test/support/feature_case.ex
index f6b1aedf24..2dd1d0635c 100644
--- a/apps/block_scout_web/test/support/feature_case.ex
+++ b/apps/block_scout_web/test/support/feature_case.ex
@@ -31,6 +31,8 @@ defmodule BlockScoutWeb.FeatureCase do
     Supervisor.restart_child(Explorer.Supervisor, Explorer.Chain.Cache.Transactions.child_id())
     Supervisor.terminate_child(Explorer.Supervisor, Explorer.Chain.Cache.Accounts.child_id())
     Supervisor.restart_child(Explorer.Supervisor, Explorer.Chain.Cache.Accounts.child_id())
+    Supervisor.terminate_child(Explorer.Supervisor, Explorer.Chain.Cache.PendingTransactions.child_id())
+    Supervisor.restart_child(Explorer.Supervisor, Explorer.Chain.Cache.PendingTransactions.child_id())
 
     metadata = Phoenix.Ecto.SQL.Sandbox.metadata_for(Explorer.Repo, self())
     {:ok, session} = Wallaby.start_session(metadata: metadata)
diff --git a/apps/explorer/config/config.exs b/apps/explorer/config/config.exs
index 0cf1a05b53..1d4fbc6204 100644
--- a/apps/explorer/config/config.exs
+++ b/apps/explorer/config/config.exs
@@ -145,6 +145,10 @@ config :explorer, Explorer.Chain.Cache.Accounts,
   ttl_check_interval: if(System.get_env("DISABLE_INDEXER") == "true", do: :timer.seconds(1), else: false),
   global_ttl: if(System.get_env("DISABLE_INDEXER") == "true", do: :timer.seconds(5))
 
+config :explorer, Explorer.Chain.Cache.PendingTransactions,
+  ttl_check_interval: if(System.get_env("DISABLE_INDEXER") == "true", do: :timer.seconds(1), else: false),
+  global_ttl: if(System.get_env("DISABLE_INDEXER") == "true", do: :timer.seconds(5))
+
 # 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/application.ex b/apps/explorer/lib/explorer/application.ex
index 53d8c03ea3..9a8dff98d0 100644
--- a/apps/explorer/lib/explorer/application.ex
+++ b/apps/explorer/lib/explorer/application.ex
@@ -13,6 +13,7 @@ defmodule Explorer.Application do
     BlockNumber,
     Blocks,
     NetVersion,
+    PendingTransactions,
     TransactionCount,
     Transactions
   }
@@ -51,7 +52,8 @@ defmodule Explorer.Application do
       con_cache_child_spec(MarketHistoryCache.cache_name()),
       con_cache_child_spec(RSK.cache_name(), ttl_check_interval: :timer.minutes(1), global_ttl: :timer.minutes(30)),
       Transactions,
-      Accounts
+      Accounts,
+      PendingTransactions
     ]
 
     children = base_children ++ configurable_children()
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index f89d933d6d..81f6061da5 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -53,6 +53,7 @@ defmodule Explorer.Chain do
     BlockCount,
     BlockNumber,
     Blocks,
+    PendingTransactions,
     TransactionCount,
     Transactions
   }
@@ -2215,6 +2216,24 @@ defmodule Explorer.Chain do
     necessity_by_association = Keyword.get(options, :necessity_by_association, %{})
     paging_options = Keyword.get(options, :paging_options, @default_paging_options)
 
+    if is_nil(paging_options.key) do
+      paging_options.page_size
+      |> PendingTransactions.take_enough()
+      |> case do
+        nil ->
+          pending_transactions = fetch_recent_pending_transactions(paging_options, necessity_by_association)
+          PendingTransactions.update(pending_transactions)
+          pending_transactions
+
+        pending_transactions ->
+          pending_transactions
+      end
+    else
+      fetch_recent_pending_transactions(paging_options, necessity_by_association)
+    end
+  end
+
+  defp fetch_recent_pending_transactions(paging_options, necessity_by_association) do
     Transaction
     |> page_pending_transaction(paging_options)
     |> limit(^paging_options.page_size)
diff --git a/apps/explorer/lib/explorer/chain/cache/pending_transactions.ex b/apps/explorer/lib/explorer/chain/cache/pending_transactions.ex
new file mode 100644
index 0000000000..686b5e7372
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/cache/pending_transactions.ex
@@ -0,0 +1,42 @@
+defmodule Explorer.Chain.Cache.PendingTransactions do
+  @moduledoc """
+  Caches the latest pending transactions
+  """
+
+  alias Explorer.Chain.Transaction
+
+  use Explorer.Chain.OrderedCache,
+    name: :pending_transactions,
+    max_size: 51,
+    preloads: [
+      :block,
+      created_contract_address: :names,
+      from_address: :names,
+      to_address: :names,
+      token_transfers: :token,
+      token_transfers: :from_address,
+      token_transfers: :to_address
+    ],
+    ttl_check_interval: Application.get_env(:explorer, __MODULE__)[:ttl_check_interval],
+    global_ttl: Application.get_env(:explorer, __MODULE__)[:global_ttl]
+
+  @type element :: Transaction.t()
+
+  @type id :: {non_neg_integer(), non_neg_integer()}
+
+  def element_to_id(%Transaction{inserted_at: inserted_at, hash: hash}) do
+    {inserted_at, hash}
+  end
+
+  def update_pending(transactions) when is_nil(transactions), do: :ok
+
+  def update_pending(transactions) do
+    transactions
+    |> Enum.filter(&pending?(&1))
+    |> update()
+  end
+
+  defp pending?(transaction) do
+    is_nil(transaction.block_hash) and (is_nil(transaction.error) or transaction.error != "dropped/replaced")
+  end
+end
diff --git a/apps/explorer/lib/explorer/chain/import/runner/blocks.ex b/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
index 394e21cbaa..c6eab88d10 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
@@ -168,11 +168,7 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
     query =
       from(
         transaction in where_forked(blocks_changes),
-        select: %{
-          block_hash: transaction.block_hash,
-          index: transaction.index,
-          hash: transaction.hash
-        },
+        select: transaction,
         # Enforce Transaction ShareLocks order (see docs: sharelocks.md)
         order_by: [asc: :hash],
         lock: "FOR UPDATE"
@@ -196,11 +192,7 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
             updated_at: ^updated_at
           ]
         ],
-        select: %{
-          block_hash: s.block_hash,
-          index: s.index,
-          hash: s.hash
-        }
+        select: s
       )
 
     {_num, transactions} = repo.update_all(update_query, [], timeout: timeout)
diff --git a/apps/explorer/test/explorer/chain/cache/pending_transactions_test.exs b/apps/explorer/test/explorer/chain/cache/pending_transactions_test.exs
new file mode 100644
index 0000000000..26339bc3d7
--- /dev/null
+++ b/apps/explorer/test/explorer/chain/cache/pending_transactions_test.exs
@@ -0,0 +1,17 @@
+defmodule Explorer.Chain.Cache.PendingTransactionsTest do
+  use Explorer.DataCase
+
+  alias Explorer.Chain.Cache.PendingTransactions
+
+  describe "update_pending/1" do
+    test "adds a new pending transaction" do
+      transaction = insert(:transaction, block_hash: nil, error: nil)
+
+      PendingTransactions.update([transaction])
+
+      transaction_hash = transaction.hash
+
+      assert [%{hash: transaction_hash}] = PendingTransactions.all()
+    end
+  end
+end
diff --git a/apps/explorer/test/support/data_case.ex b/apps/explorer/test/support/data_case.ex
index e12dd24a82..90167e676d 100644
--- a/apps/explorer/test/support/data_case.ex
+++ b/apps/explorer/test/support/data_case.ex
@@ -47,6 +47,8 @@ defmodule Explorer.DataCase do
     Supervisor.restart_child(Explorer.Supervisor, Explorer.Chain.Cache.Transactions.child_id())
     Supervisor.terminate_child(Explorer.Supervisor, Explorer.Chain.Cache.Accounts.child_id())
     Supervisor.restart_child(Explorer.Supervisor, Explorer.Chain.Cache.Accounts.child_id())
+    Supervisor.terminate_child(Explorer.Supervisor, Explorer.Chain.Cache.PendingTransactions.child_id())
+    Supervisor.restart_child(Explorer.Supervisor, Explorer.Chain.Cache.PendingTransactions.child_id())
 
     :ok
   end
diff --git a/apps/indexer/lib/indexer/block/fetcher.ex b/apps/indexer/lib/indexer/block/fetcher.ex
index 1b95d84086..d7cdd88664 100644
--- a/apps/indexer/lib/indexer/block/fetcher.ex
+++ b/apps/indexer/lib/indexer/block/fetcher.ex
@@ -13,7 +13,7 @@ defmodule Indexer.Block.Fetcher do
   alias Explorer.Chain
   alias Explorer.Chain.{Address, Block, Hash, Import, Transaction}
   alias Explorer.Chain.Cache.Blocks, as: BlocksCache
-  alias Explorer.Chain.Cache.{Accounts, BlockNumber, Transactions}
+  alias Explorer.Chain.Cache.{Accounts, BlockNumber, PendingTransactions, Transactions}
   alias Indexer.Block.Fetcher.Receipts
 
   alias Indexer.Fetcher.{
@@ -175,7 +175,7 @@ defmodule Indexer.Block.Fetcher do
            ) do
       result = {:ok, %{inserted: inserted, errors: blocks_errors}}
       update_block_cache(inserted[:blocks])
-      update_transactions_cache(inserted[:transactions])
+      update_transactions_cache(inserted[:transactions], inserted[:fork_transactions])
       update_addresses_cache(inserted[:addresses])
       result
     else
@@ -194,8 +194,10 @@ defmodule Indexer.Block.Fetcher do
 
   defp update_block_cache(_), do: :ok
 
-  defp update_transactions_cache(transactions) do
+  defp update_transactions_cache(transactions, forked_transactions) do
     Transactions.update(transactions)
+    PendingTransactions.update_pending(transactions)
+    PendingTransactions.update_pending(forked_transactions)
   end
 
   defp update_addresses_cache(addresses), do: Accounts.drop(addresses)
diff --git a/apps/indexer/lib/indexer/fetcher/pending_transaction.ex b/apps/indexer/lib/indexer/fetcher/pending_transaction.ex
index 176d8dc9b7..0a8389a991 100644
--- a/apps/indexer/lib/indexer/fetcher/pending_transaction.ex
+++ b/apps/indexer/lib/indexer/fetcher/pending_transaction.ex
@@ -14,7 +14,7 @@ defmodule Indexer.Fetcher.PendingTransaction do
 
   alias Ecto.Changeset
   alias Explorer.Chain
-  alias Explorer.Chain.Cache.Accounts
+  alias Explorer.Chain.Cache.{Accounts, PendingTransactions}
   alias Indexer.Fetcher.PendingTransaction
   alias Indexer.Transform.Addresses
 
@@ -151,6 +151,7 @@ defmodule Indexer.Fetcher.PendingTransaction do
          }) do
       {:ok, imported} ->
         Accounts.drop(imported[:addresses])
+        PendingTransactions.update_pending(imported[:transactions])
         :ok
 
       {:error, [%Changeset{} | _] = changesets} ->
diff --git a/apps/indexer/lib/indexer/fetcher/uncle_block.ex b/apps/indexer/lib/indexer/fetcher/uncle_block.ex
index e597d16ca2..3e7ab8da63 100644
--- a/apps/indexer/lib/indexer/fetcher/uncle_block.ex
+++ b/apps/indexer/lib/indexer/fetcher/uncle_block.ex
@@ -12,7 +12,7 @@ defmodule Indexer.Fetcher.UncleBlock do
   alias Ecto.Changeset
   alias EthereumJSONRPC.Blocks
   alias Explorer.Chain
-  alias Explorer.Chain.Cache.Accounts
+  alias Explorer.Chain.Cache.{Accounts, PendingTransactions}
   alias Explorer.Chain.Hash
   alias Indexer.{Block, BufferedTask, Tracer}
   alias Indexer.Fetcher.UncleBlock
@@ -155,7 +155,7 @@ defmodule Indexer.Fetcher.UncleBlock do
 
   @impl Block.Fetcher
   def import(_, options) when is_map(options) do
-    with {:ok, %{block_second_degree_relations: block_second_degree_relations}} = ok <-
+    with {:ok, %{block_second_degree_relations: block_second_degree_relations} = imported} <-
            options
            |> Map.drop(@ignored_options)
            |> uncle_blocks()
@@ -168,8 +168,10 @@ defmodule Indexer.Fetcher.UncleBlock do
       # * TokenBalance.async_fetch is not called because it uses block numbers from consensus, not uncles
 
       UncleBlock.async_fetch_blocks(block_second_degree_relations)
+      PendingTransactions.update_pending(imported[:transactions])
+      PendingTransactions.update_pending(imported[:fork_transactions])
 
-      ok
+      {:ok, imported}
     end
   end
 

From 156c6ca4551036ff42fc9c8df8cbea371f523a65 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Wed, 25 Sep 2019 13:36:50 +0300
Subject: [PATCH 07/28] do not update cache if no blocks were inserted

---
 apps/indexer/lib/indexer/block/fetcher.ex | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/indexer/lib/indexer/block/fetcher.ex b/apps/indexer/lib/indexer/block/fetcher.ex
index 1b95d84086..85b47cba6f 100644
--- a/apps/indexer/lib/indexer/block/fetcher.ex
+++ b/apps/indexer/lib/indexer/block/fetcher.ex
@@ -184,6 +184,8 @@ defmodule Indexer.Block.Fetcher do
     end
   end
 
+  defp update_block_cache([]), do: :ok
+
   defp update_block_cache(blocks) when is_list(blocks) do
     {min_block, max_block} = Enum.min_max_by(blocks, & &1.number)
 

From 3fa83faf2caeaaada3445d9b8257c80753ab3144 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Wed, 25 Sep 2019 13:39:09 +0300
Subject: [PATCH 08/28] add CHANGELOG entry

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6791e814b7..da3cf2b091 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 - [#2663](https://github.com/poanetwork/blockscout/pull/2663) - Fetch address counters in parallel
 
 ### Fixes
+- [#2736](https://github.com/poanetwork/blockscout/pull/2736) - do not update cache if no blocks were inserted
 - [#2718](https://github.com/poanetwork/blockscout/pull/2718) - Include all addresses taking part in transactions in wallets' addresses counter
 - [#2709](https://github.com/poanetwork/blockscout/pull/2709) - Fix stuck label and value for uncle block height
 - [#2707](https://github.com/poanetwork/blockscout/pull/2707) - fix for dashboard banner chart legend items

From 5665e514976cb4888c1d29223ec373f8b19413e1 Mon Sep 17 00:00:00 2001
From: Yegor San <egorgolovan89@gmail.com>
Date: Wed, 25 Sep 2019 14:30:40 +0300
Subject: [PATCH 09/28] Removed hardcoded subnetwork value.

---
 .../lib/block_scout_web/templates/layout/_topnav.html.eex       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex
index 0463d28a15..925028503c 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex
@@ -16,7 +16,7 @@
          <span class="nav-link-icon">
          <svg xmlns="http://www.w3.org/2000/svg" width="6" height="6">
          <circle cx="3" cy="3" r="3" fill="#80d6a1"></circle>
-         </svg> </span>Sokol Testnet</a>
+         </svg> </span><%= subnetwork_title() %></a>
      <button class="new-button" id="dark-mode-changer">
         <svg xmlns="http://www.w3.org/2000/svg" width="15" height="16">
             <path fill="#a3a9b5" fill-rule="evenodd" d="M14.88 11.578a.544.544 0 0 0-.599-.166 5.7 5.7 0 0 1-1.924.321c-3.259 0-5.91-2.632-5.91-5.866 0-1.947.968-3.759 2.59-4.849a.534.534 0 0 0-.225-.97A5.289 5.289 0 0 0 8.059 0C3.615 0 0 3.588 0 8s3.615 8 8.059 8c2.82 0 5.386-1.423 6.862-3.806a.533.533 0 0 0-.041-.616z"></path>

From ee42650222d2d1d9a0f3cfe22128e61a2af01e5d Mon Sep 17 00:00:00 2001
From: Yegor <egorgolovan89@gmail.com>
Date: Thu, 26 Sep 2019 12:10:26 +0300
Subject: [PATCH 10/28] Updated Changelog file

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a33cdb3856..561fe77229 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - [#2663](https://github.com/poanetwork/blockscout/pull/2663) - Fetch address counters in parallel
 
 ### Fixes
+- [#2737](https://github.com/poanetwork/blockscout/pull/2737) - switched hardcoded subnetwork value to elixir expression for mobile menu
 - [#2682](https://github.com/poanetwork/blockscout/pull/2682) - Use Task.start instead of Task.async in caches
 
 ### Chore

From 6b7e1ce2fe6e5537299542d2269bd04b23dd5a8d Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Thu, 26 Sep 2019 19:55:29 +0300
Subject: [PATCH 11/28] do not fail block `internal_transactions_indexed_at`
 field update

this runner updates internal_transactions_index_at field in blocks
table. but before this, it checks if these blocks are consensus, some
blocks may lose consensus.

we just shouldn't check if the number of updated records is exactly
equal to the number of records that we want to insert.
blocks that lost consensus will be re-fetched
---
 .../import/runner/internal_transactions_indexed_at_blocks.ex    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/explorer/lib/explorer/chain/import/runner/internal_transactions_indexed_at_blocks.ex b/apps/explorer/lib/explorer/chain/import/runner/internal_transactions_indexed_at_blocks.ex
index 2726670a30..4f82b67715 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/internal_transactions_indexed_at_blocks.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/internal_transactions_indexed_at_blocks.ex
@@ -68,7 +68,7 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactionsIndexedAtBlocks do
     block_count = Enum.count(block_numbers)
 
     try do
-      {^block_count, result} =
+      {_, result} =
         repo.update_all(
           from(b in Block, join: s in subquery(query), on: b.hash == s.hash),
           [set: [internal_transactions_indexed_at: timestamps.updated_at]],

From 69ad1408f77d81c666e522449fa358072e499bf5 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Thu, 26 Sep 2019 20:00:19 +0300
Subject: [PATCH 12/28] add CHANGELOG entry

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5d5a5f82a..eb34f671a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@
 - [#2671](https://github.com/poanetwork/blockscout/pull/2671) - fixed buttons color at smart contract section
 - [#2660](https://github.com/poanetwork/blockscout/pull/2660) - set correct last value for coin balances chart data
 - [#2619](https://github.com/poanetwork/blockscout/pull/2619) - Enforce DB transaction's order to prevent deadlocks
+- [#2738](https://github.com/poanetwork/blockscout/pull/2738) - do not fail block `internal_transactions_indexed_at` field update
 
 ### Chore
 - [#2724](https://github.com/poanetwork/blockscout/pull/2724) - fix ci by commenting a line in hackney library

From 2c8a6d6fa305363bdb315eb802bbe938a7d4b5e3 Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Thu, 26 Sep 2019 20:01:06 +0300
Subject: [PATCH 13/28] remove unused variable

---
 .../import/runner/internal_transactions_indexed_at_blocks.ex    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/explorer/lib/explorer/chain/import/runner/internal_transactions_indexed_at_blocks.ex b/apps/explorer/lib/explorer/chain/import/runner/internal_transactions_indexed_at_blocks.ex
index 4f82b67715..f2a3d482c8 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/internal_transactions_indexed_at_blocks.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/internal_transactions_indexed_at_blocks.ex
@@ -65,8 +65,6 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactionsIndexedAtBlocks do
         lock: "FOR UPDATE"
       )
 
-    block_count = Enum.count(block_numbers)
-
     try do
       {_, result} =
         repo.update_all(

From 480252140f70a7bb3b6377b698b12c3db010248c Mon Sep 17 00:00:00 2001
From: pasqu4le <pasqu4le@gmail.com>
Date: Mon, 23 Sep 2019 18:17:03 +0200
Subject: [PATCH 14/28] Remove internal_transaction block_number setting from
 blocks runner

Problem: Explorer's blocks runner is severely slowed down by doing two operation on internal transactions:
- populating their block_number field
- removing those in blocks that have lost consensus

Solution:
The field setting was introduced only to keep it correct in case of a reorg, but those internal_transactions do not pose this problem anymore because they are removed.
For this reason we can remove the block_number field setting and simplify the remaining removal operation
---
 CHANGELOG.md                                  |  1 +
 .../explorer/chain/import/runner/blocks.ex    | 68 ++++++-------------
 .../import/runner/internal_transactions.ex    | 53 +++++++--------
 3 files changed, 45 insertions(+), 77 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5d5a5f82a..a45836d031 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## Current
 
 ### Features
+- [#2726](https://github.com/poanetwork/blockscout/pull/2726) - Remove internal_transaction block_number setting from blocks runner
 - [#2717](https://github.com/poanetwork/blockscout/pull/2717) - Improve speed of nonconsensus data removal
 - [#2679](https://github.com/poanetwork/blockscout/pull/2679) - added fixed height for card chain blocks and card chain transactions
 - [#2678](https://github.com/poanetwork/blockscout/pull/2678) - fixed dashboard banner height bug
diff --git a/apps/explorer/lib/explorer/chain/import/runner/blocks.ex b/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
index 394e21cbaa..7f94d8668c 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
@@ -56,7 +56,7 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
       # Note, needs to be executed after `lose_consensus` for lock acquisition
       insert(repo, changes_list, insert_options)
     end)
-    |> Multi.run(:uncle_fetched_block_second_degree_relations, fn repo, %{blocks: blocks} when is_list(blocks) ->
+    |> Multi.run(:uncle_fetched_block_second_degree_relations, fn repo, _ ->
       update_block_second_degree_relations(repo, hashes, %{
         timeout:
           options[Runner.Block.SecondDegreeRelations.option_key()][:timeout] ||
@@ -86,15 +86,9 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
     |> Multi.run(:remove_nonconsensus_logs, fn repo, %{derive_transaction_forks: transactions} ->
       remove_nonconsensus_logs(repo, transactions, insert_options)
     end)
-    |> Multi.run(:acquire_internal_transactions, fn repo, %{derive_transaction_forks: transactions} ->
-      acquire_internal_transactions(repo, hashes, transactions)
-    end)
     |> Multi.run(:remove_nonconsensus_internal_transactions, fn repo, %{derive_transaction_forks: transactions} ->
       remove_nonconsensus_internal_transactions(repo, transactions, insert_options)
     end)
-    |> Multi.run(:internal_transaction_transaction_block_number, fn repo, _ ->
-      update_internal_transaction_block_number(repo, hashes)
-    end)
     |> Multi.run(:acquire_contract_address_tokens, fn repo, _ ->
       acquire_contract_address_tokens(repo, consensus_block_numbers)
     end)
@@ -139,26 +133,6 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
     Tokens.acquire_contract_address_tokens(repo, contract_address_hashes)
   end
 
-  defp acquire_internal_transactions(repo, hashes, forked_transaction_hashes) do
-    query =
-      from(internal_transaction in InternalTransaction,
-        join: transaction in Transaction,
-        on: internal_transaction.transaction_hash == transaction.hash,
-        where: transaction.block_hash in ^hashes,
-        or_where: transaction.hash in ^forked_transaction_hashes,
-        select: {internal_transaction.transaction_hash, internal_transaction.index},
-        # Enforce InternalTransaction ShareLocks order (see docs: sharelocks.md)
-        order_by: [
-          internal_transaction.transaction_hash,
-          internal_transaction.index
-        ],
-        # NOTE: find a better way to know the alias that ecto gives to token
-        lock: "FOR UPDATE OF i0"
-      )
-
-    {:ok, repo.all(query)}
-  end
-
   defp fork_transactions(%{
          repo: repo,
          timeout: timeout,
@@ -379,13 +353,27 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
 
   defp remove_nonconsensus_internal_transactions(repo, forked_transaction_hashes, %{timeout: timeout}) do
     query =
-      from(internal_transaction in InternalTransaction,
+      from(
+        internal_transaction in InternalTransaction,
         where: internal_transaction.transaction_hash in ^forked_transaction_hashes,
-        select: map(internal_transaction, [:transaction_hash, :index])
+        select: %{transaction_hash: internal_transaction.transaction_hash},
+        # Enforce InternalTransaction ShareLocks order (see docs: sharelocks.md)
+        order_by: [
+          internal_transaction.transaction_hash,
+          internal_transaction.index
+        ],
+        lock: "FOR UPDATE"
+      )
+
+    delete_query =
+      from(
+        i in InternalTransaction,
+        join: s in subquery(query),
+        on: i.transaction_hash == s.transaction_hash,
+        select: map(i, [:transaction_hash, :index])
       )
 
-    # ShareLocks order already enforced by `acquire_internal_transactions` (see docs: sharelocks.md)
-    {_count, deleted_internal_transactions} = repo.delete_all(query, timeout: timeout)
+    {_count, deleted_internal_transactions} = repo.delete_all(delete_query, timeout: timeout)
 
     {:ok, deleted_internal_transactions}
   rescue
@@ -645,24 +633,6 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
     end
   end
 
-  defp update_internal_transaction_block_number(repo, blocks_hashes) when is_list(blocks_hashes) do
-    query =
-      from(
-        internal_transaction in InternalTransaction,
-        join: transaction in Transaction,
-        on: internal_transaction.transaction_hash == transaction.hash,
-        join: block in Block,
-        on: block.hash == transaction.block_hash,
-        where: block.hash in ^blocks_hashes,
-        update: [set: [block_number: block.number]]
-      )
-
-    # ShareLocks order already enforced by `acquire_internal_transactions` (see docs: sharelocks.md)
-    {total, _} = repo.update_all(query, [])
-
-    {:ok, total}
-  end
-
   defp where_forked(blocks_changes) when is_list(blocks_changes) do
     initial = from(t in Transaction, where: false)
 
diff --git a/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex b/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex
index 93e3bdb6b5..67657d6542 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex
@@ -52,32 +52,36 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
     |> Multi.run(:acquire_transactions, fn repo, _ ->
       acquire_transactions(repo, changes_list)
     end)
-    |> Multi.run(:internal_transactions, fn repo, _ ->
-      insert(repo, changes_list, insert_options)
+    |> Multi.run(:internal_transactions, fn repo, %{acquire_transactions: transactions} ->
+      insert(repo, changes_list, transactions, insert_options)
     end)
-    |> Multi.run(:internal_transactions_indexed_at_transactions, fn repo, %{acquire_transactions: transaction_hashes} ->
-      update_transactions(repo, transaction_hashes, update_transactions_options)
+    |> Multi.run(:internal_transactions_indexed_at_transactions, fn repo, %{acquire_transactions: transactions} ->
+      update_transactions(repo, transactions, update_transactions_options)
     end)
   end
 
   @impl Runner
   def timeout, do: @timeout
 
-  @spec insert(Repo.t(), [map], %{
+  @spec insert(Repo.t(), [map], [Transaction.t()], %{
           optional(:on_conflict) => Runner.on_conflict(),
           required(:timeout) => timeout,
           required(:timestamps) => Import.timestamps()
         }) ::
           {:ok, [%{index: non_neg_integer, transaction_hash: Hash.t()}]}
           | {:error, [Changeset.t()]}
-  defp insert(repo, changes_list, %{timeout: timeout, timestamps: timestamps} = options)
+  defp insert(repo, changes_list, transactions, %{timeout: timeout, timestamps: timestamps} = options)
        when is_list(changes_list) do
     on_conflict = Map.get_lazy(options, :on_conflict, &default_on_conflict/0)
 
+    transactions_map = Map.new(transactions, &{&1.hash, &1})
+
     # Enforce InternalTransaction ShareLocks order (see docs: sharelocks.md)
     ordered_changes_list = Enum.sort_by(changes_list, &{&1.transaction_hash, &1.index})
 
-    final_changes_list = reject_pending_transactions(ordered_changes_list, repo)
+    final_changes_list =
+      ordered_changes_list
+      |> reject_pending_transactions(transactions_map)
 
     {:ok, internal_transactions} =
       Import.insert_changes_list(
@@ -158,8 +162,7 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
       from(
         t in Transaction,
         where: t.hash in ^transaction_hashes,
-        where: not is_nil(t.block_hash),
-        select: t.hash,
+        select: map(t, [:hash, :block_hash, :block_number]),
         # Enforce Transaction ShareLocks order (see docs: sharelocks.md)
         order_by: t.hash,
         lock: "FOR UPDATE"
@@ -170,15 +173,19 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
     {:ok, hashes}
   end
 
-  defp update_transactions(repo, transaction_hashes, %{
+  defp update_transactions(repo, transactions, %{
          timeout: timeout,
          timestamps: timestamps
        })
-       when is_list(transaction_hashes) do
+       when is_list(transactions) do
+    transaction_hashes = Enum.map(transactions, & &1.hash)
+
     update_query =
       from(
         t in Transaction,
         where: t.hash in ^transaction_hashes,
+        # do not try to update pending transactions
+        where: not is_nil(t.block_hash),
         # ShareLocks order already enforced by `acquire_transactions` (see docs: sharelocks.md)
         update: [
           set: [
@@ -214,22 +221,12 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
     end
   end
 
-  defp reject_pending_transactions(ordered_changes_list, repo) do
-    transaction_hashes =
-      ordered_changes_list
-      |> Enum.map(& &1.transaction_hash)
-      |> Enum.dedup()
-
-    query =
-      from(t in Transaction,
-        where: t.hash in ^transaction_hashes,
-        where: is_nil(t.block_hash),
-        select: t.hash
-      )
-
-    pending_transactions = repo.all(query)
-
-    ordered_changes_list
-    |> Enum.reject(fn %{transaction_hash: hash} -> Enum.member?(pending_transactions, hash) end)
+  defp reject_pending_transactions(ordered_changes_list, transactions_map) do
+    Enum.reject(ordered_changes_list, fn %{transaction_hash: hash} ->
+      transactions_map
+      |> Map.fetch!(hash)
+      |> Map.get(:block_hash)
+      |> is_nil()
+    end)
   end
 end

From b244789492fddf60157a21d58eb17b9c26d154f4 Mon Sep 17 00:00:00 2001
From: YegorSan <egorgolovan89@gmail.com>
Date: Mon, 30 Sep 2019 10:31:55 +0300
Subject: [PATCH 15/28] Fixed menu hovers in dark mode desktop view

---
 .tool-versions                                |  4 +-
 .../assets/css/theme/_dark-theme.scss         | 42 ++++++++++---------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/.tool-versions b/.tool-versions
index 785ba751f8..a5c42939bf 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,3 +1,3 @@
-elixir 1.9.1-otp-22
-erlang 22.0
+elixir 1.9.0
+erlang 21.0
 nodejs 10.11.0
diff --git a/apps/block_scout_web/assets/css/theme/_dark-theme.scss b/apps/block_scout_web/assets/css/theme/_dark-theme.scss
index bd4a97aa11..b3d902d1c0 100644
--- a/apps/block_scout_web/assets/css/theme/_dark-theme.scss
+++ b/apps/block_scout_web/assets/css/theme/_dark-theme.scss
@@ -804,23 +804,25 @@ $labels-dark: #8a8dba; // header nav, labels
     color: $dark-primary;
     position: relative;
 }
-.dark-theme-applied .navbar.navbar-primary .navbar-nav .nav-link:hover,
-.dark-theme-applied .navbar.navbar-primary .navbar-nav .nav-link.activeLink,
-.dark-theme-applied .navbar.navbar-primary .navbar-nav .nav-link:focus {
-	background-image: none;
-    width: 100%;
-	background-color: #35335d!important;
-	color: white;
-	border: none;
-  }
-  .dark-theme-applied .navbar.navbar-primary .navbar-nav .nav-link:hover:before
-   {
-	content: "|";
-    height: 50px;
-    width: 50%;
-    opacity: 1;
-    background: none;
-    left: 24%;
-    top: 14%;
-	color: $dark-primary;
-	}
\ No newline at end of file
+@media (max-width: 991.98px) {
+	.dark-theme-applied .navbar.navbar-primary .navbar-nav .nav-link:hover,
+	.dark-theme-applied .navbar.navbar-primary .navbar-nav .nav-link.activeLink,
+	.dark-theme-applied .navbar.navbar-primary .navbar-nav .nav-link:focus {
+		background-image: none;
+		width: 100%;
+		background-color: #35335d!important;
+		color: white;
+		border: none;
+	  }
+	  .dark-theme-applied .navbar.navbar-primary .navbar-nav .nav-link:hover:before
+	   {
+		content: "|";
+		height: 50px;
+		width: 50%;
+		opacity: 1;
+		background: none;
+		left: 24%;
+		top: 14%;
+		color: $dark-primary;
+		}
+		}
\ No newline at end of file

From 2256208ff6eef6816a3745ad7b59705545876860 Mon Sep 17 00:00:00 2001
From: YegorSan <egorgolovan89@gmail.com>
Date: Mon, 30 Sep 2019 10:48:47 +0300
Subject: [PATCH 16/28] Updated Changelog.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5d5a5f82a..28ed60d253 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@
 - [#2663](https://github.com/poanetwork/blockscout/pull/2663) - Fetch address counters in parallel
 
 ### Fixes
+- [#2742](https://github.com/poanetwork/blockscout/pull/2742) -
+fixed menu hovers in dark mode desktop view
 - [#2737](https://github.com/poanetwork/blockscout/pull/2737) - switched hardcoded subnetwork value to elixir expression for mobile menu
 - [#2736](https://github.com/poanetwork/blockscout/pull/2736) - do not update cache if no blocks were inserted
 - [#2731](https://github.com/poanetwork/blockscout/pull/2731) - fix library verification

From e427568c94820ec58d26846f146bd2d500a82c84 Mon Sep 17 00:00:00 2001
From: Yegor <egorgolovan89@gmail.com>
Date: Mon, 30 Sep 2019 13:22:27 +0300
Subject: [PATCH 17/28] Update .tool-versions

---
 .tool-versions | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.tool-versions b/.tool-versions
index a5c42939bf..785ba751f8 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,3 +1,3 @@
-elixir 1.9.0
-erlang 21.0
+elixir 1.9.1-otp-22
+erlang 22.0
 nodejs 10.11.0

From 50ad94f47b1046dbc5282f31348fa2f26df1c405 Mon Sep 17 00:00:00 2001
From: pasqu4le <pasqu4le@gmail.com>
Date: Wed, 25 Sep 2019 20:18:59 +0200
Subject: [PATCH 18/28] Avoid internal_transactions import retries on blocks
 without valid transactions

Problem: for some block numbers we fetch and receive internal transactions, but in the database the transactions they are part of either do not exist for that block or are pending.
This causes a foreign key error and an endless cycle of import retries.

Solution: instead of failing we remove consensus for such problematic blocks, so that they can be refetched with the correct transactions.
---
 .../import/runner/internal_transactions.ex    | 80 ++++++++++++++-----
 ...internal_transactions_indexed_at_blocks.ex |  2 +-
 .../runner/internal_transactions_test.exs     | 74 ++++++++++++++++-
 3 files changed, 133 insertions(+), 23 deletions(-)

diff --git a/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex b/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex
index 67657d6542..b4704d382b 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/internal_transactions.ex
@@ -4,9 +4,10 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
   """
 
   require Ecto.Query
+  require Logger
 
   alias Ecto.{Changeset, Multi, Repo}
-  alias Explorer.Chain.{Hash, Import, InternalTransaction, Transaction}
+  alias Explorer.Chain.{Block, Hash, Import, InternalTransaction, Transaction}
   alias Explorer.Chain.Import.Runner
 
   import Ecto.Query, only: [from: 2]
@@ -58,6 +59,14 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
     |> Multi.run(:internal_transactions_indexed_at_transactions, fn repo, %{acquire_transactions: transactions} ->
       update_transactions(repo, transactions, update_transactions_options)
     end)
+    |> Multi.run(
+      :remove_consensus_of_missing_transactions_blocks,
+      fn repo, %{internal_transactions: inserted} = results_map ->
+        # NOTE: for this to work it has to follow the runner `internal_transactions_indexed_at_blocks`
+        block_hashes = Map.get(results_map, :internal_transactions_indexed_at_blocks, [])
+        remove_consensus_of_missing_transactions_blocks(repo, block_hashes, changes_list, inserted)
+      end
+    )
   end
 
   @impl Runner
@@ -76,12 +85,11 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
 
     transactions_map = Map.new(transactions, &{&1.hash, &1})
 
-    # Enforce InternalTransaction ShareLocks order (see docs: sharelocks.md)
-    ordered_changes_list = Enum.sort_by(changes_list, &{&1.transaction_hash, &1.index})
-
     final_changes_list =
-      ordered_changes_list
-      |> reject_pending_transactions(transactions_map)
+      changes_list
+      # Enforce InternalTransaction ShareLocks order (see docs: sharelocks.md)
+      |> Enum.sort_by(&{&1.transaction_hash, &1.index})
+      |> reject_missing_transactions(transactions_map)
 
     {:ok, internal_transactions} =
       Import.insert_changes_list(
@@ -90,16 +98,12 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
         conflict_target: [:transaction_hash, :index],
         for: InternalTransaction,
         on_conflict: on_conflict,
-        returning: [:transaction_hash, :index],
+        returning: true,
         timeout: timeout,
         timestamps: timestamps
       )
 
-    {:ok,
-     for(
-       internal_transaction <- internal_transactions,
-       do: Map.take(internal_transaction, [:id, :index, :transaction_hash])
-     )}
+    {:ok, internal_transactions}
   end
 
   defp default_on_conflict do
@@ -162,15 +166,15 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
       from(
         t in Transaction,
         where: t.hash in ^transaction_hashes,
+        # do not consider pending transactions
+        where: not is_nil(t.block_hash),
         select: map(t, [:hash, :block_hash, :block_number]),
         # Enforce Transaction ShareLocks order (see docs: sharelocks.md)
         order_by: t.hash,
         lock: "FOR UPDATE"
       )
 
-    hashes = repo.all(query)
-
-    {:ok, hashes}
+    {:ok, repo.all(query)}
   end
 
   defp update_transactions(repo, transactions, %{
@@ -183,9 +187,8 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
     update_query =
       from(
         t in Transaction,
+        # pending transactions are already excluded by `acquire_transactions`
         where: t.hash in ^transaction_hashes,
-        # do not try to update pending transactions
-        where: not is_nil(t.block_hash),
         # ShareLocks order already enforced by `acquire_transactions` (see docs: sharelocks.md)
         update: [
           set: [
@@ -221,10 +224,49 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactions do
     end
   end
 
-  defp reject_pending_transactions(ordered_changes_list, transactions_map) do
+  # If not using Parity this is not relevant
+  defp remove_consensus_of_missing_transactions_blocks(_, [], _, _), do: {:ok, []}
+
+  defp remove_consensus_of_missing_transactions_blocks(repo, block_hashes, changes_list, inserted) do
+    inserted_block_numbers = MapSet.new(inserted, & &1.block_number)
+
+    missing_transactions_block_numbers =
+      changes_list
+      |> MapSet.new(& &1.block_number)
+      |> MapSet.difference(inserted_block_numbers)
+      |> MapSet.to_list()
+
+    update_query =
+      from(
+        b in Block,
+        where: b.number in ^missing_transactions_block_numbers,
+        where: b.hash in ^block_hashes,
+        # ShareLocks order already enforced by `internal_transactions_indexed_at_blocks` (see docs: sharelocks.md)
+        update: [set: [consensus: false, internal_transactions_indexed_at: nil]]
+      )
+
+    try do
+      {_num, result} = repo.update_all(update_query, [])
+
+      Logger.debug(fn ->
+        [
+          "consensus removed from blocks with numbers: ",
+          inspect(missing_transactions_block_numbers),
+          " because of missing transactions"
+        ]
+      end)
+
+      {:ok, result}
+    rescue
+      postgrex_error in Postgrex.Error ->
+        {:error, %{exception: postgrex_error, missing_transactions_block_numbers: missing_transactions_block_numbers}}
+    end
+  end
+
+  defp reject_missing_transactions(ordered_changes_list, transactions_map) do
     Enum.reject(ordered_changes_list, fn %{transaction_hash: hash} ->
       transactions_map
-      |> Map.fetch!(hash)
+      |> Map.get(hash, %{})
       |> Map.get(:block_hash)
       |> is_nil()
     end)
diff --git a/apps/explorer/lib/explorer/chain/import/runner/internal_transactions_indexed_at_blocks.ex b/apps/explorer/lib/explorer/chain/import/runner/internal_transactions_indexed_at_blocks.ex
index 2726670a30..07008e0b72 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/internal_transactions_indexed_at_blocks.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/internal_transactions_indexed_at_blocks.ex
@@ -70,7 +70,7 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactionsIndexedAtBlocks do
     try do
       {^block_count, result} =
         repo.update_all(
-          from(b in Block, join: s in subquery(query), on: b.hash == s.hash),
+          from(b in Block, join: s in subquery(query), on: b.hash == s.hash, select: b.hash),
           [set: [internal_transactions_indexed_at: timestamps.updated_at]],
           timeout: timeout
         )
diff --git a/apps/explorer/test/explorer/chain/import/runner/internal_transactions_test.exs b/apps/explorer/test/explorer/chain/import/runner/internal_transactions_test.exs
index 66d62ae940..700106ffb5 100644
--- a/apps/explorer/test/explorer/chain/import/runner/internal_transactions_test.exs
+++ b/apps/explorer/test/explorer/chain/import/runner/internal_transactions_test.exs
@@ -2,7 +2,7 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactionsTest do
   use Explorer.DataCase
 
   alias Ecto.Multi
-  alias Explorer.Chain.{Data, Wei, Transaction, InternalTransaction}
+  alias Explorer.Chain.{Block, Data, Wei, Transaction, InternalTransaction}
   alias Explorer.Chain.Import.Runner.InternalTransactions
 
   describe "run/1" do
@@ -42,10 +42,78 @@ defmodule Explorer.Chain.Import.Runner.InternalTransactionsTest do
 
       assert is_nil(Repo.get(Transaction, pending.hash).block_hash)
     end
+
+    test "removes consensus to blocks where transactions are missing" do
+      empty_block = insert(:block)
+      pending = insert(:transaction)
+
+      assert is_nil(pending.block_hash)
+
+      full_block = insert(:block)
+      inserted = insert(:transaction) |> with_block(full_block)
+
+      assert full_block.hash == inserted.block_hash
+
+      index = 0
+
+      pending_transaction_changes =
+        pending.hash
+        |> make_internal_transaction_changes(index, nil)
+        |> Map.put(:block_number, empty_block.number)
+
+      transaction_changes =
+        inserted.hash
+        |> make_internal_transaction_changes(index, nil)
+        |> Map.put(:block_number, full_block.number)
+
+      multi =
+        Multi.new()
+        |> Multi.run(:internal_transactions_indexed_at_blocks, fn _, _ -> {:ok, [empty_block.hash, full_block.hash]} end)
+
+      assert {:ok, _} = run_internal_transactions([pending_transaction_changes, transaction_changes], multi)
+
+      assert from(i in InternalTransaction, where: i.transaction_hash == ^pending.hash) |> Repo.one() |> is_nil()
+
+      assert %{consensus: false} = Repo.get(Block, empty_block.hash)
+
+      assert from(i in InternalTransaction, where: i.transaction_hash == ^inserted.hash) |> Repo.one() |> is_nil() ==
+               false
+
+      assert %{consensus: true} = Repo.get(Block, full_block.hash)
+    end
+
+    test "does not remove consensus when block is empty and no transactions are missing" do
+      empty_block = insert(:block)
+
+      full_block = insert(:block)
+      inserted = insert(:transaction) |> with_block(full_block)
+
+      assert full_block.hash == inserted.block_hash
+
+      index = 0
+
+      transaction_changes =
+        inserted.hash
+        |> make_internal_transaction_changes(index, nil)
+        |> Map.put(:block_number, full_block.number)
+
+      multi =
+        Multi.new()
+        |> Multi.run(:internal_transactions_indexed_at_blocks, fn _, _ -> {:ok, [empty_block.hash, full_block.hash]} end)
+
+      assert {:ok, _} = run_internal_transactions([transaction_changes], multi)
+
+      assert %{consensus: true} = Repo.get(Block, empty_block.hash)
+
+      assert from(i in InternalTransaction, where: i.transaction_hash == ^inserted.hash) |> Repo.one() |> is_nil() ==
+               false
+
+      assert %{consensus: true} = Repo.get(Block, full_block.hash)
+    end
   end
 
-  defp run_internal_transactions(changes_list) when is_list(changes_list) do
-    Multi.new()
+  defp run_internal_transactions(changes_list, multi \\ Multi.new()) when is_list(changes_list) do
+    multi
     |> InternalTransactions.run(changes_list, %{
       timeout: :infinity,
       timestamps: %{inserted_at: DateTime.utc_now(), updated_at: DateTime.utc_now()}

From 41fdb67cc5d10404183181036ea040fcac03776d Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Tue, 1 Oct 2019 10:24:28 +0300
Subject: [PATCH 19/28] optimize addresses page

the longest part of addreses page loading was fetching validation
count for every address.

addresses are loaded from cache. it takes less than a second but
fetching validation count takes more than 5 seconds.

Moreover, validation_count is not used.
---
 .../lib/block_scout_web/controllers/address_controller.ex    | 3 +--
 .../lib/block_scout_web/templates/address/_tile.html.eex     | 5 -----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_controller.ex
index e2cb1f6db7..d91552229a 100644
--- a/apps/block_scout_web/lib/block_scout_web/controllers/address_controller.ex
+++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_controller.ex
@@ -44,8 +44,7 @@ defmodule BlockScoutWeb.AddressController do
           index: index,
           exchange_rate: exchange_rate,
           total_supply: total_supply,
-          tx_count: tx_count,
-          validation_count: validation_count(address.hash)
+          tx_count: tx_count
         )
       end)
 
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 56f1a2bbb2..4945dca50c 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
@@ -29,11 +29,6 @@
       <span data-test="transaction_count">
         <%= @tx_count %>
       </span> <%= gettext "Transactions sent" %>
-      <% if validator?(@address) do %>
-        <span data-test="validation_count">
-          <%= @validation_count %>
-        </span> <%= gettext "Validations" %>
-      <% end %>
     </span>
   </td>
 </tr>

From a2929c4bc483354c17a2167368d1f387730389af Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Tue, 1 Oct 2019 10:29:27 +0300
Subject: [PATCH 20/28] add CHANGELOG entry

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb34f671a9..aa86164e89 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 - [#2663](https://github.com/poanetwork/blockscout/pull/2663) - Fetch address counters in parallel
 
 ### Fixes
+- [#2745](https://github.com/poanetwork/blockscout/pull/2745) - optimize addresses page
 - [#2737](https://github.com/poanetwork/blockscout/pull/2737) - switched hardcoded subnetwork value to elixir expression for mobile menu
 - [#2736](https://github.com/poanetwork/blockscout/pull/2736) - do not update cache if no blocks were inserted
 - [#2731](https://github.com/poanetwork/blockscout/pull/2731) - fix library verification

From c0221a98a42ebd474e42cc7e11bca668ca8c806d Mon Sep 17 00:00:00 2001
From: Ayrat Badykov <ayratin555@gmail.com>
Date: Tue, 1 Oct 2019 10:30:22 +0300
Subject: [PATCH 21/28] fix gettext

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

diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index 4d6f2cc136..8febd38487 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -1676,11 +1676,6 @@ msgstr ""
 msgid "Validated Transactions"
 msgstr ""
 
-#, elixir-format
-#: lib/block_scout_web/templates/address/_tile.html.eex:35
-msgid "Validations"
-msgstr ""
-
 #, elixir-format
 #: lib/block_scout_web/templates/address/_validator_metadata_modal.html.eex:30
 msgid "Validator Creation Date"
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 4d6f2cc136..8febd38487 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
@@ -1676,11 +1676,6 @@ msgstr ""
 msgid "Validated Transactions"
 msgstr ""
 
-#, elixir-format
-#: lib/block_scout_web/templates/address/_tile.html.eex:35
-msgid "Validations"
-msgstr ""
-
 #, elixir-format
 #: lib/block_scout_web/templates/address/_validator_metadata_modal.html.eex:30
 msgid "Validator Creation Date"

From 1a1905631d73df17bf5e56d94245b9419a37207d Mon Sep 17 00:00:00 2001
From: YegorSan <egorgolovan89@gmail.com>
Date: Tue, 1 Oct 2019 12:10:48 +0300
Subject: [PATCH 22/28] Deleted :before for menu links on desktop view

---
 .../assets/css/theme/_dark-theme.scss         | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/block_scout_web/assets/css/theme/_dark-theme.scss b/apps/block_scout_web/assets/css/theme/_dark-theme.scss
index b3d902d1c0..a17bfb64b9 100644
--- a/apps/block_scout_web/assets/css/theme/_dark-theme.scss
+++ b/apps/block_scout_web/assets/css/theme/_dark-theme.scss
@@ -793,16 +793,6 @@ $labels-dark: #8a8dba; // header nav, labels
     background-image: none;
     width: 100%;
     background-color: #35335d!important;
-}
- .dark-theme-applied .dropdown-item:hover:before {
-	content: "|";
-    height: 50px;
-    width: 50%;
-    opacity: 1;
-    background: none;
-    right: 17%;
-    color: $dark-primary;
-    position: relative;
 }
 @media (max-width: 991.98px) {
 	.dark-theme-applied .navbar.navbar-primary .navbar-nav .nav-link:hover,
@@ -814,6 +804,16 @@ $labels-dark: #8a8dba; // header nav, labels
 		color: white;
 		border: none;
 	  }
+	  .dark-theme-applied .dropdown-item:hover:before {
+		content: "|";
+		height: 50px;
+		width: 50%;
+		opacity: 1;
+		background: none;
+		right: 17%;
+		color: $dark-primary;
+		position: relative;
+	}
 	  .dark-theme-applied .navbar.navbar-primary .navbar-nav .nav-link:hover:before
 	   {
 		content: "|";

From 69b3c29d4dc3f06ddc7d840613f1d4d9e4217946 Mon Sep 17 00:00:00 2001
From: YegorSan <egorgolovan89@gmail.com>
Date: Tue, 1 Oct 2019 14:25:29 +0300
Subject: [PATCH 23/28] fixed address alignment in logs decoded view

---
 .../assets/css/components/_address-overview.scss              | 4 ++++
 .../lib/block_scout_web/templates/address_logs/_logs.html.eex | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/block_scout_web/assets/css/components/_address-overview.scss b/apps/block_scout_web/assets/css/components/_address-overview.scss
index a936aec99f..b2a118db64 100644
--- a/apps/block_scout_web/assets/css/components/_address-overview.scss
+++ b/apps/block_scout_web/assets/css/components/_address-overview.scss
@@ -79,4 +79,8 @@
   &:last-child {
     margin-bottom: 0;
   }
+}
+
+.logs-decoded {
+  line-height: 25px;
 }
\ No newline at end of file
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_logs/_logs.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_logs/_logs.html.eex
index 92a8ebc6cc..945049ace6 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/address_logs/_logs.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/address_logs/_logs.html.eex
@@ -17,7 +17,7 @@
   <dl class="row">
     <dt class="col-md-2"> <%= gettext "Transaction" %> </dt>
     <dd class="col-md-10">
-      <h3 class="">
+      <h3 class="logs-decoded">
         <%= link(
             @log.transaction,
             to: transaction_path(@conn, :show, @log.transaction),

From f8cbc9e1ba6846746e720f940be9dc673078e212 Mon Sep 17 00:00:00 2001
From: YegorSan <egorgolovan89@gmail.com>
Date: Tue, 1 Oct 2019 14:47:12 +0300
Subject: [PATCH 24/28] updated changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5d5a5f82a..ead369a17f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 - [#2663](https://github.com/poanetwork/blockscout/pull/2663) - Fetch address counters in parallel
 
 ### Fixes
+- [#2746](https://github.com/poanetwork/blockscout/pull/2746) - fixed wrong alignment in logs decoded view
 - [#2737](https://github.com/poanetwork/blockscout/pull/2737) - switched hardcoded subnetwork value to elixir expression for mobile menu
 - [#2736](https://github.com/poanetwork/blockscout/pull/2736) - do not update cache if no blocks were inserted
 - [#2731](https://github.com/poanetwork/blockscout/pull/2731) - fix library verification

From b0ad71037f6157b7445bbb071ed6e2151d311b54 Mon Sep 17 00:00:00 2001
From: YegorSan <egorgolovan89@gmail.com>
Date: Wed, 2 Oct 2019 10:41:18 +0300
Subject: [PATCH 25/28] Changed menu item desktop hover color

---
 apps/block_scout_web/assets/css/theme/_dark-theme.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/block_scout_web/assets/css/theme/_dark-theme.scss b/apps/block_scout_web/assets/css/theme/_dark-theme.scss
index a17bfb64b9..a7de393d89 100644
--- a/apps/block_scout_web/assets/css/theme/_dark-theme.scss
+++ b/apps/block_scout_web/assets/css/theme/_dark-theme.scss
@@ -792,7 +792,7 @@ $labels-dark: #8a8dba; // header nav, labels
 .dark-theme-applied .dropdown-item.active, .dark-theme-applied .dropdown-item:hover, .dark-theme-applied .dropdown-item:focus {
     background-image: none;
     width: 100%;
-    background-color: #35335d!important;
+    background-color: #3f426c!important;
 }
 @media (max-width: 991.98px) {
 	.dark-theme-applied .navbar.navbar-primary .navbar-nav .nav-link:hover,

From d2dcaf83ac8b88f26b4e598872f95ed414e62790 Mon Sep 17 00:00:00 2001
From: YegorSan <egorgolovan89@gmail.com>
Date: Wed, 2 Oct 2019 11:08:44 +0300
Subject: [PATCH 26/28] Update for logs decoded view

---
 .../assets/css/components/_address-overview.scss                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/block_scout_web/assets/css/components/_address-overview.scss b/apps/block_scout_web/assets/css/components/_address-overview.scss
index b2a118db64..f758e4affc 100644
--- a/apps/block_scout_web/assets/css/components/_address-overview.scss
+++ b/apps/block_scout_web/assets/css/components/_address-overview.scss
@@ -82,5 +82,5 @@
 }
 
 .logs-decoded {
-  line-height: 25px;
+  line-height: 25px!important;
 }
\ No newline at end of file

From c83c0d39c749de865623546e16f1284928a9e761 Mon Sep 17 00:00:00 2001
From: pasqu4le <pasqu4le@gmail.com>
Date: Tue, 24 Sep 2019 16:48:57 +0200
Subject: [PATCH 27/28] Add cache for first page of uncles

---
 CHANGELOG.md                                  |  1 +
 .../controllers/block_controller_test.exs     |  2 +
 .../controllers/chain_controller_test.exs     |  2 +
 apps/explorer/config/config.exs               |  4 ++
 apps/explorer/lib/explorer/application.ex     |  6 ++-
 apps/explorer/lib/explorer/chain.ex           | 48 ++++++++++++++-----
 .../lib/explorer/chain/cache/uncles.ex        | 48 +++++++++++++++++++
 .../explorer/chain/import/runner/blocks.ex    |  3 +-
 .../test/explorer/chain/cache/uncles_test.exs | 28 +++++++++++
 apps/indexer/lib/indexer/block/fetcher.ex     |  7 ++-
 .../lib/indexer/fetcher/uncle_block.ex        |  3 +-
 .../indexer/temporary/uncles_without_index.ex |  2 +
 12 files changed, 137 insertions(+), 17 deletions(-)
 create mode 100644 apps/explorer/lib/explorer/chain/cache/uncles.ex
 create mode 100644 apps/explorer/test/explorer/chain/cache/uncles_test.exs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6dda8910b3..77e7873840 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## Current
 
 ### Features
+- [#2733](https://github.com/poanetwork/blockscout/pull/2733) - Add cache for first page of uncles
 - [#2735](https://github.com/poanetwork/blockscout/pull/2735) - Add pending transactions cache
 - [#2726](https://github.com/poanetwork/blockscout/pull/2726) - Remove internal_transaction block_number setting from blocks runner
 - [#2717](https://github.com/poanetwork/blockscout/pull/2717) - Improve speed of nonconsensus data removal
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/block_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/block_controller_test.exs
index 6c0bfabfa0..a467c7c73c 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/block_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/block_controller_test.exs
@@ -5,6 +5,8 @@ defmodule BlockScoutWeb.BlockControllerTest do
   setup do
     Supervisor.terminate_child(Explorer.Supervisor, Explorer.Chain.Cache.Blocks.child_id())
     Supervisor.restart_child(Explorer.Supervisor, Explorer.Chain.Cache.Blocks.child_id())
+    Supervisor.terminate_child(Explorer.Supervisor, Explorer.Chain.Cache.Uncles.child_id())
+    Supervisor.restart_child(Explorer.Supervisor, Explorer.Chain.Cache.Uncles.child_id())
 
     :ok
   end
diff --git a/apps/block_scout_web/test/block_scout_web/controllers/chain_controller_test.exs b/apps/block_scout_web/test/block_scout_web/controllers/chain_controller_test.exs
index def232741c..93777e16e3 100644
--- a/apps/block_scout_web/test/block_scout_web/controllers/chain_controller_test.exs
+++ b/apps/block_scout_web/test/block_scout_web/controllers/chain_controller_test.exs
@@ -11,6 +11,8 @@ defmodule BlockScoutWeb.ChainControllerTest do
   setup do
     Supervisor.terminate_child(Explorer.Supervisor, Explorer.Chain.Cache.Blocks.child_id())
     Supervisor.restart_child(Explorer.Supervisor, Explorer.Chain.Cache.Blocks.child_id())
+    Supervisor.terminate_child(Explorer.Supervisor, Explorer.Chain.Cache.Uncles.child_id())
+    Supervisor.restart_child(Explorer.Supervisor, Explorer.Chain.Cache.Uncles.child_id())
     start_supervised!(AddressesCounter)
     AddressesCounter.consolidate()
 
diff --git a/apps/explorer/config/config.exs b/apps/explorer/config/config.exs
index 1d4fbc6204..7e17c086b0 100644
--- a/apps/explorer/config/config.exs
+++ b/apps/explorer/config/config.exs
@@ -149,6 +149,10 @@ config :explorer, Explorer.Chain.Cache.PendingTransactions,
   ttl_check_interval: if(System.get_env("DISABLE_INDEXER") == "true", do: :timer.seconds(1), else: false),
   global_ttl: if(System.get_env("DISABLE_INDEXER") == "true", do: :timer.seconds(5))
 
+config :explorer, Explorer.Chain.Cache.Uncles,
+  ttl_check_interval: if(System.get_env("DISABLE_INDEXER") == "true", do: :timer.seconds(1), else: false),
+  global_ttl: if(System.get_env("DISABLE_INDEXER") == "true", do: :timer.seconds(5))
+
 # 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/application.ex b/apps/explorer/lib/explorer/application.ex
index 9a8dff98d0..f903f4ad17 100644
--- a/apps/explorer/lib/explorer/application.ex
+++ b/apps/explorer/lib/explorer/application.ex
@@ -15,7 +15,8 @@ defmodule Explorer.Application do
     NetVersion,
     PendingTransactions,
     TransactionCount,
-    Transactions
+    Transactions,
+    Uncles
   }
 
   alias Explorer.Chain.Supply.RSK
@@ -53,7 +54,8 @@ defmodule Explorer.Application do
       con_cache_child_spec(RSK.cache_name(), ttl_check_interval: :timer.minutes(1), global_ttl: :timer.minutes(30)),
       Transactions,
       Accounts,
-      PendingTransactions
+      PendingTransactions,
+      Uncles
     ]
 
     children = base_children ++ configurable_children()
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 81f6061da5..01e71b7297 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -55,7 +55,8 @@ defmodule Explorer.Chain do
     Blocks,
     PendingTransactions,
     TransactionCount,
-    Transactions
+    Transactions,
+    Uncles
   }
 
   alias Explorer.Chain.Import.Runner
@@ -1344,20 +1345,43 @@ defmodule Explorer.Chain do
     paging_options = Keyword.get(options, :paging_options) || @default_paging_options
     block_type = Keyword.get(options, :block_type, "Block")
 
-    if block_type == "Block" && !paging_options.key do
-      case Blocks.take_enough(paging_options.page_size) do
-        nil ->
-          elements = fetch_blocks(block_type, paging_options, necessity_by_association)
+    cond do
+      block_type == "Block" && !paging_options.key ->
+        block_from_cache(block_type, paging_options, necessity_by_association)
 
-          Blocks.update(elements)
+      block_type == "Uncle" && !paging_options.key ->
+        uncles_from_cache(block_type, paging_options, necessity_by_association)
 
-          elements
+      true ->
+        fetch_blocks(block_type, paging_options, necessity_by_association)
+    end
+  end
 
-        blocks ->
-          blocks
-      end
-    else
-      fetch_blocks(block_type, paging_options, necessity_by_association)
+  defp block_from_cache(block_type, paging_options, necessity_by_association) do
+    case Blocks.take_enough(paging_options.page_size) do
+      nil ->
+        elements = fetch_blocks(block_type, paging_options, necessity_by_association)
+
+        Blocks.update(elements)
+
+        elements
+
+      blocks ->
+        blocks
+    end
+  end
+
+  def uncles_from_cache(block_type, paging_options, necessity_by_association) do
+    case Uncles.take_enough(paging_options.page_size) do
+      nil ->
+        elements = fetch_blocks(block_type, paging_options, necessity_by_association)
+
+        Uncles.update(elements)
+
+        elements
+
+      blocks ->
+        blocks
     end
   end
 
diff --git a/apps/explorer/lib/explorer/chain/cache/uncles.ex b/apps/explorer/lib/explorer/chain/cache/uncles.ex
new file mode 100644
index 0000000000..9afe0bf71b
--- /dev/null
+++ b/apps/explorer/lib/explorer/chain/cache/uncles.ex
@@ -0,0 +1,48 @@
+defmodule Explorer.Chain.Cache.Uncles do
+  @moduledoc """
+  Caches the last known uncles
+  """
+
+  alias Explorer.Chain.Block
+  alias Explorer.Repo
+
+  use Explorer.Chain.OrderedCache,
+    name: :uncles,
+    max_size: 60,
+    ids_list_key: "uncle_numbers",
+    preload: :transactions,
+    preload: [miner: :names],
+    preload: :rewards,
+    preload: :nephews,
+    ttl_check_interval: Application.get_env(:explorer, __MODULE__)[:ttl_check_interval],
+    global_ttl: Application.get_env(:explorer, __MODULE__)[:global_ttl]
+
+  import Ecto.Query
+
+  @type element :: Block.t()
+
+  @type id :: non_neg_integer()
+
+  def element_to_id(%Block{number: number}), do: number
+
+  def update_from_second_degree_relations(second_degree_relations) when is_nil(second_degree_relations), do: :ok
+
+  def update_from_second_degree_relations(second_degree_relations) do
+    uncle_hashes =
+      second_degree_relations
+      |> Enum.map(& &1.uncle_hash)
+      |> Enum.uniq()
+
+    query =
+      from(
+        block in Block,
+        where: block.consensus == false and block.hash in ^uncle_hashes,
+        inner_join: nephews in assoc(block, :nephews),
+        preload: [nephews: block]
+      )
+
+    query
+    |> Repo.all()
+    |> update()
+  end
+end
diff --git a/apps/explorer/lib/explorer/chain/import/runner/blocks.ex b/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
index 21b8f49fe5..ff970faad6 100644
--- a/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
+++ b/apps/explorer/lib/explorer/chain/import/runner/blocks.ex
@@ -612,7 +612,8 @@ defmodule Explorer.Chain.Import.Runner.Blocks do
         b in Block.SecondDegreeRelation,
         join: s in subquery(query),
         on: b.nephew_hash == s.nephew_hash and b.uncle_hash == s.uncle_hash,
-        update: [set: [uncle_fetched_at: ^updated_at]]
+        update: [set: [uncle_fetched_at: ^updated_at]],
+        select: map(b, [:nephew_hash, :uncle_hash, :index])
       )
 
     try do
diff --git a/apps/explorer/test/explorer/chain/cache/uncles_test.exs b/apps/explorer/test/explorer/chain/cache/uncles_test.exs
new file mode 100644
index 0000000000..c8984d34ea
--- /dev/null
+++ b/apps/explorer/test/explorer/chain/cache/uncles_test.exs
@@ -0,0 +1,28 @@
+defmodule Explorer.Chain.Cache.UnclesTest do
+  use Explorer.DataCase
+
+  alias Explorer.Chain.Cache.Uncles
+  alias Explorer.Repo
+
+  setup do
+    Supervisor.terminate_child(Explorer.Supervisor, Uncles.child_id())
+    Supervisor.restart_child(Explorer.Supervisor, Uncles.child_id())
+
+    :ok
+  end
+
+  describe "update_from_second_degree_relations/1" do
+    test "fetches an uncle from a second_degree_relation and adds it to the cache" do
+      block = insert(:block)
+      uncle = insert(:block, consensus: false)
+
+      uncle_hash = uncle.hash
+
+      second_degree_relation = insert(:block_second_degree_relation, uncle_hash: uncle_hash, nephew: block)
+
+      Uncles.update_from_second_degree_relations([second_degree_relation])
+
+      assert [%{hash: uncle_hash}] = Uncles.all()
+    end
+  end
+end
diff --git a/apps/indexer/lib/indexer/block/fetcher.ex b/apps/indexer/lib/indexer/block/fetcher.ex
index 061785298b..7b51602ddf 100644
--- a/apps/indexer/lib/indexer/block/fetcher.ex
+++ b/apps/indexer/lib/indexer/block/fetcher.ex
@@ -13,7 +13,7 @@ defmodule Indexer.Block.Fetcher do
   alias Explorer.Chain
   alias Explorer.Chain.{Address, Block, Hash, Import, Transaction}
   alias Explorer.Chain.Cache.Blocks, as: BlocksCache
-  alias Explorer.Chain.Cache.{Accounts, BlockNumber, PendingTransactions, Transactions}
+  alias Explorer.Chain.Cache.{Accounts, BlockNumber, PendingTransactions, Transactions, Uncles}
   alias Indexer.Block.Fetcher.Receipts
 
   alias Indexer.Fetcher.{
@@ -177,6 +177,7 @@ defmodule Indexer.Block.Fetcher do
       update_block_cache(inserted[:blocks])
       update_transactions_cache(inserted[:transactions], inserted[:fork_transactions])
       update_addresses_cache(inserted[:addresses])
+      update_uncles_cache(inserted[:block_second_degree_relations])
       result
     else
       {step, {:error, reason}} -> {:error, {step, reason}}
@@ -204,6 +205,10 @@ defmodule Indexer.Block.Fetcher do
 
   defp update_addresses_cache(addresses), do: Accounts.drop(addresses)
 
+  defp update_uncles_cache(updated_relations) do
+    Uncles.update_from_second_degree_relations(updated_relations)
+  end
+
   def import(
         %__MODULE__{broadcast: broadcast, callback_module: callback_module} = state,
         options
diff --git a/apps/indexer/lib/indexer/fetcher/uncle_block.ex b/apps/indexer/lib/indexer/fetcher/uncle_block.ex
index 3e7ab8da63..03c6892964 100644
--- a/apps/indexer/lib/indexer/fetcher/uncle_block.ex
+++ b/apps/indexer/lib/indexer/fetcher/uncle_block.ex
@@ -12,7 +12,7 @@ defmodule Indexer.Fetcher.UncleBlock do
   alias Ecto.Changeset
   alias EthereumJSONRPC.Blocks
   alias Explorer.Chain
-  alias Explorer.Chain.Cache.{Accounts, PendingTransactions}
+  alias Explorer.Chain.Cache.{Accounts, PendingTransactions, Uncles}
   alias Explorer.Chain.Hash
   alias Indexer.{Block, BufferedTask, Tracer}
   alias Indexer.Fetcher.UncleBlock
@@ -129,6 +129,7 @@ defmodule Indexer.Fetcher.UncleBlock do
          }) do
       {:ok, imported} ->
         Accounts.drop(imported[:addresses])
+        Uncles.update_from_second_degree_relations(imported[:block_second_degree_relations])
         retry(errors)
 
       {:error, {:import = step, [%Changeset{} | _] = changesets}} ->
diff --git a/apps/indexer/lib/indexer/temporary/uncles_without_index.ex b/apps/indexer/lib/indexer/temporary/uncles_without_index.ex
index 948f26b60d..12f133ff1a 100644
--- a/apps/indexer/lib/indexer/temporary/uncles_without_index.ex
+++ b/apps/indexer/lib/indexer/temporary/uncles_without_index.ex
@@ -15,6 +15,7 @@ defmodule Indexer.Temporary.UnclesWithoutIndex do
   alias EthereumJSONRPC.Blocks
   alias Explorer.{Chain, Repo}
   alias Explorer.Chain.Block.SecondDegreeRelation
+  alias Explorer.Chain.Cache.Uncles
   alias Indexer.{BufferedTask, Tracer}
   alias Indexer.Fetcher.UncleBlock
 
@@ -99,6 +100,7 @@ defmodule Indexer.Temporary.UnclesWithoutIndex do
     case Chain.import(%{block_second_degree_relations: %{params: block_second_degree_relations_params}}) do
       {:ok, %{block_second_degree_relations: block_second_degree_relations}} ->
         UncleBlock.async_fetch_blocks(block_second_degree_relations)
+        Uncles.update_from_second_degree_relations(block_second_degree_relations)
 
         retry(errors)
 

From a98b4218c79767d0ebc99d156b6e51ef3a329e78 Mon Sep 17 00:00:00 2001
From: YegorSan <egorgolovan89@gmail.com>
Date: Thu, 3 Oct 2019 13:31:34 +0300
Subject: [PATCH 28/28] fixed logs alignment

---
 apps/block_scout_web/assets/css/_layout.scss                  | 4 ++++
 .../block_scout_web/templates/transaction_log/_logs.html.eex  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/block_scout_web/assets/css/_layout.scss b/apps/block_scout_web/assets/css/_layout.scss
index f1a4e92312..da36762bee 100644
--- a/apps/block_scout_web/assets/css/_layout.scss
+++ b/apps/block_scout_web/assets/css/_layout.scss
@@ -8,3 +8,7 @@
     background-color: #fbfafc;
   }
 }
+
+.logs-hash {
+  line-height: 24px !important;
+}
\ No newline at end of file
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex
index 6615ec8259..0d958b938c 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction_log/_logs.html.eex
@@ -18,7 +18,7 @@
   <dl class="row">
     <dt class="col-lg-2"> <%= gettext "Address" %> </dt>
     <dd class="col-lg-10">
-      <h3 class="">
+      <h3 class="logs-hash">
         <%= link(
             @log.address,
             to: address_path(@conn, :show, @log.address),