From 9d96f3b45d2948ab5faaa8db3a87b93327bea0fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 21:02:59 +0300 Subject: [PATCH] Bump httpoison from 1.8.2 to 2.1.0 and remove Wobserver dep (#7084) * Bump httpoison from 1.8.2 to 2.1.0 Bumps [httpoison](https://github.com/edgurgel/httpoison) from 1.8.2 to 2.1.0. - [Release notes](https://github.com/edgurgel/httpoison/releases) - [Commits](https://github.com/edgurgel/httpoison/compare/v1.8.2...v2.1.0) --- updated-dependencies: - dependency-name: httpoison dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * Remove wobserver --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Viktor Baranov --- .github/workflows/e2e-tests.yml | 1 - .github/workflows/publish-docker-image-every-push.yml | 2 -- .github/workflows/publish-docker-image-release.yml | 1 - apps/block_scout_web/config/config.exs | 8 +------- apps/block_scout_web/lib/block_scout_web/router.ex | 4 ---- apps/block_scout_web/mix.exs | 3 +-- apps/ethereum_jsonrpc/mix.exs | 2 +- apps/explorer/mix.exs | 2 +- cspell.json | 1 - docker-compose/docker-compose-no-rust-services.yml | 1 - docker-compose/docker-compose.yml | 1 - docker-compose/envs/common-blockscout.env | 1 - docker/Dockerfile | 1 - docker/Makefile | 3 --- mix.exs | 1 + mix.lock | 3 +-- 16 files changed, 6 insertions(+), 29 deletions(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 916848e71a..09e2826b26 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -67,7 +67,6 @@ jobs: DISABLE_WEBAPP=false DISABLE_WRITE_API=false CACHE_ENABLE_TOTAL_GAS_USAGE_COUNTER= - WOBSERVER_ENABLED=false ADMIN_PANEL_ENABLED=false CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL= BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }} diff --git a/.github/workflows/publish-docker-image-every-push.yml b/.github/workflows/publish-docker-image-every-push.yml index 4fdf382f63..5ece3ab788 100644 --- a/.github/workflows/publish-docker-image-every-push.yml +++ b/.github/workflows/publish-docker-image-every-push.yml @@ -62,7 +62,6 @@ jobs: DISABLE_WEBAPP=false DISABLE_WRITE_API=false CACHE_ENABLE_TOTAL_GAS_USAGE_COUNTER= - WOBSERVER_ENABLED=false ADMIN_PANEL_ENABLED=false CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL= BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }} @@ -82,7 +81,6 @@ jobs: DISABLE_WEBAPP=false DISABLE_WRITE_API=false CACHE_ENABLE_TOTAL_GAS_USAGE_COUNTER= - WOBSERVER_ENABLED=false ADMIN_PANEL_ENABLED=false CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL= SESSION_COOKIE_DOMAIN=${{ secrets.FRONTEND_MAIN }} diff --git a/.github/workflows/publish-docker-image-release.yml b/.github/workflows/publish-docker-image-release.yml index 042246bc2b..dedc22fb7f 100644 --- a/.github/workflows/publish-docker-image-release.yml +++ b/.github/workflows/publish-docker-image-release.yml @@ -59,7 +59,6 @@ jobs: DISABLE_WEBAPP=false DISABLE_WRITE_API=false CACHE_ENABLE_TOTAL_GAS_USAGE_COUNTER= - WOBSERVER_ENABLED=false ADMIN_PANEL_ENABLED= CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL= BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta diff --git a/apps/block_scout_web/config/config.exs b/apps/block_scout_web/config/config.exs index 4cd9b3a91c..6a48daee3e 100644 --- a/apps/block_scout_web/config/config.exs +++ b/apps/block_scout_web/config/config.exs @@ -76,15 +76,9 @@ config :prometheus, BlockScoutWeb.Prometheus.Instrumenter, config :spandex_phoenix, tracer: BlockScoutWeb.Tracer -config :wobserver, - # return only the local node - discovery: :none, - mode: :plug - config :block_scout_web, BlockScoutWeb.ApiRouter, writing_enabled: System.get_env("DISABLE_WRITE_API") != "true", - reading_enabled: System.get_env("DISABLE_READ_API") != "true", - wobserver_enabled: System.get_env("WOBSERVER_ENABLED") == "true" + reading_enabled: System.get_env("DISABLE_READ_API") != "true" config :block_scout_web, BlockScoutWeb.WebRouter, enabled: System.get_env("DISABLE_WEBAPP") != "true" diff --git a/apps/block_scout_web/lib/block_scout_web/router.ex b/apps/block_scout_web/lib/block_scout_web/router.ex index b26f2f084a..8b7421b277 100644 --- a/apps/block_scout_web/lib/block_scout_web/router.ex +++ b/apps/block_scout_web/lib/block_scout_web/router.ex @@ -4,10 +4,6 @@ defmodule BlockScoutWeb.Router do alias BlockScoutWeb.Plug.GraphQL alias BlockScoutWeb.{ApiRouter, WebRouter} - if Application.compile_env(:block_scout_web, ApiRouter)[:wobserver_enabled] do - forward("/wobserver", Wobserver.Web.Router) - end - if Application.compile_env(:block_scout_web, :admin_panel_enabled) do forward("/admin", BlockScoutWeb.AdminRouter) end diff --git a/apps/block_scout_web/mix.exs b/apps/block_scout_web/mix.exs index aec1240331..bc447deacf 100644 --- a/apps/block_scout_web/mix.exs +++ b/apps/block_scout_web/mix.exs @@ -85,7 +85,7 @@ defmodule BlockScoutWeb.Mixfile do {:flow, "~> 1.2"}, {:gettext, "~> 0.22.0"}, {:hammer, "~> 6.0"}, - {:httpoison, "~> 1.6"}, + {:httpoison, "~> 2.0"}, {:indexer, in_umbrella: true, runtime: false}, # JSON parser and generator {:jason, "~> 1.3"}, @@ -128,7 +128,6 @@ defmodule BlockScoutWeb.Mixfile do {:wallaby, "~> 0.30", only: :test, runtime: false}, # `:cowboy` `~> 2.0` and Phoenix 1.4 compatibility {:websocket_client, git: "https://github.com/blockscout/websocket_client.git", branch: "master", override: true}, - {:wobserver, "~> 0.2.0", github: "poanetwork/wobserver", branch: "support-https"}, {:ex_json_schema, "~> 0.9.1"}, {:ueberauth, "~> 0.7"}, {:ueberauth_auth0, "~> 2.0"}, diff --git a/apps/ethereum_jsonrpc/mix.exs b/apps/ethereum_jsonrpc/mix.exs index e1a482b53f..6a40bef34e 100644 --- a/apps/ethereum_jsonrpc/mix.exs +++ b/apps/ethereum_jsonrpc/mix.exs @@ -63,7 +63,7 @@ defmodule EthereumJsonrpc.MixProject do # Static Type Checking {:dialyxir, "~> 1.1", only: [:dev, :test], runtime: false}, # JSONRPC HTTP Post calls - {:httpoison, "~> 1.6"}, + {:httpoison, "~> 2.0"}, # Decode/Encode JSON for JSONRPC {:jason, "~> 1.3"}, # Log errors and application output to separate files diff --git a/apps/explorer/mix.exs b/apps/explorer/mix.exs index 79a5fc0cae..c9f7ace69b 100644 --- a/apps/explorer/mix.exs +++ b/apps/explorer/mix.exs @@ -81,7 +81,7 @@ defmodule Explorer.Mixfile do # Data factory for testing {:ex_machina, "~> 2.3", only: [:test]}, {:exvcr, "~> 0.10", only: :test}, - {:httpoison, "~> 1.6"}, + {:httpoison, "~> 2.0"}, {:jason, "~> 1.3"}, {:junit_formatter, ">= 0.0.0", only: [:test], runtime: false}, # Log errors and application output to separate files diff --git a/cspell.json b/cspell.json index 5df85e0330..f6048a5df7 100644 --- a/cspell.json +++ b/cspell.json @@ -291,7 +291,6 @@ "watchlists", "whereis", "whiler", - "wobserver", "xdai", "xmlhttprequest", "yellowgreen", diff --git a/docker-compose/docker-compose-no-rust-services.yml b/docker-compose/docker-compose-no-rust-services.yml index cdee56cb63..e95039b977 100644 --- a/docker-compose/docker-compose-no-rust-services.yml +++ b/docker-compose/docker-compose-no-rust-services.yml @@ -27,7 +27,6 @@ services: DISABLE_WRITE_API: "false" CACHE_ENABLE_TOTAL_GAS_USAGE_COUNTER: "" CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL: "" - WOBSERVER_ENABLED: "false" ADMIN_PANEL_ENABLED: "" RELEASE_VERSION: 5.1.2 restart: always diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 8cee781b9d..0962fe7667 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -28,7 +28,6 @@ services: DISABLE_WRITE_API: "false" CACHE_ENABLE_TOTAL_GAS_USAGE_COUNTER: "" CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL: "" - WOBSERVER_ENABLED: "false" ADMIN_PANEL_ENABLED: "" RELEASE_VERSION: 5.1.2 restart: always diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env index dedb756b9e..b24d0e8d47 100644 --- a/docker-compose/envs/common-blockscout.env +++ b/docker-compose/envs/common-blockscout.env @@ -110,7 +110,6 @@ INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER=false # INDEXER_INTERNAL_TRANSACTIONS_TRACER_TYPE= # WEBAPP_URL= # API_URL= -WOBSERVER_ENABLED=false SHOW_ADDRESS_MARKETCAP_PERCENTAGE=true CHECKSUM_ADDRESS_HASHES=true CHECKSUM_FUNCTION=eth diff --git a/docker/Dockerfile b/docker/Dockerfile index bcc3a6a213..9d4fc460b5 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -23,7 +23,6 @@ ARG DISABLE_READ_API ARG DISABLE_WEBAPP ARG DISABLE_WRITE_API ARG CACHE_ENABLE_TOTAL_GAS_USAGE_COUNTER -ARG WOBSERVER_ENABLED ARG ADMIN_PANEL_ENABLED ARG CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL ARG SESSION_COOKIE_DOMAIN diff --git a/docker/Makefile b/docker/Makefile index 20e87944c5..10d52ab94e 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -285,9 +285,6 @@ endif ifdef TOKEN_METADATA_UPDATE_INTERVAL BLOCKSCOUT_CONTAINER_PARAMS += -e 'TOKEN_METADATA_UPDATE_INTERVAL=$(TOKEN_METADATA_UPDATE_INTERVAL)' endif -ifdef WOBSERVER_ENABLED - BLOCKSCOUT_CONTAINER_PARAMS += -e 'WOBSERVER_ENABLED=$(WOBSERVER_ENABLED)' -endif ifdef RESTRICTED_LIST BLOCKSCOUT_CONTAINER_PARAMS += -e 'RESTRICTED_LIST=$(RESTRICTED_LIST)' endif diff --git a/mix.exs b/mix.exs index 7f9c06c8c3..ece2bcfbc2 100644 --- a/mix.exs +++ b/mix.exs @@ -92,6 +92,7 @@ defmodule BlockScout.Mixfile do # and cannot be accessed from applications inside the apps folder defp deps do [ + {:httpoison, "~> 2.1"}, {:prometheus_ex, git: "https://github.com/lanodan/prometheus.ex", branch: "fix/elixir-1.14", override: true}, {:absinthe_plug, git: "https://github.com/blockscout/absinthe_plug.git", tag: "1.5.3", override: true}, {:tesla, "~> 1.6.0"}, diff --git a/mix.lock b/mix.lock index 2830f7350d..6d82c1716e 100644 --- a/mix.lock +++ b/mix.lock @@ -67,7 +67,7 @@ "hammer": {:hex, :hammer, "6.1.0", "f263e3c3e9946bd410ea0336b2abe0cb6260af4afb3a221e1027540706e76c55", [:make, :mix], [{:poolboy, "~> 1.5", [hex: :poolboy, repo: "hexpm", optional: false]}], "hexpm", "b47e415a562a6d072392deabcd58090d8a41182cf9044cdd6b0d0faaaf68ba57"}, "hammer_backend_redis": {:hex, :hammer_backend_redis, "6.1.2", "eb296bb4924928e24135308b2afc189201fd09411c870c6bbadea444a49b2f2c", [:mix], [{:hammer, "~> 6.0", [hex: :hammer, repo: "hexpm", optional: false]}, {:redix, "~> 1.1", [hex: :redix, repo: "hexpm", optional: false]}], "hexpm", "217ea066278910543a5e9b577d5bf2425419446b94fe76bdd9f255f39feec9fa"}, "html_entities": {:hex, :html_entities, "0.5.2", "9e47e70598da7de2a9ff6af8758399251db6dbb7eebe2b013f2bbd2515895c3c", [:mix], [], "hexpm", "c53ba390403485615623b9531e97696f076ed415e8d8058b1dbaa28181f4fdcc"}, - "httpoison": {:hex, :httpoison, "1.8.2", "9eb9c63ae289296a544842ef816a85d881d4a31f518a0fec089aaa744beae290", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "2bb350d26972e30c96e2ca74a1aaf8293d61d0742ff17f01e0279fef11599921"}, + "httpoison": {:hex, :httpoison, "2.1.0", "655fd9a7b0b95ee3e9a3b535cf7ac8e08ef5229bab187fa86ac4208b122d934b", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "fc455cb4306b43827def4f57299b2d5ac8ac331cb23f517e734a4b78210a160c"}, "idna": {:hex, :idna, "6.1.1", "8a63070e9f7d0c62eb9d9fcb360a7de382448200fbbd1b106cc96d3d8099df8d", [:rebar3], [{:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"}, "inflex": {:hex, :inflex, "2.1.0", "a365cf0821a9dacb65067abd95008ca1b0bb7dcdd85ae59965deef2aa062924c", [:mix], [], "hexpm", "14c17d05db4ee9b6d319b0bff1bdf22aa389a25398d1952c7a0b5f3d93162dd8"}, "jason": {:hex, :jason, "1.4.0", "e855647bc964a44e2f67df589ccf49105ae039d4179db7f6271dfd3843dc27e6", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "79a3791085b2a0f743ca04cec0f7be26443738779d09302e01318f97bdb82121"}, @@ -140,5 +140,4 @@ "wallaby": {:hex, :wallaby, "0.30.3", "9213ebf6e22e34544ede60e435bdbf807b67119ba4548f7b9bdbbd53a359767f", [:mix], [{:ecto_sql, ">= 3.0.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}, {:httpoison, "~> 0.12 or ~> 1.0 or ~> 2.0", [hex: :httpoison, repo: "hexpm", optional: false]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix_ecto, ">= 3.0.0", [hex: :phoenix_ecto, repo: "hexpm", optional: true]}, {:web_driver_client, "~> 0.2.0", [hex: :web_driver_client, repo: "hexpm", optional: false]}], "hexpm", "40844afbf3bf6933f21406bdba2c59042ea0983b7a2533a51f46d372d79bc400"}, "web_driver_client": {:hex, :web_driver_client, "0.2.0", "63b76cd9eb3b0716ec5467a0f8bead73d3d9612e63f7560d21357f03ad86e31a", [:mix], [{:hackney, "~> 1.6", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:tesla, "~> 1.3", [hex: :tesla, repo: "hexpm", optional: false]}], "hexpm", "83cc6092bc3e74926d1c8455f0ce927d5d1d36707b74d9a65e38c084aab0350f"}, "websocket_client": {:git, "https://github.com/blockscout/websocket_client.git", "0b4ecc5b1fb8a0bd1c8352728da787c20add53aa", [branch: "master"]}, - "wobserver": {:git, "https://github.com/poanetwork/wobserver.git", "13bcda30a87f4f0be1878920a79433ad831eefbe", [branch: "support-https"]}, }