Merge branch 'master' into vb-block-validator-custom-tooltip

CHANGELOG.md

@@ -1,12 +1,15 @@
 ## Current
 
 ### Features
+- [#2791](https://github.com/poanetwork/blockscout/pull/2791) - add ipc client
 - [#2449](https://github.com/poanetwork/blockscout/pull/2449) - add ability to send notification events through postgres notify
 
 ### Fixes
 - [#2803](https://github.com/poanetwork/blockscout/pull/2803) - Fix block validator custom tooltip
 
 ### Chore
+- [#2817](https://github.com/poanetwork/blockscout/pull/2817) - move docker integration documentation to blockscout docs
+- [#2801](https://github.com/poanetwork/blockscout/pull/2801) - remove unused clause in address_to_unique_tokens query
 
 
 ## 2.1.0-beta

apps/ethereum_jsonrpc/config/config.exs

@@ -9,6 +9,10 @@ config :ethereum_jsonrpc, EthereumJSONRPC.RequestCoordinator,
   wait_per_timeout: :timer.seconds(20),
   max_jitter: :timer.seconds(2)
 
+config :ethereum_jsonrpc,
+  rpc_transport: if(System.get_env("ETHEREUM_JSONRPC_JSON_RPC_TRANSPORT", "http") == "http", do: :http, else: :ipc),
+  ipc_path: System.get_env("IPC_PATH")
+
 # Add this configuration to add global RPC request throttling.
 # throttle_rate_limit: 250,
 # throttle_rolling_window_opts: [

apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/application.ex

@@ -5,7 +5,7 @@ defmodule EthereumJSONRPC.Application do
 
   use Application
 
-  alias EthereumJSONRPC.{RequestCoordinator, RollingWindow}
+  alias EthereumJSONRPC.{IPC, RequestCoordinator, RollingWindow}
 
   @impl Application
   def start(_type, _args) do
@@ -18,6 +18,7 @@ defmodule EthereumJSONRPC.Application do
       Supervisor.child_spec({RollingWindow, [rolling_window_opts]}, id: RollingWindow.ErrorThrottle)
     ]
     |> add_throttle_rolling_window(config)
+    |> add_ipc_client()
     |> Supervisor.start_link(strategy: :one_for_one, name: EthereumJSONRPC.Supervisor)
   end
 
@@ -37,4 +38,26 @@ defmodule EthereumJSONRPC.Application do
       children
     end
   end
+
+  defp add_ipc_client(children) do
+    case Application.get_env(:ethereum_jsonrpc, :rpc_transport) do
+      :ipc ->
+        [
+          :poolboy.child_spec(:worker, poolboy_config(), path: Application.get_env(:ethereum_jsonrpc, :ipc_path))
+          | children
+        ]
+
+      _ ->
+        children
+    end
+  end
+
+  defp poolboy_config do
+    [
+      {:name, {:local, :ipc_worker}},
+      {:worker_module, IPC},
+      {:size, 10},
+      {:max_overflow, 5}
+    ]
+  end
 end

apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/http.ex

@@ -132,7 +132,7 @@ defmodule EthereumJSONRPC.HTTP do
 
   # restrict response to only those fields supported by the JSON-RPC 2.0 standard, which means that level of keys is
   # validated, so we can indicate that with switch to atom keys.
-  defp standardize_response(%{"jsonrpc" => "2.0" = jsonrpc, "id" => id} = unstandardized) do
+  def standardize_response(%{"jsonrpc" => "2.0" = jsonrpc, "id" => id} = unstandardized) do
     # Nethermind return string ids
     id = quantity_to_integer(id)
 
@@ -155,8 +155,8 @@ defmodule EthereumJSONRPC.HTTP do
 
   # restrict error to only those fields supported by the JSON-RPC 2.0 standard, which means that level of keys is
   # validated, so we can indicate that with switch to atom keys.
-  defp standardize_error(%{"code" => code, "message" => message} = unstandardized)
+  def standardize_error(%{"code" => code, "message" => message} = unstandardized)
-       when is_integer(code) and is_binary(message) do
+      when is_integer(code) and is_binary(message) do
     standardized = %{code: code, message: message}
 
     case Map.fetch(unstandardized, "data") do

apps/ethereum_jsonrpc/lib/ethereum_jsonrpc/ipc.ex

@@ -0,0 +1,94 @@
+defmodule EthereumJSONRPC.IPC do
+  use GenServer
+  @moduledoc false
+
+  import EthereumJSONRPC.HTTP, only: [standardize_response: 1]
+
+  # Server
+
+  def start_link(opts) do
+    GenServer.start_link(__MODULE__, Keyword.merge(opts, socket: nil))
+  end
+
+  def init(state) do
+    opts = [:binary, active: false, reuseaddr: true]
+
+    response = :gen_tcp.connect({:local, state[:path]}, 0, opts)
+
+    case response do
+      {:ok, socket} -> {:ok, Keyword.put(state, :socket, socket)}
+      {:error, reason} -> {:error, reason}
+    end
+  end
+
+  def post(pid, request) do
+    GenServer.call(pid, {:request, request})
+  end
+
+  def receive_response(data, socket, timeout, result \\ <<>>)
+
+  def receive_response({:error, reason}, _socket, _timeout, _result) do
+    {:error, reason}
+  end
+
+  def receive_response(:ok, socket, timeout, result) do
+    with {:ok, response} <- :gen_tcp.recv(socket, 0, timeout) do
+      new_result = result <> response
+
+      if String.ends_with?(response, "\n") do
+        {:ok, new_result}
+      else
+        receive_response(:ok, socket, timeout, new_result)
+      end
+    end
+  end
+
+  def receive_response(data, _socket, _timeout, _result) do
+    {:error, data}
+  end
+
+  def handle_call(
+        {:request, request},
+        _from,
+        [socket: socket, path: _] = state
+      ) do
+    response =
+      socket
+      |> :gen_tcp.send(request)
+      |> receive_response(socket, 500_000)
+
+    {:reply, response, state}
+  end
+
+  # Client
+
+  def request(pid, payload) do
+    with {:ok, response} <- post(pid, Jason.encode!(payload)),
+         {:ok, decoded_body} <- Jason.decode(response) do
+      case decoded_body do
+        %{"error" => error} ->
+          {:error, error}
+
+        result = [%{} | _] ->
+          list =
+            result
+            |> Enum.reverse()
+            |> List.flatten()
+            |> Enum.map(&standardize_response/1)
+
+          {:ok, list}
+
+        result ->
+          {:ok, Map.get(result, "result")}
+      end
+    else
+      {:error, %Jason.DecodeError{data: ""}} -> {:error, :empty_response}
+      {:error, error} -> {:error, {:invalid_json, error}}
+      {:error, error} -> {:error, error}
+    end
+  end
+
+  def json_rpc(payload, _opts) do
+    :poolboy.transaction(:ipc_worker, fn pid -> request(pid, payload) end, 600_000)
+  end
+end

apps/ethereum_jsonrpc/mix.exs

@@ -91,7 +91,8 @@ defmodule EthereumJsonrpc.MixProject do
       {:websocket_client, "~> 1.3"},
       {:decimal, "~> 1.0"},
       {:decorator, "~> 1.2"},
-      {:hackney, "~> 1.15.2"}
+      {:hackney, "~> 1.15.2"},
+      {:poolboy, "~> 1.5.2"}
     ]
   end
 end

apps/explorer/lib/explorer/chain/token_transfer.ex

@@ -280,7 +280,7 @@ defmodule Explorer.Chain.TokenTransfer do
       tt in TokenTransfer,
       left_join: instance in Instance,
       on: tt.token_contract_address_hash == instance.token_contract_address_hash and tt.token_id == instance.token_id,
-      where: tt.token_contract_address_hash == ^contract_address_hash and tt.token_id == tt.token_id,
+      where: tt.token_contract_address_hash == ^contract_address_hash,
       order_by: [desc: tt.block_number],
       distinct: tt.token_id,
       preload: [:to_address],

apps/indexer/config/dev/ganache.exs

@@ -3,7 +3,11 @@ use Mix.Config
 config :indexer,
   block_interval: :timer.seconds(5),
   json_rpc_named_arguments: [
-    transport: EthereumJSONRPC.HTTP,
+    transport:
+      if(System.get_env("ETHEREUM_JSONRPC_JSON_RPC_TRANSPORT", "http") == "http",
+        do: EthereumJSONRPC.HTTP,
+        else: EthereumJSONRPC.IPC
+      ),
     transport_options: [
       http: EthereumJSONRPC.HTTP.HTTPoison,
       url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || "http://localhost:7545",

apps/indexer/config/dev/geth.exs

@@ -3,7 +3,11 @@ use Mix.Config
 config :indexer,
   block_interval: :timer.seconds(5),
   json_rpc_named_arguments: [
-    transport: EthereumJSONRPC.HTTP,
+    transport:
+      if(System.get_env("ETHEREUM_JSONRPC_JSON_RPC_TRANSPORT", "http") == "http",
+        do: EthereumJSONRPC.HTTP,
+        else: EthereumJSONRPC.IPC
+      ),
     transport_options: [
       http: EthereumJSONRPC.HTTP.HTTPoison,
       url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || "https://mainnet.infura.io/8lTvJTKmHPCHazkneJsY",

apps/indexer/config/dev/parity.exs

@@ -3,7 +3,12 @@ use Mix.Config
 config :indexer,
   block_interval: :timer.seconds(5),
   json_rpc_named_arguments: [
-    transport: EthereumJSONRPC.HTTP,
+    transport:
+      if(System.get_env("ETHEREUM_JSONRPC_JSON_RPC_TRANSPORT", "http") == "http",
+        do: EthereumJSONRPC.HTTP,
+        else: EthereumJSONRPC.IPC
+      ),
+    else: EthereumJSONRPC.IPC,
     transport_options: [
       http: EthereumJSONRPC.HTTP.HTTPoison,
       url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || "http://localhost:8545",

apps/indexer/config/dev/rsk.exs

@@ -5,7 +5,11 @@ config :indexer,
   blocks_concurrency: 1,
   receipts_concurrency: 1,
   json_rpc_named_arguments: [
-    transport: EthereumJSONRPC.HTTP,
+    transport:
+      if(System.get_env("ETHEREUM_JSONRPC_JSON_RPC_TRANSPORT", "http") == "http",
+        do: EthereumJSONRPC.HTTP,
+        else: EthereumJSONRPC.IPC
+      ),
     transport_options: [
       http: EthereumJSONRPC.HTTP.HTTPoison,
       url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || "http://localhost:8545",

apps/indexer/config/prod/ganache.exs

@@ -3,7 +3,11 @@ use Mix.Config
 config :indexer,
   block_interval: :timer.seconds(5),
   json_rpc_named_arguments: [
-    transport: EthereumJSONRPC.HTTP,
+    transport:
+      if(System.get_env("ETHEREUM_JSONRPC_JSON_RPC_TRANSPORT", "http") == "http",
+        do: EthereumJSONRPC.HTTP,
+        else: EthereumJSONRPC.IPC
+      ),
     transport_options: [
       http: EthereumJSONRPC.HTTP.HTTPoison,
       url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || "http://localhost:7545",

apps/indexer/config/prod/geth.exs

@@ -3,7 +3,11 @@ use Mix.Config
 config :indexer,
   block_interval: :timer.seconds(5),
   json_rpc_named_arguments: [
-    transport: EthereumJSONRPC.HTTP,
+    transport:
+      if(System.get_env("ETHEREUM_JSONRPC_JSON_RPC_TRANSPORT", "http") == "http",
+        do: EthereumJSONRPC.HTTP,
+        else: EthereumJSONRPC.IPC
+      ),
     transport_options: [
       http: EthereumJSONRPC.HTTP.HTTPoison,
       url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL") || "https://mainnet.infura.io/8lTvJTKmHPCHazkneJsY",

apps/indexer/config/prod/parity.exs

@@ -3,7 +3,11 @@ use Mix.Config
 config :indexer,
   block_interval: :timer.seconds(5),
   json_rpc_named_arguments: [
-    transport: EthereumJSONRPC.HTTP,
+    transport:
+      if(System.get_env("ETHEREUM_JSONRPC_JSON_RPC_TRANSPORT", "http") == "http",
+        do: EthereumJSONRPC.HTTP,
+        else: EthereumJSONRPC.IPC
+      ),
     transport_options: [
       http: EthereumJSONRPC.HTTP.HTTPoison,
       url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL"),

apps/indexer/config/prod/rsk.exs

@@ -5,7 +5,11 @@ config :indexer,
   blocks_concurrency: 1,
   receipts_concurrency: 1,
   json_rpc_named_arguments: [
-    transport: EthereumJSONRPC.HTTP,
+    transport:
+      if(System.get_env("ETHEREUM_JSONRPC_JSON_RPC_TRANSPORT", "http") == "http",
+        do: EthereumJSONRPC.HTTP,
+        else: EthereumJSONRPC.IPC
+      ),
     transport_options: [
       http: EthereumJSONRPC.HTTP.HTTPoison,
       url: System.get_env("ETHEREUM_JSONRPC_HTTP_URL"),

docker/README.md

@@ -1,77 +1,5 @@
-# BlockScout Docker integration
+# BlockScout Docker Integration
 
-For now this integration is not production ready. It made only for local usage only !
+This integration is not production ready, and should be used for local BlockScout deployment only.
-
-## How to use ?
-First of all, blockscout requires `PostgreSQL` server for working. 
-It will be provided by starting script (new docker image will be created named `postgres`)
-
-**Starting command**
-`make start` - will set everything up and start blockscout in container.
-To connect it to your local environment you will have to configure it using [env variables](#env-variables)
-
-Example connecting to local `ganache` instance running on port `2000` on Mac/Windows:
-```bash
-COIN=DAI \
-ETHEREUM_JSONRPC_VARIANT=ganache \ 
-ETHEREUM_JSONRPC_HTTP_URL=http://host.docker.internal:2000 \
-ETHEREUM_JSONRPC_WS_URL=ws://host.docker.internal:2000 \
-make start
-```
-
-Blockscout will be available on `localhost:4000`
-
-**Note**
-On mac/Windows Docker provides with a special URL `host.docker.internal` that will be available into container and routed to your local machine.
-On Linux docker is starting using `--network=host` and all services should be available on `localhost`
-
-### Migrations
-
-By default, `Makefile` will do migrations for you on `PostgreSQL` creation. 
-But you could run migrations manually using `make migrate` command.
-
-**WARNING** Migrations will clean up your local database !
-
-## Env variables
-
-BlockScout supports 3 different JSON RPC Variants.
-Variant could be configured using `ETHEREUM_JSONRPC_VARIANT` environment variable.
-
-Example: 
-```bash
-ETHEREUM_JSONRPC_VARIANT=ganache make start
-```
-
-Available options are:
-
- * `parity` - Parity JSON RPC (**Default one**)
- * `geth` - Geth JSON RPC
- * `ganache` - Ganache JSON RPC
- 
-
-| Variable | Description | Default value |
-| -------- | ----------- | ------------- |
-| `ETHEREUM_JSONRPC_VARIANT` | Variant of your JSON RPC service: `parity`, `geth` or `ganache` | `parity` |
-| `ETHEREUM_JSONRPC_HTTP_URL` | HTTP JSON RPC URL Only for `geth` or `ganache` variant | Different per JSONRPC variant |
-| `ETHEREUM_JSONRPC_WS_URL` | WS JSON RPC url | Different per JSONRPC variant |
-| `ETHEREUM_JSONRPC_TRACE_URL` | Trace URL **Only for `parity` variant** | `http://localhost:8545` |
-| `COIN` | Default Coin | `POA` |
-| `LOGO` | Coin logo | Empty | 
-| `NETWORK` | Network | Empty |
-| `SUBNETWORK` | Subnetwork | Empty |
-| `NETWORK_ICON` | Network icon | Empty | 
-| `NETWORK_PATH` | Network path | `/` |
-
-
-`ETHEREUM_JSONRPC_HTTP_URL` default values:
-
- * For `parity` - `http://localhost:8545`
- * For `geth` - `https://mainnet.infura.io/8lTvJTKmHPCHazkneJsY`
- * For `ganache` - `http://localhost:7545`
-
-`ETHEREUM_JSONRPC_WS_URL` default values:
-
- * For `parity` - `ws://localhost:8546`
- * For `geth` - `wss://mainnet.infura.io/8lTvJTKmHPCHazkneJsY/ws`
- * For `ganache` - `ws://localhost:7545`
 
+For usage instructions and ENV variables, see the [docker integration documentation](https://docs.blockscout.com/for-developers/information-and-settings/docker-integration-local-use-only).