Merge branch 'master' into ab-batch-token-updates

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## Current
 
 ### Features
+- [#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
 - [#2679](https://github.com/poanetwork/blockscout/pull/2679) - added fixed height for card chain blocks and card chain transactions
@@ -12,6 +13,9 @@
 - [#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
+- [#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

apps/block_scout_web/assets/css/theme/_dark-theme.scss

@@ -792,35 +792,37 @@ $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;
 }
- .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,
-.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;
-	}
+@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 .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: "|";
+		height: 50px;
+		width: 50%;
+		opacity: 1;
+		background: none;
+		left: 24%;
+		top: 14%;
+		color: $dark-primary;
+		}
+		}

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)
 

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>

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"

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"

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

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)

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"

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()

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)

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

apps/explorer/lib/explorer/chain/import/runner/blocks.ex

@@ -142,11 +142,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"
@@ -170,11 +166,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)

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

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

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
@@ -196,8 +196,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)

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} ->

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