Finalize Account functionality PR

.github/workflows/config.yml

@@ -156,7 +156,7 @@ jobs:
         id: dialyzer-cache
         with:
           path: priv/plts
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-dialyzer-mixlockhash_15-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-dialyzer-mixlockhash_14-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-dialyzer-"
 

CHANGELOG.md

@@ -1,6 +1,8 @@
 ## Current
 
 ### Features
+
+- [#6092](https://github.com/blockscout/blockscout/pull/6092) - Blockscout Account functionality
 - [#6073](https://github.com/blockscout/blockscout/pull/6073) - Add vyper support for rust verifier microservice integration
 
 ### Fixes

apps/block_scout_web/mix.exs

@@ -104,7 +104,7 @@ defmodule BlockScoutWeb.Mixfile do
       {:plug_cowboy, "~> 2.2"},
       # Waiting for the Pretty Print to be implemented at the Jason lib
       # https://github.com/michalmuskala/jason/issues/15
-      # {:poison, "~> 5.0.0"},
+      {:poison, "~> 4.0.1"},
       {:postgrex, ">= 0.0.0"},
       # For compatibility with `prometheus_process_collector`, which hasn't been updated yet
       {:prometheus, "~> 4.0", override: true},

apps/explorer/mix.exs

@@ -90,7 +90,7 @@ defmodule Explorer.Mixfile do
       {:mock, "~> 0.3.0", only: [:test], runtime: false},
       {:mox, "~> 1.0", only: [:test]},
       {:phoenix_html, "== 3.0.4"},
-      {:poison, "~> 4.0.0"},
+      {:poison, "~> 4.0.1"},
       {:nimble_csv, "~> 1.1"},
       {:postgrex, ">= 0.0.0"},
       # For compatibility with `prometheus_process_collector`, which hasn't been updated yet

config/runtime/dev.exs

@@ -46,11 +46,10 @@ database_api_url =
     do: System.get_env("DATABASE_READ_ONLY_API_URL"),
     else: System.get_env("DATABASE_URL")
 
-# pool_size =
+pool_size =
-#   if System.get_env("DATABASE_READ_ONLY_API_URL"),
+  if System.get_env("DATABASE_READ_ONLY_API_URL"),
-#     do: String.to_integer(System.get_env("POOL_SIZE", "40")),
+    do: String.to_integer(System.get_env("POOL_SIZE", "30")),
-#     else: String.to_integer(System.get_env("POOL_SIZE", "50"))
+    else: String.to_integer(System.get_env("POOL_SIZE", "40"))
-pool_size = String.to_integer(System.get_env("POOL_SIZE", "30"))
 
 # Configure your database
 config :explorer, Explorer.Repo,
@@ -62,10 +61,7 @@ config :explorer, Explorer.Repo,
 database_api = if System.get_env("DATABASE_READ_ONLY_API_URL"), do: nil, else: database
 hostname_api = if System.get_env("DATABASE_READ_ONLY_API_URL"), do: nil, else: hostname
 
-pool_size_api =
+pool_size_api = String.to_integer(System.get_env("POOL_SIZE_API", "10"))
-  if System.get_env("DATABASE_READ_ONLY_API_URL"),
-    do: String.to_integer(System.get_env("POOL_SIZE_API", "10")),
-    else: String.to_integer(System.get_env("POOL_SIZE_API", "10"))
 
 # Configure API database
 config :explorer, Explorer.Repo.Replica1,
@@ -76,10 +72,7 @@ config :explorer, Explorer.Repo.Replica1,
 
 database_account_url = System.get_env("ACCOUNT_DATABASE_URL") || System.get_env("DATABASE_URL")
 
-pool_size_account =
+pool_size_account = String.to_integer(System.get_env("ACCOUNT_POOL_SIZE", "10"))
-  if System.get_env("ACCOUNT_DATABASE_URL"),
-    do: String.to_integer(System.get_env("ACCOUNT_POOL_SIZE", "10")),
-    else: String.to_integer(System.get_env("ACCOUNT_POOL_SIZE", "10"))
 
 database_account = if System.get_env("ACCOUNT_DATABASE_URL"), do: nil, else: database
 hostname_account = if System.get_env("ACCOUNT_DATABASE_URL"), do: nil, else: hostname

docker-compose/envs/common-blockscout.env

@@ -19,8 +19,8 @@ BLOCKSCOUT_PROTOCOL=
 # SECRET_KEY_BASE=
 # CHECK_ORIGIN=
 PORT=4000
-# COIN=
 COIN_NAME=
+# COIN=
 # METADATA_CONTRACT=
 # VALIDATORS_CONTRACT=
 # KEYS_MANAGER_CONTRACT=

docker/Dockerfile

@@ -43,7 +43,7 @@ ADD apps/explorer/mix.exs ./apps/explorer/
 ADD apps/ethereum_jsonrpc/mix.exs ./apps/ethereum_jsonrpc/
 ADD apps/indexer/mix.exs ./apps/indexer/
 
-RUN HEX_HTTP_TIMEOUT=3600 mix do deps.get, local.rebar --force, deps.compile
+RUN mix do deps.get, local.rebar --force, deps.compile
 
 ADD . .
 

docker/Makefile

@@ -67,9 +67,6 @@ endif
 ifdef COIN
 	BLOCKSCOUT_CONTAINER_PARAMS += -e 'COIN=$(COIN)'
 endif
-ifdef COIN_NAME
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'COIN_NAME=$(COIN_NAME)'
-endif
 ifdef METADATA_CONTRACT
 	BLOCKSCOUT_CONTAINER_PARAMS += -e 'METADATA_CONTRACT=$(METADATA_CONTRACT)'
 endif
@@ -370,9 +367,6 @@ endif
 ifdef API_RATE_LIMIT_WHITELISTED_IPS
 	BLOCKSCOUT_CONTAINER_PARAMS += -e 'API_RATE_LIMIT_WHITELISTED_IPS=$(API_RATE_LIMIT_WHITELISTED_IPS)'
 endif
-ifdef COIN_NAME
-	BLOCKSCOUT_CONTAINER_PARAMS += -e 'COIN_NAME=$(COIN_NAME)'
-endif
 ifdef INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER
 	BLOCKSCOUT_CONTAINER_PARAMS += -e 'INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER=$(INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER)'
 endif
@@ -475,6 +469,9 @@ endif
 ifdef ACCOUNT_REDIS_URL
 	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ACCOUNT_REDIS_URL=$(ACCOUNT_REDIS_URL)'
 endif
+ifdef COIN_NAME
+	BLOCKSCOUT_CONTAINER_PARAMS += -e 'COIN_NAME=$(COIN_NAME)'
+endif
 ifdef ACCOUNT_AUTH0_DOMAIN
 	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ACCOUNT_AUTH0_DOMAIN=$(ACCOUNT_AUTH0_DOMAIN)'
 endif