CipherLabs
/
blockscout
mirror of https://github.com/blockscout/blockscout
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Elixir 11.2

Browse Source
pull/3484/head
Victor Baranov 4 years ago
parent 8b4d31d342
commit 4206e477ae
11 changed files with 46 additions and 45 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 52
      .github/workflows/config.yml
  2. 2
      .tool-versions
  3. 1
      CHANGELOG.md
  4. 4
      apps/block_scout_web/lib/block_scout_web/application.ex
  5. 6
      apps/block_scout_web/mix.exs
  6. 4
      apps/ethereum_jsonrpc/mix.exs
  7. 2
      apps/explorer/lib/explorer/application.ex
  8. 6
      apps/explorer/mix.exs
  9. 4
      apps/indexer/mix.exs
  10. 2
      docker/Dockerfile
  11. 8
      mix.lock

52
.github/workflows/config.yml
Unescape View File

@ -19,8 +19,8 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-elixir@v1
with:
otp-version: '22.2'
elixir-version: '1.10.4'
otp-version: '23.0.1'
elixir-version: '1.11.2'
- run: mix local.hex --force
- run: mix local.rebar --force
- name: "ELIXIR_VERSION.lock"
@ -46,8 +46,8 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-elixir@v1
with:
otp-version: '22.2'
elixir-version: '1.10.4'
otp-version: '23.0.1'
elixir-version: '1.11.2'
- run: mix local.hex --force
- run: mix local.rebar --force
- run: mix deps.get
@ -61,8 +61,8 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-elixir@v1
with:
otp-version: '22.2'
elixir-version: '1.10.4'
otp-version: '23.0.1'
elixir-version: '1.11.2'
- run: mix local.hex --force
- run: mix local.rebar --force
- run: mix deps.get
@ -76,8 +76,8 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-elixir@v1
with:
otp-version: '22.2'
elixir-version: '1.10.4'
otp-version: '23.0.1'
elixir-version: '1.11.2'
- run: mix local.hex --force
- run: mix local.rebar --force
- run: mix deps.get
@ -103,8 +103,8 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-elixir@v1
with:
otp-version: '22.2'
elixir-version: '1.10.4'
otp-version: '23.0.1'
elixir-version: '1.11.2'
- run: mix local.hex --force
- run: mix local.rebar --force
- run: mix deps.get
@ -121,8 +121,8 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-elixir@v1
with:
otp-version: '22.2'
elixir-version: '1.10.4'
otp-version: '23.0.1'
elixir-version: '1.11.2'
- run: mix local.hex --force
- run: mix local.rebar --force
- run: mix deps.get
@ -142,8 +142,8 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-elixir@v1
with:
otp-version: '22.2'
elixir-version: '1.10.4'
otp-version: '23.0.1'
elixir-version: '1.11.2'
- run: mix local.hex --force
- run: mix local.rebar --force
- run: mix deps.get
@ -167,8 +167,8 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-elixir@v1
with:
otp-version: '22.2'
elixir-version: '1.10.4'
otp-version: '23.0.1'
elixir-version: '1.11.2'
- run: mix local.hex --force
- run: mix local.rebar --force
- run: mix deps.get
@ -211,8 +211,8 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-elixir@v1
with:
otp-version: '22.2'
elixir-version: '1.10.4'
otp-version: '23.0.1'
elixir-version: '1.11.2'
- run: mix local.hex --force
- run: mix local.rebar --force
- run: mix deps.get
@ -265,8 +265,8 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-elixir@v1
with:
otp-version: '22.2'
elixir-version: '1.10.4'
otp-version: '23.0.1'
elixir-version: '1.11.2'
- run: mix local.hex --force
- run: mix local.rebar --force
- run: mix deps.get
@ -321,8 +321,8 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-elixir@v1
with:
otp-version: '22.2'
elixir-version: '1.10.4'
otp-version: '23.0.1'
elixir-version: '1.11.2'
- run: mix local.hex --force
- run: mix local.rebar --force
- run: mix deps.get
@ -377,8 +377,8 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-elixir@v1
with:
otp-version: '22.2'
elixir-version: '1.10.4'
otp-version: '23.0.1'
elixir-version: '1.11.2'
- run: mix local.hex --force
- run: mix local.rebar --force
- run: mix deps.get
@ -433,8 +433,8 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-elixir@v1
with:
otp-version: '22.2'
elixir-version: '1.10.4'
otp-version: '23.0.1'
elixir-version: '1.11.2'
- run: mix local.hex --force
- run: mix local.rebar --force
- run: mix deps.get

2
.tool-versions
Unescape View File

@ -1,3 +1,3 @@
elixir 1.10.4
elixir 1.11.2
erlang 23.0.3
nodejs 14.15.1

1
CHANGELOG.md
Unescape View File

@ -18,6 +18,7 @@
- [#3457](https://github.com/poanetwork/blockscout/pull/3457) - Fix doubled token transfer on block's page if block has reorg
### Chore
- [#3484](https://github.com/poanetwork/blockscout/pull/3484) - Elixir upgrade to 11.2
- [#3483](https://github.com/poanetwork/blockscout/pull/3483) - Update outdated dependencies
- [#3483](https://github.com/poanetwork/blockscout/pull/3483) - Migrate to Erlang/OTP 23
- [#3468](https://github.com/poanetwork/blockscout/pull/3468) - Do not check supported networks on application loading page

4
apps/block_scout_web/lib/block_scout_web/application.ex
Unescape View File

@ -10,7 +10,7 @@ defmodule BlockScoutWeb.Application do
alias BlockScoutWeb.{RealtimeEventHandler, StakingEventHandler}
def start(_type, _args) do
import Supervisor.Spec
import Supervisor
Prometheus.Instrumenter.setup()
Prometheus.Exporter.setup()
@ -19,7 +19,7 @@ defmodule BlockScoutWeb.Application do
children = [
# Start the endpoint when the application starts
{Phoenix.PubSub, name: BlockScoutWeb.PubSub},
supervisor(Endpoint, []),
child_spec(Endpoint, []),
{Absinthe.Subscription, Endpoint},
{RealtimeEventHandler, name: RealtimeEventHandler},
{StakingEventHandler, name: StakingEventHandler},

6
apps/block_scout_web/mix.exs
Unescape View File

@ -122,11 +122,11 @@ defmodule BlockScoutWeb.Mixfile do
{:qrcode, "~> 0.1.0"},
{:sobelow, ">= 0.7.0", only: [:dev, :test], runtime: false},
# Tracing
{:spandex, github: "spandex-project/spandex", branch: "allow-setting-trace-key", override: true},
{:spandex, "~> 3.0"},
# `:spandex` integration with Datadog
{:spandex_datadog, "~> 0.4.0"},
{:spandex_datadog, "~> 1.0"},
# `:spandex` tracing of `:phoenix`
{:spandex_phoenix, "~> 0.3.1"},
{:spandex_phoenix, "~> 1.0"},
{:timex, "~> 3.6"},
{:wallaby, "~> 0.26", only: :test, runtime: false},
# `:cowboy` `~> 2.0` and Phoenix 1.4 compatibility

4
apps/ethereum_jsonrpc/mix.exs
Unescape View File

@ -78,9 +78,9 @@ defmodule EthereumJsonrpc.MixProject do
# Mocking `EthereumJSONRPC.Transport` and `EthereumJSONRPC.HTTP` so we avoid hitting real chains for local testing
{:mox, "~> 0.4", only: [:test]},
# Tracing
{:spandex, github: "spandex-project/spandex", branch: "allow-setting-trace-key", override: true},
{:spandex, "~> 3.0"},
# `:spandex` integration with Datadog
{:spandex_datadog, "~> 0.4.0"},
{:spandex_datadog, "~> 1.0"},
# Convert unix timestamps in JSONRPC to DateTimes
{:timex, "~> 3.6"},
# Encode/decode function names and arguments

2
apps/explorer/lib/explorer/application.ex
Unescape View File

@ -40,7 +40,7 @@ defmodule Explorer.Application do
# Children to start in all environments
base_children = [
Explorer.Repo,
Supervisor.Spec.worker(SpandexDatadog.ApiServer, [datadog_opts()]),
Supervisor.child_spec({SpandexDatadog.ApiServer, datadog_opts()}, id: SpandexDatadog.ApiServer),
Supervisor.child_spec({Task.Supervisor, name: Explorer.HistoryTaskSupervisor}, id: Explorer.HistoryTaskSupervisor),
Supervisor.child_spec({Task.Supervisor, name: Explorer.MarketTaskSupervisor}, id: Explorer.MarketTaskSupervisor),
Supervisor.child_spec({Task.Supervisor, name: Explorer.GenesisDataTaskSupervisor}, id: GenesisDataTaskSupervisor),

6
apps/explorer/mix.exs
Unescape View File

@ -104,11 +104,11 @@ defmodule Explorer.Mixfile do
{:que, "~> 0.10.1"},
{:sobelow, ">= 0.7.0", only: [:dev, :test], runtime: false},
# Tracing
{:spandex, github: "spandex-project/spandex", branch: "allow-setting-trace-key", override: true},
{:spandex, "~> 3.0"},
# `:spandex` integration with Datadog
{:spandex_datadog, "~> 0.4.0"},
{:spandex_datadog, "~> 1.0"},
# `:spandex` tracing of `:ecto`
{:spandex_ecto, "~> 0.4.0"},
{:spandex_ecto, "~> 0.6.2"},
# Attach `:prometheus_ecto` to `:ecto`
{:telemetry, "~> 0.4.1"},
# `Timex.Duration` for `Explorer.Counters.AverageBlockTime.average_block_time/0`

4
apps/indexer/mix.exs
Unescape View File

@ -61,9 +61,9 @@ defmodule Indexer.MixProject do
# Mocking `EthereumJSONRPC.Transport`, so we avoid hitting real chains for local testing
{:mox, "~> 0.4", only: [:test]},
# Tracing
{:spandex, github: "spandex-project/spandex", branch: "allow-setting-trace-key", override: true},
{:spandex, "~> 3.0"},
# `:spandex` integration with Datadog
{:spandex_datadog, "~> 0.4.0"}
{:spandex_datadog, "~> 1.0"}
]
end

2
docker/Dockerfile
Unescape View File

@ -1,4 +1,4 @@
FROM bitwalker/alpine-elixir-phoenix:1.10.3
FROM bitwalker/alpine-elixir-phoenix:latest
RUN apk --no-cache --update add alpine-sdk gmp-dev automake libtool inotify-tools autoconf python

8
mix.lock
Unescape View File

@ -105,10 +105,10 @@
"ranch": {:hex, :ranch, "1.7.1", "6b1fab51b49196860b733a49c07604465a47bdb78aa10c1c16a3d199f7f8c881", [:rebar3], [], "hexpm", "451d8527787df716d99dc36162fca05934915db0b6141bbdac2ea8d3c7afc7d7"},
"rustler": {:hex, :rustler, "0.21.1", "5299980be32da997c54382e945bacaa015ed97a60745e1e639beaf6a7b278c65", [:mix], [{:toml, "~> 0.5.2", [hex: :toml, repo: "hexpm", optional: false]}], "hexpm", "6ee1651e10645b2b2f3bb70502bf180341aa058709177e9bc28c105934094bc6"},
"sobelow": {:hex, :sobelow, "0.10.6", "ac9ebd742035b119eb00a4b1416098b88a4d54d2f262a42602e1e9e3ed4c2afd", [:mix], [], "hexpm", "06e426b8dc0bc80ab1333ce89b904c720474824825b9ceb3dc424eb0f731b6e9"},
"spandex": {:git, "https://github.com/spandex-project/spandex.git", "92992b4aaf3d92e031c2417ff2e6c9e94d27fe36", [branch: "allow-setting-trace-key"]},
"spandex_datadog": {:hex, :spandex_datadog, "0.4.0", "75113a73e843123074886a2e31994af07d6e0632749a8d97e9ca6157b120c287", [:mix], [{:msgpax, "~> 2.2.1", [hex: :msgpax, repo: "hexpm", optional: false]}, {:spandex, "~> 2.3", [hex: :spandex, repo: "hexpm", optional: false]}], "hexpm", "34de8fd2942e3c1097d596391fe2a8102591f2fa5f7edb6fe397559c0d39edcf"},
"spandex_ecto": {:hex, :spandex_ecto, "0.4.0", "deaeaddc11a35f1c551206c53d09bb93a0da5808dbef751430e465c8c7de01d3", [:mix], [{:spandex, "~> 2.2", [hex: :spandex, repo: "hexpm", optional: false]}], "hexpm", "ef6037134548bba7a3b0efe39d8fc1a0ff95b43d6a046f193a552d311a637a97"},
"spandex_phoenix": {:hex, :spandex_phoenix, "0.3.2", "e81889d80852a895cf62ce2e25181b15766d21e8647962e0a4458414b935feb3", [:mix], [{:plug, "~> 1.3", [hex: :plug, repo: "hexpm", optional: false]}, {:spandex, "~> 2.2", [hex: :spandex, repo: "hexpm", optional: false]}], "hexpm", "6e882bb64093889a73b7b77c426c1fd5651d072cd97e8f3e8d89d502d7b44b48"},
"spandex": {:hex, :spandex, "3.0.3", "91aa318f3de696bb4d931adf65f7ebdbe5df25cccce1fe8fd376a44c46bcf69b", [:mix], [{:decorator, "~> 1.2", [hex: :decorator, repo: "hexpm", optional: true]}, {:optimal, "~> 0.3.3", [hex: :optimal, repo: "hexpm", optional: false]}, {:plug, ">= 1.0.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "e3e6c319d0ab478ddc9a39102a727a410c962b4d51c0932c72279b86d3b17044"},
"spandex_datadog": {:hex, :spandex_datadog, "1.0.0", "20db83c10600210a36a1ac95ed8cef3efb400ae948f48252437c2cc21dfd3969", [:mix], [{:msgpax, "~> 2.2.1", [hex: :msgpax, repo: "hexpm", optional: false]}, {:spandex, "~> 3.0", [hex: :spandex, repo: "hexpm", optional: false]}], "hexpm", "d1a499ed3e8580b88ca8ba10208004849b3bd6cfa045b90e4b69055b78474045"},
"spandex_ecto": {:hex, :spandex_ecto, "0.6.2", "845e0e0a115e84c218015e8a13cca7adb38e8b0a1b45010a51451a8c9961c551", [:mix], [{:spandex, "~> 2.2 or ~> 3.0", [hex: :spandex, repo: "hexpm", optional: false]}], "hexpm", "ddeb5c279ca850a38eee6decc8f91b3f4929c76f141b3329293793be54d0c1c7"},
"spandex_phoenix": {:hex, :spandex_phoenix, "1.0.5", "6bb632d3b8157bbbdac97e03aca6dc3b2afd115b6d015fc8206b009685cd3b27", [:mix], [{:plug, "~> 1.3", [hex: :plug, repo: "hexpm", optional: false]}, {:spandex, "~> 2.2 or ~> 3.0", [hex: :spandex, repo: "hexpm", optional: false]}], "hexpm", "f7bcd063fed9eb140373603f8a7340b71e219e3f62824c2c7571036f47e2ac3c"},
"ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.6", "cf344f5692c82d2cd7554f5ec8fd961548d4fd09e7d22f5b62482e5aeaebd4b0", [:make, :mix, :rebar3], [], "hexpm", "bdb0d2471f453c88ff3908e7686f86f9be327d065cc1ec16fa4540197ea04680"},
"telemetry": {:hex, :telemetry, "0.4.2", "2808c992455e08d6177322f14d3bdb6b625fbcfd233a73505870d8738a2f4599", [:rebar3], [], "hexpm", "2d1419bd9dda6a206d7b5852179511722e2b18812310d304620c7bd92a13fcef"},
"tesla": {:hex, :tesla, "1.3.3", "26ae98627af5c406584aa6755ab5fc96315d70d69a24dd7f8369cfcb75094a45", [:mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: true]}, {:exjsx, ">= 3.0.0", [hex: :exjsx, repo: "hexpm", optional: true]}, {:fuse, "~> 2.4", [hex: :fuse, repo: "hexpm", optional: true]}, {:gun, "~> 1.3", [hex: :gun, repo: "hexpm", optional: true]}, {:hackney, "~> 1.6", [hex: :hackney, repo: "hexpm", optional: true]}, {:ibrowse, "~> 4.4.0", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.0", [hex: :mint, repo: "hexpm", optional: true]}, {:poison, ">= 1.0.0", [hex: :poison, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "2648f1c276102f9250299e0b7b57f3071c67827349d9173f34c281756a1b124c"},

Write Preview
Loading…
Cancel
Save