From 96e673044bd8b6795b149c829c35252882035e2b Mon Sep 17 00:00:00 2001 From: Viktor Baranov Date: Wed, 26 Oct 2022 20:36:40 +0300 Subject: [PATCH] Disable forum link en var --- CHANGELOG.md | 1 + .../block_scout_web/templates/layout/_footer.html.eex | 4 +++- apps/block_scout_web/priv/gettext/default.pot | 10 +++++----- .../priv/gettext/en/LC_MESSAGES/default.po | 10 +++++----- apps/indexer/lib/indexer/block/fetcher.ex | 2 +- apps/indexer/lib/indexer/fetcher/coin_balance.ex | 2 +- config/runtime.exs | 3 ++- 7 files changed, 18 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 187dd75509..fc47103dc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ### Features +- [#6351](https://github.com/blockscout/blockscout/pull/6351) - Enable forum link env var - [#6316](https://github.com/blockscout/blockscout/pull/6316) - Copy public tags functionality to master - [#6196](https://github.com/blockscout/blockscout/pull/6196) - INDEXER_CATCHUP_BLOCKS_BATCH_SIZE and INDEXER_CATCHUP_BLOCKS_CONCURRENCY env varaibles - [#6187](https://github.com/blockscout/blockscout/pull/6187) - Filter by created time of verified contracts in listcontracts API endpoint diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/_footer.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/_footer.html.eex index 429c4ee8bd..4afe708dec 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/layout/_footer.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/_footer.html.eex @@ -39,7 +39,9 @@
  • <%= gettext("Submit an Issue") %>
  • <%= gettext("Contribute") %>
  • <%= gettext("Chat (#blockscout)") %>
    • -
  • <%= gettext("Forum") %>
    • + <%= if Application.get_env(:block_scout_web, :footer)[:enable_forum_link] do %> +
  • <%= gettext("Forum") %>
    • + <% end %> <%= render BlockScoutWeb.LayoutView, "_add_chain_to_mm.html" %> diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot index b22ab0f0f5..662e1cee46 100644 --- a/apps/block_scout_web/priv/gettext/default.pot +++ b/apps/block_scout_web/priv/gettext/default.pot @@ -1242,7 +1242,7 @@ msgstr "" msgid "Forked Blocks (Reorgs)" msgstr "" -#: lib/block_scout_web/templates/layout/_footer.html.eex:42 +#: lib/block_scout_web/templates/layout/_footer.html.eex:43 #, elixir-autogen, elixir-format msgid "Forum" msgstr "" @@ -1539,7 +1539,7 @@ msgstr "" msgid "Logs" msgstr "" -#: lib/block_scout_web/templates/layout/_footer.html.eex:50 +#: lib/block_scout_web/templates/layout/_footer.html.eex:52 #, elixir-autogen, elixir-format msgid "Main Networks" msgstr "" @@ -1800,7 +1800,7 @@ msgstr "" msgid "Optimization runs" msgstr "" -#: lib/block_scout_web/templates/layout/_footer.html.eex:74 +#: lib/block_scout_web/templates/layout/_footer.html.eex:76 #, elixir-autogen, elixir-format msgid "Other Explorers" msgstr "" @@ -2273,7 +2273,7 @@ msgstr "" msgid "Telegram" msgstr "" -#: lib/block_scout_web/templates/layout/_footer.html.eex:63 +#: lib/block_scout_web/templates/layout/_footer.html.eex:65 #, elixir-autogen, elixir-format msgid "Test Networks" msgstr "" @@ -2941,7 +2941,7 @@ msgstr "" msgid "Verify the contract " msgstr "" -#: lib/block_scout_web/templates/layout/_footer.html.eex:89 +#: lib/block_scout_web/templates/layout/_footer.html.eex:91 #, elixir-autogen, elixir-format msgid "Version" msgstr "" diff --git a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po index 45ae80d515..12435bfd93 100644 --- a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po +++ b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po @@ -1242,7 +1242,7 @@ msgstr "" msgid "Forked Blocks (Reorgs)" msgstr "" -#: lib/block_scout_web/templates/layout/_footer.html.eex:42 +#: lib/block_scout_web/templates/layout/_footer.html.eex:43 #, elixir-autogen, elixir-format msgid "Forum" msgstr "" @@ -1539,7 +1539,7 @@ msgstr "" msgid "Logs" msgstr "" -#: lib/block_scout_web/templates/layout/_footer.html.eex:50 +#: lib/block_scout_web/templates/layout/_footer.html.eex:52 #, elixir-autogen, elixir-format msgid "Main Networks" msgstr "" @@ -1800,7 +1800,7 @@ msgstr "" msgid "Optimization runs" msgstr "" -#: lib/block_scout_web/templates/layout/_footer.html.eex:74 +#: lib/block_scout_web/templates/layout/_footer.html.eex:76 #, elixir-autogen, elixir-format msgid "Other Explorers" msgstr "" @@ -2273,7 +2273,7 @@ msgstr "" msgid "Telegram" msgstr "" -#: lib/block_scout_web/templates/layout/_footer.html.eex:63 +#: lib/block_scout_web/templates/layout/_footer.html.eex:65 #, elixir-autogen, elixir-format msgid "Test Networks" msgstr "" @@ -2941,7 +2941,7 @@ msgstr "" msgid "Verify the contract " msgstr "" -#: lib/block_scout_web/templates/layout/_footer.html.eex:89 +#: lib/block_scout_web/templates/layout/_footer.html.eex:91 #, elixir-autogen, elixir-format msgid "Version" msgstr "" diff --git a/apps/indexer/lib/indexer/block/fetcher.ex b/apps/indexer/lib/indexer/block/fetcher.ex index 929d769550..73935756e9 100644 --- a/apps/indexer/lib/indexer/block/fetcher.ex +++ b/apps/indexer/lib/indexer/block/fetcher.ex @@ -71,7 +71,7 @@ defmodule Indexer.Block.Fetcher do # These are all the *default* values for options. # DO NOT use them directly in the code. Get options from `state`. - @receipts_batch_size 250 + @receipts_batch_size 100 @receipts_concurrency 10 @doc false diff --git a/apps/indexer/lib/indexer/fetcher/coin_balance.ex b/apps/indexer/lib/indexer/fetcher/coin_balance.ex index 7b175c7915..b09d7ea606 100644 --- a/apps/indexer/lib/indexer/fetcher/coin_balance.ex +++ b/apps/indexer/lib/indexer/fetcher/coin_balance.ex @@ -22,7 +22,7 @@ defmodule Indexer.Fetcher.CoinBalance do @defaults [ flush_interval: :timer.seconds(3), - max_batch_size: 500, + max_batch_size: 100, max_concurrency: 4, task_supervisor: Indexer.Fetcher.CoinBalance.TaskSupervisor, metadata: [fetcher: :coin_balance] diff --git a/config/runtime.exs b/config/runtime.exs index ceacf9cbcf..a8a17e2e57 100644 --- a/config/runtime.exs +++ b/config/runtime.exs @@ -32,7 +32,8 @@ config :indexer, Indexer.Fetcher.EmptyBlocksSanitizer, batch_size: indexer_empty config :block_scout_web, :footer, chat_link: System.get_env("FOOTER_CHAT_LINK", "https://discord.gg/blockscout"), forum_link: System.get_env("FOOTER_FORUM_LINK", "https://forum.poa.network/c/blockscout"), - github_link: System.get_env("FOOTER_GITHUB_LINK", "https://github.com/blockscout/blockscout") + github_link: System.get_env("FOOTER_GITHUB_LINK", "https://github.com/blockscout/blockscout"), + enable_forum_link: System.get_env("FOOTER_ENABLE_FORUM_LINK", "false") == "true" ###################### ### BlockScout Web ###