Merge branch 'master' into ab-elixir-1.9

CHANGELOG.md

@@ -8,6 +8,7 @@
 - [#2146](https://github.com/poanetwork/blockscout/pull/2146) - feat: add eth_getLogs rpc endpoint
 - [#2190](https://github.com/poanetwork/blockscout/pull/2190) - show all token transfers
 - [#2193](https://github.com/poanetwork/blockscout/pull/2193) - feat: add BLOCKSCOUT_HOST, and use it in API docs
+- [#2266](https://github.com/poanetwork/blockscout/pull/2266) - allow excluding uncles from average block time calculation
 
 ### Fixes
 - [#2263](https://github.com/poanetwork/blockscout/pull/2263) - added an ability to close network selector on outside click
@@ -57,6 +58,7 @@
 - [#2204](https://github.com/poanetwork/blockscout/pull/2204) - fix large contract verification
 - [#2247](https://github.com/poanetwork/blockscout/pull/2247) - hide logs search if there are no logs
 - [#2248](https://github.com/poanetwork/blockscout/pull/2248) - sort block after query execution for average block time
+- [#2270](https://github.com/poanetwork/blockscout/pull/2270) - Remove duplicate params in `Indexer.Fetcher.TokenBalance`
 - [#2268](https://github.com/poanetwork/blockscout/pull/2268) - remove not existing assigns in html code
 
 ### Chore

apps/explorer/config/config.exs

@@ -12,7 +12,9 @@ config :explorer,
   token_functions_reader_max_retries: 3,
   allowed_evm_versions:
     System.get_env("ALLOWED_EVM_VERSIONS") ||
-      "homestead,tangerineWhistle,spuriousDragon,byzantium,constantinople,petersburg"
+      "homestead,tangerineWhistle,spuriousDragon,byzantium,constantinople,petersburg",
+  include_uncles_in_average_block_time:
+    if(System.get_env("UNCLES_IN_AVERAGE_BLOCK_TIME") == "false", do: false, else: true)
 
 config :explorer, Explorer.Counters.AverageBlockTime, enabled: true
 

apps/explorer/lib/explorer/counters/average_block_time.ex

@@ -70,8 +70,17 @@ defmodule Explorer.Counters.AverageBlockTime do
         select: {block.number, block.timestamp}
       )
 
+    query =
+      if Application.get_env(:explorer, :include_uncles_in_average_block_time) do
+        timestamps_query
+      else
+        from(block in timestamps_query,
+          where: block.consensus == true
+        )
+      end
+
     timestamps =
-      timestamps_query
+      query
       |> Repo.all()
       |> Enum.sort_by(fn {_, timestamp} -> timestamp end, &>=/2)
       |> Enum.map(fn {number, timestamp} ->

apps/explorer/mix.exs

@@ -92,7 +92,6 @@ defmodule Explorer.Mixfile do
       {:math, "~> 0.3.0"},
       {:mock, "~> 0.3.0", only: [:test], runtime: false},
       {:mox, "~> 0.4", only: [:test]},
-      {:nimble_csv, "~> 0.6.0"},
       {:poison, "~> 3.1"},
       {:nimble_csv, "~> 0.6.0"},
       {:postgrex, ">= 0.0.0"},

apps/explorer/test/explorer/counters/average_block_time_test.exs

@@ -11,6 +11,8 @@ defmodule Explorer.Counters.AverageBlockTimeTest do
     start_supervised!(AverageBlockTime)
     Application.put_env(:explorer, AverageBlockTime, enabled: true)
 
+    Application.put_env(:explorer, :include_uncles_in_average_block_time, true)
+
     on_exit(fn ->
       Application.put_env(:explorer, AverageBlockTime, enabled: false)
     end)
@@ -43,6 +45,35 @@ defmodule Explorer.Counters.AverageBlockTimeTest do
       assert AverageBlockTime.average_block_time() == Timex.Duration.parse!("PT3S")
     end
 
+    test "excludes uncles if include_uncles_in_average_block_time is set to false" do
+      block_number = 99_999_999
+      Application.put_env(:explorer, :include_uncles_in_average_block_time, false)
+
+      first_timestamp = Timex.now()
+
+      insert(:block, number: block_number, consensus: true, timestamp: Timex.shift(first_timestamp, seconds: 3))
+      insert(:block, number: block_number, consensus: false, timestamp: Timex.shift(first_timestamp, seconds: 4))
+      insert(:block, number: block_number + 1, consensus: true, timestamp: Timex.shift(first_timestamp, seconds: 5))
+
+      AverageBlockTime.refresh()
+
+      assert AverageBlockTime.average_block_time() == Timex.Duration.parse!("PT2S")
+    end
+
+    test "excludes uncles if include_uncles_in_average_block_time is set to true" do
+      block_number = 99_999_999
+
+      first_timestamp = Timex.now()
+
+      insert(:block, number: block_number, consensus: true, timestamp: Timex.shift(first_timestamp, seconds: 3))
+      insert(:block, number: block_number, consensus: false, timestamp: Timex.shift(first_timestamp, seconds: 4))
+      insert(:block, number: block_number + 1, consensus: true, timestamp: Timex.shift(first_timestamp, seconds: 5))
+
+      AverageBlockTime.refresh()
+
+      assert AverageBlockTime.average_block_time() == Timex.Duration.parse!("PT1S")
+    end
+
     test "when there are no uncles sorts by block number" do
       block_number = 99_999_999
 

apps/indexer/lib/indexer/fetcher/token_balance.ex

@@ -93,7 +93,10 @@ defmodule Indexer.Fetcher.TokenBalance do
   end
 
   def fetch_from_blockchain(params_list) do
-    retryable_params_list = Enum.filter(params_list, &(&1.retries_count <= @max_retries))
+    retryable_params_list =
+      params_list
+      |> Enum.filter(&(&1.retries_count <= @max_retries))
+      |> Enum.uniq_by(&Map.take(&1, [:token_contract_address_hash, :address_hash, :block_number]))
 
     Logger.metadata(count: Enum.count(retryable_params_list))
 

apps/indexer/test/indexer/fetcher/token_balance_test.exs

@@ -111,6 +111,41 @@ defmodule Indexer.Fetcher.TokenBalanceTest do
 
       assert TokenBalance.run(token_balances, nil) == :ok
     end
+
+    test "fetches duplicate params only once" do
+      %Address.TokenBalance{
+        address_hash: %Hash{bytes: address_hash_bytes} = address_hash,
+        token_contract_address_hash: %Hash{bytes: token_contract_address_hash_bytes},
+        block_number: block_number
+      } = insert(:token_balance, value_fetched_at: nil, value: nil)
+
+      expect(
+        EthereumJSONRPC.Mox,
+        :json_rpc,
+        fn [%{id: id, method: "eth_call", params: [%{data: _, to: _}, _]}], _options ->
+          {:ok,
+           [
+             %{
+               id: id,
+               jsonrpc: "2.0",
+               result: "0x00000000000000000000000000000000000000000000d3c21bcecceda1000000"
+             }
+           ]}
+        end
+      )
+
+      assert TokenBalance.run(
+               [
+                 {address_hash_bytes, token_contract_address_hash_bytes, block_number, 0},
+                 {address_hash_bytes, token_contract_address_hash_bytes, block_number, 0}
+               ],
+               nil
+             ) == :ok
+
+      assert 1 =
+               from(tb in Address.TokenBalance, where: tb.address_hash == ^address_hash)
+               |> Explorer.Repo.aggregate(:count, :id)
+    end
   end
 
   describe "import_token_balances/1" do