Merge pull request blockscout#8292 from blockscout/add-ethereum-json-…

…rpc-wait-per-timeout-env-var Add ETHEREUM_JSONRPC_WAIT_PER_TIMEOUT env var
FairCrypto · Aug 24, 2023 · 70e1cc3 · 70e1cc3
2 parents 54a0777 + 0c9c61c
commit 70e1cc3
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 - [#8181](https://github.com/blockscout/blockscout/pull/8181) - Insert current token balances placeholders along with historical
 - [#8210](https://github.com/blockscout/blockscout/pull/8210) - Drop address foreign keys
+- [#8292](https://github.com/blockscout/blockscout/pull/8292) - Add ETHEREUM_JSONRPC_WAIT_PER_TIMEOUT env var
 
 ### Fixes
 

diff --git a/apps/ethereum_jsonrpc/config/config.exs b/apps/ethereum_jsonrpc/config/config.exs
@@ -6,7 +6,6 @@ config :ethereum_jsonrpc, EthereumJSONRPC.RequestCoordinator,
     duration: :timer.minutes(1),
     table: EthereumJSONRPC.RequestCoordinator.TimeoutCounter
   ],
-  wait_per_timeout: :timer.seconds(20),
   max_jitter: :timer.seconds(2)
 
 # Add this configuration to add global RPC request throttling.

diff --git a/apps/ethereum_jsonrpc/config/runtime/test.exs b/apps/ethereum_jsonrpc/config/runtime/test.exs
@@ -2,6 +2,8 @@ import Config
 
 alias EthereumJSONRPC.Variant
 
+config :ethereum_jsonrpc, EthereumJSONRPC.RequestCoordinator, wait_per_timeout: 2
+
 variant = Variant.get()
 
 Code.require_file("#{variant}.exs", "#{__DIR__}/../../../explorer/config/test")

diff --git a/apps/ethereum_jsonrpc/config/test.exs b/apps/ethereum_jsonrpc/config/test.exs
@@ -6,7 +6,6 @@ config :ethereum_jsonrpc, EthereumJSONRPC.RequestCoordinator,
     duration: :timer.seconds(6),
     table: EthereumJSONRPC.RequestCoordinator.TimeoutCounter
   ],
-  wait_per_timeout: 2,
   max_jitter: 1,
   # This should not actually limit anything in tests, but it is here to enable the relevant code for testing
   throttle_rate_limit: 10_000,

diff --git a/config/runtime.exs b/config/runtime.exs
@@ -163,6 +163,9 @@ config :ethereum_jsonrpc, EthereumJSONRPC.Geth,
 config :ethereum_jsonrpc, EthereumJSONRPC.PendingTransaction,
   type: System.get_env("ETHEREUM_JSONRPC_PENDING_TRANSACTIONS_TYPE", "default")
 
+config :ethereum_jsonrpc, EthereumJSONRPC.RequestCoordinator,
+  wait_per_timeout: ConfigHelper.parse_time_env_var("ETHEREUM_JSONRPC_WAIT_PER_TIMEOUT", "20s")
+
 ################
 ### Explorer ###
 ################

diff --git a/docker-compose/envs/common-blockscout.env b/docker-compose/envs/common-blockscout.env
@@ -13,6 +13,7 @@ LOGO=/images/blockscout_logo.svg
 ETHEREUM_JSONRPC_TRANSPORT=http
 ETHEREUM_JSONRPC_DISABLE_ARCHIVE_BALANCES=false
 # ETHEREUM_JSONRPC_HTTP_HEADERS=
+# ETHEREUM_JSONRPC_WAIT_PER_TIMEOUT=
 IPC_PATH=
 NETWORK_PATH=/
 BLOCKSCOUT_HOST=

diff --git a/docker/Makefile b/docker/Makefile
@@ -63,6 +63,9 @@ endif
 ifdef ETHEREUM_JSONRPC_HTTP_HEADERS
 	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ETHEREUM_JSONRPC_HTTP_HEADERS=$(ETHEREUM_JSONRPC_HTTP_HEADERS)'
 endif
+ifdef ETHEREUM_JSONRPC_WAIT_PER_TIMEOUT
+	BLOCKSCOUT_CONTAINER_PARAMS += -e 'ETHEREUM_JSONRPC_WAIT_PER_TIMEOUT=$(ETHEREUM_JSONRPC_WAIT_PER_TIMEOUT)'
+endif
 ifdef IPC_PATH
 	BLOCKSCOUT_CONTAINER_PARAMS += -e 'IPC_PATH=$(IPC_PATH)'
 endif