Merge branch 'master' into ab-autoappending-constructor-arguments

CHANGELOG.md

@@ -9,6 +9,8 @@
 
 
 ### Fixes
+- [#2843](https://github.com/poanetwork/blockscout/pull/2843) - fix realtime fetcher small skips feature
+- [#2841](https://github.com/poanetwork/blockscout/pull/2841) - LUKSO dashboard height fix
 - [#2837](https://github.com/poanetwork/blockscout/pull/2837) - fix txlist ordering issue
 - [#2830](https://github.com/poanetwork/blockscout/pull/2830) - Fix wrong color of contract icon on xDai chain
 - [#2829](https://github.com/poanetwork/blockscout/pull/2829) - Fix for stuck gas limit label and value
@@ -18,6 +20,8 @@
 - [#2803](https://github.com/poanetwork/blockscout/pull/2803) - Fix block validator custom tooltip
 
 ### Chore
+- [#2845](https://github.com/poanetwork/blockscout/pull/2845) - Set outline none for nav dropdown item in mobile view (fix for Safari)
+- [#2844](https://github.com/poanetwork/blockscout/pull/2844) - Extend external reward types up to 20
 - [#2827](https://github.com/poanetwork/blockscout/pull/2827) - Node js 12.13.0 (latest LTS release) support
 - [#2818](https://github.com/poanetwork/blockscout/pull/2818) - allow hiding marketcap percentage
 - [#2817](https://github.com/poanetwork/blockscout/pull/2817) - move docker integration documentation to blockscout docs

apps/block_scout_web/assets/css/components/_navbar.scss

@@ -25,6 +25,7 @@ $navbar-logo-width: auto !default;
   .navbar-nav {
     
     .nav-link {
+      outline: none;
       align-items: center;
       color: $header-links-color;
       display: flex;

apps/block_scout_web/assets/css/theme/_lukso_variables.scss

@@ -56,6 +56,9 @@ $dashboard-banner-network-stats-static-image: "/images/lukso_dashboard_image.png
 $dashboard-banner-network-plain-container-height: 150px;
 
 .layout-container {
+  .dashboard-banner-container {
+    height: auto !important;
+  }
   .dashboard-banner-container::after {
     display: none;
   }

apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/parity/fetched_beneficiaries.ex

@@ -180,6 +180,16 @@ defmodule EthereumJSONRPC.Parity.FetchedBeneficiaries do
   defp get_address_type(reward_type, index) when reward_type == "external" and index == 8, do: :validator
   defp get_address_type(reward_type, index) when reward_type == "external" and index == 9, do: :validator
   defp get_address_type(reward_type, index) when reward_type == "external" and index == 10, do: :validator
+  defp get_address_type(reward_type, index) when reward_type == "external" and index == 11, do: :validator
+  defp get_address_type(reward_type, index) when reward_type == "external" and index == 12, do: :validator
+  defp get_address_type(reward_type, index) when reward_type == "external" and index == 13, do: :validator
+  defp get_address_type(reward_type, index) when reward_type == "external" and index == 14, do: :validator
+  defp get_address_type(reward_type, index) when reward_type == "external" and index == 15, do: :validator
+  defp get_address_type(reward_type, index) when reward_type == "external" and index == 16, do: :validator
+  defp get_address_type(reward_type, index) when reward_type == "external" and index == 17, do: :validator
+  defp get_address_type(reward_type, index) when reward_type == "external" and index == 18, do: :validator
+  defp get_address_type(reward_type, index) when reward_type == "external" and index == 19, do: :validator
+  defp get_address_type(reward_type, index) when reward_type == "external" and index == 20, do: :validator
   defp get_address_type(reward_type, _index) when reward_type == "block", do: :validator
   defp get_address_type(reward_type, _index) when reward_type == "uncle", do: :uncle
   defp get_address_type(reward_type, _index) when reward_type == "emptyStep", do: :validator

apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/transaction.ex

@@ -308,7 +308,7 @@ defmodule EthereumJSONRPC.Transaction do
   end
 
   def to_elixir(transaction) when is_binary(transaction) do
-    Logger.warn(["Fetched transaction is not full: ", transaction])
+    #    Logger.warn(["Fetched transaction is not full: ", transaction])
 
     nil
   end

apps/indexer/lib/indexer/block/realtime/fetcher.ex

@@ -250,9 +250,13 @@ defmodule Indexer.Block.Realtime.Fetcher do
         [number]
 
       true ->
+        if number - previous_number - 1 > 10 do
+          (number - 10)..number
+        else
           (previous_number + 1)..number
         end
     end
+  end
 
   defp reorg?(number, max_number_seen) when is_integer(max_number_seen) and number <= max_number_seen do
     true

apps/indexer/test/indexer/block/realtime/fetcher_test.exs

@@ -448,7 +448,7 @@ defmodule Indexer.Block.Realtime.FetcherTest do
       old_number = 94
 
       assert (previous_number + 1)..number == Realtime.Fetcher.determine_fetching_action(number, previous_number, nil)
-      assert (old_number + 1)..number == Realtime.Fetcher.determine_fetching_action(number, old_number, nil)
+      assert (number - 10)..number == Realtime.Fetcher.determine_fetching_action(number, old_number, nil)
     end
 
     test "when number immediately follows the previous_number it is fetched" do
@@ -472,7 +472,7 @@ defmodule Indexer.Block.Realtime.FetcherTest do
 
       number = max_number_seen + max_skipping_distance + 1
 
-      assert (previous_number + 1)..number ==
+      assert (number - 10)..number ==
                Realtime.Fetcher.determine_fetching_action(number, previous_number, max_number_seen)
     end
   end