Skip to content

Commit

Permalink
Merge pull request #6189 from blockscout/vb-fix-ethereum-json-rpc-var…
Browse files Browse the repository at this point in the history
…inat

Fix runtime definition of ETHEREUM_JSONRPC_VARIANT variable
  • Loading branch information
vbaranov committed Sep 29, 2022
2 parents 6fbe072 + 3dcf91d commit 1a29b38
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
### Chore

- [#6183](https://github.com/blockscout/blockscout/pull/6183) - Transparent coin name definition
- [#6155](https://github.com/blockscout/blockscout/pull/6155) - Refactor Ethereum JSON RPC variants
- [#6155](https://github.com/blockscout/blockscout/pull/6155), [#6189](https://github.com/blockscout/blockscout/pull/6189) - Refactor Ethereum JSON RPC variants
- [#6125](https://github.com/blockscout/blockscout/pull/6125) - Rename obsolete "parity" EthereumJSONRPC.Variant to "nethermind"
- [#6124](https://github.com/blockscout/blockscout/pull/6124) - Docker compose: add config for Erigon
- [#6053](https://github.com/blockscout/blockscout/pull/6053) - Bump jest-environment-jsdom from 29.0.1 to 29.0.2 in /apps/block_scout_web/assets
Expand Down
2 changes: 1 addition & 1 deletion apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/variant.ex
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ defmodule EthereumJSONRPC.Variant do
) :: {:ok, [raw_trace_params]} | {:error, reason :: term} | :ignore

def get do
variant = Application.get_env(:ethereum_jsonrpc, __MODULE__)[:type]
variant = System.get_env("ETHEREUM_JSONRPC_VARIANT", "nethermind")

cond do
is_nil(variant) ->
Expand Down
2 changes: 0 additions & 2 deletions config/runtime.exs
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,6 @@ config :ethereum_jsonrpc, EthereumJSONRPC.Geth, debug_trace_transaction_timeout:
config :ethereum_jsonrpc, EthereumJSONRPC.PendingTransaction,
type: System.get_env("ETHEREUM_JSONRPC_PENDING_TRANSACTIONS_TYPE", "default")

config :ethereum_jsonrpc, EthereumJSONRPC.Variant, type: System.get_env("ETHEREUM_JSONRPC_VARIANT", "nethermind")

################
### Explorer ###
################
Expand Down

0 comments on commit 1a29b38

Please sign in to comment.