Merge remote-tracking branch 'origin/master' into npm-packages-update

5 years ago · 27b2585631
parent 2dba90a35d 7004563d11
commit 27b2585631
8 changed files with 38 additions and 18 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -3,7 +3,7 @@ jobs:
  build:
    docker:
      # Ensure .tool-versions matches
-      - image: circleci/elixir:1.9.0-node-browsers
+      - image: circleci/elixir:1.9.1-node-browsers
        environment:
          MIX_ENV: test
          # match POSTGRES_PASSWORD for postgres image below
@ -129,7 +129,7 @@ jobs:
  check_formatted:
    docker:
      # Ensure .tool-versions matches
-      - image: circleci/elixir:1.9.0
+      - image: circleci/elixir:1.9.1
        environment:
          MIX_ENV: test

@ -143,7 +143,7 @@ jobs:
  credo:
    docker:
      # Ensure .tool-versions matches
-      - image: circleci/elixir:1.9.0
+      - image: circleci/elixir:1.9.1
        environment:
          MIX_ENV: test

@ -177,7 +177,7 @@ jobs:
  dialyzer:
    docker:
      # Ensure .tool-versions matches
-      - image: circleci/elixir:1.9.0
+      - image: circleci/elixir:1.9.1
        environment:
          MIX_ENV: test

@ -247,7 +247,7 @@ jobs:
  gettext:
    docker:
      # Ensure .tool-versions matches
-      - image: circleci/elixir:1.9.0
+      - image: circleci/elixir:1.9.1
        environment:
          MIX_ENV: test

@ -286,7 +286,7 @@ jobs:
  release:
    docker:
      # Ensure .tool-versions matches
-      - image: circleci/elixir:1.9.0
+      - image: circleci/elixir:1.9.1
        environment:
          MIX_ENV: prod

@ -312,7 +312,7 @@ jobs:
  sobelow:
    docker:
      # Ensure .tool-versions matches
-      - image: circleci/elixir:1.9.0
+      - image: circleci/elixir:1.9.1
        environment:
          MIX_ENV: test

@ -336,7 +336,7 @@ jobs:
  test_geth_http_websocket:
    docker:
      # Ensure .tool-versions matches
-      - image: circleci/elixir:1.9.0-node-browsers
+      - image: circleci/elixir:1.9.1-node-browsers
        environment:
          MIX_ENV: test
          # match POSTGRES_PASSWORD for postgres image below
@ -390,7 +390,7 @@ jobs:
  test_geth_mox:
    docker:
      # Ensure .tool-versions matches
-      - image: circleci/elixir:1.9.0-node-browsers
+      - image: circleci/elixir:1.9.1-node-browsers
        environment:
          MIX_ENV: test
          # match POSTGRES_PASSWORD for postgres image below
@ -444,7 +444,7 @@ jobs:
  test_parity_http_websocket:
    docker:
      # Ensure .tool-versions matches
-      - image: circleci/elixir:1.9.0-node-browsers
+      - image: circleci/elixir:1.9.1-node-browsers
        environment:
          MIX_ENV: test
          # match POSTGRES_PASSWORD for postgres image below
@ -498,7 +498,7 @@ jobs:
  test_parity_mox:
    docker:
      # Ensure .tool-versions matches
-      - image: circleci/elixir:1.9.0-node-browsers
+      - image: circleci/elixir:1.9.1-node-browsers
        environment:
          MIX_ENV: test
          # match POSTGRES_PASSWORD for postgres image below
@ -552,7 +552,7 @@ jobs:
  coveralls_merge:
    docker:
      # Ensure .tool-versions matches
-      - image: circleci/elixir:1.9.0
+      - image: circleci/elixir:1.9.1
        environment:
          MIX_ENV: test

--- a/.tool-versions
+++ b/.tool-versions
@ -1,3 +1,3 @@
-elixir 1.9
-erlang 21.0.4
+elixir 1.9.1-otp-22
+erlang 22.0
 nodejs 10.11.0
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,6 +1,7 @@
 ## Current

 ### Features
+- [#2458](https://github.com/poanetwork/blockscout/pull/2458) - Add LAST_BLOCK var to add ability indexing in the range of blocks
 - [#2456](https://github.com/poanetwork/blockscout/pull/2456) - fetch pending transactions for geth

 ### Fixes
@ -8,6 +9,7 @@
 - [#2425](https://github.com/poanetwork/blockscout/pull/2425) - Force to show address view for checksummed address even if it is not in DB

 ### Chore
+- [#2402](https://github.com/poanetwork/blockscout/pull/2402) - bump otp version to 22.0
 - [#2432](https://github.com/poanetwork/blockscout/pull/2432) - bump credo version
 - [#2457](https://github.com/poanetwork/blockscout/pull/2457) - update mix.lock
 - [#2435](https://github.com/poanetwork/blockscout/pull/2435) - Replace deprecated extract-text-webpack-plugin with mini-css-extract-plugin
--- a/apps/indexer/config/config.exs
+++ b/apps/indexer/config/config.exs
@ -35,7 +35,8 @@ config :indexer,
    String.to_integer(System.get_env("TOKEN_METADATA_UPDATE_INTERVAL") || "#{2 * 24 * 60 * 60}"),
  # bytes
  memory_limit: 1 <<< 30,
-  first_block: System.get_env("FIRST_BLOCK") || "0"
+  first_block: System.get_env("FIRST_BLOCK") || "0",
+  last_block: System.get_env("LAST_BLOCK") || ""

 # config :indexer, Indexer.Fetcher.ReplacedTransaction.Supervisor, disabled?: true
 # config :indexer, Indexer.Fetcher.BlockReward.Supervisor, disabled?: true
--- a/apps/indexer/lib/indexer/block/catchup/fetcher.ex
+++ b/apps/indexer/lib/indexer/block/catchup/fetcher.ex
@ -72,7 +72,14 @@ defmodule Indexer.Block.Catchup.Fetcher do
      ) do
    Logger.metadata(fetcher: :block_catchup)

-    {:ok, latest_block_number} = EthereumJSONRPC.fetch_block_number_by_tag("latest", json_rpc_named_arguments)
+    {:ok, latest_block_number} =
+      case latest_block() do
+        nil ->
+          EthereumJSONRPC.fetch_block_number_by_tag("latest", json_rpc_named_arguments)
+
+        number ->
+          {:ok, number}
+      end

    case latest_block_number do
      # let realtime indexer get the genesis block
@ -337,4 +344,13 @@ defmodule Indexer.Block.Catchup.Fetcher do
      _ -> 0
    end
  end
+
+  defp latest_block do
+    string_value = Application.get_env(:indexer, :last_block)
+
+    case Integer.parse(string_value) do
+      {integer, ""} -> integer
+      _ -> nil
+    end
+  end
 end
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@ -1,4 +1,4 @@
-FROM bitwalker/alpine-elixir-phoenix:1.9.0
+FROM bitwalker/alpine-elixir-phoenix:1.9.1

 RUN apk --no-cache --update add alpine-sdk gmp-dev automake libtool inotify-tools autoconf python

--- a/docs/env-variables.md
+++ b/docs/env-variables.md
@ -48,6 +48,7 @@ $ export NETWORK=POA
 | `BLOCK_TRANSFORMER` | | Transformer for blocks: base or clique. | base |  v1.3.4+ |
 | `GRAPHIQL _TRANSACTION` | | Default transaction in query to GraphiQL. | (empty) |  v1.3.4+ |
 | `FIRST_BLOCK` | | The block number, where indexing begins from. | 0 |  v1.3.8+ |
+| `LAST_BLOCK` | | The block number, where indexing stops. | (empty) | master |
 | `TXS_COUNT_CACHE_PERIOD` | | Interval in seconds to restart the task, which calculates the total txs count. | 60 * 60 * 2 |  v1.3.9+ |
 | `ADDRESS_WITH_BALANCES` <br /> `_UPDATE_INTERVAL`|  | Interval in seconds to restart the task, which calculates addresses with balances. | 30 * 60 |  v1.3.9+ |
 | `LINK_TO_OTHER_EXPLORERS` | | true/false. If true, links to other explorers are added in the footer  | (empty)  |  v1.3.0+ |
--- a/mix.exs
+++ b/mix.exs
@ -14,7 +14,7 @@ defmodule BlockScout.Mixfile do
        plt_add_apps: ~w(ex_unit mix)a,
        ignore_warnings: ".dialyzer-ignore"
      ],
-      elixir: "~> 1.9",
+      elixir: "~> 1.9.1",
      preferred_cli_env: [
        coveralls: :test,
        "coveralls.detail": :test,